diff --git a/.eslintrc.js b/.eslintrc.js index 2c15ee90fe..74b71f61ff 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { plugins: ['prettier'], extends: ['eslint:recommended', 'prettier'], - parser: '@babel/eslint-parser', + parser: 'esprima', settings: { next: { rootDir: 'packages/next/' diff --git a/README.md b/README.md index bfaae28aeb..c2e869f31d 100644 --- a/README.md +++ b/README.md @@ -258,6 +258,7 @@ telescope({ | `aminoEncoding.casingFn` | set the amino-casing function for a project | `snake()` | | `aminoEncoding.exceptions` | set specific aminoType name exceptions | see code | | `aminoEncoding.typeUrlToAmino` | create functions for aminoType name exceptions | `undefined`| +| `aminoEncoding.useLegacyInlineEncoding` | To use legacy inline encoding instead of using v2 recursive encoding | `false`| ### Implemented Interface Options @@ -279,6 +280,8 @@ telescope({ | `prototypes.allowUndefinedTypes` | boolean value allowing `Type`s to be `undefined` | `false` | | `prototypes.optionalQueryParams` | boolean value setting queryParams to be optional | `false` | | `prototypes.optionalPageRequests` | boolean value setting `PageRequest` fields to optional | `false` | +| `prototypes.addTypeUrlToDecoders` | Include typeUrl feild into decoders to indicate the original type. | `true` | +| `prototypes.addTypeUrlToObjects` | Include typeUrl feild into objects to indicate the original type | `true` | ### Prototypes Methods @@ -291,6 +294,10 @@ telescope({ | `prototypes.methods.fromPartial` | boolean to enable `fromPartial` method on proto objects | `true` | | `prototypes.methods.fromSDK` | boolean to enable `fromSDK` method on proto objects | `false` | | `prototypes.methods.toSDK` | boolean to enable `toSDK` method on proto objects | `false` | +| `prototypes.methods.toAmino` | boolean to enable `toAmino` method on proto objects | `true` | +| `prototypes.methods.fromAmino` | boolean to enable `fromAmino` method on proto objects | `true` | +| `prototypes.methods.toProto` | boolean to enable `toProto` method on proto objects | `true` | +| `prototypes.methods.fromProto` | boolean to enable `fromProto` method on proto objects | `true` | ### LCD Client Options @@ -359,9 +366,9 @@ See [RPC Clients](#rpc-clients) for more info. | option | description | defaults | | ----------------------------------------- | -------------------------------------------------------------- | --------- | -| `prototypes.typingsFormat.customTypes.useCosmosSDKDec` | enable handling "prototypes.typingsFormat.customTypes.useCosmosSDKDec" proto custom type. Used to show decimal fields with the custom type correctly. Highly recommend set to true. | `false` | -| `prototypes.typingsFormat.num64` | 'long' or 'bigint', the way of generating int64 proto types, set to 'bigint' to enable using more stable built-in type | `long` | -| `prototypes.typingsFormat.useDeepPartial` | defaults to true, but if disabled uses the `Partial` TS type | `true` | +| `prototypes.typingsFormat.customTypes.useCosmosSDKDec` | enable handling "prototypes.typingsFormat.customTypes.useCosmosSDKDec" proto custom type. Used to show decimal fields with the custom type correctly. Highly recommend set to true. | `true` | +| `prototypes.typingsFormat.num64` | 'long' or 'bigint', the way of generating int64 proto types, set to 'bigint' to enable using more stable built-in type | `bigint` | +| `prototypes.typingsFormat.useDeepPartial` | By default using the `Partial` TS type, otherwise using `DeepPartial` | `false` | | `prototypes.typingsFormat.useExact` | defaults to false, but if enabled uses the `Exact` TS type | `false` | | `prototypes.typingsFormat.timestamp` | use either `date` or `timestamp` for `Timestamp` proto type | "date" | | `prototypes.typingsFormat.duration` | use either `duration` or `string` for `Duration` proto type | "duration"| @@ -406,6 +413,7 @@ See [RPC Clients](#rpc-clients) for more info. | `removeUnusedImports` | removes unused imports | `true` | | `classesUseArrowFunctions` | classes use arrow functions instead of `bind()`ing in constructors | `false` | | `includeExternalHelpers` | exports a few helpers functions in `extern.ts` | `false` | +| `interfaces.enabled` | Enable handling accepts_interface to decode or encode fields that can be multiple types | `true` | ## Types diff --git a/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts index 4f4969cdd4..9ca7f8bfa8 100644 --- a/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output/google/api/expr/v1alpha1/eval.ts @@ -45,6 +45,7 @@ function createBaseExprValue(): ExprValue { }; } export const ExprValue = { + typeUrl: "/google.api.expr.v1alpha1.ExprValue", encode(message: ExprValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.exprs) { IdRef.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -142,6 +143,7 @@ function createBaseIdRef(): IdRef { }; } export const IdRef = { + typeUrl: "/google.api.expr.v1alpha1.IdRef", encode(message: IdRef, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); diff --git a/__fixtures__/misc/output/misc/eval_request.ts b/__fixtures__/misc/output/misc/eval_request.ts index c93abfdfb5..56bc046529 100644 --- a/__fixtures__/misc/output/misc/eval_request.ts +++ b/__fixtures__/misc/output/misc/eval_request.ts @@ -277,6 +277,7 @@ function createBaseEvalRequest(): EvalRequest { }; } export const EvalRequest = { + typeUrl: "/misc.EvalRequest", encode(message: EvalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.bindings).forEach(([key, value]) => { EvalRequest_BindingsEntry.encode({ diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts index c0d56e675a..d7a0364c72 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta1/audit.ts @@ -84,6 +84,7 @@ function createBaseProvider(): Provider { }; } export const Provider = { + typeUrl: "/akash.audit.v1beta1.Provider", encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -168,6 +169,45 @@ export const Provider = { obj.attributes = []; } return obj; + }, + fromAmino(object: ProviderAmino): Provider { + return { + owner: object.owner, + auditor: object.auditor, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Provider): ProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: ProviderAminoMsg): Provider { + return Provider.fromAmino(object.value); + }, + toAminoMsg(message: Provider): ProviderAminoMsg { + return { + type: "akash/audit/provider", + value: Provider.toAmino(message) + }; + }, + fromProtoMsg(message: ProviderProtoMsg): Provider { + return Provider.decode(message.value); + }, + toProto(message: Provider): Uint8Array { + return Provider.encode(message).finish(); + }, + toProtoMsg(message: Provider): ProviderProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.Provider", + value: Provider.encode(message).finish() + }; } }; function createBaseAuditedAttributes(): AuditedAttributes { @@ -178,6 +218,7 @@ function createBaseAuditedAttributes(): AuditedAttributes { }; } export const AuditedAttributes = { + typeUrl: "/akash.audit.v1beta1.AuditedAttributes", encode(message: AuditedAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -262,6 +303,45 @@ export const AuditedAttributes = { obj.attributes = []; } return obj; + }, + fromAmino(object: AuditedAttributesAmino): AuditedAttributes { + return { + owner: object.owner, + auditor: object.auditor, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: AuditedAttributes): AuditedAttributesAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: AuditedAttributesAminoMsg): AuditedAttributes { + return AuditedAttributes.fromAmino(object.value); + }, + toAminoMsg(message: AuditedAttributes): AuditedAttributesAminoMsg { + return { + type: "akash/audit/audited-attributes", + value: AuditedAttributes.toAmino(message) + }; + }, + fromProtoMsg(message: AuditedAttributesProtoMsg): AuditedAttributes { + return AuditedAttributes.decode(message.value); + }, + toProto(message: AuditedAttributes): Uint8Array { + return AuditedAttributes.encode(message).finish(); + }, + toProtoMsg(message: AuditedAttributes): AuditedAttributesProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.AuditedAttributes", + value: AuditedAttributes.encode(message).finish() + }; } }; function createBaseAttributesResponse(): AttributesResponse { @@ -270,6 +350,7 @@ function createBaseAttributesResponse(): AttributesResponse { }; } export const AttributesResponse = { + typeUrl: "/akash.audit.v1beta1.AttributesResponse", encode(message: AttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.attributes) { AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -330,6 +411,41 @@ export const AttributesResponse = { obj.attributes = []; } return obj; + }, + fromAmino(object: AttributesResponseAmino): AttributesResponse { + return { + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => AuditedAttributes.fromAmino(e)) : [] + }; + }, + toAmino(message: AttributesResponse): AttributesResponseAmino { + const obj: any = {}; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: AttributesResponseAminoMsg): AttributesResponse { + return AttributesResponse.fromAmino(object.value); + }, + toAminoMsg(message: AttributesResponse): AttributesResponseAminoMsg { + return { + type: "akash/audit/attributes-response", + value: AttributesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AttributesResponseProtoMsg): AttributesResponse { + return AttributesResponse.decode(message.value); + }, + toProto(message: AttributesResponse): Uint8Array { + return AttributesResponse.encode(message).finish(); + }, + toProtoMsg(message: AttributesResponse): AttributesResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.AttributesResponse", + value: AttributesResponse.encode(message).finish() + }; } }; function createBaseAttributesFilters(): AttributesFilters { @@ -339,6 +455,7 @@ function createBaseAttributesFilters(): AttributesFilters { }; } export const AttributesFilters = { + typeUrl: "/akash.audit.v1beta1.AttributesFilters", encode(message: AttributesFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.auditors) { writer.uint32(10).string(v!); @@ -419,6 +536,47 @@ export const AttributesFilters = { obj.owners = []; } return obj; + }, + fromAmino(object: AttributesFiltersAmino): AttributesFilters { + return { + auditors: Array.isArray(object?.auditors) ? object.auditors.map((e: any) => e) : [], + owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => e) : [] + }; + }, + toAmino(message: AttributesFilters): AttributesFiltersAmino { + const obj: any = {}; + if (message.auditors) { + obj.auditors = message.auditors.map(e => e); + } else { + obj.auditors = []; + } + if (message.owners) { + obj.owners = message.owners.map(e => e); + } else { + obj.owners = []; + } + return obj; + }, + fromAminoMsg(object: AttributesFiltersAminoMsg): AttributesFilters { + return AttributesFilters.fromAmino(object.value); + }, + toAminoMsg(message: AttributesFilters): AttributesFiltersAminoMsg { + return { + type: "akash/audit/attributes-filters", + value: AttributesFilters.toAmino(message) + }; + }, + fromProtoMsg(message: AttributesFiltersProtoMsg): AttributesFilters { + return AttributesFilters.decode(message.value); + }, + toProto(message: AttributesFilters): Uint8Array { + return AttributesFilters.encode(message).finish(); + }, + toProtoMsg(message: AttributesFilters): AttributesFiltersProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.AttributesFilters", + value: AttributesFilters.encode(message).finish() + }; } }; function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes { @@ -429,6 +587,7 @@ function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes { }; } export const MsgSignProviderAttributes = { + typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributes", encode(message: MsgSignProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -513,12 +672,52 @@ export const MsgSignProviderAttributes = { obj.attributes = []; } return obj; + }, + fromAmino(object: MsgSignProviderAttributesAmino): MsgSignProviderAttributes { + return { + owner: object.owner, + auditor: object.auditor, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: MsgSignProviderAttributesAminoMsg): MsgSignProviderAttributes { + return MsgSignProviderAttributes.fromAmino(object.value); + }, + toAminoMsg(message: MsgSignProviderAttributes): MsgSignProviderAttributesAminoMsg { + return { + type: "akash/audit/testonly-sign-provider-attributes", + value: MsgSignProviderAttributes.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSignProviderAttributesProtoMsg): MsgSignProviderAttributes { + return MsgSignProviderAttributes.decode(message.value); + }, + toProto(message: MsgSignProviderAttributes): Uint8Array { + return MsgSignProviderAttributes.encode(message).finish(); + }, + toProtoMsg(message: MsgSignProviderAttributes): MsgSignProviderAttributesProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributes", + value: MsgSignProviderAttributes.encode(message).finish() + }; } }; function createBaseMsgSignProviderAttributesResponse(): MsgSignProviderAttributesResponse { return {}; } export const MsgSignProviderAttributesResponse = { + typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse", encode(_: MsgSignProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -556,6 +755,34 @@ export const MsgSignProviderAttributesResponse = { toSDK(_: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSignProviderAttributesResponseAmino): MsgSignProviderAttributesResponse { + return {}; + }, + toAmino(_: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSignProviderAttributesResponseAminoMsg): MsgSignProviderAttributesResponse { + return MsgSignProviderAttributesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseAminoMsg { + return { + type: "akash/audit/testonly-sign-provider-attributes-response", + value: MsgSignProviderAttributesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSignProviderAttributesResponseProtoMsg): MsgSignProviderAttributesResponse { + return MsgSignProviderAttributesResponse.decode(message.value); + }, + toProto(message: MsgSignProviderAttributesResponse): Uint8Array { + return MsgSignProviderAttributesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse", + value: MsgSignProviderAttributesResponse.encode(message).finish() + }; } }; function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes { @@ -566,6 +793,7 @@ function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes { }; } export const MsgDeleteProviderAttributes = { + typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributes", encode(message: MsgDeleteProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -650,12 +878,52 @@ export const MsgDeleteProviderAttributes = { obj.keys = []; } return obj; + }, + fromAmino(object: MsgDeleteProviderAttributesAmino): MsgDeleteProviderAttributes { + return { + owner: object.owner, + auditor: object.auditor, + keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => e) : [] + }; + }, + toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.keys) { + obj.keys = message.keys.map(e => e); + } else { + obj.keys = []; + } + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderAttributesAminoMsg): MsgDeleteProviderAttributes { + return MsgDeleteProviderAttributes.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAminoMsg { + return { + type: "akash/audit/testonly-delete-provider-attributes", + value: MsgDeleteProviderAttributes.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderAttributesProtoMsg): MsgDeleteProviderAttributes { + return MsgDeleteProviderAttributes.decode(message.value); + }, + toProto(message: MsgDeleteProviderAttributes): Uint8Array { + return MsgDeleteProviderAttributes.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributes", + value: MsgDeleteProviderAttributes.encode(message).finish() + }; } }; function createBaseMsgDeleteProviderAttributesResponse(): MsgDeleteProviderAttributesResponse { return {}; } export const MsgDeleteProviderAttributesResponse = { + typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse", encode(_: MsgDeleteProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -693,5 +961,33 @@ export const MsgDeleteProviderAttributesResponse = { toSDK(_: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDeleteProviderAttributesResponseAmino): MsgDeleteProviderAttributesResponse { + return {}; + }, + toAmino(_: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderAttributesResponseAminoMsg): MsgDeleteProviderAttributesResponse { + return MsgDeleteProviderAttributesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseAminoMsg { + return { + type: "akash/audit/testonly-delete-provider-attributes-response", + value: MsgDeleteProviderAttributesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderAttributesResponseProtoMsg): MsgDeleteProviderAttributesResponse { + return MsgDeleteProviderAttributesResponse.decode(message.value); + }, + toProto(message: MsgDeleteProviderAttributesResponse): Uint8Array { + return MsgDeleteProviderAttributesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse", + value: MsgDeleteProviderAttributesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts index b5120ebcce..4bc7a36660 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/audit.ts @@ -84,6 +84,7 @@ function createBaseProvider(): Provider { }; } export const Provider = { + typeUrl: "/akash.audit.v1beta2.Provider", encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -168,6 +169,45 @@ export const Provider = { obj.attributes = []; } return obj; + }, + fromAmino(object: ProviderAmino): Provider { + return { + owner: object.owner, + auditor: object.auditor, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Provider): ProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: ProviderAminoMsg): Provider { + return Provider.fromAmino(object.value); + }, + toAminoMsg(message: Provider): ProviderAminoMsg { + return { + type: "akash/audit/v1beta2/provider", + value: Provider.toAmino(message) + }; + }, + fromProtoMsg(message: ProviderProtoMsg): Provider { + return Provider.decode(message.value); + }, + toProto(message: Provider): Uint8Array { + return Provider.encode(message).finish(); + }, + toProtoMsg(message: Provider): ProviderProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.Provider", + value: Provider.encode(message).finish() + }; } }; function createBaseAuditedAttributes(): AuditedAttributes { @@ -178,6 +218,7 @@ function createBaseAuditedAttributes(): AuditedAttributes { }; } export const AuditedAttributes = { + typeUrl: "/akash.audit.v1beta2.AuditedAttributes", encode(message: AuditedAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -262,6 +303,45 @@ export const AuditedAttributes = { obj.attributes = []; } return obj; + }, + fromAmino(object: AuditedAttributesAmino): AuditedAttributes { + return { + owner: object.owner, + auditor: object.auditor, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: AuditedAttributes): AuditedAttributesAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: AuditedAttributesAminoMsg): AuditedAttributes { + return AuditedAttributes.fromAmino(object.value); + }, + toAminoMsg(message: AuditedAttributes): AuditedAttributesAminoMsg { + return { + type: "akash/audit/v1beta2/audited-attributes", + value: AuditedAttributes.toAmino(message) + }; + }, + fromProtoMsg(message: AuditedAttributesProtoMsg): AuditedAttributes { + return AuditedAttributes.decode(message.value); + }, + toProto(message: AuditedAttributes): Uint8Array { + return AuditedAttributes.encode(message).finish(); + }, + toProtoMsg(message: AuditedAttributes): AuditedAttributesProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.AuditedAttributes", + value: AuditedAttributes.encode(message).finish() + }; } }; function createBaseAttributesResponse(): AttributesResponse { @@ -270,6 +350,7 @@ function createBaseAttributesResponse(): AttributesResponse { }; } export const AttributesResponse = { + typeUrl: "/akash.audit.v1beta2.AttributesResponse", encode(message: AttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.attributes) { AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -330,6 +411,41 @@ export const AttributesResponse = { obj.attributes = []; } return obj; + }, + fromAmino(object: AttributesResponseAmino): AttributesResponse { + return { + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => AuditedAttributes.fromAmino(e)) : [] + }; + }, + toAmino(message: AttributesResponse): AttributesResponseAmino { + const obj: any = {}; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: AttributesResponseAminoMsg): AttributesResponse { + return AttributesResponse.fromAmino(object.value); + }, + toAminoMsg(message: AttributesResponse): AttributesResponseAminoMsg { + return { + type: "akash/audit/v1beta2/attributes-response", + value: AttributesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AttributesResponseProtoMsg): AttributesResponse { + return AttributesResponse.decode(message.value); + }, + toProto(message: AttributesResponse): Uint8Array { + return AttributesResponse.encode(message).finish(); + }, + toProtoMsg(message: AttributesResponse): AttributesResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.AttributesResponse", + value: AttributesResponse.encode(message).finish() + }; } }; function createBaseAttributesFilters(): AttributesFilters { @@ -339,6 +455,7 @@ function createBaseAttributesFilters(): AttributesFilters { }; } export const AttributesFilters = { + typeUrl: "/akash.audit.v1beta2.AttributesFilters", encode(message: AttributesFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.auditors) { writer.uint32(10).string(v!); @@ -419,6 +536,47 @@ export const AttributesFilters = { obj.owners = []; } return obj; + }, + fromAmino(object: AttributesFiltersAmino): AttributesFilters { + return { + auditors: Array.isArray(object?.auditors) ? object.auditors.map((e: any) => e) : [], + owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => e) : [] + }; + }, + toAmino(message: AttributesFilters): AttributesFiltersAmino { + const obj: any = {}; + if (message.auditors) { + obj.auditors = message.auditors.map(e => e); + } else { + obj.auditors = []; + } + if (message.owners) { + obj.owners = message.owners.map(e => e); + } else { + obj.owners = []; + } + return obj; + }, + fromAminoMsg(object: AttributesFiltersAminoMsg): AttributesFilters { + return AttributesFilters.fromAmino(object.value); + }, + toAminoMsg(message: AttributesFilters): AttributesFiltersAminoMsg { + return { + type: "akash/audit/v1beta2/attributes-filters", + value: AttributesFilters.toAmino(message) + }; + }, + fromProtoMsg(message: AttributesFiltersProtoMsg): AttributesFilters { + return AttributesFilters.decode(message.value); + }, + toProto(message: AttributesFilters): Uint8Array { + return AttributesFilters.encode(message).finish(); + }, + toProtoMsg(message: AttributesFilters): AttributesFiltersProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.AttributesFilters", + value: AttributesFilters.encode(message).finish() + }; } }; function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes { @@ -429,6 +587,7 @@ function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes { }; } export const MsgSignProviderAttributes = { + typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributes", encode(message: MsgSignProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -513,12 +672,52 @@ export const MsgSignProviderAttributes = { obj.attributes = []; } return obj; + }, + fromAmino(object: MsgSignProviderAttributesAmino): MsgSignProviderAttributes { + return { + owner: object.owner, + auditor: object.auditor, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSignProviderAttributes): MsgSignProviderAttributesAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: MsgSignProviderAttributesAminoMsg): MsgSignProviderAttributes { + return MsgSignProviderAttributes.fromAmino(object.value); + }, + toAminoMsg(message: MsgSignProviderAttributes): MsgSignProviderAttributesAminoMsg { + return { + type: "mymessage-testonly", + value: MsgSignProviderAttributes.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSignProviderAttributesProtoMsg): MsgSignProviderAttributes { + return MsgSignProviderAttributes.decode(message.value); + }, + toProto(message: MsgSignProviderAttributes): Uint8Array { + return MsgSignProviderAttributes.encode(message).finish(); + }, + toProtoMsg(message: MsgSignProviderAttributes): MsgSignProviderAttributesProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributes", + value: MsgSignProviderAttributes.encode(message).finish() + }; } }; function createBaseMsgSignProviderAttributesResponse(): MsgSignProviderAttributesResponse { return {}; } export const MsgSignProviderAttributesResponse = { + typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse", encode(_: MsgSignProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -556,6 +755,34 @@ export const MsgSignProviderAttributesResponse = { toSDK(_: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSignProviderAttributesResponseAmino): MsgSignProviderAttributesResponse { + return {}; + }, + toAmino(_: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSignProviderAttributesResponseAminoMsg): MsgSignProviderAttributesResponse { + return MsgSignProviderAttributesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseAminoMsg { + return { + type: "akash/audit/v1beta2/testonly-sign-provider-attributes-response", + value: MsgSignProviderAttributesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSignProviderAttributesResponseProtoMsg): MsgSignProviderAttributesResponse { + return MsgSignProviderAttributesResponse.decode(message.value); + }, + toProto(message: MsgSignProviderAttributesResponse): Uint8Array { + return MsgSignProviderAttributesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSignProviderAttributesResponse): MsgSignProviderAttributesResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse", + value: MsgSignProviderAttributesResponse.encode(message).finish() + }; } }; function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes { @@ -566,6 +793,7 @@ function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes { }; } export const MsgDeleteProviderAttributes = { + typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributes", encode(message: MsgDeleteProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -650,12 +878,52 @@ export const MsgDeleteProviderAttributes = { obj.keys = []; } return obj; + }, + fromAmino(object: MsgDeleteProviderAttributesAmino): MsgDeleteProviderAttributes { + return { + owner: object.owner, + auditor: object.auditor, + keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => e) : [] + }; + }, + toAmino(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.auditor = message.auditor; + if (message.keys) { + obj.keys = message.keys.map(e => e); + } else { + obj.keys = []; + } + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderAttributesAminoMsg): MsgDeleteProviderAttributes { + return MsgDeleteProviderAttributes.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesAminoMsg { + return { + type: "akash/audit/v1beta2/testonly-delete-provider-attributes", + value: MsgDeleteProviderAttributes.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderAttributesProtoMsg): MsgDeleteProviderAttributes { + return MsgDeleteProviderAttributes.decode(message.value); + }, + toProto(message: MsgDeleteProviderAttributes): Uint8Array { + return MsgDeleteProviderAttributes.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProviderAttributes): MsgDeleteProviderAttributesProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributes", + value: MsgDeleteProviderAttributes.encode(message).finish() + }; } }; function createBaseMsgDeleteProviderAttributesResponse(): MsgDeleteProviderAttributesResponse { return {}; } export const MsgDeleteProviderAttributesResponse = { + typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse", encode(_: MsgDeleteProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -693,5 +961,33 @@ export const MsgDeleteProviderAttributesResponse = { toSDK(_: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDeleteProviderAttributesResponseAmino): MsgDeleteProviderAttributesResponse { + return {}; + }, + toAmino(_: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderAttributesResponseAminoMsg): MsgDeleteProviderAttributesResponse { + return MsgDeleteProviderAttributesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseAminoMsg { + return { + type: "akash/audit/v1beta2/testonly-delete-provider-attributes-response", + value: MsgDeleteProviderAttributesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderAttributesResponseProtoMsg): MsgDeleteProviderAttributesResponse { + return MsgDeleteProviderAttributesResponse.decode(message.value); + }, + toProto(message: MsgDeleteProviderAttributesResponse): Uint8Array { + return MsgDeleteProviderAttributesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProviderAttributesResponse): MsgDeleteProviderAttributesResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse", + value: MsgDeleteProviderAttributesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts index b3f12df8d9..0d611931f3 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/genesis.ts @@ -16,6 +16,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.audit.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.attributes) { AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -76,5 +77,40 @@ export const GenesisState = { obj.attributes = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => AuditedAttributes.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? AuditedAttributes.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/audit/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts index 860108992d..aae0bd9c0f 100644 --- a/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/audit/v1beta2/query.ts @@ -68,6 +68,7 @@ function createBaseQueryProvidersResponse(): QueryProvidersResponse { }; } export const QueryProvidersResponse = { + typeUrl: "/akash.audit.v1beta2.QueryProvidersResponse", encode(message: QueryProvidersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.providers) { Provider.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -140,6 +141,43 @@ export const QueryProvidersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProvidersResponseAmino): QueryProvidersResponse { + return { + providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => Provider.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProvidersResponse): QueryProvidersResponseAmino { + const obj: any = {}; + if (message.providers) { + obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); + } else { + obj.providers = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProvidersResponseAminoMsg): QueryProvidersResponse { + return QueryProvidersResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProvidersResponse): QueryProvidersResponseAminoMsg { + return { + type: "akash/audit/v1beta2/query-providers-response", + value: QueryProvidersResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProvidersResponseProtoMsg): QueryProvidersResponse { + return QueryProvidersResponse.decode(message.value); + }, + toProto(message: QueryProvidersResponse): Uint8Array { + return QueryProvidersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProvidersResponse): QueryProvidersResponseProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.QueryProvidersResponse", + value: QueryProvidersResponse.encode(message).finish() + }; } }; function createBaseQueryProviderRequest(): QueryProviderRequest { @@ -149,6 +187,7 @@ function createBaseQueryProviderRequest(): QueryProviderRequest { }; } export const QueryProviderRequest = { + typeUrl: "/akash.audit.v1beta2.QueryProviderRequest", encode(message: QueryProviderRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.auditor !== "") { writer.uint32(10).string(message.auditor); @@ -213,6 +252,39 @@ export const QueryProviderRequest = { obj.auditor = message.auditor; obj.owner = message.owner; return obj; + }, + fromAmino(object: QueryProviderRequestAmino): QueryProviderRequest { + return { + auditor: object.auditor, + owner: object.owner + }; + }, + toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { + const obj: any = {}; + obj.auditor = message.auditor; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { + return QueryProviderRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProviderRequest): QueryProviderRequestAminoMsg { + return { + type: "akash/audit/v1beta2/query-provider-request", + value: QueryProviderRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProviderRequestProtoMsg): QueryProviderRequest { + return QueryProviderRequest.decode(message.value); + }, + toProto(message: QueryProviderRequest): Uint8Array { + return QueryProviderRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProviderRequest): QueryProviderRequestProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.QueryProviderRequest", + value: QueryProviderRequest.encode(message).finish() + }; } }; function createBaseQueryAllProvidersAttributesRequest(): QueryAllProvidersAttributesRequest { @@ -221,6 +293,7 @@ function createBaseQueryAllProvidersAttributesRequest(): QueryAllProvidersAttrib }; } export const QueryAllProvidersAttributesRequest = { + typeUrl: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest", encode(message: QueryAllProvidersAttributesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -273,6 +346,37 @@ export const QueryAllProvidersAttributesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllProvidersAttributesRequestAmino): QueryAllProvidersAttributesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllProvidersAttributesRequest): QueryAllProvidersAttributesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllProvidersAttributesRequestAminoMsg): QueryAllProvidersAttributesRequest { + return QueryAllProvidersAttributesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllProvidersAttributesRequest): QueryAllProvidersAttributesRequestAminoMsg { + return { + type: "akash/audit/v1beta2/query-all-providers-attributes-request", + value: QueryAllProvidersAttributesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllProvidersAttributesRequestProtoMsg): QueryAllProvidersAttributesRequest { + return QueryAllProvidersAttributesRequest.decode(message.value); + }, + toProto(message: QueryAllProvidersAttributesRequest): Uint8Array { + return QueryAllProvidersAttributesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllProvidersAttributesRequest): QueryAllProvidersAttributesRequestProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest", + value: QueryAllProvidersAttributesRequest.encode(message).finish() + }; } }; function createBaseQueryProviderAttributesRequest(): QueryProviderAttributesRequest { @@ -282,6 +386,7 @@ function createBaseQueryProviderAttributesRequest(): QueryProviderAttributesRequ }; } export const QueryProviderAttributesRequest = { + typeUrl: "/akash.audit.v1beta2.QueryProviderAttributesRequest", encode(message: QueryProviderAttributesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -346,6 +451,39 @@ export const QueryProviderAttributesRequest = { obj.owner = message.owner; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProviderAttributesRequestAmino): QueryProviderAttributesRequest { + return { + owner: object.owner, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProviderAttributesRequestAminoMsg): QueryProviderAttributesRequest { + return QueryProviderAttributesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestAminoMsg { + return { + type: "akash/audit/v1beta2/query-provider-attributes-request", + value: QueryProviderAttributesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProviderAttributesRequestProtoMsg): QueryProviderAttributesRequest { + return QueryProviderAttributesRequest.decode(message.value); + }, + toProto(message: QueryProviderAttributesRequest): Uint8Array { + return QueryProviderAttributesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProviderAttributesRequest): QueryProviderAttributesRequestProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.QueryProviderAttributesRequest", + value: QueryProviderAttributesRequest.encode(message).finish() + }; } }; function createBaseQueryProviderAuditorRequest(): QueryProviderAuditorRequest { @@ -355,6 +493,7 @@ function createBaseQueryProviderAuditorRequest(): QueryProviderAuditorRequest { }; } export const QueryProviderAuditorRequest = { + typeUrl: "/akash.audit.v1beta2.QueryProviderAuditorRequest", encode(message: QueryProviderAuditorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.auditor !== "") { writer.uint32(10).string(message.auditor); @@ -419,6 +558,39 @@ export const QueryProviderAuditorRequest = { obj.auditor = message.auditor; obj.owner = message.owner; return obj; + }, + fromAmino(object: QueryProviderAuditorRequestAmino): QueryProviderAuditorRequest { + return { + auditor: object.auditor, + owner: object.owner + }; + }, + toAmino(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAmino { + const obj: any = {}; + obj.auditor = message.auditor; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: QueryProviderAuditorRequestAminoMsg): QueryProviderAuditorRequest { + return QueryProviderAuditorRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestAminoMsg { + return { + type: "akash/audit/v1beta2/query-provider-auditor-request", + value: QueryProviderAuditorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProviderAuditorRequestProtoMsg): QueryProviderAuditorRequest { + return QueryProviderAuditorRequest.decode(message.value); + }, + toProto(message: QueryProviderAuditorRequest): Uint8Array { + return QueryProviderAuditorRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProviderAuditorRequest): QueryProviderAuditorRequestProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.QueryProviderAuditorRequest", + value: QueryProviderAuditorRequest.encode(message).finish() + }; } }; function createBaseQueryAuditorAttributesRequest(): QueryAuditorAttributesRequest { @@ -428,6 +600,7 @@ function createBaseQueryAuditorAttributesRequest(): QueryAuditorAttributesReques }; } export const QueryAuditorAttributesRequest = { + typeUrl: "/akash.audit.v1beta2.QueryAuditorAttributesRequest", encode(message: QueryAuditorAttributesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.auditor !== "") { writer.uint32(10).string(message.auditor); @@ -492,5 +665,38 @@ export const QueryAuditorAttributesRequest = { obj.auditor = message.auditor; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAuditorAttributesRequestAmino): QueryAuditorAttributesRequest { + return { + auditor: object.auditor, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAmino { + const obj: any = {}; + obj.auditor = message.auditor; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAuditorAttributesRequestAminoMsg): QueryAuditorAttributesRequest { + return QueryAuditorAttributesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestAminoMsg { + return { + type: "akash/audit/v1beta2/query-auditor-attributes-request", + value: QueryAuditorAttributesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAuditorAttributesRequestProtoMsg): QueryAuditorAttributesRequest { + return QueryAuditorAttributesRequest.decode(message.value); + }, + toProto(message: QueryAuditorAttributesRequest): Uint8Array { + return QueryAuditorAttributesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAuditorAttributesRequest): QueryAuditorAttributesRequestProtoMsg { + return { + typeUrl: "/akash.audit.v1beta2.QueryAuditorAttributesRequest", + value: QueryAuditorAttributesRequest.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts index 32a6b0be53..a349616423 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/attribute.ts @@ -52,6 +52,7 @@ function createBaseAttribute(): Attribute { }; } export const Attribute = { + typeUrl: "/akash.base.v1beta1.Attribute", encode(message: Attribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); @@ -116,6 +117,39 @@ export const Attribute = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeAmino): Attribute { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Attribute): AttributeAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeAminoMsg): Attribute { + return Attribute.fromAmino(object.value); + }, + toAminoMsg(message: Attribute): AttributeAminoMsg { + return { + type: "akash/base/attribute", + value: Attribute.toAmino(message) + }; + }, + fromProtoMsg(message: AttributeProtoMsg): Attribute { + return Attribute.decode(message.value); + }, + toProto(message: Attribute): Uint8Array { + return Attribute.encode(message).finish(); + }, + toProtoMsg(message: Attribute): AttributeProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.Attribute", + value: Attribute.encode(message).finish() + }; } }; function createBaseSignedBy(): SignedBy { @@ -125,6 +159,7 @@ function createBaseSignedBy(): SignedBy { }; } export const SignedBy = { + typeUrl: "/akash.base.v1beta1.SignedBy", encode(message: SignedBy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allOf) { writer.uint32(10).string(v!); @@ -205,6 +240,47 @@ export const SignedBy = { obj.any_of = []; } return obj; + }, + fromAmino(object: SignedByAmino): SignedBy { + return { + allOf: Array.isArray(object?.all_of) ? object.all_of.map((e: any) => e) : [], + anyOf: Array.isArray(object?.any_of) ? object.any_of.map((e: any) => e) : [] + }; + }, + toAmino(message: SignedBy): SignedByAmino { + const obj: any = {}; + if (message.allOf) { + obj.all_of = message.allOf.map(e => e); + } else { + obj.all_of = []; + } + if (message.anyOf) { + obj.any_of = message.anyOf.map(e => e); + } else { + obj.any_of = []; + } + return obj; + }, + fromAminoMsg(object: SignedByAminoMsg): SignedBy { + return SignedBy.fromAmino(object.value); + }, + toAminoMsg(message: SignedBy): SignedByAminoMsg { + return { + type: "akash/base/signed-by", + value: SignedBy.toAmino(message) + }; + }, + fromProtoMsg(message: SignedByProtoMsg): SignedBy { + return SignedBy.decode(message.value); + }, + toProto(message: SignedBy): Uint8Array { + return SignedBy.encode(message).finish(); + }, + toProtoMsg(message: SignedBy): SignedByProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.SignedBy", + value: SignedBy.encode(message).finish() + }; } }; function createBasePlacementRequirements(): PlacementRequirements { @@ -214,6 +290,7 @@ function createBasePlacementRequirements(): PlacementRequirements { }; } export const PlacementRequirements = { + typeUrl: "/akash.base.v1beta1.PlacementRequirements", encode(message: PlacementRequirements, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedBy !== undefined) { SignedBy.encode(message.signedBy, writer.uint32(10).fork()).ldelim(); @@ -286,5 +363,42 @@ export const PlacementRequirements = { obj.attributes = []; } return obj; + }, + fromAmino(object: PlacementRequirementsAmino): PlacementRequirements { + return { + signedBy: object?.signed_by ? SignedBy.fromAmino(object.signed_by) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: PlacementRequirements): PlacementRequirementsAmino { + const obj: any = {}; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: PlacementRequirementsAminoMsg): PlacementRequirements { + return PlacementRequirements.fromAmino(object.value); + }, + toAminoMsg(message: PlacementRequirements): PlacementRequirementsAminoMsg { + return { + type: "akash/base/placement-requirements", + value: PlacementRequirements.toAmino(message) + }; + }, + fromProtoMsg(message: PlacementRequirementsProtoMsg): PlacementRequirements { + return PlacementRequirements.decode(message.value); + }, + toProto(message: PlacementRequirements): Uint8Array { + return PlacementRequirements.encode(message).finish(); + }, + toProtoMsg(message: PlacementRequirements): PlacementRequirementsProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.PlacementRequirements", + value: PlacementRequirements.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts index 700e373d2a..e702df91b2 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/endpoint.ts @@ -49,6 +49,7 @@ function createBaseEndpoint(): Endpoint { }; } export const Endpoint = { + typeUrl: "/akash.base.v1beta1.Endpoint", encode(message: Endpoint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== 0) { writer.uint32(8).int32(message.kind); @@ -101,5 +102,36 @@ export const Endpoint = { const obj: any = {}; message.kind !== undefined && (obj.kind = endpoint_KindToJSON(message.kind)); return obj; + }, + fromAmino(object: EndpointAmino): Endpoint { + return { + kind: isSet(object.kind) ? endpoint_KindFromJSON(object.kind) : -1 + }; + }, + toAmino(message: Endpoint): EndpointAmino { + const obj: any = {}; + obj.kind = message.kind; + return obj; + }, + fromAminoMsg(object: EndpointAminoMsg): Endpoint { + return Endpoint.fromAmino(object.value); + }, + toAminoMsg(message: Endpoint): EndpointAminoMsg { + return { + type: "akash/base/endpoint", + value: Endpoint.toAmino(message) + }; + }, + fromProtoMsg(message: EndpointProtoMsg): Endpoint { + return Endpoint.decode(message.value); + }, + toProto(message: Endpoint): Uint8Array { + return Endpoint.encode(message).finish(); + }, + toProtoMsg(message: Endpoint): EndpointProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.Endpoint", + value: Endpoint.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts index 450f56a602..d55f3a8c8a 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resource.ts @@ -61,6 +61,7 @@ function createBaseCPU(): CPU { }; } export const CPU = { + typeUrl: "/akash.base.v1beta1.CPU", encode(message: CPU, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.units !== undefined) { ResourceValue.encode(message.units, writer.uint32(10).fork()).ldelim(); @@ -133,6 +134,43 @@ export const CPU = { obj.attributes = []; } return obj; + }, + fromAmino(object: CPUAmino): CPU { + return { + units: object?.units ? ResourceValue.fromAmino(object.units) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: CPU): CPUAmino { + const obj: any = {}; + obj.units = message.units ? ResourceValue.toAmino(message.units) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: CPUAminoMsg): CPU { + return CPU.fromAmino(object.value); + }, + toAminoMsg(message: CPU): CPUAminoMsg { + return { + type: "akash/base/cpu", + value: CPU.toAmino(message) + }; + }, + fromProtoMsg(message: CPUProtoMsg): CPU { + return CPU.decode(message.value); + }, + toProto(message: CPU): Uint8Array { + return CPU.encode(message).finish(); + }, + toProtoMsg(message: CPU): CPUProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.CPU", + value: CPU.encode(message).finish() + }; } }; function createBaseMemory(): Memory { @@ -142,6 +180,7 @@ function createBaseMemory(): Memory { }; } export const Memory = { + typeUrl: "/akash.base.v1beta1.Memory", encode(message: Memory, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quantity !== undefined) { ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim(); @@ -214,6 +253,43 @@ export const Memory = { obj.attributes = []; } return obj; + }, + fromAmino(object: MemoryAmino): Memory { + return { + quantity: object?.quantity ? ResourceValue.fromAmino(object.quantity) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Memory): MemoryAmino { + const obj: any = {}; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: MemoryAminoMsg): Memory { + return Memory.fromAmino(object.value); + }, + toAminoMsg(message: Memory): MemoryAminoMsg { + return { + type: "akash/base/memory", + value: Memory.toAmino(message) + }; + }, + fromProtoMsg(message: MemoryProtoMsg): Memory { + return Memory.decode(message.value); + }, + toProto(message: Memory): Uint8Array { + return Memory.encode(message).finish(); + }, + toProtoMsg(message: Memory): MemoryProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.Memory", + value: Memory.encode(message).finish() + }; } }; function createBaseStorage(): Storage { @@ -223,6 +299,7 @@ function createBaseStorage(): Storage { }; } export const Storage = { + typeUrl: "/akash.base.v1beta1.Storage", encode(message: Storage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quantity !== undefined) { ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim(); @@ -295,6 +372,43 @@ export const Storage = { obj.attributes = []; } return obj; + }, + fromAmino(object: StorageAmino): Storage { + return { + quantity: object?.quantity ? ResourceValue.fromAmino(object.quantity) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Storage): StorageAmino { + const obj: any = {}; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: StorageAminoMsg): Storage { + return Storage.fromAmino(object.value); + }, + toAminoMsg(message: Storage): StorageAminoMsg { + return { + type: "akash/base/storage", + value: Storage.toAmino(message) + }; + }, + fromProtoMsg(message: StorageProtoMsg): Storage { + return Storage.decode(message.value); + }, + toProto(message: Storage): Uint8Array { + return Storage.encode(message).finish(); + }, + toProtoMsg(message: Storage): StorageProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.Storage", + value: Storage.encode(message).finish() + }; } }; function createBaseResourceUnits(): ResourceUnits { @@ -306,6 +420,7 @@ function createBaseResourceUnits(): ResourceUnits { }; } export const ResourceUnits = { + typeUrl: "/akash.base.v1beta1.ResourceUnits", encode(message: ResourceUnits, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.cpu !== undefined) { CPU.encode(message.cpu, writer.uint32(10).fork()).ldelim(); @@ -402,5 +517,46 @@ export const ResourceUnits = { obj.endpoints = []; } return obj; + }, + fromAmino(object: ResourceUnitsAmino): ResourceUnits { + return { + cpu: object?.cpu ? CPU.fromAmino(object.cpu) : undefined, + memory: object?.memory ? Memory.fromAmino(object.memory) : undefined, + storage: object?.storage ? Storage.fromAmino(object.storage) : undefined, + endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromAmino(e)) : [] + }; + }, + toAmino(message: ResourceUnits): ResourceUnitsAmino { + const obj: any = {}; + obj.cpu = message.cpu ? CPU.toAmino(message.cpu) : undefined; + obj.memory = message.memory ? Memory.toAmino(message.memory) : undefined; + obj.storage = message.storage ? Storage.toAmino(message.storage) : undefined; + if (message.endpoints) { + obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); + } else { + obj.endpoints = []; + } + return obj; + }, + fromAminoMsg(object: ResourceUnitsAminoMsg): ResourceUnits { + return ResourceUnits.fromAmino(object.value); + }, + toAminoMsg(message: ResourceUnits): ResourceUnitsAminoMsg { + return { + type: "akash/base/resource-units", + value: ResourceUnits.toAmino(message) + }; + }, + fromProtoMsg(message: ResourceUnitsProtoMsg): ResourceUnits { + return ResourceUnits.decode(message.value); + }, + toProto(message: ResourceUnits): Uint8Array { + return ResourceUnits.encode(message).finish(); + }, + toProtoMsg(message: ResourceUnits): ResourceUnitsProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.ResourceUnits", + value: ResourceUnits.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resourcevalue.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resourcevalue.ts index 70737eec1d..d70dc7d7db 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resourcevalue.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta1/resourcevalue.ts @@ -15,6 +15,7 @@ function createBaseResourceValue(): ResourceValue { }; } export const ResourceValue = { + typeUrl: "/akash.base.v1beta1.ResourceValue", encode(message: ResourceValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.val.length !== 0) { writer.uint32(10).bytes(message.val); @@ -67,5 +68,36 @@ export const ResourceValue = { const obj: any = {}; obj.val = message.val; return obj; + }, + fromAmino(object: ResourceValueAmino): ResourceValue { + return { + val: object.val + }; + }, + toAmino(message: ResourceValue): ResourceValueAmino { + const obj: any = {}; + obj.val = message.val; + return obj; + }, + fromAminoMsg(object: ResourceValueAminoMsg): ResourceValue { + return ResourceValue.fromAmino(object.value); + }, + toAminoMsg(message: ResourceValue): ResourceValueAminoMsg { + return { + type: "akash/base/resource-value", + value: ResourceValue.toAmino(message) + }; + }, + fromProtoMsg(message: ResourceValueProtoMsg): ResourceValue { + return ResourceValue.decode(message.value); + }, + toProto(message: ResourceValue): Uint8Array { + return ResourceValue.encode(message).finish(); + }, + toProtoMsg(message: ResourceValue): ResourceValueProtoMsg { + return { + typeUrl: "/akash.base.v1beta1.ResourceValue", + value: ResourceValue.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts index be8e2f3fd1..6489fb4faa 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/attribute.ts @@ -52,6 +52,7 @@ function createBaseAttribute(): Attribute { }; } export const Attribute = { + typeUrl: "/akash.base.v1beta2.Attribute", encode(message: Attribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); @@ -116,6 +117,39 @@ export const Attribute = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeAmino): Attribute { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Attribute): AttributeAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeAminoMsg): Attribute { + return Attribute.fromAmino(object.value); + }, + toAminoMsg(message: Attribute): AttributeAminoMsg { + return { + type: "akash/base/v1beta2/attribute", + value: Attribute.toAmino(message) + }; + }, + fromProtoMsg(message: AttributeProtoMsg): Attribute { + return Attribute.decode(message.value); + }, + toProto(message: Attribute): Uint8Array { + return Attribute.encode(message).finish(); + }, + toProtoMsg(message: Attribute): AttributeProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.Attribute", + value: Attribute.encode(message).finish() + }; } }; function createBaseSignedBy(): SignedBy { @@ -125,6 +159,7 @@ function createBaseSignedBy(): SignedBy { }; } export const SignedBy = { + typeUrl: "/akash.base.v1beta2.SignedBy", encode(message: SignedBy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allOf) { writer.uint32(10).string(v!); @@ -205,6 +240,47 @@ export const SignedBy = { obj.any_of = []; } return obj; + }, + fromAmino(object: SignedByAmino): SignedBy { + return { + allOf: Array.isArray(object?.all_of) ? object.all_of.map((e: any) => e) : [], + anyOf: Array.isArray(object?.any_of) ? object.any_of.map((e: any) => e) : [] + }; + }, + toAmino(message: SignedBy): SignedByAmino { + const obj: any = {}; + if (message.allOf) { + obj.all_of = message.allOf.map(e => e); + } else { + obj.all_of = []; + } + if (message.anyOf) { + obj.any_of = message.anyOf.map(e => e); + } else { + obj.any_of = []; + } + return obj; + }, + fromAminoMsg(object: SignedByAminoMsg): SignedBy { + return SignedBy.fromAmino(object.value); + }, + toAminoMsg(message: SignedBy): SignedByAminoMsg { + return { + type: "akash/base/v1beta2/signed-by", + value: SignedBy.toAmino(message) + }; + }, + fromProtoMsg(message: SignedByProtoMsg): SignedBy { + return SignedBy.decode(message.value); + }, + toProto(message: SignedBy): Uint8Array { + return SignedBy.encode(message).finish(); + }, + toProtoMsg(message: SignedBy): SignedByProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.SignedBy", + value: SignedBy.encode(message).finish() + }; } }; function createBasePlacementRequirements(): PlacementRequirements { @@ -214,6 +290,7 @@ function createBasePlacementRequirements(): PlacementRequirements { }; } export const PlacementRequirements = { + typeUrl: "/akash.base.v1beta2.PlacementRequirements", encode(message: PlacementRequirements, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedBy !== undefined) { SignedBy.encode(message.signedBy, writer.uint32(10).fork()).ldelim(); @@ -286,5 +363,42 @@ export const PlacementRequirements = { obj.attributes = []; } return obj; + }, + fromAmino(object: PlacementRequirementsAmino): PlacementRequirements { + return { + signedBy: object?.signed_by ? SignedBy.fromAmino(object.signed_by) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: PlacementRequirements): PlacementRequirementsAmino { + const obj: any = {}; + obj.signed_by = message.signedBy ? SignedBy.toAmino(message.signedBy) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: PlacementRequirementsAminoMsg): PlacementRequirements { + return PlacementRequirements.fromAmino(object.value); + }, + toAminoMsg(message: PlacementRequirements): PlacementRequirementsAminoMsg { + return { + type: "akash/base/v1beta2/placement-requirements", + value: PlacementRequirements.toAmino(message) + }; + }, + fromProtoMsg(message: PlacementRequirementsProtoMsg): PlacementRequirements { + return PlacementRequirements.decode(message.value); + }, + toProto(message: PlacementRequirements): Uint8Array { + return PlacementRequirements.encode(message).finish(); + }, + toProtoMsg(message: PlacementRequirements): PlacementRequirementsProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.PlacementRequirements", + value: PlacementRequirements.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts index e2c6055434..f845c6b557 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/endpoint.ts @@ -59,6 +59,7 @@ function createBaseEndpoint(): Endpoint { }; } export const Endpoint = { + typeUrl: "/akash.base.v1beta2.Endpoint", encode(message: Endpoint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== 0) { writer.uint32(8).int32(message.kind); @@ -123,5 +124,38 @@ export const Endpoint = { message.kind !== undefined && (obj.kind = endpoint_KindToJSON(message.kind)); obj.sequence_number = message.sequenceNumber; return obj; + }, + fromAmino(object: EndpointAmino): Endpoint { + return { + kind: isSet(object.kind) ? endpoint_KindFromJSON(object.kind) : -1, + sequenceNumber: object.sequence_number + }; + }, + toAmino(message: Endpoint): EndpointAmino { + const obj: any = {}; + obj.kind = message.kind; + obj.sequence_number = message.sequenceNumber; + return obj; + }, + fromAminoMsg(object: EndpointAminoMsg): Endpoint { + return Endpoint.fromAmino(object.value); + }, + toAminoMsg(message: Endpoint): EndpointAminoMsg { + return { + type: "akash/base/v1beta2/endpoint", + value: Endpoint.toAmino(message) + }; + }, + fromProtoMsg(message: EndpointProtoMsg): Endpoint { + return Endpoint.decode(message.value); + }, + toProto(message: Endpoint): Uint8Array { + return Endpoint.encode(message).finish(); + }, + toProtoMsg(message: Endpoint): EndpointProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.Endpoint", + value: Endpoint.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts index 07c58d13d8..3de8b14116 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resource.ts @@ -42,6 +42,7 @@ function createBaseCPU(): CPU { }; } export const CPU = { + typeUrl: "/akash.base.v1beta2.CPU", encode(message: CPU, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.units !== undefined) { ResourceValue.encode(message.units, writer.uint32(10).fork()).ldelim(); @@ -114,6 +115,43 @@ export const CPU = { obj.attributes = []; } return obj; + }, + fromAmino(object: CPUAmino): CPU { + return { + units: object?.units ? ResourceValue.fromAmino(object.units) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: CPU): CPUAmino { + const obj: any = {}; + obj.units = message.units ? ResourceValue.toAmino(message.units) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: CPUAminoMsg): CPU { + return CPU.fromAmino(object.value); + }, + toAminoMsg(message: CPU): CPUAminoMsg { + return { + type: "akash/base/v1beta2/cpu", + value: CPU.toAmino(message) + }; + }, + fromProtoMsg(message: CPUProtoMsg): CPU { + return CPU.decode(message.value); + }, + toProto(message: CPU): Uint8Array { + return CPU.encode(message).finish(); + }, + toProtoMsg(message: CPU): CPUProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.CPU", + value: CPU.encode(message).finish() + }; } }; function createBaseMemory(): Memory { @@ -123,6 +161,7 @@ function createBaseMemory(): Memory { }; } export const Memory = { + typeUrl: "/akash.base.v1beta2.Memory", encode(message: Memory, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quantity !== undefined) { ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim(); @@ -195,6 +234,43 @@ export const Memory = { obj.attributes = []; } return obj; + }, + fromAmino(object: MemoryAmino): Memory { + return { + quantity: object?.quantity ? ResourceValue.fromAmino(object.quantity) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Memory): MemoryAmino { + const obj: any = {}; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: MemoryAminoMsg): Memory { + return Memory.fromAmino(object.value); + }, + toAminoMsg(message: Memory): MemoryAminoMsg { + return { + type: "akash/base/v1beta2/memory", + value: Memory.toAmino(message) + }; + }, + fromProtoMsg(message: MemoryProtoMsg): Memory { + return Memory.decode(message.value); + }, + toProto(message: Memory): Uint8Array { + return Memory.encode(message).finish(); + }, + toProtoMsg(message: Memory): MemoryProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.Memory", + value: Memory.encode(message).finish() + }; } }; function createBaseStorage(): Storage { @@ -205,6 +281,7 @@ function createBaseStorage(): Storage { }; } export const Storage = { + typeUrl: "/akash.base.v1beta2.Storage", encode(message: Storage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -289,5 +366,44 @@ export const Storage = { obj.attributes = []; } return obj; + }, + fromAmino(object: StorageAmino): Storage { + return { + name: object.name, + quantity: object?.quantity ? ResourceValue.fromAmino(object.quantity) : undefined, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Storage): StorageAmino { + const obj: any = {}; + obj.name = message.name; + obj.quantity = message.quantity ? ResourceValue.toAmino(message.quantity) : undefined; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: StorageAminoMsg): Storage { + return Storage.fromAmino(object.value); + }, + toAminoMsg(message: Storage): StorageAminoMsg { + return { + type: "akash/base/v1beta2/storage", + value: Storage.toAmino(message) + }; + }, + fromProtoMsg(message: StorageProtoMsg): Storage { + return Storage.decode(message.value); + }, + toProto(message: Storage): Uint8Array { + return Storage.encode(message).finish(); + }, + toProtoMsg(message: Storage): StorageProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.Storage", + value: Storage.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts index 58dcb07774..1df215f308 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourceunits.ts @@ -32,6 +32,7 @@ function createBaseResourceUnits(): ResourceUnits { }; } export const ResourceUnits = { + typeUrl: "/akash.base.v1beta2.ResourceUnits", encode(message: ResourceUnits, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.cpu !== undefined) { CPU.encode(message.cpu, writer.uint32(10).fork()).ldelim(); @@ -136,5 +137,50 @@ export const ResourceUnits = { obj.endpoints = []; } return obj; + }, + fromAmino(object: ResourceUnitsAmino): ResourceUnits { + return { + cpu: object?.cpu ? CPU.fromAmino(object.cpu) : undefined, + memory: object?.memory ? Memory.fromAmino(object.memory) : undefined, + storage: Array.isArray(object?.storage) ? object.storage.map((e: any) => Storage.fromAmino(e)) : [], + endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromAmino(e)) : [] + }; + }, + toAmino(message: ResourceUnits): ResourceUnitsAmino { + const obj: any = {}; + obj.cpu = message.cpu ? CPU.toAmino(message.cpu) : undefined; + obj.memory = message.memory ? Memory.toAmino(message.memory) : undefined; + if (message.storage) { + obj.storage = message.storage.map(e => e ? Storage.toAmino(e) : undefined); + } else { + obj.storage = []; + } + if (message.endpoints) { + obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); + } else { + obj.endpoints = []; + } + return obj; + }, + fromAminoMsg(object: ResourceUnitsAminoMsg): ResourceUnits { + return ResourceUnits.fromAmino(object.value); + }, + toAminoMsg(message: ResourceUnits): ResourceUnitsAminoMsg { + return { + type: "akash/base/v1beta2/resource-units", + value: ResourceUnits.toAmino(message) + }; + }, + fromProtoMsg(message: ResourceUnitsProtoMsg): ResourceUnits { + return ResourceUnits.decode(message.value); + }, + toProto(message: ResourceUnits): Uint8Array { + return ResourceUnits.encode(message).finish(); + }, + toProtoMsg(message: ResourceUnits): ResourceUnitsProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.ResourceUnits", + value: ResourceUnits.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourcevalue.ts b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourcevalue.ts index 7edb3f1e54..6fd14cf6cd 100644 --- a/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourcevalue.ts +++ b/__fixtures__/v-next/outputosmojs/akash/base/v1beta2/resourcevalue.ts @@ -15,6 +15,7 @@ function createBaseResourceValue(): ResourceValue { }; } export const ResourceValue = { + typeUrl: "/akash.base.v1beta2.ResourceValue", encode(message: ResourceValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.val.length !== 0) { writer.uint32(10).bytes(message.val); @@ -67,5 +68,36 @@ export const ResourceValue = { const obj: any = {}; obj.val = message.val; return obj; + }, + fromAmino(object: ResourceValueAmino): ResourceValue { + return { + val: object.val + }; + }, + toAmino(message: ResourceValue): ResourceValueAmino { + const obj: any = {}; + obj.val = message.val; + return obj; + }, + fromAminoMsg(object: ResourceValueAminoMsg): ResourceValue { + return ResourceValue.fromAmino(object.value); + }, + toAminoMsg(message: ResourceValue): ResourceValueAminoMsg { + return { + type: "akash/base/v1beta2/resource-value", + value: ResourceValue.toAmino(message) + }; + }, + fromProtoMsg(message: ResourceValueProtoMsg): ResourceValue { + return ResourceValue.decode(message.value); + }, + toProto(message: ResourceValue): Uint8Array { + return ResourceValue.encode(message).finish(); + }, + toProtoMsg(message: ResourceValue): ResourceValueProtoMsg { + return { + typeUrl: "/akash.base.v1beta2.ResourceValue", + value: ResourceValue.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts index 939f8895aa..7734a4df2e 100644 --- a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/cert.ts @@ -111,6 +111,7 @@ function createBaseCertificateID(): CertificateID { }; } export const CertificateID = { + typeUrl: "/akash.cert.v1beta2.CertificateID", encode(message: CertificateID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -175,6 +176,39 @@ export const CertificateID = { obj.owner = message.owner; obj.serial = message.serial; return obj; + }, + fromAmino(object: CertificateIDAmino): CertificateID { + return { + owner: object.owner, + serial: object.serial + }; + }, + toAmino(message: CertificateID): CertificateIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.serial = message.serial; + return obj; + }, + fromAminoMsg(object: CertificateIDAminoMsg): CertificateID { + return CertificateID.fromAmino(object.value); + }, + toAminoMsg(message: CertificateID): CertificateIDAminoMsg { + return { + type: "akash/cert/v1beta2/certificate-i-d", + value: CertificateID.toAmino(message) + }; + }, + fromProtoMsg(message: CertificateIDProtoMsg): CertificateID { + return CertificateID.decode(message.value); + }, + toProto(message: CertificateID): Uint8Array { + return CertificateID.encode(message).finish(); + }, + toProtoMsg(message: CertificateID): CertificateIDProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.CertificateID", + value: CertificateID.encode(message).finish() + }; } }; function createBaseCertificate(): Certificate { @@ -185,6 +219,7 @@ function createBaseCertificate(): Certificate { }; } export const Certificate = { + typeUrl: "/akash.cert.v1beta2.Certificate", encode(message: Certificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.state !== 0) { writer.uint32(16).int32(message.state); @@ -261,6 +296,41 @@ export const Certificate = { obj.cert = message.cert; obj.pubkey = message.pubkey; return obj; + }, + fromAmino(object: CertificateAmino): Certificate { + return { + state: isSet(object.state) ? certificate_StateFromJSON(object.state) : -1, + cert: object.cert, + pubkey: object.pubkey + }; + }, + toAmino(message: Certificate): CertificateAmino { + const obj: any = {}; + obj.state = message.state; + obj.cert = message.cert; + obj.pubkey = message.pubkey; + return obj; + }, + fromAminoMsg(object: CertificateAminoMsg): Certificate { + return Certificate.fromAmino(object.value); + }, + toAminoMsg(message: Certificate): CertificateAminoMsg { + return { + type: "akash/cert/v1beta2/certificate", + value: Certificate.toAmino(message) + }; + }, + fromProtoMsg(message: CertificateProtoMsg): Certificate { + return Certificate.decode(message.value); + }, + toProto(message: Certificate): Uint8Array { + return Certificate.encode(message).finish(); + }, + toProtoMsg(message: Certificate): CertificateProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.Certificate", + value: Certificate.encode(message).finish() + }; } }; function createBaseCertificateFilter(): CertificateFilter { @@ -271,6 +341,7 @@ function createBaseCertificateFilter(): CertificateFilter { }; } export const CertificateFilter = { + typeUrl: "/akash.cert.v1beta2.CertificateFilter", encode(message: CertificateFilter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -347,6 +418,41 @@ export const CertificateFilter = { obj.serial = message.serial; obj.state = message.state; return obj; + }, + fromAmino(object: CertificateFilterAmino): CertificateFilter { + return { + owner: object.owner, + serial: object.serial, + state: object.state + }; + }, + toAmino(message: CertificateFilter): CertificateFilterAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.serial = message.serial; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: CertificateFilterAminoMsg): CertificateFilter { + return CertificateFilter.fromAmino(object.value); + }, + toAminoMsg(message: CertificateFilter): CertificateFilterAminoMsg { + return { + type: "akash/cert/v1beta2/certificate-filter", + value: CertificateFilter.toAmino(message) + }; + }, + fromProtoMsg(message: CertificateFilterProtoMsg): CertificateFilter { + return CertificateFilter.decode(message.value); + }, + toProto(message: CertificateFilter): Uint8Array { + return CertificateFilter.encode(message).finish(); + }, + toProtoMsg(message: CertificateFilter): CertificateFilterProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.CertificateFilter", + value: CertificateFilter.encode(message).finish() + }; } }; function createBaseMsgCreateCertificate(): MsgCreateCertificate { @@ -357,6 +463,7 @@ function createBaseMsgCreateCertificate(): MsgCreateCertificate { }; } export const MsgCreateCertificate = { + typeUrl: "/akash.cert.v1beta2.MsgCreateCertificate", encode(message: MsgCreateCertificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -433,12 +540,48 @@ export const MsgCreateCertificate = { obj.cert = message.cert; obj.pubkey = message.pubkey; return obj; + }, + fromAmino(object: MsgCreateCertificateAmino): MsgCreateCertificate { + return { + owner: object.owner, + cert: object.cert, + pubkey: object.pubkey + }; + }, + toAmino(message: MsgCreateCertificate): MsgCreateCertificateAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.cert = message.cert; + obj.pubkey = message.pubkey; + return obj; + }, + fromAminoMsg(object: MsgCreateCertificateAminoMsg): MsgCreateCertificate { + return MsgCreateCertificate.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateCertificate): MsgCreateCertificateAminoMsg { + return { + type: "akash/cert/v1beta2/testonly-create-certificate", + value: MsgCreateCertificate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateCertificateProtoMsg): MsgCreateCertificate { + return MsgCreateCertificate.decode(message.value); + }, + toProto(message: MsgCreateCertificate): Uint8Array { + return MsgCreateCertificate.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateCertificate): MsgCreateCertificateProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.MsgCreateCertificate", + value: MsgCreateCertificate.encode(message).finish() + }; } }; function createBaseMsgCreateCertificateResponse(): MsgCreateCertificateResponse { return {}; } export const MsgCreateCertificateResponse = { + typeUrl: "/akash.cert.v1beta2.MsgCreateCertificateResponse", encode(_: MsgCreateCertificateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -476,6 +619,34 @@ export const MsgCreateCertificateResponse = { toSDK(_: MsgCreateCertificateResponse): MsgCreateCertificateResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateCertificateResponseAmino): MsgCreateCertificateResponse { + return {}; + }, + toAmino(_: MsgCreateCertificateResponse): MsgCreateCertificateResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateCertificateResponseAminoMsg): MsgCreateCertificateResponse { + return MsgCreateCertificateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateCertificateResponse): MsgCreateCertificateResponseAminoMsg { + return { + type: "akash/cert/v1beta2/testonly-create-certificate-response", + value: MsgCreateCertificateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateCertificateResponseProtoMsg): MsgCreateCertificateResponse { + return MsgCreateCertificateResponse.decode(message.value); + }, + toProto(message: MsgCreateCertificateResponse): Uint8Array { + return MsgCreateCertificateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateCertificateResponse): MsgCreateCertificateResponseProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.MsgCreateCertificateResponse", + value: MsgCreateCertificateResponse.encode(message).finish() + }; } }; function createBaseMsgRevokeCertificate(): MsgRevokeCertificate { @@ -484,6 +655,7 @@ function createBaseMsgRevokeCertificate(): MsgRevokeCertificate { }; } export const MsgRevokeCertificate = { + typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificate", encode(message: MsgRevokeCertificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { CertificateID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -536,12 +708,44 @@ export const MsgRevokeCertificate = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? CertificateID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgRevokeCertificateAmino): MsgRevokeCertificate { + return { + id: object?.id ? CertificateID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgRevokeCertificate): MsgRevokeCertificateAmino { + const obj: any = {}; + obj.id = message.id ? CertificateID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgRevokeCertificateAminoMsg): MsgRevokeCertificate { + return MsgRevokeCertificate.fromAmino(object.value); + }, + toAminoMsg(message: MsgRevokeCertificate): MsgRevokeCertificateAminoMsg { + return { + type: "akash/cert/v1beta2/testonly-revoke-certificate", + value: MsgRevokeCertificate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRevokeCertificateProtoMsg): MsgRevokeCertificate { + return MsgRevokeCertificate.decode(message.value); + }, + toProto(message: MsgRevokeCertificate): Uint8Array { + return MsgRevokeCertificate.encode(message).finish(); + }, + toProtoMsg(message: MsgRevokeCertificate): MsgRevokeCertificateProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificate", + value: MsgRevokeCertificate.encode(message).finish() + }; } }; function createBaseMsgRevokeCertificateResponse(): MsgRevokeCertificateResponse { return {}; } export const MsgRevokeCertificateResponse = { + typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificateResponse", encode(_: MsgRevokeCertificateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -579,5 +783,33 @@ export const MsgRevokeCertificateResponse = { toSDK(_: MsgRevokeCertificateResponse): MsgRevokeCertificateResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRevokeCertificateResponseAmino): MsgRevokeCertificateResponse { + return {}; + }, + toAmino(_: MsgRevokeCertificateResponse): MsgRevokeCertificateResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRevokeCertificateResponseAminoMsg): MsgRevokeCertificateResponse { + return MsgRevokeCertificateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRevokeCertificateResponse): MsgRevokeCertificateResponseAminoMsg { + return { + type: "akash/cert/v1beta2/testonly-revoke-certificate-response", + value: MsgRevokeCertificateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRevokeCertificateResponseProtoMsg): MsgRevokeCertificateResponse { + return MsgRevokeCertificateResponse.decode(message.value); + }, + toProto(message: MsgRevokeCertificateResponse): Uint8Array { + return MsgRevokeCertificateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRevokeCertificateResponse): MsgRevokeCertificateResponseProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificateResponse", + value: MsgRevokeCertificateResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts index be50baa4cf..c603a32212 100644 --- a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/genesis.ts @@ -27,6 +27,7 @@ function createBaseGenesisCertificate(): GenesisCertificate { }; } export const GenesisCertificate = { + typeUrl: "/akash.cert.v1beta2.GenesisCertificate", encode(message: GenesisCertificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -91,6 +92,39 @@ export const GenesisCertificate = { obj.owner = message.owner; message.certificate !== undefined && (obj.certificate = message.certificate ? Certificate.toSDK(message.certificate) : undefined); return obj; + }, + fromAmino(object: GenesisCertificateAmino): GenesisCertificate { + return { + owner: object.owner, + certificate: object?.certificate ? Certificate.fromAmino(object.certificate) : undefined + }; + }, + toAmino(message: GenesisCertificate): GenesisCertificateAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisCertificateAminoMsg): GenesisCertificate { + return GenesisCertificate.fromAmino(object.value); + }, + toAminoMsg(message: GenesisCertificate): GenesisCertificateAminoMsg { + return { + type: "akash/cert/v1beta2/genesis-certificate", + value: GenesisCertificate.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisCertificateProtoMsg): GenesisCertificate { + return GenesisCertificate.decode(message.value); + }, + toProto(message: GenesisCertificate): Uint8Array { + return GenesisCertificate.encode(message).finish(); + }, + toProtoMsg(message: GenesisCertificate): GenesisCertificateProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.GenesisCertificate", + value: GenesisCertificate.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -99,6 +133,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.cert.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.certificates) { GenesisCertificate.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -159,5 +194,40 @@ export const GenesisState = { obj.certificates = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + certificates: Array.isArray(object?.certificates) ? object.certificates.map((e: any) => GenesisCertificate.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.certificates) { + obj.certificates = message.certificates.map(e => e ? GenesisCertificate.toAmino(e) : undefined); + } else { + obj.certificates = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/cert/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts index d492a73ed2..5aba6ed9ea 100644 --- a/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/cert/v1beta2/query.ts @@ -40,6 +40,7 @@ function createBaseCertificateResponse(): CertificateResponse { }; } export const CertificateResponse = { + typeUrl: "/akash.cert.v1beta2.CertificateResponse", encode(message: CertificateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.certificate !== undefined) { Certificate.encode(message.certificate, writer.uint32(10).fork()).ldelim(); @@ -104,6 +105,39 @@ export const CertificateResponse = { message.certificate !== undefined && (obj.certificate = message.certificate ? Certificate.toSDK(message.certificate) : undefined); obj.serial = message.serial; return obj; + }, + fromAmino(object: CertificateResponseAmino): CertificateResponse { + return { + certificate: object?.certificate ? Certificate.fromAmino(object.certificate) : undefined, + serial: object.serial + }; + }, + toAmino(message: CertificateResponse): CertificateResponseAmino { + const obj: any = {}; + obj.certificate = message.certificate ? Certificate.toAmino(message.certificate) : undefined; + obj.serial = message.serial; + return obj; + }, + fromAminoMsg(object: CertificateResponseAminoMsg): CertificateResponse { + return CertificateResponse.fromAmino(object.value); + }, + toAminoMsg(message: CertificateResponse): CertificateResponseAminoMsg { + return { + type: "akash/cert/v1beta2/certificate-response", + value: CertificateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: CertificateResponseProtoMsg): CertificateResponse { + return CertificateResponse.decode(message.value); + }, + toProto(message: CertificateResponse): Uint8Array { + return CertificateResponse.encode(message).finish(); + }, + toProtoMsg(message: CertificateResponse): CertificateResponseProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.CertificateResponse", + value: CertificateResponse.encode(message).finish() + }; } }; function createBaseQueryCertificatesRequest(): QueryCertificatesRequest { @@ -113,6 +147,7 @@ function createBaseQueryCertificatesRequest(): QueryCertificatesRequest { }; } export const QueryCertificatesRequest = { + typeUrl: "/akash.cert.v1beta2.QueryCertificatesRequest", encode(message: QueryCertificatesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filter !== undefined) { CertificateFilter.encode(message.filter, writer.uint32(10).fork()).ldelim(); @@ -177,6 +212,39 @@ export const QueryCertificatesRequest = { message.filter !== undefined && (obj.filter = message.filter ? CertificateFilter.toSDK(message.filter) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryCertificatesRequestAmino): QueryCertificatesRequest { + return { + filter: object?.filter ? CertificateFilter.fromAmino(object.filter) : undefined, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryCertificatesRequest): QueryCertificatesRequestAmino { + const obj: any = {}; + obj.filter = message.filter ? CertificateFilter.toAmino(message.filter) : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCertificatesRequestAminoMsg): QueryCertificatesRequest { + return QueryCertificatesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCertificatesRequest): QueryCertificatesRequestAminoMsg { + return { + type: "akash/cert/v1beta2/query-certificates-request", + value: QueryCertificatesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCertificatesRequestProtoMsg): QueryCertificatesRequest { + return QueryCertificatesRequest.decode(message.value); + }, + toProto(message: QueryCertificatesRequest): Uint8Array { + return QueryCertificatesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCertificatesRequest): QueryCertificatesRequestProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.QueryCertificatesRequest", + value: QueryCertificatesRequest.encode(message).finish() + }; } }; function createBaseQueryCertificatesResponse(): QueryCertificatesResponse { @@ -186,6 +254,7 @@ function createBaseQueryCertificatesResponse(): QueryCertificatesResponse { }; } export const QueryCertificatesResponse = { + typeUrl: "/akash.cert.v1beta2.QueryCertificatesResponse", encode(message: QueryCertificatesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.certificates) { CertificateResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -258,5 +327,42 @@ export const QueryCertificatesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryCertificatesResponseAmino): QueryCertificatesResponse { + return { + certificates: Array.isArray(object?.certificates) ? object.certificates.map((e: any) => CertificateResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryCertificatesResponse): QueryCertificatesResponseAmino { + const obj: any = {}; + if (message.certificates) { + obj.certificates = message.certificates.map(e => e ? CertificateResponse.toAmino(e) : undefined); + } else { + obj.certificates = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCertificatesResponseAminoMsg): QueryCertificatesResponse { + return QueryCertificatesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCertificatesResponse): QueryCertificatesResponseAminoMsg { + return { + type: "akash/cert/v1beta2/query-certificates-response", + value: QueryCertificatesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCertificatesResponseProtoMsg): QueryCertificatesResponse { + return QueryCertificatesResponse.decode(message.value); + }, + toProto(message: QueryCertificatesResponse): Uint8Array { + return QueryCertificatesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCertificatesResponse): QueryCertificatesResponseProtoMsg { + return { + typeUrl: "/akash.cert.v1beta2.QueryCertificatesResponse", + value: QueryCertificatesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts index 54d0c08473..264543ca38 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/authz.ts @@ -26,6 +26,7 @@ function createBaseDepositDeploymentAuthorization(): DepositDeploymentAuthorizat }; } export const DepositDeploymentAuthorization = { + typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization", encode(message: DepositDeploymentAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spendLimit !== undefined) { Coin.encode(message.spendLimit, writer.uint32(10).fork()).ldelim(); @@ -78,5 +79,36 @@ export const DepositDeploymentAuthorization = { const obj: any = {}; message.spendLimit !== undefined && (obj.spend_limit = message.spendLimit ? Coin.toSDK(message.spendLimit) : undefined); return obj; + }, + fromAmino(object: DepositDeploymentAuthorizationAmino): DepositDeploymentAuthorization { + return { + spendLimit: object?.spend_limit ? Coin.fromAmino(object.spend_limit) : undefined + }; + }, + toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { + const obj: any = {}; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + return obj; + }, + fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { + return DepositDeploymentAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAminoMsg { + return { + type: "akash/deployment/deposit-deployment-authorization", + value: DepositDeploymentAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: DepositDeploymentAuthorizationProtoMsg): DepositDeploymentAuthorization { + return DepositDeploymentAuthorization.decode(message.value); + }, + toProto(message: DepositDeploymentAuthorization): Uint8Array { + return DepositDeploymentAuthorization.encode(message).finish(); + }, + toProtoMsg(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization", + value: DepositDeploymentAuthorization.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts index cbcf72d87f..b70314be62 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/deployment.ts @@ -151,6 +151,7 @@ function createBaseMsgCreateDeployment(): MsgCreateDeployment { }; } export const MsgCreateDeployment = { + typeUrl: "/akash.deployment.v1beta1.MsgCreateDeployment", encode(message: MsgCreateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -247,12 +248,54 @@ export const MsgCreateDeployment = { obj.version = message.version; message.deposit !== undefined && (obj.deposit = message.deposit ? Coin.toSDK(message.deposit) : undefined); return obj; + }, + fromAmino(object: MsgCreateDeploymentAmino): MsgCreateDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupSpec.fromAmino(e)) : [], + version: object.version, + deposit: object?.deposit ? Coin.fromAmino(object.deposit) : undefined + }; + }, + toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.version = message.version; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { + return MsgCreateDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateDeployment): MsgCreateDeploymentAminoMsg { + return { + type: "akash/deployment/testonly-create-deployment", + value: MsgCreateDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateDeploymentProtoMsg): MsgCreateDeployment { + return MsgCreateDeployment.decode(message.value); + }, + toProto(message: MsgCreateDeployment): Uint8Array { + return MsgCreateDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateDeployment): MsgCreateDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgCreateDeployment", + value: MsgCreateDeployment.encode(message).finish() + }; } }; function createBaseMsgCreateDeploymentResponse(): MsgCreateDeploymentResponse { return {}; } export const MsgCreateDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse", encode(_: MsgCreateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -290,6 +333,34 @@ export const MsgCreateDeploymentResponse = { toSDK(_: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateDeploymentResponseAmino): MsgCreateDeploymentResponse { + return {}; + }, + toAmino(_: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateDeploymentResponseAminoMsg): MsgCreateDeploymentResponse { + return MsgCreateDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseAminoMsg { + return { + type: "akash/deployment/testonly-create-deployment-response", + value: MsgCreateDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateDeploymentResponseProtoMsg): MsgCreateDeploymentResponse { + return MsgCreateDeploymentResponse.decode(message.value); + }, + toProto(message: MsgCreateDeploymentResponse): Uint8Array { + return MsgCreateDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse", + value: MsgCreateDeploymentResponse.encode(message).finish() + }; } }; function createBaseMsgDepositDeployment(): MsgDepositDeployment { @@ -299,6 +370,7 @@ function createBaseMsgDepositDeployment(): MsgDepositDeployment { }; } export const MsgDepositDeployment = { + typeUrl: "/akash.deployment.v1beta1.MsgDepositDeployment", encode(message: MsgDepositDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -363,12 +435,46 @@ export const MsgDepositDeployment = { message.id !== undefined && (obj.id = message.id ? DeploymentID.toSDK(message.id) : undefined); message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: MsgDepositDeploymentAmino): MsgDepositDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: MsgDepositDeployment): MsgDepositDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { + return MsgDepositDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgDepositDeployment): MsgDepositDeploymentAminoMsg { + return { + type: "akash/deployment/testonly-deposit-deployment", + value: MsgDepositDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositDeploymentProtoMsg): MsgDepositDeployment { + return MsgDepositDeployment.decode(message.value); + }, + toProto(message: MsgDepositDeployment): Uint8Array { + return MsgDepositDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgDepositDeployment): MsgDepositDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgDepositDeployment", + value: MsgDepositDeployment.encode(message).finish() + }; } }; function createBaseMsgDepositDeploymentResponse(): MsgDepositDeploymentResponse { return {}; } export const MsgDepositDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse", encode(_: MsgDepositDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -406,6 +512,34 @@ export const MsgDepositDeploymentResponse = { toSDK(_: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDepositDeploymentResponseAmino): MsgDepositDeploymentResponse { + return {}; + }, + toAmino(_: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDepositDeploymentResponseAminoMsg): MsgDepositDeploymentResponse { + return MsgDepositDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseAminoMsg { + return { + type: "akash/deployment/testonly-deposit-deployment-response", + value: MsgDepositDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositDeploymentResponseProtoMsg): MsgDepositDeploymentResponse { + return MsgDepositDeploymentResponse.decode(message.value); + }, + toProto(message: MsgDepositDeploymentResponse): Uint8Array { + return MsgDepositDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse", + value: MsgDepositDeploymentResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateDeployment(): MsgUpdateDeployment { @@ -416,6 +550,7 @@ function createBaseMsgUpdateDeployment(): MsgUpdateDeployment { }; } export const MsgUpdateDeployment = { + typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeployment", encode(message: MsgUpdateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -500,12 +635,52 @@ export const MsgUpdateDeployment = { } obj.version = message.version; return obj; + }, + fromAmino(object: MsgUpdateDeploymentAmino): MsgUpdateDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupSpec.fromAmino(e)) : [], + version: object.version + }; + }, + toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { + return MsgUpdateDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateDeployment): MsgUpdateDeploymentAminoMsg { + return { + type: "akash/deployment/testonly-update-deployment", + value: MsgUpdateDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateDeploymentProtoMsg): MsgUpdateDeployment { + return MsgUpdateDeployment.decode(message.value); + }, + toProto(message: MsgUpdateDeployment): Uint8Array { + return MsgUpdateDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateDeployment): MsgUpdateDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeployment", + value: MsgUpdateDeployment.encode(message).finish() + }; } }; function createBaseMsgUpdateDeploymentResponse(): MsgUpdateDeploymentResponse { return {}; } export const MsgUpdateDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse", encode(_: MsgUpdateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -543,6 +718,34 @@ export const MsgUpdateDeploymentResponse = { toSDK(_: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateDeploymentResponseAmino): MsgUpdateDeploymentResponse { + return {}; + }, + toAmino(_: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateDeploymentResponseAminoMsg): MsgUpdateDeploymentResponse { + return MsgUpdateDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseAminoMsg { + return { + type: "akash/deployment/testonly-update-deployment-response", + value: MsgUpdateDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateDeploymentResponseProtoMsg): MsgUpdateDeploymentResponse { + return MsgUpdateDeploymentResponse.decode(message.value); + }, + toProto(message: MsgUpdateDeploymentResponse): Uint8Array { + return MsgUpdateDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse", + value: MsgUpdateDeploymentResponse.encode(message).finish() + }; } }; function createBaseMsgCloseDeployment(): MsgCloseDeployment { @@ -551,6 +754,7 @@ function createBaseMsgCloseDeployment(): MsgCloseDeployment { }; } export const MsgCloseDeployment = { + typeUrl: "/akash.deployment.v1beta1.MsgCloseDeployment", encode(message: MsgCloseDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -603,12 +807,44 @@ export const MsgCloseDeployment = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? DeploymentID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgCloseDeploymentAmino): MsgCloseDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { + return MsgCloseDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseDeployment): MsgCloseDeploymentAminoMsg { + return { + type: "akash/deployment/testonly-close-deployment", + value: MsgCloseDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseDeploymentProtoMsg): MsgCloseDeployment { + return MsgCloseDeployment.decode(message.value); + }, + toProto(message: MsgCloseDeployment): Uint8Array { + return MsgCloseDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseDeployment): MsgCloseDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgCloseDeployment", + value: MsgCloseDeployment.encode(message).finish() + }; } }; function createBaseMsgCloseDeploymentResponse(): MsgCloseDeploymentResponse { return {}; } export const MsgCloseDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse", encode(_: MsgCloseDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -646,6 +882,34 @@ export const MsgCloseDeploymentResponse = { toSDK(_: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCloseDeploymentResponseAmino): MsgCloseDeploymentResponse { + return {}; + }, + toAmino(_: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCloseDeploymentResponseAminoMsg): MsgCloseDeploymentResponse { + return MsgCloseDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseAminoMsg { + return { + type: "akash/deployment/testonly-close-deployment-response", + value: MsgCloseDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseDeploymentResponseProtoMsg): MsgCloseDeploymentResponse { + return MsgCloseDeploymentResponse.decode(message.value); + }, + toProto(message: MsgCloseDeploymentResponse): Uint8Array { + return MsgCloseDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse", + value: MsgCloseDeploymentResponse.encode(message).finish() + }; } }; function createBaseDeploymentID(): DeploymentID { @@ -655,6 +919,7 @@ function createBaseDeploymentID(): DeploymentID { }; } export const DeploymentID = { + typeUrl: "/akash.deployment.v1beta1.DeploymentID", encode(message: DeploymentID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -719,6 +984,39 @@ export const DeploymentID = { obj.owner = message.owner; obj.dseq = message.dseq; return obj; + }, + fromAmino(object: DeploymentIDAmino): DeploymentID { + return { + owner: object.owner, + dseq: BigInt(object.dseq) + }; + }, + toAmino(message: DeploymentID): DeploymentIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + return obj; + }, + fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { + return DeploymentID.fromAmino(object.value); + }, + toAminoMsg(message: DeploymentID): DeploymentIDAminoMsg { + return { + type: "akash/deployment/deployment-i-d", + value: DeploymentID.toAmino(message) + }; + }, + fromProtoMsg(message: DeploymentIDProtoMsg): DeploymentID { + return DeploymentID.decode(message.value); + }, + toProto(message: DeploymentID): Uint8Array { + return DeploymentID.encode(message).finish(); + }, + toProtoMsg(message: DeploymentID): DeploymentIDProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.DeploymentID", + value: DeploymentID.encode(message).finish() + }; } }; function createBaseDeployment(): Deployment { @@ -730,6 +1028,7 @@ function createBaseDeployment(): Deployment { }; } export const Deployment = { + typeUrl: "/akash.deployment.v1beta1.Deployment", encode(message: Deployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentId !== undefined) { DeploymentID.encode(message.deploymentId, writer.uint32(10).fork()).ldelim(); @@ -818,6 +1117,43 @@ export const Deployment = { obj.version = message.version; obj.created_at = message.createdAt; return obj; + }, + fromAmino(object: DeploymentAmino): Deployment { + return { + deploymentId: object?.deployment_id ? DeploymentID.fromAmino(object.deployment_id) : undefined, + state: isSet(object.state) ? deployment_StateFromJSON(object.state) : -1, + version: object.version, + createdAt: BigInt(object.created_at) + }; + }, + toAmino(message: Deployment): DeploymentAmino { + const obj: any = {}; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : undefined; + obj.state = message.state; + obj.version = message.version; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: DeploymentAminoMsg): Deployment { + return Deployment.fromAmino(object.value); + }, + toAminoMsg(message: Deployment): DeploymentAminoMsg { + return { + type: "akash/deployment/deployment", + value: Deployment.toAmino(message) + }; + }, + fromProtoMsg(message: DeploymentProtoMsg): Deployment { + return Deployment.decode(message.value); + }, + toProto(message: Deployment): Uint8Array { + return Deployment.encode(message).finish(); + }, + toProtoMsg(message: Deployment): DeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.Deployment", + value: Deployment.encode(message).finish() + }; } }; function createBaseDeploymentFilters(): DeploymentFilters { @@ -828,6 +1164,7 @@ function createBaseDeploymentFilters(): DeploymentFilters { }; } export const DeploymentFilters = { + typeUrl: "/akash.deployment.v1beta1.DeploymentFilters", encode(message: DeploymentFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -904,6 +1241,41 @@ export const DeploymentFilters = { obj.dseq = message.dseq; obj.state = message.state; return obj; + }, + fromAmino(object: DeploymentFiltersAmino): DeploymentFilters { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + state: object.state + }; + }, + toAmino(message: DeploymentFilters): DeploymentFiltersAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { + return DeploymentFilters.fromAmino(object.value); + }, + toAminoMsg(message: DeploymentFilters): DeploymentFiltersAminoMsg { + return { + type: "akash/deployment/deployment-filters", + value: DeploymentFilters.toAmino(message) + }; + }, + fromProtoMsg(message: DeploymentFiltersProtoMsg): DeploymentFilters { + return DeploymentFilters.decode(message.value); + }, + toProto(message: DeploymentFilters): Uint8Array { + return DeploymentFilters.encode(message).finish(); + }, + toProtoMsg(message: DeploymentFilters): DeploymentFiltersProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.DeploymentFilters", + value: DeploymentFilters.encode(message).finish() + }; } }; /** Msg defines the deployment Msg service. */ diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts index 01afb59edb..38985da9e5 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/genesis.ts @@ -31,6 +31,7 @@ function createBaseGenesisDeployment(): GenesisDeployment { }; } export const GenesisDeployment = { + typeUrl: "/akash.deployment.v1beta1.GenesisDeployment", encode(message: GenesisDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); @@ -103,6 +104,43 @@ export const GenesisDeployment = { obj.groups = []; } return obj; + }, + fromAmino(object: GenesisDeploymentAmino): GenesisDeployment { + return { + deployment: object?.deployment ? Deployment.fromAmino(object.deployment) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisDeployment): GenesisDeploymentAmino { + const obj: any = {}; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); + } else { + obj.groups = []; + } + return obj; + }, + fromAminoMsg(object: GenesisDeploymentAminoMsg): GenesisDeployment { + return GenesisDeployment.fromAmino(object.value); + }, + toAminoMsg(message: GenesisDeployment): GenesisDeploymentAminoMsg { + return { + type: "akash/deployment/genesis-deployment", + value: GenesisDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisDeploymentProtoMsg): GenesisDeployment { + return GenesisDeployment.decode(message.value); + }, + toProto(message: GenesisDeployment): Uint8Array { + return GenesisDeployment.encode(message).finish(); + }, + toProtoMsg(message: GenesisDeployment): GenesisDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.GenesisDeployment", + value: GenesisDeployment.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -112,6 +150,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.deployment.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { GenesisDeployment.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -184,5 +223,42 @@ export const GenesisState = { } message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => GenesisDeployment.fromAmino(e)) : [], + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.deployments) { + obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); + } else { + obj.deployments = []; + } + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/deployment/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts index 8ad169e16a..06b94bd054 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/group.ts @@ -151,6 +151,7 @@ function createBaseMsgCloseGroup(): MsgCloseGroup { }; } export const MsgCloseGroup = { + typeUrl: "/akash.deployment.v1beta1.MsgCloseGroup", encode(message: MsgCloseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -203,12 +204,44 @@ export const MsgCloseGroup = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgCloseGroupAmino): MsgCloseGroup { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { + return MsgCloseGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseGroup): MsgCloseGroupAminoMsg { + return { + type: "akash/deployment/testonly-close-group", + value: MsgCloseGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseGroupProtoMsg): MsgCloseGroup { + return MsgCloseGroup.decode(message.value); + }, + toProto(message: MsgCloseGroup): Uint8Array { + return MsgCloseGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseGroup): MsgCloseGroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgCloseGroup", + value: MsgCloseGroup.encode(message).finish() + }; } }; function createBaseMsgCloseGroupResponse(): MsgCloseGroupResponse { return {}; } export const MsgCloseGroupResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgCloseGroupResponse", encode(_: MsgCloseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -246,6 +279,34 @@ export const MsgCloseGroupResponse = { toSDK(_: MsgCloseGroupResponse): MsgCloseGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCloseGroupResponseAmino): MsgCloseGroupResponse { + return {}; + }, + toAmino(_: MsgCloseGroupResponse): MsgCloseGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCloseGroupResponseAminoMsg): MsgCloseGroupResponse { + return MsgCloseGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseGroupResponse): MsgCloseGroupResponseAminoMsg { + return { + type: "akash/deployment/testonly-close-group-response", + value: MsgCloseGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseGroupResponseProtoMsg): MsgCloseGroupResponse { + return MsgCloseGroupResponse.decode(message.value); + }, + toProto(message: MsgCloseGroupResponse): Uint8Array { + return MsgCloseGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseGroupResponse): MsgCloseGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgCloseGroupResponse", + value: MsgCloseGroupResponse.encode(message).finish() + }; } }; function createBaseMsgPauseGroup(): MsgPauseGroup { @@ -254,6 +315,7 @@ function createBaseMsgPauseGroup(): MsgPauseGroup { }; } export const MsgPauseGroup = { + typeUrl: "/akash.deployment.v1beta1.MsgPauseGroup", encode(message: MsgPauseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -306,12 +368,44 @@ export const MsgPauseGroup = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgPauseGroupAmino): MsgPauseGroup { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { + return MsgPauseGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgPauseGroup): MsgPauseGroupAminoMsg { + return { + type: "akash/deployment/testonly-pause-group", + value: MsgPauseGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPauseGroupProtoMsg): MsgPauseGroup { + return MsgPauseGroup.decode(message.value); + }, + toProto(message: MsgPauseGroup): Uint8Array { + return MsgPauseGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgPauseGroup): MsgPauseGroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgPauseGroup", + value: MsgPauseGroup.encode(message).finish() + }; } }; function createBaseMsgPauseGroupResponse(): MsgPauseGroupResponse { return {}; } export const MsgPauseGroupResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgPauseGroupResponse", encode(_: MsgPauseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -349,6 +443,34 @@ export const MsgPauseGroupResponse = { toSDK(_: MsgPauseGroupResponse): MsgPauseGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgPauseGroupResponseAmino): MsgPauseGroupResponse { + return {}; + }, + toAmino(_: MsgPauseGroupResponse): MsgPauseGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgPauseGroupResponseAminoMsg): MsgPauseGroupResponse { + return MsgPauseGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgPauseGroupResponse): MsgPauseGroupResponseAminoMsg { + return { + type: "akash/deployment/testonly-pause-group-response", + value: MsgPauseGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPauseGroupResponseProtoMsg): MsgPauseGroupResponse { + return MsgPauseGroupResponse.decode(message.value); + }, + toProto(message: MsgPauseGroupResponse): Uint8Array { + return MsgPauseGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgPauseGroupResponse): MsgPauseGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgPauseGroupResponse", + value: MsgPauseGroupResponse.encode(message).finish() + }; } }; function createBaseMsgStartGroup(): MsgStartGroup { @@ -357,6 +479,7 @@ function createBaseMsgStartGroup(): MsgStartGroup { }; } export const MsgStartGroup = { + typeUrl: "/akash.deployment.v1beta1.MsgStartGroup", encode(message: MsgStartGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -409,12 +532,44 @@ export const MsgStartGroup = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgStartGroupAmino): MsgStartGroup { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgStartGroup): MsgStartGroupAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { + return MsgStartGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgStartGroup): MsgStartGroupAminoMsg { + return { + type: "akash/deployment/testonly-start-group", + value: MsgStartGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStartGroupProtoMsg): MsgStartGroup { + return MsgStartGroup.decode(message.value); + }, + toProto(message: MsgStartGroup): Uint8Array { + return MsgStartGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgStartGroup): MsgStartGroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgStartGroup", + value: MsgStartGroup.encode(message).finish() + }; } }; function createBaseMsgStartGroupResponse(): MsgStartGroupResponse { return {}; } export const MsgStartGroupResponse = { + typeUrl: "/akash.deployment.v1beta1.MsgStartGroupResponse", encode(_: MsgStartGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -452,6 +607,34 @@ export const MsgStartGroupResponse = { toSDK(_: MsgStartGroupResponse): MsgStartGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgStartGroupResponseAmino): MsgStartGroupResponse { + return {}; + }, + toAmino(_: MsgStartGroupResponse): MsgStartGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgStartGroupResponseAminoMsg): MsgStartGroupResponse { + return MsgStartGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgStartGroupResponse): MsgStartGroupResponseAminoMsg { + return { + type: "akash/deployment/testonly-start-group-response", + value: MsgStartGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStartGroupResponseProtoMsg): MsgStartGroupResponse { + return MsgStartGroupResponse.decode(message.value); + }, + toProto(message: MsgStartGroupResponse): Uint8Array { + return MsgStartGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgStartGroupResponse): MsgStartGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.MsgStartGroupResponse", + value: MsgStartGroupResponse.encode(message).finish() + }; } }; function createBaseGroupID(): GroupID { @@ -462,6 +645,7 @@ function createBaseGroupID(): GroupID { }; } export const GroupID = { + typeUrl: "/akash.deployment.v1beta1.GroupID", encode(message: GroupID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -538,6 +722,41 @@ export const GroupID = { obj.dseq = message.dseq; obj.gseq = message.gseq; return obj; + }, + fromAmino(object: GroupIDAmino): GroupID { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq + }; + }, + toAmino(message: GroupID): GroupIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + return obj; + }, + fromAminoMsg(object: GroupIDAminoMsg): GroupID { + return GroupID.fromAmino(object.value); + }, + toAminoMsg(message: GroupID): GroupIDAminoMsg { + return { + type: "akash/deployment/group-i-d", + value: GroupID.toAmino(message) + }; + }, + fromProtoMsg(message: GroupIDProtoMsg): GroupID { + return GroupID.decode(message.value); + }, + toProto(message: GroupID): Uint8Array { + return GroupID.encode(message).finish(); + }, + toProtoMsg(message: GroupID): GroupIDProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.GroupID", + value: GroupID.encode(message).finish() + }; } }; function createBaseGroupSpec(): GroupSpec { @@ -548,6 +767,7 @@ function createBaseGroupSpec(): GroupSpec { }; } export const GroupSpec = { + typeUrl: "/akash.deployment.v1beta1.GroupSpec", encode(message: GroupSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -632,6 +852,45 @@ export const GroupSpec = { obj.resources = []; } return obj; + }, + fromAmino(object: GroupSpecAmino): GroupSpec { + return { + name: object.name, + requirements: object?.requirements ? PlacementRequirements.fromAmino(object.requirements) : undefined, + resources: Array.isArray(object?.resources) ? object.resources.map((e: any) => Resource.fromAmino(e)) : [] + }; + }, + toAmino(message: GroupSpec): GroupSpecAmino { + const obj: any = {}; + obj.name = message.name; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + if (message.resources) { + obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); + } else { + obj.resources = []; + } + return obj; + }, + fromAminoMsg(object: GroupSpecAminoMsg): GroupSpec { + return GroupSpec.fromAmino(object.value); + }, + toAminoMsg(message: GroupSpec): GroupSpecAminoMsg { + return { + type: "akash/deployment/group-spec", + value: GroupSpec.toAmino(message) + }; + }, + fromProtoMsg(message: GroupSpecProtoMsg): GroupSpec { + return GroupSpec.decode(message.value); + }, + toProto(message: GroupSpec): Uint8Array { + return GroupSpec.encode(message).finish(); + }, + toProtoMsg(message: GroupSpec): GroupSpecProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.GroupSpec", + value: GroupSpec.encode(message).finish() + }; } }; function createBaseGroup(): Group { @@ -643,6 +902,7 @@ function createBaseGroup(): Group { }; } export const Group = { + typeUrl: "/akash.deployment.v1beta1.Group", encode(message: Group, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== undefined) { GroupID.encode(message.groupId, writer.uint32(10).fork()).ldelim(); @@ -731,6 +991,43 @@ export const Group = { message.groupSpec !== undefined && (obj.group_spec = message.groupSpec ? GroupSpec.toSDK(message.groupSpec) : undefined); obj.created_at = message.createdAt; return obj; + }, + fromAmino(object: GroupAmino): Group { + return { + groupId: object?.group_id ? GroupID.fromAmino(object.group_id) : undefined, + state: isSet(object.state) ? group_StateFromJSON(object.state) : -1, + groupSpec: object?.group_spec ? GroupSpec.fromAmino(object.group_spec) : undefined, + createdAt: BigInt(object.created_at) + }; + }, + toAmino(message: Group): GroupAmino { + const obj: any = {}; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : undefined; + obj.state = message.state; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : undefined; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GroupAminoMsg): Group { + return Group.fromAmino(object.value); + }, + toAminoMsg(message: Group): GroupAminoMsg { + return { + type: "akash/deployment/group", + value: Group.toAmino(message) + }; + }, + fromProtoMsg(message: GroupProtoMsg): Group { + return Group.decode(message.value); + }, + toProto(message: Group): Uint8Array { + return Group.encode(message).finish(); + }, + toProtoMsg(message: Group): GroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.Group", + value: Group.encode(message).finish() + }; } }; function createBaseResource(): Resource { @@ -741,6 +1038,7 @@ function createBaseResource(): Resource { }; } export const Resource = { + typeUrl: "/akash.deployment.v1beta1.Resource", encode(message: Resource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resources !== undefined) { ResourceUnits.encode(message.resources, writer.uint32(10).fork()).ldelim(); @@ -817,5 +1115,40 @@ export const Resource = { obj.count = message.count; message.price !== undefined && (obj.price = message.price ? Coin.toSDK(message.price) : undefined); return obj; + }, + fromAmino(object: ResourceAmino): Resource { + return { + resources: object?.resources ? ResourceUnits.fromAmino(object.resources) : undefined, + count: object.count, + price: object?.price ? Coin.fromAmino(object.price) : undefined + }; + }, + toAmino(message: Resource): ResourceAmino { + const obj: any = {}; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : undefined; + obj.count = message.count; + obj.price = message.price ? Coin.toAmino(message.price) : undefined; + return obj; + }, + fromAminoMsg(object: ResourceAminoMsg): Resource { + return Resource.fromAmino(object.value); + }, + toAminoMsg(message: Resource): ResourceAminoMsg { + return { + type: "akash/deployment/resource", + value: Resource.toAmino(message) + }; + }, + fromProtoMsg(message: ResourceProtoMsg): Resource { + return Resource.decode(message.value); + }, + toProto(message: Resource): Uint8Array { + return Resource.encode(message).finish(); + }, + toProtoMsg(message: Resource): ResourceProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.Resource", + value: Resource.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts index 76ff29be8a..dbff23b846 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/params.ts @@ -16,6 +16,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/akash.deployment.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentMinDeposit !== undefined) { Coin.encode(message.deploymentMinDeposit, writer.uint32(10).fork()).ldelim(); @@ -68,5 +69,36 @@ export const Params = { const obj: any = {}; message.deploymentMinDeposit !== undefined && (obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toSDK(message.deploymentMinDeposit) : undefined); return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + deploymentMinDeposit: object?.deployment_min_deposit ? Coin.fromAmino(object.deployment_min_deposit) : undefined + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "akash/deployment/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts index bd58e0d162..e54df80963 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta1/query.ts @@ -69,6 +69,7 @@ function createBaseQueryDeploymentsRequest(): QueryDeploymentsRequest { }; } export const QueryDeploymentsRequest = { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsRequest", encode(message: QueryDeploymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { DeploymentFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); @@ -133,6 +134,39 @@ export const QueryDeploymentsRequest = { message.filters !== undefined && (obj.filters = message.filters ? DeploymentFilters.toSDK(message.filters) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentsRequestAmino): QueryDeploymentsRequest { + return { + filters: object?.filters ? DeploymentFilters.fromAmino(object.filters) : undefined, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDeploymentsRequest): QueryDeploymentsRequestAmino { + const obj: any = {}; + obj.filters = message.filters ? DeploymentFilters.toAmino(message.filters) : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentsRequestAminoMsg): QueryDeploymentsRequest { + return QueryDeploymentsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentsRequest): QueryDeploymentsRequestAminoMsg { + return { + type: "akash/deployment/query-deployments-request", + value: QueryDeploymentsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentsRequestProtoMsg): QueryDeploymentsRequest { + return QueryDeploymentsRequest.decode(message.value); + }, + toProto(message: QueryDeploymentsRequest): Uint8Array { + return QueryDeploymentsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentsRequest): QueryDeploymentsRequestProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsRequest", + value: QueryDeploymentsRequest.encode(message).finish() + }; } }; function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse { @@ -142,6 +176,7 @@ function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse { }; } export const QueryDeploymentsResponse = { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsResponse", encode(message: QueryDeploymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { QueryDeploymentResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -214,6 +249,43 @@ export const QueryDeploymentsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentsResponseAmino): QueryDeploymentsResponse { + return { + deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => QueryDeploymentResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDeploymentsResponse): QueryDeploymentsResponseAmino { + const obj: any = {}; + if (message.deployments) { + obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); + } else { + obj.deployments = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentsResponseAminoMsg): QueryDeploymentsResponse { + return QueryDeploymentsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentsResponse): QueryDeploymentsResponseAminoMsg { + return { + type: "akash/deployment/query-deployments-response", + value: QueryDeploymentsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentsResponseProtoMsg): QueryDeploymentsResponse { + return QueryDeploymentsResponse.decode(message.value); + }, + toProto(message: QueryDeploymentsResponse): Uint8Array { + return QueryDeploymentsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentsResponse): QueryDeploymentsResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsResponse", + value: QueryDeploymentsResponse.encode(message).finish() + }; } }; function createBaseQueryDeploymentRequest(): QueryDeploymentRequest { @@ -222,6 +294,7 @@ function createBaseQueryDeploymentRequest(): QueryDeploymentRequest { }; } export const QueryDeploymentRequest = { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentRequest", encode(message: QueryDeploymentRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -274,6 +347,37 @@ export const QueryDeploymentRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? DeploymentID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentRequestAmino): QueryDeploymentRequest { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryDeploymentRequest): QueryDeploymentRequestAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentRequestAminoMsg): QueryDeploymentRequest { + return QueryDeploymentRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentRequest): QueryDeploymentRequestAminoMsg { + return { + type: "akash/deployment/query-deployment-request", + value: QueryDeploymentRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentRequestProtoMsg): QueryDeploymentRequest { + return QueryDeploymentRequest.decode(message.value); + }, + toProto(message: QueryDeploymentRequest): Uint8Array { + return QueryDeploymentRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentRequest): QueryDeploymentRequestProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentRequest", + value: QueryDeploymentRequest.encode(message).finish() + }; } }; function createBaseQueryDeploymentResponse(): QueryDeploymentResponse { @@ -284,6 +388,7 @@ function createBaseQueryDeploymentResponse(): QueryDeploymentResponse { }; } export const QueryDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentResponse", encode(message: QueryDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); @@ -368,6 +473,45 @@ export const QueryDeploymentResponse = { } message.escrowAccount !== undefined && (obj.escrow_account = message.escrowAccount ? Account.toSDK(message.escrowAccount) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentResponseAmino): QueryDeploymentResponse { + return { + deployment: object?.deployment ? Deployment.fromAmino(object.deployment) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromAmino(e)) : [], + escrowAccount: object?.escrow_account ? Account.fromAmino(object.escrow_account) : undefined + }; + }, + toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { + const obj: any = {}; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentResponseAminoMsg): QueryDeploymentResponse { + return QueryDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentResponse): QueryDeploymentResponseAminoMsg { + return { + type: "akash/deployment/query-deployment-response", + value: QueryDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentResponseProtoMsg): QueryDeploymentResponse { + return QueryDeploymentResponse.decode(message.value); + }, + toProto(message: QueryDeploymentResponse): Uint8Array { + return QueryDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentResponse): QueryDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.QueryDeploymentResponse", + value: QueryDeploymentResponse.encode(message).finish() + }; } }; function createBaseQueryGroupRequest(): QueryGroupRequest { @@ -376,6 +520,7 @@ function createBaseQueryGroupRequest(): QueryGroupRequest { }; } export const QueryGroupRequest = { + typeUrl: "/akash.deployment.v1beta1.QueryGroupRequest", encode(message: QueryGroupRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -428,6 +573,37 @@ export const QueryGroupRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryGroupRequestAmino): QueryGroupRequest { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryGroupRequest): QueryGroupRequestAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupRequestAminoMsg): QueryGroupRequest { + return QueryGroupRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupRequest): QueryGroupRequestAminoMsg { + return { + type: "akash/deployment/query-group-request", + value: QueryGroupRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupRequestProtoMsg): QueryGroupRequest { + return QueryGroupRequest.decode(message.value); + }, + toProto(message: QueryGroupRequest): Uint8Array { + return QueryGroupRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupRequest): QueryGroupRequestProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.QueryGroupRequest", + value: QueryGroupRequest.encode(message).finish() + }; } }; function createBaseQueryGroupResponse(): QueryGroupResponse { @@ -436,6 +612,7 @@ function createBaseQueryGroupResponse(): QueryGroupResponse { }; } export const QueryGroupResponse = { + typeUrl: "/akash.deployment.v1beta1.QueryGroupResponse", encode(message: QueryGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.group !== undefined) { Group.encode(message.group, writer.uint32(10).fork()).ldelim(); @@ -488,6 +665,37 @@ export const QueryGroupResponse = { const obj: any = {}; message.group !== undefined && (obj.group = message.group ? Group.toSDK(message.group) : undefined); return obj; + }, + fromAmino(object: QueryGroupResponseAmino): QueryGroupResponse { + return { + group: object?.group ? Group.fromAmino(object.group) : undefined + }; + }, + toAmino(message: QueryGroupResponse): QueryGroupResponseAmino { + const obj: any = {}; + obj.group = message.group ? Group.toAmino(message.group) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupResponseAminoMsg): QueryGroupResponse { + return QueryGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupResponse): QueryGroupResponseAminoMsg { + return { + type: "akash/deployment/query-group-response", + value: QueryGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupResponseProtoMsg): QueryGroupResponse { + return QueryGroupResponse.decode(message.value); + }, + toProto(message: QueryGroupResponse): Uint8Array { + return QueryGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupResponse): QueryGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta1.QueryGroupResponse", + value: QueryGroupResponse.encode(message).finish() + }; } }; /** Query defines the gRPC querier service */ diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts index 36aac619bb..788b582515 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/authz.ts @@ -26,6 +26,7 @@ function createBaseDepositDeploymentAuthorization(): DepositDeploymentAuthorizat }; } export const DepositDeploymentAuthorization = { + typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization", encode(message: DepositDeploymentAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spendLimit !== undefined) { Coin.encode(message.spendLimit, writer.uint32(10).fork()).ldelim(); @@ -78,5 +79,36 @@ export const DepositDeploymentAuthorization = { const obj: any = {}; message.spendLimit !== undefined && (obj.spend_limit = message.spendLimit ? Coin.toSDK(message.spendLimit) : undefined); return obj; + }, + fromAmino(object: DepositDeploymentAuthorizationAmino): DepositDeploymentAuthorization { + return { + spendLimit: object?.spend_limit ? Coin.fromAmino(object.spend_limit) : undefined + }; + }, + toAmino(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAmino { + const obj: any = {}; + obj.spend_limit = message.spendLimit ? Coin.toAmino(message.spendLimit) : undefined; + return obj; + }, + fromAminoMsg(object: DepositDeploymentAuthorizationAminoMsg): DepositDeploymentAuthorization { + return DepositDeploymentAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationAminoMsg { + return { + type: "akash/deployment/v1beta2/deposit-deployment-authorization", + value: DepositDeploymentAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: DepositDeploymentAuthorizationProtoMsg): DepositDeploymentAuthorization { + return DepositDeploymentAuthorization.decode(message.value); + }, + toProto(message: DepositDeploymentAuthorization): Uint8Array { + return DepositDeploymentAuthorization.encode(message).finish(); + }, + toProtoMsg(message: DepositDeploymentAuthorization): DepositDeploymentAuthorizationProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization", + value: DepositDeploymentAuthorization.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts index 3f81143d6f..fcce7b400a 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deployment.ts @@ -85,6 +85,7 @@ function createBaseDeploymentID(): DeploymentID { }; } export const DeploymentID = { + typeUrl: "/akash.deployment.v1beta2.DeploymentID", encode(message: DeploymentID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -149,6 +150,39 @@ export const DeploymentID = { obj.owner = message.owner; obj.dseq = message.dseq; return obj; + }, + fromAmino(object: DeploymentIDAmino): DeploymentID { + return { + owner: object.owner, + dseq: BigInt(object.dseq) + }; + }, + toAmino(message: DeploymentID): DeploymentIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + return obj; + }, + fromAminoMsg(object: DeploymentIDAminoMsg): DeploymentID { + return DeploymentID.fromAmino(object.value); + }, + toAminoMsg(message: DeploymentID): DeploymentIDAminoMsg { + return { + type: "akash/deployment/v1beta2/deployment-i-d", + value: DeploymentID.toAmino(message) + }; + }, + fromProtoMsg(message: DeploymentIDProtoMsg): DeploymentID { + return DeploymentID.decode(message.value); + }, + toProto(message: DeploymentID): Uint8Array { + return DeploymentID.encode(message).finish(); + }, + toProtoMsg(message: DeploymentID): DeploymentIDProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.DeploymentID", + value: DeploymentID.encode(message).finish() + }; } }; function createBaseDeployment(): Deployment { @@ -160,6 +194,7 @@ function createBaseDeployment(): Deployment { }; } export const Deployment = { + typeUrl: "/akash.deployment.v1beta2.Deployment", encode(message: Deployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentId !== undefined) { DeploymentID.encode(message.deploymentId, writer.uint32(10).fork()).ldelim(); @@ -248,6 +283,43 @@ export const Deployment = { obj.version = message.version; obj.created_at = message.createdAt; return obj; + }, + fromAmino(object: DeploymentAmino): Deployment { + return { + deploymentId: object?.deployment_id ? DeploymentID.fromAmino(object.deployment_id) : undefined, + state: isSet(object.state) ? deployment_StateFromJSON(object.state) : -1, + version: object.version, + createdAt: BigInt(object.created_at) + }; + }, + toAmino(message: Deployment): DeploymentAmino { + const obj: any = {}; + obj.deployment_id = message.deploymentId ? DeploymentID.toAmino(message.deploymentId) : undefined; + obj.state = message.state; + obj.version = message.version; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: DeploymentAminoMsg): Deployment { + return Deployment.fromAmino(object.value); + }, + toAminoMsg(message: Deployment): DeploymentAminoMsg { + return { + type: "akash/deployment/v1beta2/deployment", + value: Deployment.toAmino(message) + }; + }, + fromProtoMsg(message: DeploymentProtoMsg): Deployment { + return Deployment.decode(message.value); + }, + toProto(message: Deployment): Uint8Array { + return Deployment.encode(message).finish(); + }, + toProtoMsg(message: Deployment): DeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.Deployment", + value: Deployment.encode(message).finish() + }; } }; function createBaseDeploymentFilters(): DeploymentFilters { @@ -258,6 +330,7 @@ function createBaseDeploymentFilters(): DeploymentFilters { }; } export const DeploymentFilters = { + typeUrl: "/akash.deployment.v1beta2.DeploymentFilters", encode(message: DeploymentFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -334,5 +407,40 @@ export const DeploymentFilters = { obj.dseq = message.dseq; obj.state = message.state; return obj; + }, + fromAmino(object: DeploymentFiltersAmino): DeploymentFilters { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + state: object.state + }; + }, + toAmino(message: DeploymentFilters): DeploymentFiltersAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: DeploymentFiltersAminoMsg): DeploymentFilters { + return DeploymentFilters.fromAmino(object.value); + }, + toAminoMsg(message: DeploymentFilters): DeploymentFiltersAminoMsg { + return { + type: "akash/deployment/v1beta2/deployment-filters", + value: DeploymentFilters.toAmino(message) + }; + }, + fromProtoMsg(message: DeploymentFiltersProtoMsg): DeploymentFilters { + return DeploymentFilters.decode(message.value); + }, + toProto(message: DeploymentFilters): Uint8Array { + return DeploymentFilters.encode(message).finish(); + }, + toProtoMsg(message: DeploymentFilters): DeploymentFiltersProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.DeploymentFilters", + value: DeploymentFilters.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts index 4d33134847..4c11866772 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/deploymentmsg.ts @@ -78,6 +78,7 @@ function createBaseMsgCreateDeployment(): MsgCreateDeployment { }; } export const MsgCreateDeployment = { + typeUrl: "/akash.deployment.v1beta2.MsgCreateDeployment", encode(message: MsgCreateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -186,12 +187,56 @@ export const MsgCreateDeployment = { message.deposit !== undefined && (obj.deposit = message.deposit ? Coin.toSDK(message.deposit) : undefined); obj.depositor = message.depositor; return obj; + }, + fromAmino(object: MsgCreateDeploymentAmino): MsgCreateDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupSpec.fromAmino(e)) : [], + version: object.version, + deposit: object?.deposit ? Coin.fromAmino(object.deposit) : undefined, + depositor: object.depositor + }; + }, + toAmino(message: MsgCreateDeployment): MsgCreateDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? GroupSpec.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.version = message.version; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + obj.depositor = message.depositor; + return obj; + }, + fromAminoMsg(object: MsgCreateDeploymentAminoMsg): MsgCreateDeployment { + return MsgCreateDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateDeployment): MsgCreateDeploymentAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-create-deployment", + value: MsgCreateDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateDeploymentProtoMsg): MsgCreateDeployment { + return MsgCreateDeployment.decode(message.value); + }, + toProto(message: MsgCreateDeployment): Uint8Array { + return MsgCreateDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateDeployment): MsgCreateDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgCreateDeployment", + value: MsgCreateDeployment.encode(message).finish() + }; } }; function createBaseMsgCreateDeploymentResponse(): MsgCreateDeploymentResponse { return {}; } export const MsgCreateDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse", encode(_: MsgCreateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -229,6 +274,34 @@ export const MsgCreateDeploymentResponse = { toSDK(_: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateDeploymentResponseAmino): MsgCreateDeploymentResponse { + return {}; + }, + toAmino(_: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateDeploymentResponseAminoMsg): MsgCreateDeploymentResponse { + return MsgCreateDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-create-deployment-response", + value: MsgCreateDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateDeploymentResponseProtoMsg): MsgCreateDeploymentResponse { + return MsgCreateDeploymentResponse.decode(message.value); + }, + toProto(message: MsgCreateDeploymentResponse): Uint8Array { + return MsgCreateDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateDeploymentResponse): MsgCreateDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse", + value: MsgCreateDeploymentResponse.encode(message).finish() + }; } }; function createBaseMsgDepositDeployment(): MsgDepositDeployment { @@ -239,6 +312,7 @@ function createBaseMsgDepositDeployment(): MsgDepositDeployment { }; } export const MsgDepositDeployment = { + typeUrl: "/akash.deployment.v1beta2.MsgDepositDeployment", encode(message: MsgDepositDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -315,12 +389,48 @@ export const MsgDepositDeployment = { message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); obj.depositor = message.depositor; return obj; + }, + fromAmino(object: MsgDepositDeploymentAmino): MsgDepositDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined, + depositor: object.depositor + }; + }, + toAmino(message: MsgDepositDeployment): MsgDepositDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + obj.depositor = message.depositor; + return obj; + }, + fromAminoMsg(object: MsgDepositDeploymentAminoMsg): MsgDepositDeployment { + return MsgDepositDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgDepositDeployment): MsgDepositDeploymentAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-deposit-deployment", + value: MsgDepositDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositDeploymentProtoMsg): MsgDepositDeployment { + return MsgDepositDeployment.decode(message.value); + }, + toProto(message: MsgDepositDeployment): Uint8Array { + return MsgDepositDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgDepositDeployment): MsgDepositDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgDepositDeployment", + value: MsgDepositDeployment.encode(message).finish() + }; } }; function createBaseMsgDepositDeploymentResponse(): MsgDepositDeploymentResponse { return {}; } export const MsgDepositDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse", encode(_: MsgDepositDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -358,6 +468,34 @@ export const MsgDepositDeploymentResponse = { toSDK(_: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDepositDeploymentResponseAmino): MsgDepositDeploymentResponse { + return {}; + }, + toAmino(_: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDepositDeploymentResponseAminoMsg): MsgDepositDeploymentResponse { + return MsgDepositDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-deposit-deployment-response", + value: MsgDepositDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositDeploymentResponseProtoMsg): MsgDepositDeploymentResponse { + return MsgDepositDeploymentResponse.decode(message.value); + }, + toProto(message: MsgDepositDeploymentResponse): Uint8Array { + return MsgDepositDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDepositDeploymentResponse): MsgDepositDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse", + value: MsgDepositDeploymentResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateDeployment(): MsgUpdateDeployment { @@ -367,6 +505,7 @@ function createBaseMsgUpdateDeployment(): MsgUpdateDeployment { }; } export const MsgUpdateDeployment = { + typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeployment", encode(message: MsgUpdateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -431,12 +570,46 @@ export const MsgUpdateDeployment = { message.id !== undefined && (obj.id = message.id ? DeploymentID.toSDK(message.id) : undefined); obj.version = message.version; return obj; + }, + fromAmino(object: MsgUpdateDeploymentAmino): MsgUpdateDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined, + version: object.version + }; + }, + toAmino(message: MsgUpdateDeployment): MsgUpdateDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: MsgUpdateDeploymentAminoMsg): MsgUpdateDeployment { + return MsgUpdateDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateDeployment): MsgUpdateDeploymentAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-update-deployment", + value: MsgUpdateDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateDeploymentProtoMsg): MsgUpdateDeployment { + return MsgUpdateDeployment.decode(message.value); + }, + toProto(message: MsgUpdateDeployment): Uint8Array { + return MsgUpdateDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateDeployment): MsgUpdateDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeployment", + value: MsgUpdateDeployment.encode(message).finish() + }; } }; function createBaseMsgUpdateDeploymentResponse(): MsgUpdateDeploymentResponse { return {}; } export const MsgUpdateDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse", encode(_: MsgUpdateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -474,6 +647,34 @@ export const MsgUpdateDeploymentResponse = { toSDK(_: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateDeploymentResponseAmino): MsgUpdateDeploymentResponse { + return {}; + }, + toAmino(_: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateDeploymentResponseAminoMsg): MsgUpdateDeploymentResponse { + return MsgUpdateDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-update-deployment-response", + value: MsgUpdateDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateDeploymentResponseProtoMsg): MsgUpdateDeploymentResponse { + return MsgUpdateDeploymentResponse.decode(message.value); + }, + toProto(message: MsgUpdateDeploymentResponse): Uint8Array { + return MsgUpdateDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateDeploymentResponse): MsgUpdateDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse", + value: MsgUpdateDeploymentResponse.encode(message).finish() + }; } }; function createBaseMsgCloseDeployment(): MsgCloseDeployment { @@ -482,6 +683,7 @@ function createBaseMsgCloseDeployment(): MsgCloseDeployment { }; } export const MsgCloseDeployment = { + typeUrl: "/akash.deployment.v1beta2.MsgCloseDeployment", encode(message: MsgCloseDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -534,12 +736,44 @@ export const MsgCloseDeployment = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? DeploymentID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgCloseDeploymentAmino): MsgCloseDeployment { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgCloseDeployment): MsgCloseDeploymentAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCloseDeploymentAminoMsg): MsgCloseDeployment { + return MsgCloseDeployment.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseDeployment): MsgCloseDeploymentAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-close-deployment", + value: MsgCloseDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseDeploymentProtoMsg): MsgCloseDeployment { + return MsgCloseDeployment.decode(message.value); + }, + toProto(message: MsgCloseDeployment): Uint8Array { + return MsgCloseDeployment.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseDeployment): MsgCloseDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgCloseDeployment", + value: MsgCloseDeployment.encode(message).finish() + }; } }; function createBaseMsgCloseDeploymentResponse(): MsgCloseDeploymentResponse { return {}; } export const MsgCloseDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse", encode(_: MsgCloseDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -577,5 +811,33 @@ export const MsgCloseDeploymentResponse = { toSDK(_: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCloseDeploymentResponseAmino): MsgCloseDeploymentResponse { + return {}; + }, + toAmino(_: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCloseDeploymentResponseAminoMsg): MsgCloseDeploymentResponse { + return MsgCloseDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-close-deployment-response", + value: MsgCloseDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseDeploymentResponseProtoMsg): MsgCloseDeploymentResponse { + return MsgCloseDeploymentResponse.decode(message.value); + }, + toProto(message: MsgCloseDeploymentResponse): Uint8Array { + return MsgCloseDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseDeploymentResponse): MsgCloseDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse", + value: MsgCloseDeploymentResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts index 1f5a305524..b516a7d164 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/genesis.ts @@ -31,6 +31,7 @@ function createBaseGenesisDeployment(): GenesisDeployment { }; } export const GenesisDeployment = { + typeUrl: "/akash.deployment.v1beta2.GenesisDeployment", encode(message: GenesisDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); @@ -103,6 +104,43 @@ export const GenesisDeployment = { obj.groups = []; } return obj; + }, + fromAmino(object: GenesisDeploymentAmino): GenesisDeployment { + return { + deployment: object?.deployment ? Deployment.fromAmino(object.deployment) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisDeployment): GenesisDeploymentAmino { + const obj: any = {}; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); + } else { + obj.groups = []; + } + return obj; + }, + fromAminoMsg(object: GenesisDeploymentAminoMsg): GenesisDeployment { + return GenesisDeployment.fromAmino(object.value); + }, + toAminoMsg(message: GenesisDeployment): GenesisDeploymentAminoMsg { + return { + type: "akash/deployment/v1beta2/genesis-deployment", + value: GenesisDeployment.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisDeploymentProtoMsg): GenesisDeployment { + return GenesisDeployment.decode(message.value); + }, + toProto(message: GenesisDeployment): Uint8Array { + return GenesisDeployment.encode(message).finish(); + }, + toProtoMsg(message: GenesisDeployment): GenesisDeploymentProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.GenesisDeployment", + value: GenesisDeployment.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -112,6 +150,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.deployment.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { GenesisDeployment.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -184,5 +223,42 @@ export const GenesisState = { } message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => GenesisDeployment.fromAmino(e)) : [], + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.deployments) { + obj.deployments = message.deployments.map(e => e ? GenesisDeployment.toAmino(e) : undefined); + } else { + obj.deployments = []; + } + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/deployment/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts index e39732dc5c..f77e978b35 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/group.ts @@ -81,6 +81,7 @@ function createBaseGroup(): Group { }; } export const Group = { + typeUrl: "/akash.deployment.v1beta2.Group", encode(message: Group, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== undefined) { GroupID.encode(message.groupId, writer.uint32(10).fork()).ldelim(); @@ -169,5 +170,42 @@ export const Group = { message.groupSpec !== undefined && (obj.group_spec = message.groupSpec ? GroupSpec.toSDK(message.groupSpec) : undefined); obj.created_at = message.createdAt; return obj; + }, + fromAmino(object: GroupAmino): Group { + return { + groupId: object?.group_id ? GroupID.fromAmino(object.group_id) : undefined, + state: isSet(object.state) ? group_StateFromJSON(object.state) : -1, + groupSpec: object?.group_spec ? GroupSpec.fromAmino(object.group_spec) : undefined, + createdAt: BigInt(object.created_at) + }; + }, + toAmino(message: Group): GroupAmino { + const obj: any = {}; + obj.group_id = message.groupId ? GroupID.toAmino(message.groupId) : undefined; + obj.state = message.state; + obj.group_spec = message.groupSpec ? GroupSpec.toAmino(message.groupSpec) : undefined; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GroupAminoMsg): Group { + return Group.fromAmino(object.value); + }, + toAminoMsg(message: Group): GroupAminoMsg { + return { + type: "akash/deployment/v1beta2/group", + value: Group.toAmino(message) + }; + }, + fromProtoMsg(message: GroupProtoMsg): Group { + return Group.decode(message.value); + }, + toProto(message: Group): Uint8Array { + return Group.encode(message).finish(); + }, + toProtoMsg(message: Group): GroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.Group", + value: Group.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts index 8b695cd76f..3325bf03a1 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupid.ts @@ -21,6 +21,7 @@ function createBaseGroupID(): GroupID { }; } export const GroupID = { + typeUrl: "/akash.deployment.v1beta2.GroupID", encode(message: GroupID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -97,5 +98,40 @@ export const GroupID = { obj.dseq = message.dseq; obj.gseq = message.gseq; return obj; + }, + fromAmino(object: GroupIDAmino): GroupID { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq + }; + }, + toAmino(message: GroupID): GroupIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + return obj; + }, + fromAminoMsg(object: GroupIDAminoMsg): GroupID { + return GroupID.fromAmino(object.value); + }, + toAminoMsg(message: GroupID): GroupIDAminoMsg { + return { + type: "akash/deployment/v1beta2/group-i-d", + value: GroupID.toAmino(message) + }; + }, + fromProtoMsg(message: GroupIDProtoMsg): GroupID { + return GroupID.decode(message.value); + }, + toProto(message: GroupID): Uint8Array { + return GroupID.encode(message).finish(); + }, + toProtoMsg(message: GroupID): GroupIDProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.GroupID", + value: GroupID.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts index eb076aa90e..01f3b1c5ea 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupmsg.ts @@ -44,6 +44,7 @@ function createBaseMsgCloseGroup(): MsgCloseGroup { }; } export const MsgCloseGroup = { + typeUrl: "/akash.deployment.v1beta2.MsgCloseGroup", encode(message: MsgCloseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -96,12 +97,44 @@ export const MsgCloseGroup = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgCloseGroupAmino): MsgCloseGroup { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgCloseGroup): MsgCloseGroupAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCloseGroupAminoMsg): MsgCloseGroup { + return MsgCloseGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseGroup): MsgCloseGroupAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-close-group", + value: MsgCloseGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseGroupProtoMsg): MsgCloseGroup { + return MsgCloseGroup.decode(message.value); + }, + toProto(message: MsgCloseGroup): Uint8Array { + return MsgCloseGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseGroup): MsgCloseGroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgCloseGroup", + value: MsgCloseGroup.encode(message).finish() + }; } }; function createBaseMsgCloseGroupResponse(): MsgCloseGroupResponse { return {}; } export const MsgCloseGroupResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgCloseGroupResponse", encode(_: MsgCloseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -139,6 +172,34 @@ export const MsgCloseGroupResponse = { toSDK(_: MsgCloseGroupResponse): MsgCloseGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCloseGroupResponseAmino): MsgCloseGroupResponse { + return {}; + }, + toAmino(_: MsgCloseGroupResponse): MsgCloseGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCloseGroupResponseAminoMsg): MsgCloseGroupResponse { + return MsgCloseGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseGroupResponse): MsgCloseGroupResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-close-group-response", + value: MsgCloseGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseGroupResponseProtoMsg): MsgCloseGroupResponse { + return MsgCloseGroupResponse.decode(message.value); + }, + toProto(message: MsgCloseGroupResponse): Uint8Array { + return MsgCloseGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseGroupResponse): MsgCloseGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgCloseGroupResponse", + value: MsgCloseGroupResponse.encode(message).finish() + }; } }; function createBaseMsgPauseGroup(): MsgPauseGroup { @@ -147,6 +208,7 @@ function createBaseMsgPauseGroup(): MsgPauseGroup { }; } export const MsgPauseGroup = { + typeUrl: "/akash.deployment.v1beta2.MsgPauseGroup", encode(message: MsgPauseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -199,12 +261,44 @@ export const MsgPauseGroup = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgPauseGroupAmino): MsgPauseGroup { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgPauseGroup): MsgPauseGroupAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgPauseGroupAminoMsg): MsgPauseGroup { + return MsgPauseGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgPauseGroup): MsgPauseGroupAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-pause-group", + value: MsgPauseGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPauseGroupProtoMsg): MsgPauseGroup { + return MsgPauseGroup.decode(message.value); + }, + toProto(message: MsgPauseGroup): Uint8Array { + return MsgPauseGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgPauseGroup): MsgPauseGroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgPauseGroup", + value: MsgPauseGroup.encode(message).finish() + }; } }; function createBaseMsgPauseGroupResponse(): MsgPauseGroupResponse { return {}; } export const MsgPauseGroupResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgPauseGroupResponse", encode(_: MsgPauseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -242,6 +336,34 @@ export const MsgPauseGroupResponse = { toSDK(_: MsgPauseGroupResponse): MsgPauseGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgPauseGroupResponseAmino): MsgPauseGroupResponse { + return {}; + }, + toAmino(_: MsgPauseGroupResponse): MsgPauseGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgPauseGroupResponseAminoMsg): MsgPauseGroupResponse { + return MsgPauseGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgPauseGroupResponse): MsgPauseGroupResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-pause-group-response", + value: MsgPauseGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPauseGroupResponseProtoMsg): MsgPauseGroupResponse { + return MsgPauseGroupResponse.decode(message.value); + }, + toProto(message: MsgPauseGroupResponse): Uint8Array { + return MsgPauseGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgPauseGroupResponse): MsgPauseGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgPauseGroupResponse", + value: MsgPauseGroupResponse.encode(message).finish() + }; } }; function createBaseMsgStartGroup(): MsgStartGroup { @@ -250,6 +372,7 @@ function createBaseMsgStartGroup(): MsgStartGroup { }; } export const MsgStartGroup = { + typeUrl: "/akash.deployment.v1beta2.MsgStartGroup", encode(message: MsgStartGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -302,12 +425,44 @@ export const MsgStartGroup = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: MsgStartGroupAmino): MsgStartGroup { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: MsgStartGroup): MsgStartGroupAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: MsgStartGroupAminoMsg): MsgStartGroup { + return MsgStartGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgStartGroup): MsgStartGroupAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-start-group", + value: MsgStartGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStartGroupProtoMsg): MsgStartGroup { + return MsgStartGroup.decode(message.value); + }, + toProto(message: MsgStartGroup): Uint8Array { + return MsgStartGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgStartGroup): MsgStartGroupProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgStartGroup", + value: MsgStartGroup.encode(message).finish() + }; } }; function createBaseMsgStartGroupResponse(): MsgStartGroupResponse { return {}; } export const MsgStartGroupResponse = { + typeUrl: "/akash.deployment.v1beta2.MsgStartGroupResponse", encode(_: MsgStartGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -345,5 +500,33 @@ export const MsgStartGroupResponse = { toSDK(_: MsgStartGroupResponse): MsgStartGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgStartGroupResponseAmino): MsgStartGroupResponse { + return {}; + }, + toAmino(_: MsgStartGroupResponse): MsgStartGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgStartGroupResponseAminoMsg): MsgStartGroupResponse { + return MsgStartGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgStartGroupResponse): MsgStartGroupResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/testonly-start-group-response", + value: MsgStartGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStartGroupResponseProtoMsg): MsgStartGroupResponse { + return MsgStartGroupResponse.decode(message.value); + }, + toProto(message: MsgStartGroupResponse): Uint8Array { + return MsgStartGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgStartGroupResponse): MsgStartGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.MsgStartGroupResponse", + value: MsgStartGroupResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts index e455661c6c..849a72e3e4 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/groupspec.ts @@ -23,6 +23,7 @@ function createBaseGroupSpec(): GroupSpec { }; } export const GroupSpec = { + typeUrl: "/akash.deployment.v1beta2.GroupSpec", encode(message: GroupSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -107,5 +108,44 @@ export const GroupSpec = { obj.resources = []; } return obj; + }, + fromAmino(object: GroupSpecAmino): GroupSpec { + return { + name: object.name, + requirements: object?.requirements ? PlacementRequirements.fromAmino(object.requirements) : undefined, + resources: Array.isArray(object?.resources) ? object.resources.map((e: any) => Resource.fromAmino(e)) : [] + }; + }, + toAmino(message: GroupSpec): GroupSpecAmino { + const obj: any = {}; + obj.name = message.name; + obj.requirements = message.requirements ? PlacementRequirements.toAmino(message.requirements) : undefined; + if (message.resources) { + obj.resources = message.resources.map(e => e ? Resource.toAmino(e) : undefined); + } else { + obj.resources = []; + } + return obj; + }, + fromAminoMsg(object: GroupSpecAminoMsg): GroupSpec { + return GroupSpec.fromAmino(object.value); + }, + toAminoMsg(message: GroupSpec): GroupSpecAminoMsg { + return { + type: "akash/deployment/v1beta2/group-spec", + value: GroupSpec.toAmino(message) + }; + }, + fromProtoMsg(message: GroupSpecProtoMsg): GroupSpec { + return GroupSpec.decode(message.value); + }, + toProto(message: GroupSpec): Uint8Array { + return GroupSpec.encode(message).finish(); + }, + toProtoMsg(message: GroupSpec): GroupSpecProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.GroupSpec", + value: GroupSpec.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts index 750314c1e2..9b975b1eca 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/params.ts @@ -16,6 +16,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/akash.deployment.v1beta2.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentMinDeposit !== undefined) { Coin.encode(message.deploymentMinDeposit, writer.uint32(10).fork()).ldelim(); @@ -68,5 +69,36 @@ export const Params = { const obj: any = {}; message.deploymentMinDeposit !== undefined && (obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toSDK(message.deploymentMinDeposit) : undefined); return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + deploymentMinDeposit: object?.deployment_min_deposit ? Coin.fromAmino(object.deployment_min_deposit) : undefined + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.deployment_min_deposit = message.deploymentMinDeposit ? Coin.toAmino(message.deploymentMinDeposit) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "akash/deployment/v1beta2/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts index 10df5bf21c..bac1dd871e 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/query.ts @@ -69,6 +69,7 @@ function createBaseQueryDeploymentsRequest(): QueryDeploymentsRequest { }; } export const QueryDeploymentsRequest = { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsRequest", encode(message: QueryDeploymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { DeploymentFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); @@ -133,6 +134,39 @@ export const QueryDeploymentsRequest = { message.filters !== undefined && (obj.filters = message.filters ? DeploymentFilters.toSDK(message.filters) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentsRequestAmino): QueryDeploymentsRequest { + return { + filters: object?.filters ? DeploymentFilters.fromAmino(object.filters) : undefined, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDeploymentsRequest): QueryDeploymentsRequestAmino { + const obj: any = {}; + obj.filters = message.filters ? DeploymentFilters.toAmino(message.filters) : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentsRequestAminoMsg): QueryDeploymentsRequest { + return QueryDeploymentsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentsRequest): QueryDeploymentsRequestAminoMsg { + return { + type: "akash/deployment/v1beta2/query-deployments-request", + value: QueryDeploymentsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentsRequestProtoMsg): QueryDeploymentsRequest { + return QueryDeploymentsRequest.decode(message.value); + }, + toProto(message: QueryDeploymentsRequest): Uint8Array { + return QueryDeploymentsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentsRequest): QueryDeploymentsRequestProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsRequest", + value: QueryDeploymentsRequest.encode(message).finish() + }; } }; function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse { @@ -142,6 +176,7 @@ function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse { }; } export const QueryDeploymentsResponse = { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsResponse", encode(message: QueryDeploymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { QueryDeploymentResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -214,6 +249,43 @@ export const QueryDeploymentsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentsResponseAmino): QueryDeploymentsResponse { + return { + deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => QueryDeploymentResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDeploymentsResponse): QueryDeploymentsResponseAmino { + const obj: any = {}; + if (message.deployments) { + obj.deployments = message.deployments.map(e => e ? QueryDeploymentResponse.toAmino(e) : undefined); + } else { + obj.deployments = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentsResponseAminoMsg): QueryDeploymentsResponse { + return QueryDeploymentsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentsResponse): QueryDeploymentsResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/query-deployments-response", + value: QueryDeploymentsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentsResponseProtoMsg): QueryDeploymentsResponse { + return QueryDeploymentsResponse.decode(message.value); + }, + toProto(message: QueryDeploymentsResponse): Uint8Array { + return QueryDeploymentsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentsResponse): QueryDeploymentsResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsResponse", + value: QueryDeploymentsResponse.encode(message).finish() + }; } }; function createBaseQueryDeploymentRequest(): QueryDeploymentRequest { @@ -222,6 +294,7 @@ function createBaseQueryDeploymentRequest(): QueryDeploymentRequest { }; } export const QueryDeploymentRequest = { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentRequest", encode(message: QueryDeploymentRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -274,6 +347,37 @@ export const QueryDeploymentRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? DeploymentID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentRequestAmino): QueryDeploymentRequest { + return { + id: object?.id ? DeploymentID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryDeploymentRequest): QueryDeploymentRequestAmino { + const obj: any = {}; + obj.id = message.id ? DeploymentID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentRequestAminoMsg): QueryDeploymentRequest { + return QueryDeploymentRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentRequest): QueryDeploymentRequestAminoMsg { + return { + type: "akash/deployment/v1beta2/query-deployment-request", + value: QueryDeploymentRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentRequestProtoMsg): QueryDeploymentRequest { + return QueryDeploymentRequest.decode(message.value); + }, + toProto(message: QueryDeploymentRequest): Uint8Array { + return QueryDeploymentRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentRequest): QueryDeploymentRequestProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentRequest", + value: QueryDeploymentRequest.encode(message).finish() + }; } }; function createBaseQueryDeploymentResponse(): QueryDeploymentResponse { @@ -284,6 +388,7 @@ function createBaseQueryDeploymentResponse(): QueryDeploymentResponse { }; } export const QueryDeploymentResponse = { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentResponse", encode(message: QueryDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); @@ -368,6 +473,45 @@ export const QueryDeploymentResponse = { } message.escrowAccount !== undefined && (obj.escrow_account = message.escrowAccount ? Account.toSDK(message.escrowAccount) : undefined); return obj; + }, + fromAmino(object: QueryDeploymentResponseAmino): QueryDeploymentResponse { + return { + deployment: object?.deployment ? Deployment.fromAmino(object.deployment) : undefined, + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromAmino(e)) : [], + escrowAccount: object?.escrow_account ? Account.fromAmino(object.escrow_account) : undefined + }; + }, + toAmino(message: QueryDeploymentResponse): QueryDeploymentResponseAmino { + const obj: any = {}; + obj.deployment = message.deployment ? Deployment.toAmino(message.deployment) : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? Group.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDeploymentResponseAminoMsg): QueryDeploymentResponse { + return QueryDeploymentResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDeploymentResponse): QueryDeploymentResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/query-deployment-response", + value: QueryDeploymentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDeploymentResponseProtoMsg): QueryDeploymentResponse { + return QueryDeploymentResponse.decode(message.value); + }, + toProto(message: QueryDeploymentResponse): Uint8Array { + return QueryDeploymentResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDeploymentResponse): QueryDeploymentResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.QueryDeploymentResponse", + value: QueryDeploymentResponse.encode(message).finish() + }; } }; function createBaseQueryGroupRequest(): QueryGroupRequest { @@ -376,6 +520,7 @@ function createBaseQueryGroupRequest(): QueryGroupRequest { }; } export const QueryGroupRequest = { + typeUrl: "/akash.deployment.v1beta2.QueryGroupRequest", encode(message: QueryGroupRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -428,6 +573,37 @@ export const QueryGroupRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? GroupID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryGroupRequestAmino): QueryGroupRequest { + return { + id: object?.id ? GroupID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryGroupRequest): QueryGroupRequestAmino { + const obj: any = {}; + obj.id = message.id ? GroupID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupRequestAminoMsg): QueryGroupRequest { + return QueryGroupRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupRequest): QueryGroupRequestAminoMsg { + return { + type: "akash/deployment/v1beta2/query-group-request", + value: QueryGroupRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupRequestProtoMsg): QueryGroupRequest { + return QueryGroupRequest.decode(message.value); + }, + toProto(message: QueryGroupRequest): Uint8Array { + return QueryGroupRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupRequest): QueryGroupRequestProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.QueryGroupRequest", + value: QueryGroupRequest.encode(message).finish() + }; } }; function createBaseQueryGroupResponse(): QueryGroupResponse { @@ -436,6 +612,7 @@ function createBaseQueryGroupResponse(): QueryGroupResponse { }; } export const QueryGroupResponse = { + typeUrl: "/akash.deployment.v1beta2.QueryGroupResponse", encode(message: QueryGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.group !== undefined) { Group.encode(message.group, writer.uint32(10).fork()).ldelim(); @@ -488,5 +665,36 @@ export const QueryGroupResponse = { const obj: any = {}; message.group !== undefined && (obj.group = message.group ? Group.toSDK(message.group) : undefined); return obj; + }, + fromAmino(object: QueryGroupResponseAmino): QueryGroupResponse { + return { + group: object?.group ? Group.fromAmino(object.group) : undefined + }; + }, + toAmino(message: QueryGroupResponse): QueryGroupResponseAmino { + const obj: any = {}; + obj.group = message.group ? Group.toAmino(message.group) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupResponseAminoMsg): QueryGroupResponse { + return QueryGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupResponse): QueryGroupResponseAminoMsg { + return { + type: "akash/deployment/v1beta2/query-group-response", + value: QueryGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupResponseProtoMsg): QueryGroupResponse { + return QueryGroupResponse.decode(message.value); + }, + toProto(message: QueryGroupResponse): Uint8Array { + return QueryGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupResponse): QueryGroupResponseProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.QueryGroupResponse", + value: QueryGroupResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts index d91aa8e167..2ed9182f0e 100644 --- a/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputosmojs/akash/deployment/v1beta2/resource.ts @@ -23,6 +23,7 @@ function createBaseResource(): Resource { }; } export const Resource = { + typeUrl: "/akash.deployment.v1beta2.Resource", encode(message: Resource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resources !== undefined) { ResourceUnits.encode(message.resources, writer.uint32(10).fork()).ldelim(); @@ -99,5 +100,40 @@ export const Resource = { obj.count = message.count; message.price !== undefined && (obj.price = message.price ? DecCoin.toSDK(message.price) : undefined); return obj; + }, + fromAmino(object: ResourceAmino): Resource { + return { + resources: object?.resources ? ResourceUnits.fromAmino(object.resources) : undefined, + count: object.count, + price: object?.price ? DecCoin.fromAmino(object.price) : undefined + }; + }, + toAmino(message: Resource): ResourceAmino { + const obj: any = {}; + obj.resources = message.resources ? ResourceUnits.toAmino(message.resources) : undefined; + obj.count = message.count; + obj.price = message.price ? DecCoin.toAmino(message.price) : undefined; + return obj; + }, + fromAminoMsg(object: ResourceAminoMsg): Resource { + return Resource.fromAmino(object.value); + }, + toAminoMsg(message: Resource): ResourceAminoMsg { + return { + type: "akash/deployment/v1beta2/resource", + value: Resource.toAmino(message) + }; + }, + fromProtoMsg(message: ResourceProtoMsg): Resource { + return Resource.decode(message.value); + }, + toProto(message: Resource): Uint8Array { + return Resource.encode(message).finish(); + }, + toProtoMsg(message: Resource): ResourceProtoMsg { + return { + typeUrl: "/akash.deployment.v1beta2.Resource", + value: Resource.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts index 57ab557776..f8de1583f1 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/genesis.ts @@ -19,6 +19,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.escrow.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -99,5 +100,46 @@ export const GenesisState = { obj.payments = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromAmino(e)) : [], + payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => Payment.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + if (message.payments) { + obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); + } else { + obj.payments = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/escrow/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts index eb6f8c502b..b3a4918936 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/query.ts @@ -67,6 +67,7 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest { }; } export const QueryAccountsRequest = { + typeUrl: "/akash.escrow.v1beta1.QueryAccountsRequest", encode(message: QueryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); @@ -167,6 +168,45 @@ export const QueryAccountsRequest = { obj.state = message.state; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAccountsRequestAmino): QueryAccountsRequest { + return { + scope: object.scope, + xid: object.xid, + owner: object.owner, + state: object.state, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { + const obj: any = {}; + obj.scope = message.scope; + obj.xid = message.xid; + obj.owner = message.owner; + obj.state = message.state; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountsRequestAminoMsg): QueryAccountsRequest { + return QueryAccountsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountsRequest): QueryAccountsRequestAminoMsg { + return { + type: "akash/escrow/query-accounts-request", + value: QueryAccountsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountsRequestProtoMsg): QueryAccountsRequest { + return QueryAccountsRequest.decode(message.value); + }, + toProto(message: QueryAccountsRequest): Uint8Array { + return QueryAccountsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountsRequest): QueryAccountsRequestProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.QueryAccountsRequest", + value: QueryAccountsRequest.encode(message).finish() + }; } }; function createBaseQueryAccountsResponse(): QueryAccountsResponse { @@ -176,6 +216,7 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse { }; } export const QueryAccountsResponse = { + typeUrl: "/akash.escrow.v1beta1.QueryAccountsResponse", encode(message: QueryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -248,6 +289,43 @@ export const QueryAccountsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAccountsResponseAmino): QueryAccountsResponse { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAccountsResponse): QueryAccountsResponseAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountsResponseAminoMsg): QueryAccountsResponse { + return QueryAccountsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountsResponse): QueryAccountsResponseAminoMsg { + return { + type: "akash/escrow/query-accounts-response", + value: QueryAccountsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountsResponseProtoMsg): QueryAccountsResponse { + return QueryAccountsResponse.decode(message.value); + }, + toProto(message: QueryAccountsResponse): Uint8Array { + return QueryAccountsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountsResponse): QueryAccountsResponseProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.QueryAccountsResponse", + value: QueryAccountsResponse.encode(message).finish() + }; } }; function createBaseQueryPaymentsRequest(): QueryPaymentsRequest { @@ -261,6 +339,7 @@ function createBaseQueryPaymentsRequest(): QueryPaymentsRequest { }; } export const QueryPaymentsRequest = { + typeUrl: "/akash.escrow.v1beta1.QueryPaymentsRequest", encode(message: QueryPaymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); @@ -373,6 +452,47 @@ export const QueryPaymentsRequest = { obj.state = message.state; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPaymentsRequestAmino): QueryPaymentsRequest { + return { + scope: object.scope, + xid: object.xid, + id: object.id, + owner: object.owner, + state: object.state, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPaymentsRequest): QueryPaymentsRequestAmino { + const obj: any = {}; + obj.scope = message.scope; + obj.xid = message.xid; + obj.id = message.id; + obj.owner = message.owner; + obj.state = message.state; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPaymentsRequestAminoMsg): QueryPaymentsRequest { + return QueryPaymentsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPaymentsRequest): QueryPaymentsRequestAminoMsg { + return { + type: "akash/escrow/query-payments-request", + value: QueryPaymentsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPaymentsRequestProtoMsg): QueryPaymentsRequest { + return QueryPaymentsRequest.decode(message.value); + }, + toProto(message: QueryPaymentsRequest): Uint8Array { + return QueryPaymentsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPaymentsRequest): QueryPaymentsRequestProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.QueryPaymentsRequest", + value: QueryPaymentsRequest.encode(message).finish() + }; } }; function createBaseQueryPaymentsResponse(): QueryPaymentsResponse { @@ -382,6 +502,7 @@ function createBaseQueryPaymentsResponse(): QueryPaymentsResponse { }; } export const QueryPaymentsResponse = { + typeUrl: "/akash.escrow.v1beta1.QueryPaymentsResponse", encode(message: QueryPaymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.payments) { Payment.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -454,5 +575,42 @@ export const QueryPaymentsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPaymentsResponseAmino): QueryPaymentsResponse { + return { + payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => Payment.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPaymentsResponse): QueryPaymentsResponseAmino { + const obj: any = {}; + if (message.payments) { + obj.payments = message.payments.map(e => e ? Payment.toAmino(e) : undefined); + } else { + obj.payments = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPaymentsResponseAminoMsg): QueryPaymentsResponse { + return QueryPaymentsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPaymentsResponse): QueryPaymentsResponseAminoMsg { + return { + type: "akash/escrow/query-payments-response", + value: QueryPaymentsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPaymentsResponseProtoMsg): QueryPaymentsResponse { + return QueryPaymentsResponse.decode(message.value); + }, + toProto(message: QueryPaymentsResponse): Uint8Array { + return QueryPaymentsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPaymentsResponse): QueryPaymentsResponseProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.QueryPaymentsResponse", + value: QueryPaymentsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts index 96b03294ca..25ae285477 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta1/types.ts @@ -159,6 +159,7 @@ function createBaseAccountID(): AccountID { }; } export const AccountID = { + typeUrl: "/akash.escrow.v1beta1.AccountID", encode(message: AccountID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); @@ -223,6 +224,39 @@ export const AccountID = { obj.scope = message.scope; obj.xid = message.xid; return obj; + }, + fromAmino(object: AccountIDAmino): AccountID { + return { + scope: object.scope, + xid: object.xid + }; + }, + toAmino(message: AccountID): AccountIDAmino { + const obj: any = {}; + obj.scope = message.scope; + obj.xid = message.xid; + return obj; + }, + fromAminoMsg(object: AccountIDAminoMsg): AccountID { + return AccountID.fromAmino(object.value); + }, + toAminoMsg(message: AccountID): AccountIDAminoMsg { + return { + type: "akash/escrow/account-i-d", + value: AccountID.toAmino(message) + }; + }, + fromProtoMsg(message: AccountIDProtoMsg): AccountID { + return AccountID.decode(message.value); + }, + toProto(message: AccountID): Uint8Array { + return AccountID.encode(message).finish(); + }, + toProtoMsg(message: AccountID): AccountIDProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.AccountID", + value: AccountID.encode(message).finish() + }; } }; function createBaseAccount(): Account { @@ -236,6 +270,7 @@ function createBaseAccount(): Account { }; } export const Account = { + typeUrl: "/akash.escrow.v1beta1.Account", encode(message: Account, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { AccountID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -348,6 +383,47 @@ export const Account = { message.transferred !== undefined && (obj.transferred = message.transferred ? Coin.toSDK(message.transferred) : undefined); obj.settled_at = message.settledAt; return obj; + }, + fromAmino(object: AccountAmino): Account { + return { + id: object?.id ? AccountID.fromAmino(object.id) : undefined, + owner: object.owner, + state: isSet(object.state) ? account_StateFromJSON(object.state) : -1, + balance: object?.balance ? Coin.fromAmino(object.balance) : undefined, + transferred: object?.transferred ? Coin.fromAmino(object.transferred) : undefined, + settledAt: BigInt(object.settled_at) + }; + }, + toAmino(message: Account): AccountAmino { + const obj: any = {}; + obj.id = message.id ? AccountID.toAmino(message.id) : undefined; + obj.owner = message.owner; + obj.state = message.state; + obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; + obj.transferred = message.transferred ? Coin.toAmino(message.transferred) : undefined; + obj.settled_at = message.settledAt ? message.settledAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: AccountAminoMsg): Account { + return Account.fromAmino(object.value); + }, + toAminoMsg(message: Account): AccountAminoMsg { + return { + type: "akash/escrow/account", + value: Account.toAmino(message) + }; + }, + fromProtoMsg(message: AccountProtoMsg): Account { + return Account.decode(message.value); + }, + toProto(message: Account): Uint8Array { + return Account.encode(message).finish(); + }, + toProtoMsg(message: Account): AccountProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.Account", + value: Account.encode(message).finish() + }; } }; function createBasePayment(): Payment { @@ -362,6 +438,7 @@ function createBasePayment(): Payment { }; } export const Payment = { + typeUrl: "/akash.escrow.v1beta1.Payment", encode(message: Payment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.accountId !== undefined) { AccountID.encode(message.accountId, writer.uint32(10).fork()).ldelim(); @@ -486,5 +563,48 @@ export const Payment = { message.balance !== undefined && (obj.balance = message.balance ? Coin.toSDK(message.balance) : undefined); message.withdrawn !== undefined && (obj.withdrawn = message.withdrawn ? Coin.toSDK(message.withdrawn) : undefined); return obj; + }, + fromAmino(object: PaymentAmino): Payment { + return { + accountId: object?.account_id ? AccountID.fromAmino(object.account_id) : undefined, + paymentId: object.payment_id, + owner: object.owner, + state: isSet(object.state) ? payment_StateFromJSON(object.state) : -1, + rate: object?.rate ? Coin.fromAmino(object.rate) : undefined, + balance: object?.balance ? Coin.fromAmino(object.balance) : undefined, + withdrawn: object?.withdrawn ? Coin.fromAmino(object.withdrawn) : undefined + }; + }, + toAmino(message: Payment): PaymentAmino { + const obj: any = {}; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : undefined; + obj.payment_id = message.paymentId; + obj.owner = message.owner; + obj.state = message.state; + obj.rate = message.rate ? Coin.toAmino(message.rate) : undefined; + obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : undefined; + return obj; + }, + fromAminoMsg(object: PaymentAminoMsg): Payment { + return Payment.fromAmino(object.value); + }, + toAminoMsg(message: Payment): PaymentAminoMsg { + return { + type: "akash/escrow/payment", + value: Payment.toAmino(message) + }; + }, + fromProtoMsg(message: PaymentProtoMsg): Payment { + return Payment.decode(message.value); + }, + toProto(message: Payment): Uint8Array { + return Payment.encode(message).finish(); + }, + toProtoMsg(message: Payment): PaymentProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta1.Payment", + value: Payment.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts index 63a13ce0bd..8a4cad8bf3 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/genesis.ts @@ -19,6 +19,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.escrow.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -99,5 +100,46 @@ export const GenesisState = { obj.payments = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromAmino(e)) : [], + payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => FractionalPayment.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + if (message.payments) { + obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); + } else { + obj.payments = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/escrow/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts index 4b45bd3cee..cebbe4c96b 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/query.ts @@ -67,6 +67,7 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest { }; } export const QueryAccountsRequest = { + typeUrl: "/akash.escrow.v1beta2.QueryAccountsRequest", encode(message: QueryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); @@ -167,6 +168,45 @@ export const QueryAccountsRequest = { obj.state = message.state; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAccountsRequestAmino): QueryAccountsRequest { + return { + scope: object.scope, + xid: object.xid, + owner: object.owner, + state: object.state, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { + const obj: any = {}; + obj.scope = message.scope; + obj.xid = message.xid; + obj.owner = message.owner; + obj.state = message.state; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountsRequestAminoMsg): QueryAccountsRequest { + return QueryAccountsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountsRequest): QueryAccountsRequestAminoMsg { + return { + type: "akash/escrow/v1beta2/query-accounts-request", + value: QueryAccountsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountsRequestProtoMsg): QueryAccountsRequest { + return QueryAccountsRequest.decode(message.value); + }, + toProto(message: QueryAccountsRequest): Uint8Array { + return QueryAccountsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountsRequest): QueryAccountsRequestProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.QueryAccountsRequest", + value: QueryAccountsRequest.encode(message).finish() + }; } }; function createBaseQueryAccountsResponse(): QueryAccountsResponse { @@ -176,6 +216,7 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse { }; } export const QueryAccountsResponse = { + typeUrl: "/akash.escrow.v1beta2.QueryAccountsResponse", encode(message: QueryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -248,6 +289,43 @@ export const QueryAccountsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAccountsResponseAmino): QueryAccountsResponse { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAccountsResponse): QueryAccountsResponseAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Account.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountsResponseAminoMsg): QueryAccountsResponse { + return QueryAccountsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountsResponse): QueryAccountsResponseAminoMsg { + return { + type: "akash/escrow/v1beta2/query-accounts-response", + value: QueryAccountsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountsResponseProtoMsg): QueryAccountsResponse { + return QueryAccountsResponse.decode(message.value); + }, + toProto(message: QueryAccountsResponse): Uint8Array { + return QueryAccountsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountsResponse): QueryAccountsResponseProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.QueryAccountsResponse", + value: QueryAccountsResponse.encode(message).finish() + }; } }; function createBaseQueryPaymentsRequest(): QueryPaymentsRequest { @@ -261,6 +339,7 @@ function createBaseQueryPaymentsRequest(): QueryPaymentsRequest { }; } export const QueryPaymentsRequest = { + typeUrl: "/akash.escrow.v1beta2.QueryPaymentsRequest", encode(message: QueryPaymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); @@ -373,6 +452,47 @@ export const QueryPaymentsRequest = { obj.state = message.state; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPaymentsRequestAmino): QueryPaymentsRequest { + return { + scope: object.scope, + xid: object.xid, + id: object.id, + owner: object.owner, + state: object.state, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPaymentsRequest): QueryPaymentsRequestAmino { + const obj: any = {}; + obj.scope = message.scope; + obj.xid = message.xid; + obj.id = message.id; + obj.owner = message.owner; + obj.state = message.state; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPaymentsRequestAminoMsg): QueryPaymentsRequest { + return QueryPaymentsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPaymentsRequest): QueryPaymentsRequestAminoMsg { + return { + type: "akash/escrow/v1beta2/query-payments-request", + value: QueryPaymentsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPaymentsRequestProtoMsg): QueryPaymentsRequest { + return QueryPaymentsRequest.decode(message.value); + }, + toProto(message: QueryPaymentsRequest): Uint8Array { + return QueryPaymentsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPaymentsRequest): QueryPaymentsRequestProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.QueryPaymentsRequest", + value: QueryPaymentsRequest.encode(message).finish() + }; } }; function createBaseQueryPaymentsResponse(): QueryPaymentsResponse { @@ -382,6 +502,7 @@ function createBaseQueryPaymentsResponse(): QueryPaymentsResponse { }; } export const QueryPaymentsResponse = { + typeUrl: "/akash.escrow.v1beta2.QueryPaymentsResponse", encode(message: QueryPaymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.payments) { FractionalPayment.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -454,5 +575,42 @@ export const QueryPaymentsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPaymentsResponseAmino): QueryPaymentsResponse { + return { + payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => FractionalPayment.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPaymentsResponse): QueryPaymentsResponseAmino { + const obj: any = {}; + if (message.payments) { + obj.payments = message.payments.map(e => e ? FractionalPayment.toAmino(e) : undefined); + } else { + obj.payments = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPaymentsResponseAminoMsg): QueryPaymentsResponse { + return QueryPaymentsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPaymentsResponse): QueryPaymentsResponseAminoMsg { + return { + type: "akash/escrow/v1beta2/query-payments-response", + value: QueryPaymentsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPaymentsResponseProtoMsg): QueryPaymentsResponse { + return QueryPaymentsResponse.decode(message.value); + }, + toProto(message: QueryPaymentsResponse): Uint8Array { + return QueryPaymentsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPaymentsResponse): QueryPaymentsResponseProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.QueryPaymentsResponse", + value: QueryPaymentsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts index d2d2015e82..87aaaafa1f 100644 --- a/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputosmojs/akash/escrow/v1beta2/types.ts @@ -172,6 +172,7 @@ function createBaseAccountID(): AccountID { }; } export const AccountID = { + typeUrl: "/akash.escrow.v1beta2.AccountID", encode(message: AccountID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); @@ -236,6 +237,39 @@ export const AccountID = { obj.scope = message.scope; obj.xid = message.xid; return obj; + }, + fromAmino(object: AccountIDAmino): AccountID { + return { + scope: object.scope, + xid: object.xid + }; + }, + toAmino(message: AccountID): AccountIDAmino { + const obj: any = {}; + obj.scope = message.scope; + obj.xid = message.xid; + return obj; + }, + fromAminoMsg(object: AccountIDAminoMsg): AccountID { + return AccountID.fromAmino(object.value); + }, + toAminoMsg(message: AccountID): AccountIDAminoMsg { + return { + type: "akash/escrow/v1beta2/account-i-d", + value: AccountID.toAmino(message) + }; + }, + fromProtoMsg(message: AccountIDProtoMsg): AccountID { + return AccountID.decode(message.value); + }, + toProto(message: AccountID): Uint8Array { + return AccountID.encode(message).finish(); + }, + toProtoMsg(message: AccountID): AccountIDProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.AccountID", + value: AccountID.encode(message).finish() + }; } }; function createBaseAccount(): Account { @@ -251,6 +285,7 @@ function createBaseAccount(): Account { }; } export const Account = { + typeUrl: "/akash.escrow.v1beta2.Account", encode(message: Account, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { AccountID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -387,6 +422,51 @@ export const Account = { obj.depositor = message.depositor; message.funds !== undefined && (obj.funds = message.funds ? DecCoin.toSDK(message.funds) : undefined); return obj; + }, + fromAmino(object: AccountAmino): Account { + return { + id: object?.id ? AccountID.fromAmino(object.id) : undefined, + owner: object.owner, + state: isSet(object.state) ? account_StateFromJSON(object.state) : -1, + balance: object?.balance ? DecCoin.fromAmino(object.balance) : undefined, + transferred: object?.transferred ? DecCoin.fromAmino(object.transferred) : undefined, + settledAt: BigInt(object.settled_at), + depositor: object.depositor, + funds: object?.funds ? DecCoin.fromAmino(object.funds) : undefined + }; + }, + toAmino(message: Account): AccountAmino { + const obj: any = {}; + obj.id = message.id ? AccountID.toAmino(message.id) : undefined; + obj.owner = message.owner; + obj.state = message.state; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : undefined; + obj.transferred = message.transferred ? DecCoin.toAmino(message.transferred) : undefined; + obj.settled_at = message.settledAt ? message.settledAt.toString() : undefined; + obj.depositor = message.depositor; + obj.funds = message.funds ? DecCoin.toAmino(message.funds) : undefined; + return obj; + }, + fromAminoMsg(object: AccountAminoMsg): Account { + return Account.fromAmino(object.value); + }, + toAminoMsg(message: Account): AccountAminoMsg { + return { + type: "akash/escrow/v1beta2/account", + value: Account.toAmino(message) + }; + }, + fromProtoMsg(message: AccountProtoMsg): Account { + return Account.decode(message.value); + }, + toProto(message: Account): Uint8Array { + return Account.encode(message).finish(); + }, + toProtoMsg(message: Account): AccountProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.Account", + value: Account.encode(message).finish() + }; } }; function createBaseFractionalPayment(): FractionalPayment { @@ -401,6 +481,7 @@ function createBaseFractionalPayment(): FractionalPayment { }; } export const FractionalPayment = { + typeUrl: "/akash.escrow.v1beta2.FractionalPayment", encode(message: FractionalPayment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.accountId !== undefined) { AccountID.encode(message.accountId, writer.uint32(10).fork()).ldelim(); @@ -525,5 +606,48 @@ export const FractionalPayment = { message.balance !== undefined && (obj.balance = message.balance ? DecCoin.toSDK(message.balance) : undefined); message.withdrawn !== undefined && (obj.withdrawn = message.withdrawn ? Coin.toSDK(message.withdrawn) : undefined); return obj; + }, + fromAmino(object: FractionalPaymentAmino): FractionalPayment { + return { + accountId: object?.account_id ? AccountID.fromAmino(object.account_id) : undefined, + paymentId: object.payment_id, + owner: object.owner, + state: isSet(object.state) ? fractionalPayment_StateFromJSON(object.state) : -1, + rate: object?.rate ? DecCoin.fromAmino(object.rate) : undefined, + balance: object?.balance ? DecCoin.fromAmino(object.balance) : undefined, + withdrawn: object?.withdrawn ? Coin.fromAmino(object.withdrawn) : undefined + }; + }, + toAmino(message: FractionalPayment): FractionalPaymentAmino { + const obj: any = {}; + obj.account_id = message.accountId ? AccountID.toAmino(message.accountId) : undefined; + obj.payment_id = message.paymentId; + obj.owner = message.owner; + obj.state = message.state; + obj.rate = message.rate ? DecCoin.toAmino(message.rate) : undefined; + obj.balance = message.balance ? DecCoin.toAmino(message.balance) : undefined; + obj.withdrawn = message.withdrawn ? Coin.toAmino(message.withdrawn) : undefined; + return obj; + }, + fromAminoMsg(object: FractionalPaymentAminoMsg): FractionalPayment { + return FractionalPayment.fromAmino(object.value); + }, + toAminoMsg(message: FractionalPayment): FractionalPaymentAminoMsg { + return { + type: "akash/escrow/v1beta2/fractional-payment", + value: FractionalPayment.toAmino(message) + }; + }, + fromProtoMsg(message: FractionalPaymentProtoMsg): FractionalPayment { + return FractionalPayment.decode(message.value); + }, + toProto(message: FractionalPayment): Uint8Array { + return FractionalPayment.encode(message).finish(); + }, + toProtoMsg(message: FractionalPayment): FractionalPaymentProtoMsg { + return { + typeUrl: "/akash.escrow.v1beta2.FractionalPayment", + value: FractionalPayment.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts index a2f57acf6f..7e3bc03648 100644 --- a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/genesis.ts @@ -16,6 +16,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.inflation.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -68,5 +69,36 @@ export const GenesisState = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/inflation/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.inflation.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts index f1b141548b..6dc992047c 100644 --- a/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/inflation/v1beta2/params.ts @@ -31,6 +31,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/akash.inflation.v1beta2.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflationDecayFactor !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.inflationDecayFactor, 18).atomics); @@ -107,5 +108,40 @@ export const Params = { obj.initial_inflation = message.initialInflation; obj.variance = message.variance; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + inflationDecayFactor: object.inflation_decay_factor, + initialInflation: object.initial_inflation, + variance: object.variance + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.inflation_decay_factor = message.inflationDecayFactor; + obj.initial_inflation = message.initialInflation; + obj.variance = message.variance; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "akash/inflation/v1beta2/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/akash.inflation.v1beta2.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts index e91b063d99..0de9bc7457 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/bid.ts @@ -151,6 +151,7 @@ function createBaseMsgCreateBid(): MsgCreateBid { }; } export const MsgCreateBid = { + typeUrl: "/akash.market.v1beta2.MsgCreateBid", encode(message: MsgCreateBid, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.order !== undefined) { OrderID.encode(message.order, writer.uint32(10).fork()).ldelim(); @@ -239,12 +240,50 @@ export const MsgCreateBid = { message.price !== undefined && (obj.price = message.price ? DecCoin.toSDK(message.price) : undefined); message.deposit !== undefined && (obj.deposit = message.deposit ? Coin.toSDK(message.deposit) : undefined); return obj; + }, + fromAmino(object: MsgCreateBidAmino): MsgCreateBid { + return { + order: object?.order ? OrderID.fromAmino(object.order) : undefined, + provider: object.provider, + price: object?.price ? DecCoin.fromAmino(object.price) : undefined, + deposit: object?.deposit ? Coin.fromAmino(object.deposit) : undefined + }; + }, + toAmino(message: MsgCreateBid): MsgCreateBidAmino { + const obj: any = {}; + obj.order = message.order ? OrderID.toAmino(message.order) : undefined; + obj.provider = message.provider; + obj.price = message.price ? DecCoin.toAmino(message.price) : undefined; + obj.deposit = message.deposit ? Coin.toAmino(message.deposit) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateBidAminoMsg): MsgCreateBid { + return MsgCreateBid.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateBid): MsgCreateBidAminoMsg { + return { + type: "akash/market/v1beta2/testonly-create-bid", + value: MsgCreateBid.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateBidProtoMsg): MsgCreateBid { + return MsgCreateBid.decode(message.value); + }, + toProto(message: MsgCreateBid): Uint8Array { + return MsgCreateBid.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateBid): MsgCreateBidProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCreateBid", + value: MsgCreateBid.encode(message).finish() + }; } }; function createBaseMsgCreateBidResponse(): MsgCreateBidResponse { return {}; } export const MsgCreateBidResponse = { + typeUrl: "/akash.market.v1beta2.MsgCreateBidResponse", encode(_: MsgCreateBidResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -282,6 +321,34 @@ export const MsgCreateBidResponse = { toSDK(_: MsgCreateBidResponse): MsgCreateBidResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateBidResponseAmino): MsgCreateBidResponse { + return {}; + }, + toAmino(_: MsgCreateBidResponse): MsgCreateBidResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateBidResponseAminoMsg): MsgCreateBidResponse { + return MsgCreateBidResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateBidResponse): MsgCreateBidResponseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-create-bid-response", + value: MsgCreateBidResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateBidResponseProtoMsg): MsgCreateBidResponse { + return MsgCreateBidResponse.decode(message.value); + }, + toProto(message: MsgCreateBidResponse): Uint8Array { + return MsgCreateBidResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateBidResponse): MsgCreateBidResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCreateBidResponse", + value: MsgCreateBidResponse.encode(message).finish() + }; } }; function createBaseMsgCloseBid(): MsgCloseBid { @@ -290,6 +357,7 @@ function createBaseMsgCloseBid(): MsgCloseBid { }; } export const MsgCloseBid = { + typeUrl: "/akash.market.v1beta2.MsgCloseBid", encode(message: MsgCloseBid, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); @@ -342,12 +410,44 @@ export const MsgCloseBid = { const obj: any = {}; message.bidId !== undefined && (obj.bid_id = message.bidId ? BidID.toSDK(message.bidId) : undefined); return obj; + }, + fromAmino(object: MsgCloseBidAmino): MsgCloseBid { + return { + bidId: object?.bid_id ? BidID.fromAmino(object.bid_id) : undefined + }; + }, + toAmino(message: MsgCloseBid): MsgCloseBidAmino { + const obj: any = {}; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCloseBidAminoMsg): MsgCloseBid { + return MsgCloseBid.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseBid): MsgCloseBidAminoMsg { + return { + type: "akash/market/v1beta2/testonly-close-bid", + value: MsgCloseBid.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseBidProtoMsg): MsgCloseBid { + return MsgCloseBid.decode(message.value); + }, + toProto(message: MsgCloseBid): Uint8Array { + return MsgCloseBid.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseBid): MsgCloseBidProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCloseBid", + value: MsgCloseBid.encode(message).finish() + }; } }; function createBaseMsgCloseBidResponse(): MsgCloseBidResponse { return {}; } export const MsgCloseBidResponse = { + typeUrl: "/akash.market.v1beta2.MsgCloseBidResponse", encode(_: MsgCloseBidResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -385,6 +485,34 @@ export const MsgCloseBidResponse = { toSDK(_: MsgCloseBidResponse): MsgCloseBidResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCloseBidResponseAmino): MsgCloseBidResponse { + return {}; + }, + toAmino(_: MsgCloseBidResponse): MsgCloseBidResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCloseBidResponseAminoMsg): MsgCloseBidResponse { + return MsgCloseBidResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseBidResponse): MsgCloseBidResponseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-close-bid-response", + value: MsgCloseBidResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseBidResponseProtoMsg): MsgCloseBidResponse { + return MsgCloseBidResponse.decode(message.value); + }, + toProto(message: MsgCloseBidResponse): Uint8Array { + return MsgCloseBidResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseBidResponse): MsgCloseBidResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCloseBidResponse", + value: MsgCloseBidResponse.encode(message).finish() + }; } }; function createBaseBidID(): BidID { @@ -397,6 +525,7 @@ function createBaseBidID(): BidID { }; } export const BidID = { + typeUrl: "/akash.market.v1beta2.BidID", encode(message: BidID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -497,6 +626,45 @@ export const BidID = { obj.oseq = message.oseq; obj.provider = message.provider; return obj; + }, + fromAmino(object: BidIDAmino): BidID { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq, + oseq: object.oseq, + provider: object.provider + }; + }, + toAmino(message: BidID): BidIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + obj.oseq = message.oseq; + obj.provider = message.provider; + return obj; + }, + fromAminoMsg(object: BidIDAminoMsg): BidID { + return BidID.fromAmino(object.value); + }, + toAminoMsg(message: BidID): BidIDAminoMsg { + return { + type: "akash/market/v1beta2/bid-i-d", + value: BidID.toAmino(message) + }; + }, + fromProtoMsg(message: BidIDProtoMsg): BidID { + return BidID.decode(message.value); + }, + toProto(message: BidID): Uint8Array { + return BidID.encode(message).finish(); + }, + toProtoMsg(message: BidID): BidIDProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.BidID", + value: BidID.encode(message).finish() + }; } }; function createBaseBid(): Bid { @@ -508,6 +676,7 @@ function createBaseBid(): Bid { }; } export const Bid = { + typeUrl: "/akash.market.v1beta2.Bid", encode(message: Bid, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); @@ -596,6 +765,43 @@ export const Bid = { message.price !== undefined && (obj.price = message.price ? DecCoin.toSDK(message.price) : undefined); obj.created_at = message.createdAt; return obj; + }, + fromAmino(object: BidAmino): Bid { + return { + bidId: object?.bid_id ? BidID.fromAmino(object.bid_id) : undefined, + state: isSet(object.state) ? bid_StateFromJSON(object.state) : -1, + price: object?.price ? DecCoin.fromAmino(object.price) : undefined, + createdAt: BigInt(object.created_at) + }; + }, + toAmino(message: Bid): BidAmino { + const obj: any = {}; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + obj.state = message.state; + obj.price = message.price ? DecCoin.toAmino(message.price) : undefined; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BidAminoMsg): Bid { + return Bid.fromAmino(object.value); + }, + toAminoMsg(message: Bid): BidAminoMsg { + return { + type: "akash/market/v1beta2/bid", + value: Bid.toAmino(message) + }; + }, + fromProtoMsg(message: BidProtoMsg): Bid { + return Bid.decode(message.value); + }, + toProto(message: Bid): Uint8Array { + return Bid.encode(message).finish(); + }, + toProtoMsg(message: Bid): BidProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.Bid", + value: Bid.encode(message).finish() + }; } }; function createBaseBidFilters(): BidFilters { @@ -609,6 +815,7 @@ function createBaseBidFilters(): BidFilters { }; } export const BidFilters = { + typeUrl: "/akash.market.v1beta2.BidFilters", encode(message: BidFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -721,5 +928,46 @@ export const BidFilters = { obj.provider = message.provider; obj.state = message.state; return obj; + }, + fromAmino(object: BidFiltersAmino): BidFilters { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq, + oseq: object.oseq, + provider: object.provider, + state: object.state + }; + }, + toAmino(message: BidFilters): BidFiltersAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + obj.oseq = message.oseq; + obj.provider = message.provider; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: BidFiltersAminoMsg): BidFilters { + return BidFilters.fromAmino(object.value); + }, + toAminoMsg(message: BidFilters): BidFiltersAminoMsg { + return { + type: "akash/market/v1beta2/bid-filters", + value: BidFilters.toAmino(message) + }; + }, + fromProtoMsg(message: BidFiltersProtoMsg): BidFilters { + return BidFilters.decode(message.value); + }, + toProto(message: BidFilters): Uint8Array { + return BidFilters.encode(message).finish(); + }, + toProtoMsg(message: BidFilters): BidFiltersProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.BidFilters", + value: BidFilters.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts index 639ddd6e9e..03fcb8d6d4 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/genesis.ts @@ -24,6 +24,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.market.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.orders) { Order.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -116,5 +117,48 @@ export const GenesisState = { } message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + orders: Array.isArray(object?.orders) ? object.orders.map((e: any) => Order.fromAmino(e)) : [], + leases: Array.isArray(object?.leases) ? object.leases.map((e: any) => Lease.fromAmino(e)) : [], + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.orders) { + obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); + } else { + obj.orders = []; + } + if (message.leases) { + obj.leases = message.leases.map(e => e ? Lease.toAmino(e) : undefined); + } else { + obj.leases = []; + } + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/market/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts index 539a98c90d..691a6c9aae 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/lease.ts @@ -147,6 +147,7 @@ function createBaseLeaseID(): LeaseID { }; } export const LeaseID = { + typeUrl: "/akash.market.v1beta2.LeaseID", encode(message: LeaseID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -247,6 +248,45 @@ export const LeaseID = { obj.oseq = message.oseq; obj.provider = message.provider; return obj; + }, + fromAmino(object: LeaseIDAmino): LeaseID { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq, + oseq: object.oseq, + provider: object.provider + }; + }, + toAmino(message: LeaseID): LeaseIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + obj.oseq = message.oseq; + obj.provider = message.provider; + return obj; + }, + fromAminoMsg(object: LeaseIDAminoMsg): LeaseID { + return LeaseID.fromAmino(object.value); + }, + toAminoMsg(message: LeaseID): LeaseIDAminoMsg { + return { + type: "akash/market/v1beta2/lease-i-d", + value: LeaseID.toAmino(message) + }; + }, + fromProtoMsg(message: LeaseIDProtoMsg): LeaseID { + return LeaseID.decode(message.value); + }, + toProto(message: LeaseID): Uint8Array { + return LeaseID.encode(message).finish(); + }, + toProtoMsg(message: LeaseID): LeaseIDProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.LeaseID", + value: LeaseID.encode(message).finish() + }; } }; function createBaseLease(): Lease { @@ -259,6 +299,7 @@ function createBaseLease(): Lease { }; } export const Lease = { + typeUrl: "/akash.market.v1beta2.Lease", encode(message: Lease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leaseId !== undefined) { LeaseID.encode(message.leaseId, writer.uint32(10).fork()).ldelim(); @@ -359,6 +400,45 @@ export const Lease = { obj.created_at = message.createdAt; obj.closed_on = message.closedOn; return obj; + }, + fromAmino(object: LeaseAmino): Lease { + return { + leaseId: object?.lease_id ? LeaseID.fromAmino(object.lease_id) : undefined, + state: isSet(object.state) ? lease_StateFromJSON(object.state) : -1, + price: object?.price ? DecCoin.fromAmino(object.price) : undefined, + createdAt: BigInt(object.created_at), + closedOn: BigInt(object.closed_on) + }; + }, + toAmino(message: Lease): LeaseAmino { + const obj: any = {}; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + obj.state = message.state; + obj.price = message.price ? DecCoin.toAmino(message.price) : undefined; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + obj.closed_on = message.closedOn ? message.closedOn.toString() : undefined; + return obj; + }, + fromAminoMsg(object: LeaseAminoMsg): Lease { + return Lease.fromAmino(object.value); + }, + toAminoMsg(message: Lease): LeaseAminoMsg { + return { + type: "akash/market/v1beta2/lease", + value: Lease.toAmino(message) + }; + }, + fromProtoMsg(message: LeaseProtoMsg): Lease { + return Lease.decode(message.value); + }, + toProto(message: Lease): Uint8Array { + return Lease.encode(message).finish(); + }, + toProtoMsg(message: Lease): LeaseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.Lease", + value: Lease.encode(message).finish() + }; } }; function createBaseLeaseFilters(): LeaseFilters { @@ -372,6 +452,7 @@ function createBaseLeaseFilters(): LeaseFilters { }; } export const LeaseFilters = { + typeUrl: "/akash.market.v1beta2.LeaseFilters", encode(message: LeaseFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -484,6 +565,47 @@ export const LeaseFilters = { obj.provider = message.provider; obj.state = message.state; return obj; + }, + fromAmino(object: LeaseFiltersAmino): LeaseFilters { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq, + oseq: object.oseq, + provider: object.provider, + state: object.state + }; + }, + toAmino(message: LeaseFilters): LeaseFiltersAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + obj.oseq = message.oseq; + obj.provider = message.provider; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: LeaseFiltersAminoMsg): LeaseFilters { + return LeaseFilters.fromAmino(object.value); + }, + toAminoMsg(message: LeaseFilters): LeaseFiltersAminoMsg { + return { + type: "akash/market/v1beta2/lease-filters", + value: LeaseFilters.toAmino(message) + }; + }, + fromProtoMsg(message: LeaseFiltersProtoMsg): LeaseFilters { + return LeaseFilters.decode(message.value); + }, + toProto(message: LeaseFilters): Uint8Array { + return LeaseFilters.encode(message).finish(); + }, + toProtoMsg(message: LeaseFilters): LeaseFiltersProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.LeaseFilters", + value: LeaseFilters.encode(message).finish() + }; } }; function createBaseMsgCreateLease(): MsgCreateLease { @@ -492,6 +614,7 @@ function createBaseMsgCreateLease(): MsgCreateLease { }; } export const MsgCreateLease = { + typeUrl: "/akash.market.v1beta2.MsgCreateLease", encode(message: MsgCreateLease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); @@ -544,12 +667,44 @@ export const MsgCreateLease = { const obj: any = {}; message.bidId !== undefined && (obj.bid_id = message.bidId ? BidID.toSDK(message.bidId) : undefined); return obj; + }, + fromAmino(object: MsgCreateLeaseAmino): MsgCreateLease { + return { + bidId: object?.bid_id ? BidID.fromAmino(object.bid_id) : undefined + }; + }, + toAmino(message: MsgCreateLease): MsgCreateLeaseAmino { + const obj: any = {}; + obj.bid_id = message.bidId ? BidID.toAmino(message.bidId) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateLeaseAminoMsg): MsgCreateLease { + return MsgCreateLease.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateLease): MsgCreateLeaseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-create-lease", + value: MsgCreateLease.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateLeaseProtoMsg): MsgCreateLease { + return MsgCreateLease.decode(message.value); + }, + toProto(message: MsgCreateLease): Uint8Array { + return MsgCreateLease.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateLease): MsgCreateLeaseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCreateLease", + value: MsgCreateLease.encode(message).finish() + }; } }; function createBaseMsgCreateLeaseResponse(): MsgCreateLeaseResponse { return {}; } export const MsgCreateLeaseResponse = { + typeUrl: "/akash.market.v1beta2.MsgCreateLeaseResponse", encode(_: MsgCreateLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -587,6 +742,34 @@ export const MsgCreateLeaseResponse = { toSDK(_: MsgCreateLeaseResponse): MsgCreateLeaseResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateLeaseResponseAmino): MsgCreateLeaseResponse { + return {}; + }, + toAmino(_: MsgCreateLeaseResponse): MsgCreateLeaseResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateLeaseResponseAminoMsg): MsgCreateLeaseResponse { + return MsgCreateLeaseResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateLeaseResponse): MsgCreateLeaseResponseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-create-lease-response", + value: MsgCreateLeaseResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateLeaseResponseProtoMsg): MsgCreateLeaseResponse { + return MsgCreateLeaseResponse.decode(message.value); + }, + toProto(message: MsgCreateLeaseResponse): Uint8Array { + return MsgCreateLeaseResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateLeaseResponse): MsgCreateLeaseResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCreateLeaseResponse", + value: MsgCreateLeaseResponse.encode(message).finish() + }; } }; function createBaseMsgWithdrawLease(): MsgWithdrawLease { @@ -595,6 +778,7 @@ function createBaseMsgWithdrawLease(): MsgWithdrawLease { }; } export const MsgWithdrawLease = { + typeUrl: "/akash.market.v1beta2.MsgWithdrawLease", encode(message: MsgWithdrawLease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { LeaseID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); @@ -647,12 +831,44 @@ export const MsgWithdrawLease = { const obj: any = {}; message.bidId !== undefined && (obj.bid_id = message.bidId ? LeaseID.toSDK(message.bidId) : undefined); return obj; + }, + fromAmino(object: MsgWithdrawLeaseAmino): MsgWithdrawLease { + return { + bidId: object?.bid_id ? LeaseID.fromAmino(object.bid_id) : undefined + }; + }, + toAmino(message: MsgWithdrawLease): MsgWithdrawLeaseAmino { + const obj: any = {}; + obj.bid_id = message.bidId ? LeaseID.toAmino(message.bidId) : undefined; + return obj; + }, + fromAminoMsg(object: MsgWithdrawLeaseAminoMsg): MsgWithdrawLease { + return MsgWithdrawLease.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawLease): MsgWithdrawLeaseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-withdraw-lease", + value: MsgWithdrawLease.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawLeaseProtoMsg): MsgWithdrawLease { + return MsgWithdrawLease.decode(message.value); + }, + toProto(message: MsgWithdrawLease): Uint8Array { + return MsgWithdrawLease.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawLease): MsgWithdrawLeaseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgWithdrawLease", + value: MsgWithdrawLease.encode(message).finish() + }; } }; function createBaseMsgWithdrawLeaseResponse(): MsgWithdrawLeaseResponse { return {}; } export const MsgWithdrawLeaseResponse = { + typeUrl: "/akash.market.v1beta2.MsgWithdrawLeaseResponse", encode(_: MsgWithdrawLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -690,6 +906,34 @@ export const MsgWithdrawLeaseResponse = { toSDK(_: MsgWithdrawLeaseResponse): MsgWithdrawLeaseResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgWithdrawLeaseResponseAmino): MsgWithdrawLeaseResponse { + return {}; + }, + toAmino(_: MsgWithdrawLeaseResponse): MsgWithdrawLeaseResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgWithdrawLeaseResponseAminoMsg): MsgWithdrawLeaseResponse { + return MsgWithdrawLeaseResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawLeaseResponse): MsgWithdrawLeaseResponseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-withdraw-lease-response", + value: MsgWithdrawLeaseResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawLeaseResponseProtoMsg): MsgWithdrawLeaseResponse { + return MsgWithdrawLeaseResponse.decode(message.value); + }, + toProto(message: MsgWithdrawLeaseResponse): Uint8Array { + return MsgWithdrawLeaseResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawLeaseResponse): MsgWithdrawLeaseResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgWithdrawLeaseResponse", + value: MsgWithdrawLeaseResponse.encode(message).finish() + }; } }; function createBaseMsgCloseLease(): MsgCloseLease { @@ -698,6 +942,7 @@ function createBaseMsgCloseLease(): MsgCloseLease { }; } export const MsgCloseLease = { + typeUrl: "/akash.market.v1beta2.MsgCloseLease", encode(message: MsgCloseLease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leaseId !== undefined) { LeaseID.encode(message.leaseId, writer.uint32(10).fork()).ldelim(); @@ -750,12 +995,44 @@ export const MsgCloseLease = { const obj: any = {}; message.leaseId !== undefined && (obj.lease_id = message.leaseId ? LeaseID.toSDK(message.leaseId) : undefined); return obj; + }, + fromAmino(object: MsgCloseLeaseAmino): MsgCloseLease { + return { + leaseId: object?.lease_id ? LeaseID.fromAmino(object.lease_id) : undefined + }; + }, + toAmino(message: MsgCloseLease): MsgCloseLeaseAmino { + const obj: any = {}; + obj.lease_id = message.leaseId ? LeaseID.toAmino(message.leaseId) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCloseLeaseAminoMsg): MsgCloseLease { + return MsgCloseLease.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseLease): MsgCloseLeaseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-close-lease", + value: MsgCloseLease.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseLeaseProtoMsg): MsgCloseLease { + return MsgCloseLease.decode(message.value); + }, + toProto(message: MsgCloseLease): Uint8Array { + return MsgCloseLease.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseLease): MsgCloseLeaseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCloseLease", + value: MsgCloseLease.encode(message).finish() + }; } }; function createBaseMsgCloseLeaseResponse(): MsgCloseLeaseResponse { return {}; } export const MsgCloseLeaseResponse = { + typeUrl: "/akash.market.v1beta2.MsgCloseLeaseResponse", encode(_: MsgCloseLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -793,5 +1070,33 @@ export const MsgCloseLeaseResponse = { toSDK(_: MsgCloseLeaseResponse): MsgCloseLeaseResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCloseLeaseResponseAmino): MsgCloseLeaseResponse { + return {}; + }, + toAmino(_: MsgCloseLeaseResponse): MsgCloseLeaseResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCloseLeaseResponseAminoMsg): MsgCloseLeaseResponse { + return MsgCloseLeaseResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCloseLeaseResponse): MsgCloseLeaseResponseAminoMsg { + return { + type: "akash/market/v1beta2/testonly-close-lease-response", + value: MsgCloseLeaseResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCloseLeaseResponseProtoMsg): MsgCloseLeaseResponse { + return MsgCloseLeaseResponse.decode(message.value); + }, + toProto(message: MsgCloseLeaseResponse): Uint8Array { + return MsgCloseLeaseResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCloseLeaseResponse): MsgCloseLeaseResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.MsgCloseLeaseResponse", + value: MsgCloseLeaseResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts index ffee5afb38..1b8c7729d2 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/order.ts @@ -103,6 +103,7 @@ function createBaseOrderID(): OrderID { }; } export const OrderID = { + typeUrl: "/akash.market.v1beta2.OrderID", encode(message: OrderID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -191,6 +192,43 @@ export const OrderID = { obj.gseq = message.gseq; obj.oseq = message.oseq; return obj; + }, + fromAmino(object: OrderIDAmino): OrderID { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq, + oseq: object.oseq + }; + }, + toAmino(message: OrderID): OrderIDAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + obj.oseq = message.oseq; + return obj; + }, + fromAminoMsg(object: OrderIDAminoMsg): OrderID { + return OrderID.fromAmino(object.value); + }, + toAminoMsg(message: OrderID): OrderIDAminoMsg { + return { + type: "akash/market/v1beta2/order-i-d", + value: OrderID.toAmino(message) + }; + }, + fromProtoMsg(message: OrderIDProtoMsg): OrderID { + return OrderID.decode(message.value); + }, + toProto(message: OrderID): Uint8Array { + return OrderID.encode(message).finish(); + }, + toProtoMsg(message: OrderID): OrderIDProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.OrderID", + value: OrderID.encode(message).finish() + }; } }; function createBaseOrder(): Order { @@ -202,6 +240,7 @@ function createBaseOrder(): Order { }; } export const Order = { + typeUrl: "/akash.market.v1beta2.Order", encode(message: Order, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.orderId !== undefined) { OrderID.encode(message.orderId, writer.uint32(10).fork()).ldelim(); @@ -290,6 +329,43 @@ export const Order = { message.spec !== undefined && (obj.spec = message.spec ? GroupSpec.toSDK(message.spec) : undefined); obj.created_at = message.createdAt; return obj; + }, + fromAmino(object: OrderAmino): Order { + return { + orderId: object?.order_id ? OrderID.fromAmino(object.order_id) : undefined, + state: isSet(object.state) ? order_StateFromJSON(object.state) : -1, + spec: object?.spec ? GroupSpec.fromAmino(object.spec) : undefined, + createdAt: BigInt(object.created_at) + }; + }, + toAmino(message: Order): OrderAmino { + const obj: any = {}; + obj.order_id = message.orderId ? OrderID.toAmino(message.orderId) : undefined; + obj.state = message.state; + obj.spec = message.spec ? GroupSpec.toAmino(message.spec) : undefined; + obj.created_at = message.createdAt ? message.createdAt.toString() : undefined; + return obj; + }, + fromAminoMsg(object: OrderAminoMsg): Order { + return Order.fromAmino(object.value); + }, + toAminoMsg(message: Order): OrderAminoMsg { + return { + type: "akash/market/v1beta2/order", + value: Order.toAmino(message) + }; + }, + fromProtoMsg(message: OrderProtoMsg): Order { + return Order.decode(message.value); + }, + toProto(message: Order): Uint8Array { + return Order.encode(message).finish(); + }, + toProtoMsg(message: Order): OrderProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.Order", + value: Order.encode(message).finish() + }; } }; function createBaseOrderFilters(): OrderFilters { @@ -302,6 +378,7 @@ function createBaseOrderFilters(): OrderFilters { }; } export const OrderFilters = { + typeUrl: "/akash.market.v1beta2.OrderFilters", encode(message: OrderFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -402,5 +479,44 @@ export const OrderFilters = { obj.oseq = message.oseq; obj.state = message.state; return obj; + }, + fromAmino(object: OrderFiltersAmino): OrderFilters { + return { + owner: object.owner, + dseq: BigInt(object.dseq), + gseq: object.gseq, + oseq: object.oseq, + state: object.state + }; + }, + toAmino(message: OrderFilters): OrderFiltersAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.dseq = message.dseq ? message.dseq.toString() : undefined; + obj.gseq = message.gseq; + obj.oseq = message.oseq; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: OrderFiltersAminoMsg): OrderFilters { + return OrderFilters.fromAmino(object.value); + }, + toAminoMsg(message: OrderFilters): OrderFiltersAminoMsg { + return { + type: "akash/market/v1beta2/order-filters", + value: OrderFilters.toAmino(message) + }; + }, + fromProtoMsg(message: OrderFiltersProtoMsg): OrderFilters { + return OrderFilters.decode(message.value); + }, + toProto(message: OrderFilters): Uint8Array { + return OrderFilters.encode(message).finish(); + }, + toProtoMsg(message: OrderFilters): OrderFiltersProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.OrderFilters", + value: OrderFilters.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts index 77a0fe3314..ec98367739 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/params.ts @@ -19,6 +19,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/akash.market.v1beta2.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidMinDeposit !== undefined) { Coin.encode(message.bidMinDeposit, writer.uint32(10).fork()).ldelim(); @@ -83,5 +84,38 @@ export const Params = { message.bidMinDeposit !== undefined && (obj.bid_min_deposit = message.bidMinDeposit ? Coin.toSDK(message.bidMinDeposit) : undefined); obj.order_max_bids = message.orderMaxBids; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + bidMinDeposit: object?.bid_min_deposit ? Coin.fromAmino(object.bid_min_deposit) : undefined, + orderMaxBids: object.order_max_bids + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.bid_min_deposit = message.bidMinDeposit ? Coin.toAmino(message.bidMinDeposit) : undefined; + obj.order_max_bids = message.orderMaxBids; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "akash/market/v1beta2/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts index b043c1b729..b935352fc9 100644 --- a/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/market/v1beta2/query.ts @@ -125,6 +125,7 @@ function createBaseQueryOrdersRequest(): QueryOrdersRequest { }; } export const QueryOrdersRequest = { + typeUrl: "/akash.market.v1beta2.QueryOrdersRequest", encode(message: QueryOrdersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { OrderFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); @@ -189,6 +190,39 @@ export const QueryOrdersRequest = { message.filters !== undefined && (obj.filters = message.filters ? OrderFilters.toSDK(message.filters) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryOrdersRequestAmino): QueryOrdersRequest { + return { + filters: object?.filters ? OrderFilters.fromAmino(object.filters) : undefined, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryOrdersRequest): QueryOrdersRequestAmino { + const obj: any = {}; + obj.filters = message.filters ? OrderFilters.toAmino(message.filters) : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryOrdersRequestAminoMsg): QueryOrdersRequest { + return QueryOrdersRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryOrdersRequest): QueryOrdersRequestAminoMsg { + return { + type: "akash/market/v1beta2/query-orders-request", + value: QueryOrdersRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryOrdersRequestProtoMsg): QueryOrdersRequest { + return QueryOrdersRequest.decode(message.value); + }, + toProto(message: QueryOrdersRequest): Uint8Array { + return QueryOrdersRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryOrdersRequest): QueryOrdersRequestProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryOrdersRequest", + value: QueryOrdersRequest.encode(message).finish() + }; } }; function createBaseQueryOrdersResponse(): QueryOrdersResponse { @@ -198,6 +232,7 @@ function createBaseQueryOrdersResponse(): QueryOrdersResponse { }; } export const QueryOrdersResponse = { + typeUrl: "/akash.market.v1beta2.QueryOrdersResponse", encode(message: QueryOrdersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.orders) { Order.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -270,6 +305,43 @@ export const QueryOrdersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryOrdersResponseAmino): QueryOrdersResponse { + return { + orders: Array.isArray(object?.orders) ? object.orders.map((e: any) => Order.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryOrdersResponse): QueryOrdersResponseAmino { + const obj: any = {}; + if (message.orders) { + obj.orders = message.orders.map(e => e ? Order.toAmino(e) : undefined); + } else { + obj.orders = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryOrdersResponseAminoMsg): QueryOrdersResponse { + return QueryOrdersResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryOrdersResponse): QueryOrdersResponseAminoMsg { + return { + type: "akash/market/v1beta2/query-orders-response", + value: QueryOrdersResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryOrdersResponseProtoMsg): QueryOrdersResponse { + return QueryOrdersResponse.decode(message.value); + }, + toProto(message: QueryOrdersResponse): Uint8Array { + return QueryOrdersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryOrdersResponse): QueryOrdersResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryOrdersResponse", + value: QueryOrdersResponse.encode(message).finish() + }; } }; function createBaseQueryOrderRequest(): QueryOrderRequest { @@ -278,6 +350,7 @@ function createBaseQueryOrderRequest(): QueryOrderRequest { }; } export const QueryOrderRequest = { + typeUrl: "/akash.market.v1beta2.QueryOrderRequest", encode(message: QueryOrderRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { OrderID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -330,6 +403,37 @@ export const QueryOrderRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? OrderID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryOrderRequestAmino): QueryOrderRequest { + return { + id: object?.id ? OrderID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryOrderRequest): QueryOrderRequestAmino { + const obj: any = {}; + obj.id = message.id ? OrderID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryOrderRequestAminoMsg): QueryOrderRequest { + return QueryOrderRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryOrderRequest): QueryOrderRequestAminoMsg { + return { + type: "akash/market/v1beta2/query-order-request", + value: QueryOrderRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryOrderRequestProtoMsg): QueryOrderRequest { + return QueryOrderRequest.decode(message.value); + }, + toProto(message: QueryOrderRequest): Uint8Array { + return QueryOrderRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryOrderRequest): QueryOrderRequestProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryOrderRequest", + value: QueryOrderRequest.encode(message).finish() + }; } }; function createBaseQueryOrderResponse(): QueryOrderResponse { @@ -338,6 +442,7 @@ function createBaseQueryOrderResponse(): QueryOrderResponse { }; } export const QueryOrderResponse = { + typeUrl: "/akash.market.v1beta2.QueryOrderResponse", encode(message: QueryOrderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.order !== undefined) { Order.encode(message.order, writer.uint32(10).fork()).ldelim(); @@ -390,6 +495,37 @@ export const QueryOrderResponse = { const obj: any = {}; message.order !== undefined && (obj.order = message.order ? Order.toSDK(message.order) : undefined); return obj; + }, + fromAmino(object: QueryOrderResponseAmino): QueryOrderResponse { + return { + order: object?.order ? Order.fromAmino(object.order) : undefined + }; + }, + toAmino(message: QueryOrderResponse): QueryOrderResponseAmino { + const obj: any = {}; + obj.order = message.order ? Order.toAmino(message.order) : undefined; + return obj; + }, + fromAminoMsg(object: QueryOrderResponseAminoMsg): QueryOrderResponse { + return QueryOrderResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryOrderResponse): QueryOrderResponseAminoMsg { + return { + type: "akash/market/v1beta2/query-order-response", + value: QueryOrderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryOrderResponseProtoMsg): QueryOrderResponse { + return QueryOrderResponse.decode(message.value); + }, + toProto(message: QueryOrderResponse): Uint8Array { + return QueryOrderResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryOrderResponse): QueryOrderResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryOrderResponse", + value: QueryOrderResponse.encode(message).finish() + }; } }; function createBaseQueryBidsRequest(): QueryBidsRequest { @@ -399,6 +535,7 @@ function createBaseQueryBidsRequest(): QueryBidsRequest { }; } export const QueryBidsRequest = { + typeUrl: "/akash.market.v1beta2.QueryBidsRequest", encode(message: QueryBidsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { BidFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); @@ -463,6 +600,39 @@ export const QueryBidsRequest = { message.filters !== undefined && (obj.filters = message.filters ? BidFilters.toSDK(message.filters) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryBidsRequestAmino): QueryBidsRequest { + return { + filters: object?.filters ? BidFilters.fromAmino(object.filters) : undefined, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryBidsRequest): QueryBidsRequestAmino { + const obj: any = {}; + obj.filters = message.filters ? BidFilters.toAmino(message.filters) : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryBidsRequestAminoMsg): QueryBidsRequest { + return QueryBidsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryBidsRequest): QueryBidsRequestAminoMsg { + return { + type: "akash/market/v1beta2/query-bids-request", + value: QueryBidsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBidsRequestProtoMsg): QueryBidsRequest { + return QueryBidsRequest.decode(message.value); + }, + toProto(message: QueryBidsRequest): Uint8Array { + return QueryBidsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBidsRequest): QueryBidsRequestProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryBidsRequest", + value: QueryBidsRequest.encode(message).finish() + }; } }; function createBaseQueryBidsResponse(): QueryBidsResponse { @@ -472,6 +642,7 @@ function createBaseQueryBidsResponse(): QueryBidsResponse { }; } export const QueryBidsResponse = { + typeUrl: "/akash.market.v1beta2.QueryBidsResponse", encode(message: QueryBidsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.bids) { QueryBidResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -544,6 +715,43 @@ export const QueryBidsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryBidsResponseAmino): QueryBidsResponse { + return { + bids: Array.isArray(object?.bids) ? object.bids.map((e: any) => QueryBidResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryBidsResponse): QueryBidsResponseAmino { + const obj: any = {}; + if (message.bids) { + obj.bids = message.bids.map(e => e ? QueryBidResponse.toAmino(e) : undefined); + } else { + obj.bids = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryBidsResponseAminoMsg): QueryBidsResponse { + return QueryBidsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryBidsResponse): QueryBidsResponseAminoMsg { + return { + type: "akash/market/v1beta2/query-bids-response", + value: QueryBidsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBidsResponseProtoMsg): QueryBidsResponse { + return QueryBidsResponse.decode(message.value); + }, + toProto(message: QueryBidsResponse): Uint8Array { + return QueryBidsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBidsResponse): QueryBidsResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryBidsResponse", + value: QueryBidsResponse.encode(message).finish() + }; } }; function createBaseQueryBidRequest(): QueryBidRequest { @@ -552,6 +760,7 @@ function createBaseQueryBidRequest(): QueryBidRequest { }; } export const QueryBidRequest = { + typeUrl: "/akash.market.v1beta2.QueryBidRequest", encode(message: QueryBidRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { BidID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -604,6 +813,37 @@ export const QueryBidRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? BidID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryBidRequestAmino): QueryBidRequest { + return { + id: object?.id ? BidID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryBidRequest): QueryBidRequestAmino { + const obj: any = {}; + obj.id = message.id ? BidID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryBidRequestAminoMsg): QueryBidRequest { + return QueryBidRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryBidRequest): QueryBidRequestAminoMsg { + return { + type: "akash/market/v1beta2/query-bid-request", + value: QueryBidRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBidRequestProtoMsg): QueryBidRequest { + return QueryBidRequest.decode(message.value); + }, + toProto(message: QueryBidRequest): Uint8Array { + return QueryBidRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBidRequest): QueryBidRequestProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryBidRequest", + value: QueryBidRequest.encode(message).finish() + }; } }; function createBaseQueryBidResponse(): QueryBidResponse { @@ -613,6 +853,7 @@ function createBaseQueryBidResponse(): QueryBidResponse { }; } export const QueryBidResponse = { + typeUrl: "/akash.market.v1beta2.QueryBidResponse", encode(message: QueryBidResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bid !== undefined) { Bid.encode(message.bid, writer.uint32(10).fork()).ldelim(); @@ -677,6 +918,39 @@ export const QueryBidResponse = { message.bid !== undefined && (obj.bid = message.bid ? Bid.toSDK(message.bid) : undefined); message.escrowAccount !== undefined && (obj.escrow_account = message.escrowAccount ? Account.toSDK(message.escrowAccount) : undefined); return obj; + }, + fromAmino(object: QueryBidResponseAmino): QueryBidResponse { + return { + bid: object?.bid ? Bid.fromAmino(object.bid) : undefined, + escrowAccount: object?.escrow_account ? Account.fromAmino(object.escrow_account) : undefined + }; + }, + toAmino(message: QueryBidResponse): QueryBidResponseAmino { + const obj: any = {}; + obj.bid = message.bid ? Bid.toAmino(message.bid) : undefined; + obj.escrow_account = message.escrowAccount ? Account.toAmino(message.escrowAccount) : undefined; + return obj; + }, + fromAminoMsg(object: QueryBidResponseAminoMsg): QueryBidResponse { + return QueryBidResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryBidResponse): QueryBidResponseAminoMsg { + return { + type: "akash/market/v1beta2/query-bid-response", + value: QueryBidResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBidResponseProtoMsg): QueryBidResponse { + return QueryBidResponse.decode(message.value); + }, + toProto(message: QueryBidResponse): Uint8Array { + return QueryBidResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBidResponse): QueryBidResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryBidResponse", + value: QueryBidResponse.encode(message).finish() + }; } }; function createBaseQueryLeasesRequest(): QueryLeasesRequest { @@ -686,6 +960,7 @@ function createBaseQueryLeasesRequest(): QueryLeasesRequest { }; } export const QueryLeasesRequest = { + typeUrl: "/akash.market.v1beta2.QueryLeasesRequest", encode(message: QueryLeasesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { LeaseFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); @@ -750,6 +1025,39 @@ export const QueryLeasesRequest = { message.filters !== undefined && (obj.filters = message.filters ? LeaseFilters.toSDK(message.filters) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryLeasesRequestAmino): QueryLeasesRequest { + return { + filters: object?.filters ? LeaseFilters.fromAmino(object.filters) : undefined, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryLeasesRequest): QueryLeasesRequestAmino { + const obj: any = {}; + obj.filters = message.filters ? LeaseFilters.toAmino(message.filters) : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryLeasesRequestAminoMsg): QueryLeasesRequest { + return QueryLeasesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryLeasesRequest): QueryLeasesRequestAminoMsg { + return { + type: "akash/market/v1beta2/query-leases-request", + value: QueryLeasesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLeasesRequestProtoMsg): QueryLeasesRequest { + return QueryLeasesRequest.decode(message.value); + }, + toProto(message: QueryLeasesRequest): Uint8Array { + return QueryLeasesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryLeasesRequest): QueryLeasesRequestProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryLeasesRequest", + value: QueryLeasesRequest.encode(message).finish() + }; } }; function createBaseQueryLeasesResponse(): QueryLeasesResponse { @@ -759,6 +1067,7 @@ function createBaseQueryLeasesResponse(): QueryLeasesResponse { }; } export const QueryLeasesResponse = { + typeUrl: "/akash.market.v1beta2.QueryLeasesResponse", encode(message: QueryLeasesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.leases) { QueryLeaseResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -831,6 +1140,43 @@ export const QueryLeasesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryLeasesResponseAmino): QueryLeasesResponse { + return { + leases: Array.isArray(object?.leases) ? object.leases.map((e: any) => QueryLeaseResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryLeasesResponse): QueryLeasesResponseAmino { + const obj: any = {}; + if (message.leases) { + obj.leases = message.leases.map(e => e ? QueryLeaseResponse.toAmino(e) : undefined); + } else { + obj.leases = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryLeasesResponseAminoMsg): QueryLeasesResponse { + return QueryLeasesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryLeasesResponse): QueryLeasesResponseAminoMsg { + return { + type: "akash/market/v1beta2/query-leases-response", + value: QueryLeasesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLeasesResponseProtoMsg): QueryLeasesResponse { + return QueryLeasesResponse.decode(message.value); + }, + toProto(message: QueryLeasesResponse): Uint8Array { + return QueryLeasesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryLeasesResponse): QueryLeasesResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryLeasesResponse", + value: QueryLeasesResponse.encode(message).finish() + }; } }; function createBaseQueryLeaseRequest(): QueryLeaseRequest { @@ -839,6 +1185,7 @@ function createBaseQueryLeaseRequest(): QueryLeaseRequest { }; } export const QueryLeaseRequest = { + typeUrl: "/akash.market.v1beta2.QueryLeaseRequest", encode(message: QueryLeaseRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { LeaseID.encode(message.id, writer.uint32(10).fork()).ldelim(); @@ -891,6 +1238,37 @@ export const QueryLeaseRequest = { const obj: any = {}; message.id !== undefined && (obj.id = message.id ? LeaseID.toSDK(message.id) : undefined); return obj; + }, + fromAmino(object: QueryLeaseRequestAmino): QueryLeaseRequest { + return { + id: object?.id ? LeaseID.fromAmino(object.id) : undefined + }; + }, + toAmino(message: QueryLeaseRequest): QueryLeaseRequestAmino { + const obj: any = {}; + obj.id = message.id ? LeaseID.toAmino(message.id) : undefined; + return obj; + }, + fromAminoMsg(object: QueryLeaseRequestAminoMsg): QueryLeaseRequest { + return QueryLeaseRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryLeaseRequest): QueryLeaseRequestAminoMsg { + return { + type: "akash/market/v1beta2/query-lease-request", + value: QueryLeaseRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLeaseRequestProtoMsg): QueryLeaseRequest { + return QueryLeaseRequest.decode(message.value); + }, + toProto(message: QueryLeaseRequest): Uint8Array { + return QueryLeaseRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryLeaseRequest): QueryLeaseRequestProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryLeaseRequest", + value: QueryLeaseRequest.encode(message).finish() + }; } }; function createBaseQueryLeaseResponse(): QueryLeaseResponse { @@ -900,6 +1278,7 @@ function createBaseQueryLeaseResponse(): QueryLeaseResponse { }; } export const QueryLeaseResponse = { + typeUrl: "/akash.market.v1beta2.QueryLeaseResponse", encode(message: QueryLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lease !== undefined) { Lease.encode(message.lease, writer.uint32(10).fork()).ldelim(); @@ -964,5 +1343,38 @@ export const QueryLeaseResponse = { message.lease !== undefined && (obj.lease = message.lease ? Lease.toSDK(message.lease) : undefined); message.escrowPayment !== undefined && (obj.escrow_payment = message.escrowPayment ? FractionalPayment.toSDK(message.escrowPayment) : undefined); return obj; + }, + fromAmino(object: QueryLeaseResponseAmino): QueryLeaseResponse { + return { + lease: object?.lease ? Lease.fromAmino(object.lease) : undefined, + escrowPayment: object?.escrow_payment ? FractionalPayment.fromAmino(object.escrow_payment) : undefined + }; + }, + toAmino(message: QueryLeaseResponse): QueryLeaseResponseAmino { + const obj: any = {}; + obj.lease = message.lease ? Lease.toAmino(message.lease) : undefined; + obj.escrow_payment = message.escrowPayment ? FractionalPayment.toAmino(message.escrowPayment) : undefined; + return obj; + }, + fromAminoMsg(object: QueryLeaseResponseAminoMsg): QueryLeaseResponse { + return QueryLeaseResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryLeaseResponse): QueryLeaseResponseAminoMsg { + return { + type: "akash/market/v1beta2/query-lease-response", + value: QueryLeaseResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLeaseResponseProtoMsg): QueryLeaseResponse { + return QueryLeaseResponse.decode(message.value); + }, + toProto(message: QueryLeaseResponse): Uint8Array { + return QueryLeaseResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryLeaseResponse): QueryLeaseResponseProtoMsg { + return { + typeUrl: "/akash.market.v1beta2.QueryLeaseResponse", + value: QueryLeaseResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts index 28f717b87f..14cead6d5f 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta1/provider.ts @@ -81,6 +81,7 @@ function createBaseProviderInfo(): ProviderInfo { }; } export const ProviderInfo = { + typeUrl: "/akash.provider.v1beta1.ProviderInfo", encode(message: ProviderInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.email !== "") { writer.uint32(10).string(message.email); @@ -145,6 +146,39 @@ export const ProviderInfo = { obj.email = message.email; obj.website = message.website; return obj; + }, + fromAmino(object: ProviderInfoAmino): ProviderInfo { + return { + email: object.email, + website: object.website + }; + }, + toAmino(message: ProviderInfo): ProviderInfoAmino { + const obj: any = {}; + obj.email = message.email; + obj.website = message.website; + return obj; + }, + fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { + return ProviderInfo.fromAmino(object.value); + }, + toAminoMsg(message: ProviderInfo): ProviderInfoAminoMsg { + return { + type: "akash/provider/provider-info", + value: ProviderInfo.toAmino(message) + }; + }, + fromProtoMsg(message: ProviderInfoProtoMsg): ProviderInfo { + return ProviderInfo.decode(message.value); + }, + toProto(message: ProviderInfo): Uint8Array { + return ProviderInfo.encode(message).finish(); + }, + toProtoMsg(message: ProviderInfo): ProviderInfoProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.ProviderInfo", + value: ProviderInfo.encode(message).finish() + }; } }; function createBaseMsgCreateProvider(): MsgCreateProvider { @@ -156,6 +190,7 @@ function createBaseMsgCreateProvider(): MsgCreateProvider { }; } export const MsgCreateProvider = { + typeUrl: "/akash.provider.v1beta1.MsgCreateProvider", encode(message: MsgCreateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -252,12 +287,54 @@ export const MsgCreateProvider = { } message.info !== undefined && (obj.info = message.info ? ProviderInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: MsgCreateProviderAmino): MsgCreateProvider { + return { + owner: object.owner, + hostUri: object.host_uri, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [], + info: object?.info ? ProviderInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.host_uri = message.hostUri; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { + return MsgCreateProvider.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateProvider): MsgCreateProviderAminoMsg { + return { + type: "akash/provider/testonly-create-provider", + value: MsgCreateProvider.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateProviderProtoMsg): MsgCreateProvider { + return MsgCreateProvider.decode(message.value); + }, + toProto(message: MsgCreateProvider): Uint8Array { + return MsgCreateProvider.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateProvider): MsgCreateProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.MsgCreateProvider", + value: MsgCreateProvider.encode(message).finish() + }; } }; function createBaseMsgCreateProviderResponse(): MsgCreateProviderResponse { return {}; } export const MsgCreateProviderResponse = { + typeUrl: "/akash.provider.v1beta1.MsgCreateProviderResponse", encode(_: MsgCreateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -295,6 +372,34 @@ export const MsgCreateProviderResponse = { toSDK(_: MsgCreateProviderResponse): MsgCreateProviderResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateProviderResponseAmino): MsgCreateProviderResponse { + return {}; + }, + toAmino(_: MsgCreateProviderResponse): MsgCreateProviderResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateProviderResponseAminoMsg): MsgCreateProviderResponse { + return MsgCreateProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateProviderResponse): MsgCreateProviderResponseAminoMsg { + return { + type: "akash/provider/testonly-create-provider-response", + value: MsgCreateProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateProviderResponseProtoMsg): MsgCreateProviderResponse { + return MsgCreateProviderResponse.decode(message.value); + }, + toProto(message: MsgCreateProviderResponse): Uint8Array { + return MsgCreateProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateProviderResponse): MsgCreateProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.MsgCreateProviderResponse", + value: MsgCreateProviderResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateProvider(): MsgUpdateProvider { @@ -306,6 +411,7 @@ function createBaseMsgUpdateProvider(): MsgUpdateProvider { }; } export const MsgUpdateProvider = { + typeUrl: "/akash.provider.v1beta1.MsgUpdateProvider", encode(message: MsgUpdateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -402,12 +508,54 @@ export const MsgUpdateProvider = { } message.info !== undefined && (obj.info = message.info ? ProviderInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: MsgUpdateProviderAmino): MsgUpdateProvider { + return { + owner: object.owner, + hostUri: object.host_uri, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [], + info: object?.info ? ProviderInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.host_uri = message.hostUri; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { + return MsgUpdateProvider.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateProvider): MsgUpdateProviderAminoMsg { + return { + type: "akash/provider/testonly-update-provider", + value: MsgUpdateProvider.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateProviderProtoMsg): MsgUpdateProvider { + return MsgUpdateProvider.decode(message.value); + }, + toProto(message: MsgUpdateProvider): Uint8Array { + return MsgUpdateProvider.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateProvider): MsgUpdateProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.MsgUpdateProvider", + value: MsgUpdateProvider.encode(message).finish() + }; } }; function createBaseMsgUpdateProviderResponse(): MsgUpdateProviderResponse { return {}; } export const MsgUpdateProviderResponse = { + typeUrl: "/akash.provider.v1beta1.MsgUpdateProviderResponse", encode(_: MsgUpdateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -445,6 +593,34 @@ export const MsgUpdateProviderResponse = { toSDK(_: MsgUpdateProviderResponse): MsgUpdateProviderResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateProviderResponseAmino): MsgUpdateProviderResponse { + return {}; + }, + toAmino(_: MsgUpdateProviderResponse): MsgUpdateProviderResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateProviderResponseAminoMsg): MsgUpdateProviderResponse { + return MsgUpdateProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateProviderResponse): MsgUpdateProviderResponseAminoMsg { + return { + type: "akash/provider/testonly-update-provider-response", + value: MsgUpdateProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateProviderResponseProtoMsg): MsgUpdateProviderResponse { + return MsgUpdateProviderResponse.decode(message.value); + }, + toProto(message: MsgUpdateProviderResponse): Uint8Array { + return MsgUpdateProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateProviderResponse): MsgUpdateProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.MsgUpdateProviderResponse", + value: MsgUpdateProviderResponse.encode(message).finish() + }; } }; function createBaseMsgDeleteProvider(): MsgDeleteProvider { @@ -453,6 +629,7 @@ function createBaseMsgDeleteProvider(): MsgDeleteProvider { }; } export const MsgDeleteProvider = { + typeUrl: "/akash.provider.v1beta1.MsgDeleteProvider", encode(message: MsgDeleteProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -505,12 +682,44 @@ export const MsgDeleteProvider = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: MsgDeleteProviderAmino): MsgDeleteProvider { + return { + owner: object.owner + }; + }, + toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { + return MsgDeleteProvider.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProvider): MsgDeleteProviderAminoMsg { + return { + type: "akash/provider/testonly-delete-provider", + value: MsgDeleteProvider.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderProtoMsg): MsgDeleteProvider { + return MsgDeleteProvider.decode(message.value); + }, + toProto(message: MsgDeleteProvider): Uint8Array { + return MsgDeleteProvider.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProvider): MsgDeleteProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.MsgDeleteProvider", + value: MsgDeleteProvider.encode(message).finish() + }; } }; function createBaseMsgDeleteProviderResponse(): MsgDeleteProviderResponse { return {}; } export const MsgDeleteProviderResponse = { + typeUrl: "/akash.provider.v1beta1.MsgDeleteProviderResponse", encode(_: MsgDeleteProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -548,6 +757,34 @@ export const MsgDeleteProviderResponse = { toSDK(_: MsgDeleteProviderResponse): MsgDeleteProviderResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDeleteProviderResponseAmino): MsgDeleteProviderResponse { + return {}; + }, + toAmino(_: MsgDeleteProviderResponse): MsgDeleteProviderResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderResponseAminoMsg): MsgDeleteProviderResponse { + return MsgDeleteProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProviderResponse): MsgDeleteProviderResponseAminoMsg { + return { + type: "akash/provider/testonly-delete-provider-response", + value: MsgDeleteProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderResponseProtoMsg): MsgDeleteProviderResponse { + return MsgDeleteProviderResponse.decode(message.value); + }, + toProto(message: MsgDeleteProviderResponse): Uint8Array { + return MsgDeleteProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProviderResponse): MsgDeleteProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.MsgDeleteProviderResponse", + value: MsgDeleteProviderResponse.encode(message).finish() + }; } }; function createBaseProvider(): Provider { @@ -559,6 +796,7 @@ function createBaseProvider(): Provider { }; } export const Provider = { + typeUrl: "/akash.provider.v1beta1.Provider", encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -655,5 +893,46 @@ export const Provider = { } message.info !== undefined && (obj.info = message.info ? ProviderInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: ProviderAmino): Provider { + return { + owner: object.owner, + hostUri: object.host_uri, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [], + info: object?.info ? ProviderInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: Provider): ProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.host_uri = message.hostUri; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: ProviderAminoMsg): Provider { + return Provider.fromAmino(object.value); + }, + toAminoMsg(message: Provider): ProviderAminoMsg { + return { + type: "akash/provider/provider", + value: Provider.toAmino(message) + }; + }, + fromProtoMsg(message: ProviderProtoMsg): Provider { + return Provider.decode(message.value); + }, + toProto(message: Provider): Uint8Array { + return Provider.encode(message).finish(); + }, + toProtoMsg(message: Provider): ProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta1.Provider", + value: Provider.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts index a934e66043..38487c8dd2 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/genesis.ts @@ -16,6 +16,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/akash.provider.v1beta2.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.providers) { Provider.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -76,5 +77,40 @@ export const GenesisState = { obj.providers = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => Provider.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.providers) { + obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); + } else { + obj.providers = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "akash/provider/v1beta2/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts index 80f38db38d..339922044f 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/provider.ts @@ -81,6 +81,7 @@ function createBaseProviderInfo(): ProviderInfo { }; } export const ProviderInfo = { + typeUrl: "/akash.provider.v1beta2.ProviderInfo", encode(message: ProviderInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.email !== "") { writer.uint32(10).string(message.email); @@ -145,6 +146,39 @@ export const ProviderInfo = { obj.email = message.email; obj.website = message.website; return obj; + }, + fromAmino(object: ProviderInfoAmino): ProviderInfo { + return { + email: object.email, + website: object.website + }; + }, + toAmino(message: ProviderInfo): ProviderInfoAmino { + const obj: any = {}; + obj.email = message.email; + obj.website = message.website; + return obj; + }, + fromAminoMsg(object: ProviderInfoAminoMsg): ProviderInfo { + return ProviderInfo.fromAmino(object.value); + }, + toAminoMsg(message: ProviderInfo): ProviderInfoAminoMsg { + return { + type: "akash/provider/v1beta2/provider-info", + value: ProviderInfo.toAmino(message) + }; + }, + fromProtoMsg(message: ProviderInfoProtoMsg): ProviderInfo { + return ProviderInfo.decode(message.value); + }, + toProto(message: ProviderInfo): Uint8Array { + return ProviderInfo.encode(message).finish(); + }, + toProtoMsg(message: ProviderInfo): ProviderInfoProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.ProviderInfo", + value: ProviderInfo.encode(message).finish() + }; } }; function createBaseMsgCreateProvider(): MsgCreateProvider { @@ -156,6 +190,7 @@ function createBaseMsgCreateProvider(): MsgCreateProvider { }; } export const MsgCreateProvider = { + typeUrl: "/akash.provider.v1beta2.MsgCreateProvider", encode(message: MsgCreateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -252,12 +287,54 @@ export const MsgCreateProvider = { } message.info !== undefined && (obj.info = message.info ? ProviderInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: MsgCreateProviderAmino): MsgCreateProvider { + return { + owner: object.owner, + hostUri: object.host_uri, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [], + info: object?.info ? ProviderInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: MsgCreateProvider): MsgCreateProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.host_uri = message.hostUri; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateProviderAminoMsg): MsgCreateProvider { + return MsgCreateProvider.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateProvider): MsgCreateProviderAminoMsg { + return { + type: "akash/provider/v1beta2/testonly-create-provider", + value: MsgCreateProvider.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateProviderProtoMsg): MsgCreateProvider { + return MsgCreateProvider.decode(message.value); + }, + toProto(message: MsgCreateProvider): Uint8Array { + return MsgCreateProvider.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateProvider): MsgCreateProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.MsgCreateProvider", + value: MsgCreateProvider.encode(message).finish() + }; } }; function createBaseMsgCreateProviderResponse(): MsgCreateProviderResponse { return {}; } export const MsgCreateProviderResponse = { + typeUrl: "/akash.provider.v1beta2.MsgCreateProviderResponse", encode(_: MsgCreateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -295,6 +372,34 @@ export const MsgCreateProviderResponse = { toSDK(_: MsgCreateProviderResponse): MsgCreateProviderResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateProviderResponseAmino): MsgCreateProviderResponse { + return {}; + }, + toAmino(_: MsgCreateProviderResponse): MsgCreateProviderResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateProviderResponseAminoMsg): MsgCreateProviderResponse { + return MsgCreateProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateProviderResponse): MsgCreateProviderResponseAminoMsg { + return { + type: "akash/provider/v1beta2/testonly-create-provider-response", + value: MsgCreateProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateProviderResponseProtoMsg): MsgCreateProviderResponse { + return MsgCreateProviderResponse.decode(message.value); + }, + toProto(message: MsgCreateProviderResponse): Uint8Array { + return MsgCreateProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateProviderResponse): MsgCreateProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.MsgCreateProviderResponse", + value: MsgCreateProviderResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateProvider(): MsgUpdateProvider { @@ -306,6 +411,7 @@ function createBaseMsgUpdateProvider(): MsgUpdateProvider { }; } export const MsgUpdateProvider = { + typeUrl: "/akash.provider.v1beta2.MsgUpdateProvider", encode(message: MsgUpdateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -402,12 +508,54 @@ export const MsgUpdateProvider = { } message.info !== undefined && (obj.info = message.info ? ProviderInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: MsgUpdateProviderAmino): MsgUpdateProvider { + return { + owner: object.owner, + hostUri: object.host_uri, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [], + info: object?.info ? ProviderInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: MsgUpdateProvider): MsgUpdateProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.host_uri = message.hostUri; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: MsgUpdateProviderAminoMsg): MsgUpdateProvider { + return MsgUpdateProvider.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateProvider): MsgUpdateProviderAminoMsg { + return { + type: "akash/provider/v1beta2/testonly-update-provider", + value: MsgUpdateProvider.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateProviderProtoMsg): MsgUpdateProvider { + return MsgUpdateProvider.decode(message.value); + }, + toProto(message: MsgUpdateProvider): Uint8Array { + return MsgUpdateProvider.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateProvider): MsgUpdateProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.MsgUpdateProvider", + value: MsgUpdateProvider.encode(message).finish() + }; } }; function createBaseMsgUpdateProviderResponse(): MsgUpdateProviderResponse { return {}; } export const MsgUpdateProviderResponse = { + typeUrl: "/akash.provider.v1beta2.MsgUpdateProviderResponse", encode(_: MsgUpdateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -445,6 +593,34 @@ export const MsgUpdateProviderResponse = { toSDK(_: MsgUpdateProviderResponse): MsgUpdateProviderResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateProviderResponseAmino): MsgUpdateProviderResponse { + return {}; + }, + toAmino(_: MsgUpdateProviderResponse): MsgUpdateProviderResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateProviderResponseAminoMsg): MsgUpdateProviderResponse { + return MsgUpdateProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateProviderResponse): MsgUpdateProviderResponseAminoMsg { + return { + type: "akash/provider/v1beta2/testonly-update-provider-response", + value: MsgUpdateProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateProviderResponseProtoMsg): MsgUpdateProviderResponse { + return MsgUpdateProviderResponse.decode(message.value); + }, + toProto(message: MsgUpdateProviderResponse): Uint8Array { + return MsgUpdateProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateProviderResponse): MsgUpdateProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.MsgUpdateProviderResponse", + value: MsgUpdateProviderResponse.encode(message).finish() + }; } }; function createBaseMsgDeleteProvider(): MsgDeleteProvider { @@ -453,6 +629,7 @@ function createBaseMsgDeleteProvider(): MsgDeleteProvider { }; } export const MsgDeleteProvider = { + typeUrl: "/akash.provider.v1beta2.MsgDeleteProvider", encode(message: MsgDeleteProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -505,12 +682,44 @@ export const MsgDeleteProvider = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: MsgDeleteProviderAmino): MsgDeleteProvider { + return { + owner: object.owner + }; + }, + toAmino(message: MsgDeleteProvider): MsgDeleteProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderAminoMsg): MsgDeleteProvider { + return MsgDeleteProvider.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProvider): MsgDeleteProviderAminoMsg { + return { + type: "akash/provider/v1beta2/testonly-delete-provider", + value: MsgDeleteProvider.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderProtoMsg): MsgDeleteProvider { + return MsgDeleteProvider.decode(message.value); + }, + toProto(message: MsgDeleteProvider): Uint8Array { + return MsgDeleteProvider.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProvider): MsgDeleteProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.MsgDeleteProvider", + value: MsgDeleteProvider.encode(message).finish() + }; } }; function createBaseMsgDeleteProviderResponse(): MsgDeleteProviderResponse { return {}; } export const MsgDeleteProviderResponse = { + typeUrl: "/akash.provider.v1beta2.MsgDeleteProviderResponse", encode(_: MsgDeleteProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -548,6 +757,34 @@ export const MsgDeleteProviderResponse = { toSDK(_: MsgDeleteProviderResponse): MsgDeleteProviderResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDeleteProviderResponseAmino): MsgDeleteProviderResponse { + return {}; + }, + toAmino(_: MsgDeleteProviderResponse): MsgDeleteProviderResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDeleteProviderResponseAminoMsg): MsgDeleteProviderResponse { + return MsgDeleteProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeleteProviderResponse): MsgDeleteProviderResponseAminoMsg { + return { + type: "akash/provider/v1beta2/testonly-delete-provider-response", + value: MsgDeleteProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDeleteProviderResponseProtoMsg): MsgDeleteProviderResponse { + return MsgDeleteProviderResponse.decode(message.value); + }, + toProto(message: MsgDeleteProviderResponse): Uint8Array { + return MsgDeleteProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDeleteProviderResponse): MsgDeleteProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.MsgDeleteProviderResponse", + value: MsgDeleteProviderResponse.encode(message).finish() + }; } }; function createBaseProvider(): Provider { @@ -559,6 +796,7 @@ function createBaseProvider(): Provider { }; } export const Provider = { + typeUrl: "/akash.provider.v1beta2.Provider", encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -655,5 +893,46 @@ export const Provider = { } message.info !== undefined && (obj.info = message.info ? ProviderInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: ProviderAmino): Provider { + return { + owner: object.owner, + hostUri: object.host_uri, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [], + info: object?.info ? ProviderInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: Provider): ProviderAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.host_uri = message.hostUri; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + obj.info = message.info ? ProviderInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: ProviderAminoMsg): Provider { + return Provider.fromAmino(object.value); + }, + toAminoMsg(message: Provider): ProviderAminoMsg { + return { + type: "akash/provider/v1beta2/provider", + value: Provider.toAmino(message) + }; + }, + fromProtoMsg(message: ProviderProtoMsg): Provider { + return Provider.decode(message.value); + }, + toProto(message: Provider): Uint8Array { + return Provider.encode(message).finish(); + }, + toProtoMsg(message: Provider): ProviderProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.Provider", + value: Provider.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts index a4c3daf121..ad5b8ed815 100644 --- a/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputosmojs/akash/provider/v1beta2/query.ts @@ -43,6 +43,7 @@ function createBaseQueryProvidersRequest(): QueryProvidersRequest { }; } export const QueryProvidersRequest = { + typeUrl: "/akash.provider.v1beta2.QueryProvidersRequest", encode(message: QueryProvidersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -95,6 +96,37 @@ export const QueryProvidersRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProvidersRequestAmino): QueryProvidersRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProvidersRequest): QueryProvidersRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProvidersRequestAminoMsg): QueryProvidersRequest { + return QueryProvidersRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProvidersRequest): QueryProvidersRequestAminoMsg { + return { + type: "akash/provider/v1beta2/query-providers-request", + value: QueryProvidersRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProvidersRequestProtoMsg): QueryProvidersRequest { + return QueryProvidersRequest.decode(message.value); + }, + toProto(message: QueryProvidersRequest): Uint8Array { + return QueryProvidersRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProvidersRequest): QueryProvidersRequestProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.QueryProvidersRequest", + value: QueryProvidersRequest.encode(message).finish() + }; } }; function createBaseQueryProvidersResponse(): QueryProvidersResponse { @@ -104,6 +136,7 @@ function createBaseQueryProvidersResponse(): QueryProvidersResponse { }; } export const QueryProvidersResponse = { + typeUrl: "/akash.provider.v1beta2.QueryProvidersResponse", encode(message: QueryProvidersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.providers) { Provider.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -176,6 +209,43 @@ export const QueryProvidersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProvidersResponseAmino): QueryProvidersResponse { + return { + providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => Provider.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProvidersResponse): QueryProvidersResponseAmino { + const obj: any = {}; + if (message.providers) { + obj.providers = message.providers.map(e => e ? Provider.toAmino(e) : undefined); + } else { + obj.providers = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProvidersResponseAminoMsg): QueryProvidersResponse { + return QueryProvidersResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProvidersResponse): QueryProvidersResponseAminoMsg { + return { + type: "akash/provider/v1beta2/query-providers-response", + value: QueryProvidersResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProvidersResponseProtoMsg): QueryProvidersResponse { + return QueryProvidersResponse.decode(message.value); + }, + toProto(message: QueryProvidersResponse): Uint8Array { + return QueryProvidersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProvidersResponse): QueryProvidersResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.QueryProvidersResponse", + value: QueryProvidersResponse.encode(message).finish() + }; } }; function createBaseQueryProviderRequest(): QueryProviderRequest { @@ -184,6 +254,7 @@ function createBaseQueryProviderRequest(): QueryProviderRequest { }; } export const QueryProviderRequest = { + typeUrl: "/akash.provider.v1beta2.QueryProviderRequest", encode(message: QueryProviderRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -236,6 +307,37 @@ export const QueryProviderRequest = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: QueryProviderRequestAmino): QueryProviderRequest { + return { + owner: object.owner + }; + }, + toAmino(message: QueryProviderRequest): QueryProviderRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: QueryProviderRequestAminoMsg): QueryProviderRequest { + return QueryProviderRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProviderRequest): QueryProviderRequestAminoMsg { + return { + type: "akash/provider/v1beta2/query-provider-request", + value: QueryProviderRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProviderRequestProtoMsg): QueryProviderRequest { + return QueryProviderRequest.decode(message.value); + }, + toProto(message: QueryProviderRequest): Uint8Array { + return QueryProviderRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProviderRequest): QueryProviderRequestProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.QueryProviderRequest", + value: QueryProviderRequest.encode(message).finish() + }; } }; function createBaseQueryProviderResponse(): QueryProviderResponse { @@ -244,6 +346,7 @@ function createBaseQueryProviderResponse(): QueryProviderResponse { }; } export const QueryProviderResponse = { + typeUrl: "/akash.provider.v1beta2.QueryProviderResponse", encode(message: QueryProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.provider !== undefined) { Provider.encode(message.provider, writer.uint32(10).fork()).ldelim(); @@ -296,5 +399,36 @@ export const QueryProviderResponse = { const obj: any = {}; message.provider !== undefined && (obj.provider = message.provider ? Provider.toSDK(message.provider) : undefined); return obj; + }, + fromAmino(object: QueryProviderResponseAmino): QueryProviderResponse { + return { + provider: object?.provider ? Provider.fromAmino(object.provider) : undefined + }; + }, + toAmino(message: QueryProviderResponse): QueryProviderResponseAmino { + const obj: any = {}; + obj.provider = message.provider ? Provider.toAmino(message.provider) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProviderResponseAminoMsg): QueryProviderResponse { + return QueryProviderResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProviderResponse): QueryProviderResponseAminoMsg { + return { + type: "akash/provider/v1beta2/query-provider-response", + value: QueryProviderResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProviderResponseProtoMsg): QueryProviderResponse { + return QueryProviderResponse.decode(message.value); + }, + toProto(message: QueryProviderResponse): Uint8Array { + return QueryProviderResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProviderResponse): QueryProviderResponseProtoMsg { + return { + typeUrl: "/akash.provider.v1beta2.QueryProviderResponse", + value: QueryProviderResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts b/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts index 16935eb6aa..de44f896ab 100644 --- a/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts +++ b/__fixtures__/v-next/outputosmojs/capability/v1/capability.ts @@ -51,6 +51,7 @@ function createBaseCapability(): Capability { }; } export const Capability = { + typeUrl: "/capability.v1.Capability", encode(message: Capability, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); @@ -103,6 +104,31 @@ export const Capability = { const obj: any = {}; obj.index = message.index; return obj; + }, + fromAmino(object: CapabilityAmino): Capability { + return { + index: BigInt(object.index) + }; + }, + toAmino(message: Capability): CapabilityAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + return obj; + }, + fromAminoMsg(object: CapabilityAminoMsg): Capability { + return Capability.fromAmino(object.value); + }, + fromProtoMsg(message: CapabilityProtoMsg): Capability { + return Capability.decode(message.value); + }, + toProto(message: Capability): Uint8Array { + return Capability.encode(message).finish(); + }, + toProtoMsg(message: Capability): CapabilityProtoMsg { + return { + typeUrl: "/capability.v1.Capability", + value: Capability.encode(message).finish() + }; } }; function createBaseOwner(): Owner { @@ -112,6 +138,7 @@ function createBaseOwner(): Owner { }; } export const Owner = { + typeUrl: "/capability.v1.Owner", encode(message: Owner, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.module !== "") { writer.uint32(10).string(message.module); @@ -176,6 +203,33 @@ export const Owner = { obj.module = message.module; obj.name = message.name; return obj; + }, + fromAmino(object: OwnerAmino): Owner { + return { + module: object.module, + name: object.name + }; + }, + toAmino(message: Owner): OwnerAmino { + const obj: any = {}; + obj.module = message.module; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: OwnerAminoMsg): Owner { + return Owner.fromAmino(object.value); + }, + fromProtoMsg(message: OwnerProtoMsg): Owner { + return Owner.decode(message.value); + }, + toProto(message: Owner): Uint8Array { + return Owner.encode(message).finish(); + }, + toProtoMsg(message: Owner): OwnerProtoMsg { + return { + typeUrl: "/capability.v1.Owner", + value: Owner.encode(message).finish() + }; } }; function createBaseCapabilityOwners(): CapabilityOwners { @@ -184,6 +238,7 @@ function createBaseCapabilityOwners(): CapabilityOwners { }; } export const CapabilityOwners = { + typeUrl: "/capability.v1.CapabilityOwners", encode(message: CapabilityOwners, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.owners) { Owner.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -244,5 +299,34 @@ export const CapabilityOwners = { obj.owners = []; } return obj; + }, + fromAmino(object: CapabilityOwnersAmino): CapabilityOwners { + return { + owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => Owner.fromAmino(e)) : [] + }; + }, + toAmino(message: CapabilityOwners): CapabilityOwnersAmino { + const obj: any = {}; + if (message.owners) { + obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); + } else { + obj.owners = []; + } + return obj; + }, + fromAminoMsg(object: CapabilityOwnersAminoMsg): CapabilityOwners { + return CapabilityOwners.fromAmino(object.value); + }, + fromProtoMsg(message: CapabilityOwnersProtoMsg): CapabilityOwners { + return CapabilityOwners.decode(message.value); + }, + toProto(message: CapabilityOwners): Uint8Array { + return CapabilityOwners.encode(message).finish(); + }, + toProtoMsg(message: CapabilityOwners): CapabilityOwnersProtoMsg { + return { + typeUrl: "/capability.v1.CapabilityOwners", + value: CapabilityOwners.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts index c51b3d57e2..f5c04637cd 100644 --- a/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/capability/v1/genesis.ts @@ -36,6 +36,7 @@ function createBaseGenesisOwners(): GenesisOwners { }; } export const GenesisOwners = { + typeUrl: "/capability.v1.GenesisOwners", encode(message: GenesisOwners, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); @@ -100,6 +101,33 @@ export const GenesisOwners = { obj.index = message.index; message.indexOwners !== undefined && (obj.index_owners = message.indexOwners ? CapabilityOwners.toSDK(message.indexOwners) : undefined); return obj; + }, + fromAmino(object: GenesisOwnersAmino): GenesisOwners { + return { + index: BigInt(object.index), + indexOwners: object?.index_owners ? CapabilityOwners.fromAmino(object.index_owners) : undefined + }; + }, + toAmino(message: GenesisOwners): GenesisOwnersAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisOwnersAminoMsg): GenesisOwners { + return GenesisOwners.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisOwnersProtoMsg): GenesisOwners { + return GenesisOwners.decode(message.value); + }, + toProto(message: GenesisOwners): Uint8Array { + return GenesisOwners.encode(message).finish(); + }, + toProtoMsg(message: GenesisOwners): GenesisOwnersProtoMsg { + return { + typeUrl: "/capability.v1.GenesisOwners", + value: GenesisOwners.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -109,6 +137,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/capability.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); @@ -181,5 +210,36 @@ export const GenesisState = { obj.owners = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + index: BigInt(object.index), + owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => GenesisOwners.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + if (message.owners) { + obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); + } else { + obj.owners = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/capability.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/confio/proofs.ts b/__fixtures__/v-next/outputosmojs/confio/proofs.ts index 3e71846403..aaf20156aa 100644 --- a/__fixtures__/v-next/outputosmojs/confio/proofs.ts +++ b/__fixtures__/v-next/outputosmojs/confio/proofs.ts @@ -483,6 +483,7 @@ function createBaseExistenceProof(): ExistenceProof { }; } export const ExistenceProof = { + typeUrl: "/ics23.ExistenceProof", encode(message: ExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -579,6 +580,41 @@ export const ExistenceProof = { obj.path = []; } return obj; + }, + fromAmino(object: ExistenceProofAmino): ExistenceProof { + return { + key: object.key, + value: object.value, + leaf: object?.leaf ? LeafOp.fromAmino(object.leaf) : undefined, + path: Array.isArray(object?.path) ? object.path.map((e: any) => InnerOp.fromAmino(e)) : [] + }; + }, + toAmino(message: ExistenceProof): ExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + obj.leaf = message.leaf ? LeafOp.toAmino(message.leaf) : undefined; + if (message.path) { + obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); + } else { + obj.path = []; + } + return obj; + }, + fromAminoMsg(object: ExistenceProofAminoMsg): ExistenceProof { + return ExistenceProof.fromAmino(object.value); + }, + fromProtoMsg(message: ExistenceProofProtoMsg): ExistenceProof { + return ExistenceProof.decode(message.value); + }, + toProto(message: ExistenceProof): Uint8Array { + return ExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: ExistenceProof): ExistenceProofProtoMsg { + return { + typeUrl: "/ics23.ExistenceProof", + value: ExistenceProof.encode(message).finish() + }; } }; function createBaseNonExistenceProof(): NonExistenceProof { @@ -589,6 +625,7 @@ function createBaseNonExistenceProof(): NonExistenceProof { }; } export const NonExistenceProof = { + typeUrl: "/ics23.NonExistenceProof", encode(message: NonExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -665,6 +702,35 @@ export const NonExistenceProof = { message.left !== undefined && (obj.left = message.left ? ExistenceProof.toSDK(message.left) : undefined); message.right !== undefined && (obj.right = message.right ? ExistenceProof.toSDK(message.right) : undefined); return obj; + }, + fromAmino(object: NonExistenceProofAmino): NonExistenceProof { + return { + key: object.key, + left: object?.left ? ExistenceProof.fromAmino(object.left) : undefined, + right: object?.right ? ExistenceProof.fromAmino(object.right) : undefined + }; + }, + toAmino(message: NonExistenceProof): NonExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.left = message.left ? ExistenceProof.toAmino(message.left) : undefined; + obj.right = message.right ? ExistenceProof.toAmino(message.right) : undefined; + return obj; + }, + fromAminoMsg(object: NonExistenceProofAminoMsg): NonExistenceProof { + return NonExistenceProof.fromAmino(object.value); + }, + fromProtoMsg(message: NonExistenceProofProtoMsg): NonExistenceProof { + return NonExistenceProof.decode(message.value); + }, + toProto(message: NonExistenceProof): Uint8Array { + return NonExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: NonExistenceProof): NonExistenceProofProtoMsg { + return { + typeUrl: "/ics23.NonExistenceProof", + value: NonExistenceProof.encode(message).finish() + }; } }; function createBaseCommitmentProof(): CommitmentProof { @@ -676,6 +742,7 @@ function createBaseCommitmentProof(): CommitmentProof { }; } export const CommitmentProof = { + typeUrl: "/ics23.CommitmentProof", encode(message: CommitmentProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); @@ -764,6 +831,37 @@ export const CommitmentProof = { message.batch !== undefined && (obj.batch = message.batch ? BatchProof.toSDK(message.batch) : undefined); message.compressed !== undefined && (obj.compressed = message.compressed ? CompressedBatchProof.toSDK(message.compressed) : undefined); return obj; + }, + fromAmino(object: CommitmentProofAmino): CommitmentProof { + return { + exist: object?.exist ? ExistenceProof.fromAmino(object.exist) : undefined, + nonexist: object?.nonexist ? NonExistenceProof.fromAmino(object.nonexist) : undefined, + batch: object?.batch ? BatchProof.fromAmino(object.batch) : undefined, + compressed: object?.compressed ? CompressedBatchProof.fromAmino(object.compressed) : undefined + }; + }, + toAmino(message: CommitmentProof): CommitmentProofAmino { + const obj: any = {}; + obj.exist = message.exist ? ExistenceProof.toAmino(message.exist) : undefined; + obj.nonexist = message.nonexist ? NonExistenceProof.toAmino(message.nonexist) : undefined; + obj.batch = message.batch ? BatchProof.toAmino(message.batch) : undefined; + obj.compressed = message.compressed ? CompressedBatchProof.toAmino(message.compressed) : undefined; + return obj; + }, + fromAminoMsg(object: CommitmentProofAminoMsg): CommitmentProof { + return CommitmentProof.fromAmino(object.value); + }, + fromProtoMsg(message: CommitmentProofProtoMsg): CommitmentProof { + return CommitmentProof.decode(message.value); + }, + toProto(message: CommitmentProof): Uint8Array { + return CommitmentProof.encode(message).finish(); + }, + toProtoMsg(message: CommitmentProof): CommitmentProofProtoMsg { + return { + typeUrl: "/ics23.CommitmentProof", + value: CommitmentProof.encode(message).finish() + }; } }; function createBaseLeafOp(): LeafOp { @@ -776,6 +874,7 @@ function createBaseLeafOp(): LeafOp { }; } export const LeafOp = { + typeUrl: "/ics23.LeafOp", encode(message: LeafOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== 0) { writer.uint32(8).int32(message.hash); @@ -876,6 +975,39 @@ export const LeafOp = { message.length !== undefined && (obj.length = lengthOpToJSON(message.length)); obj.prefix = message.prefix; return obj; + }, + fromAmino(object: LeafOpAmino): LeafOp { + return { + hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1, + prehashKey: isSet(object.prehash_key) ? hashOpFromJSON(object.prehash_key) : -1, + prehashValue: isSet(object.prehash_value) ? hashOpFromJSON(object.prehash_value) : -1, + length: isSet(object.length) ? lengthOpFromJSON(object.length) : -1, + prefix: object.prefix + }; + }, + toAmino(message: LeafOp): LeafOpAmino { + const obj: any = {}; + obj.hash = message.hash; + obj.prehash_key = message.prehashKey; + obj.prehash_value = message.prehashValue; + obj.length = message.length; + obj.prefix = message.prefix; + return obj; + }, + fromAminoMsg(object: LeafOpAminoMsg): LeafOp { + return LeafOp.fromAmino(object.value); + }, + fromProtoMsg(message: LeafOpProtoMsg): LeafOp { + return LeafOp.decode(message.value); + }, + toProto(message: LeafOp): Uint8Array { + return LeafOp.encode(message).finish(); + }, + toProtoMsg(message: LeafOp): LeafOpProtoMsg { + return { + typeUrl: "/ics23.LeafOp", + value: LeafOp.encode(message).finish() + }; } }; function createBaseInnerOp(): InnerOp { @@ -886,6 +1018,7 @@ function createBaseInnerOp(): InnerOp { }; } export const InnerOp = { + typeUrl: "/ics23.InnerOp", encode(message: InnerOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== 0) { writer.uint32(8).int32(message.hash); @@ -962,6 +1095,35 @@ export const InnerOp = { obj.prefix = message.prefix; obj.suffix = message.suffix; return obj; + }, + fromAmino(object: InnerOpAmino): InnerOp { + return { + hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1, + prefix: object.prefix, + suffix: object.suffix + }; + }, + toAmino(message: InnerOp): InnerOpAmino { + const obj: any = {}; + obj.hash = message.hash; + obj.prefix = message.prefix; + obj.suffix = message.suffix; + return obj; + }, + fromAminoMsg(object: InnerOpAminoMsg): InnerOp { + return InnerOp.fromAmino(object.value); + }, + fromProtoMsg(message: InnerOpProtoMsg): InnerOp { + return InnerOp.decode(message.value); + }, + toProto(message: InnerOp): Uint8Array { + return InnerOp.encode(message).finish(); + }, + toProtoMsg(message: InnerOp): InnerOpProtoMsg { + return { + typeUrl: "/ics23.InnerOp", + value: InnerOp.encode(message).finish() + }; } }; function createBaseProofSpec(): ProofSpec { @@ -973,6 +1135,7 @@ function createBaseProofSpec(): ProofSpec { }; } export const ProofSpec = { + typeUrl: "/ics23.ProofSpec", encode(message: ProofSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leafSpec !== undefined) { LeafOp.encode(message.leafSpec, writer.uint32(10).fork()).ldelim(); @@ -1061,6 +1224,37 @@ export const ProofSpec = { obj.max_depth = message.maxDepth; obj.min_depth = message.minDepth; return obj; + }, + fromAmino(object: ProofSpecAmino): ProofSpec { + return { + leafSpec: object?.leaf_spec ? LeafOp.fromAmino(object.leaf_spec) : undefined, + innerSpec: object?.inner_spec ? InnerSpec.fromAmino(object.inner_spec) : undefined, + maxDepth: object.max_depth, + minDepth: object.min_depth + }; + }, + toAmino(message: ProofSpec): ProofSpecAmino { + const obj: any = {}; + obj.leaf_spec = message.leafSpec ? LeafOp.toAmino(message.leafSpec) : undefined; + obj.inner_spec = message.innerSpec ? InnerSpec.toAmino(message.innerSpec) : undefined; + obj.max_depth = message.maxDepth; + obj.min_depth = message.minDepth; + return obj; + }, + fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { + return ProofSpec.fromAmino(object.value); + }, + fromProtoMsg(message: ProofSpecProtoMsg): ProofSpec { + return ProofSpec.decode(message.value); + }, + toProto(message: ProofSpec): Uint8Array { + return ProofSpec.encode(message).finish(); + }, + toProtoMsg(message: ProofSpec): ProofSpecProtoMsg { + return { + typeUrl: "/ics23.ProofSpec", + value: ProofSpec.encode(message).finish() + }; } }; function createBaseInnerSpec(): InnerSpec { @@ -1074,6 +1268,7 @@ function createBaseInnerSpec(): InnerSpec { }; } export const InnerSpec = { + typeUrl: "/ics23.InnerSpec", encode(message: InnerSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.childOrder) { @@ -1203,6 +1398,45 @@ export const InnerSpec = { obj.empty_child = message.emptyChild; message.hash !== undefined && (obj.hash = hashOpToJSON(message.hash)); return obj; + }, + fromAmino(object: InnerSpecAmino): InnerSpec { + return { + childOrder: Array.isArray(object?.child_order) ? object.child_order.map((e: any) => e) : [], + childSize: object.child_size, + minPrefixLength: object.min_prefix_length, + maxPrefixLength: object.max_prefix_length, + emptyChild: object.empty_child, + hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1 + }; + }, + toAmino(message: InnerSpec): InnerSpecAmino { + const obj: any = {}; + if (message.childOrder) { + obj.child_order = message.childOrder.map(e => e); + } else { + obj.child_order = []; + } + obj.child_size = message.childSize; + obj.min_prefix_length = message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength; + obj.empty_child = message.emptyChild; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { + return InnerSpec.fromAmino(object.value); + }, + fromProtoMsg(message: InnerSpecProtoMsg): InnerSpec { + return InnerSpec.decode(message.value); + }, + toProto(message: InnerSpec): Uint8Array { + return InnerSpec.encode(message).finish(); + }, + toProtoMsg(message: InnerSpec): InnerSpecProtoMsg { + return { + typeUrl: "/ics23.InnerSpec", + value: InnerSpec.encode(message).finish() + }; } }; function createBaseBatchProof(): BatchProof { @@ -1211,6 +1445,7 @@ function createBaseBatchProof(): BatchProof { }; } export const BatchProof = { + typeUrl: "/ics23.BatchProof", encode(message: BatchProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { BatchEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1271,6 +1506,35 @@ export const BatchProof = { obj.entries = []; } return obj; + }, + fromAmino(object: BatchProofAmino): BatchProof { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => BatchEntry.fromAmino(e)) : [] + }; + }, + toAmino(message: BatchProof): BatchProofAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: BatchProofAminoMsg): BatchProof { + return BatchProof.fromAmino(object.value); + }, + fromProtoMsg(message: BatchProofProtoMsg): BatchProof { + return BatchProof.decode(message.value); + }, + toProto(message: BatchProof): Uint8Array { + return BatchProof.encode(message).finish(); + }, + toProtoMsg(message: BatchProof): BatchProofProtoMsg { + return { + typeUrl: "/ics23.BatchProof", + value: BatchProof.encode(message).finish() + }; } }; function createBaseBatchEntry(): BatchEntry { @@ -1280,6 +1544,7 @@ function createBaseBatchEntry(): BatchEntry { }; } export const BatchEntry = { + typeUrl: "/ics23.BatchEntry", encode(message: BatchEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); @@ -1344,6 +1609,33 @@ export const BatchEntry = { message.exist !== undefined && (obj.exist = message.exist ? ExistenceProof.toSDK(message.exist) : undefined); message.nonexist !== undefined && (obj.nonexist = message.nonexist ? NonExistenceProof.toSDK(message.nonexist) : undefined); return obj; + }, + fromAmino(object: BatchEntryAmino): BatchEntry { + return { + exist: object?.exist ? ExistenceProof.fromAmino(object.exist) : undefined, + nonexist: object?.nonexist ? NonExistenceProof.fromAmino(object.nonexist) : undefined + }; + }, + toAmino(message: BatchEntry): BatchEntryAmino { + const obj: any = {}; + obj.exist = message.exist ? ExistenceProof.toAmino(message.exist) : undefined; + obj.nonexist = message.nonexist ? NonExistenceProof.toAmino(message.nonexist) : undefined; + return obj; + }, + fromAminoMsg(object: BatchEntryAminoMsg): BatchEntry { + return BatchEntry.fromAmino(object.value); + }, + fromProtoMsg(message: BatchEntryProtoMsg): BatchEntry { + return BatchEntry.decode(message.value); + }, + toProto(message: BatchEntry): Uint8Array { + return BatchEntry.encode(message).finish(); + }, + toProtoMsg(message: BatchEntry): BatchEntryProtoMsg { + return { + typeUrl: "/ics23.BatchEntry", + value: BatchEntry.encode(message).finish() + }; } }; function createBaseCompressedBatchProof(): CompressedBatchProof { @@ -1353,6 +1645,7 @@ function createBaseCompressedBatchProof(): CompressedBatchProof { }; } export const CompressedBatchProof = { + typeUrl: "/ics23.CompressedBatchProof", encode(message: CompressedBatchProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { CompressedBatchEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1433,6 +1726,41 @@ export const CompressedBatchProof = { obj.lookup_inners = []; } return obj; + }, + fromAmino(object: CompressedBatchProofAmino): CompressedBatchProof { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => CompressedBatchEntry.fromAmino(e)) : [], + lookupInners: Array.isArray(object?.lookup_inners) ? object.lookup_inners.map((e: any) => InnerOp.fromAmino(e)) : [] + }; + }, + toAmino(message: CompressedBatchProof): CompressedBatchProofAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + if (message.lookupInners) { + obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); + } else { + obj.lookup_inners = []; + } + return obj; + }, + fromAminoMsg(object: CompressedBatchProofAminoMsg): CompressedBatchProof { + return CompressedBatchProof.fromAmino(object.value); + }, + fromProtoMsg(message: CompressedBatchProofProtoMsg): CompressedBatchProof { + return CompressedBatchProof.decode(message.value); + }, + toProto(message: CompressedBatchProof): Uint8Array { + return CompressedBatchProof.encode(message).finish(); + }, + toProtoMsg(message: CompressedBatchProof): CompressedBatchProofProtoMsg { + return { + typeUrl: "/ics23.CompressedBatchProof", + value: CompressedBatchProof.encode(message).finish() + }; } }; function createBaseCompressedBatchEntry(): CompressedBatchEntry { @@ -1442,6 +1770,7 @@ function createBaseCompressedBatchEntry(): CompressedBatchEntry { }; } export const CompressedBatchEntry = { + typeUrl: "/ics23.CompressedBatchEntry", encode(message: CompressedBatchEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { CompressedExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); @@ -1506,6 +1835,33 @@ export const CompressedBatchEntry = { message.exist !== undefined && (obj.exist = message.exist ? CompressedExistenceProof.toSDK(message.exist) : undefined); message.nonexist !== undefined && (obj.nonexist = message.nonexist ? CompressedNonExistenceProof.toSDK(message.nonexist) : undefined); return obj; + }, + fromAmino(object: CompressedBatchEntryAmino): CompressedBatchEntry { + return { + exist: object?.exist ? CompressedExistenceProof.fromAmino(object.exist) : undefined, + nonexist: object?.nonexist ? CompressedNonExistenceProof.fromAmino(object.nonexist) : undefined + }; + }, + toAmino(message: CompressedBatchEntry): CompressedBatchEntryAmino { + const obj: any = {}; + obj.exist = message.exist ? CompressedExistenceProof.toAmino(message.exist) : undefined; + obj.nonexist = message.nonexist ? CompressedNonExistenceProof.toAmino(message.nonexist) : undefined; + return obj; + }, + fromAminoMsg(object: CompressedBatchEntryAminoMsg): CompressedBatchEntry { + return CompressedBatchEntry.fromAmino(object.value); + }, + fromProtoMsg(message: CompressedBatchEntryProtoMsg): CompressedBatchEntry { + return CompressedBatchEntry.decode(message.value); + }, + toProto(message: CompressedBatchEntry): Uint8Array { + return CompressedBatchEntry.encode(message).finish(); + }, + toProtoMsg(message: CompressedBatchEntry): CompressedBatchEntryProtoMsg { + return { + typeUrl: "/ics23.CompressedBatchEntry", + value: CompressedBatchEntry.encode(message).finish() + }; } }; function createBaseCompressedExistenceProof(): CompressedExistenceProof { @@ -1517,6 +1873,7 @@ function createBaseCompressedExistenceProof(): CompressedExistenceProof { }; } export const CompressedExistenceProof = { + typeUrl: "/ics23.CompressedExistenceProof", encode(message: CompressedExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -1622,6 +1979,41 @@ export const CompressedExistenceProof = { obj.path = []; } return obj; + }, + fromAmino(object: CompressedExistenceProofAmino): CompressedExistenceProof { + return { + key: object.key, + value: object.value, + leaf: object?.leaf ? LeafOp.fromAmino(object.leaf) : undefined, + path: Array.isArray(object?.path) ? object.path.map((e: any) => e) : [] + }; + }, + toAmino(message: CompressedExistenceProof): CompressedExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + obj.leaf = message.leaf ? LeafOp.toAmino(message.leaf) : undefined; + if (message.path) { + obj.path = message.path.map(e => e); + } else { + obj.path = []; + } + return obj; + }, + fromAminoMsg(object: CompressedExistenceProofAminoMsg): CompressedExistenceProof { + return CompressedExistenceProof.fromAmino(object.value); + }, + fromProtoMsg(message: CompressedExistenceProofProtoMsg): CompressedExistenceProof { + return CompressedExistenceProof.decode(message.value); + }, + toProto(message: CompressedExistenceProof): Uint8Array { + return CompressedExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: CompressedExistenceProof): CompressedExistenceProofProtoMsg { + return { + typeUrl: "/ics23.CompressedExistenceProof", + value: CompressedExistenceProof.encode(message).finish() + }; } }; function createBaseCompressedNonExistenceProof(): CompressedNonExistenceProof { @@ -1632,6 +2024,7 @@ function createBaseCompressedNonExistenceProof(): CompressedNonExistenceProof { }; } export const CompressedNonExistenceProof = { + typeUrl: "/ics23.CompressedNonExistenceProof", encode(message: CompressedNonExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -1708,5 +2101,34 @@ export const CompressedNonExistenceProof = { message.left !== undefined && (obj.left = message.left ? CompressedExistenceProof.toSDK(message.left) : undefined); message.right !== undefined && (obj.right = message.right ? CompressedExistenceProof.toSDK(message.right) : undefined); return obj; + }, + fromAmino(object: CompressedNonExistenceProofAmino): CompressedNonExistenceProof { + return { + key: object.key, + left: object?.left ? CompressedExistenceProof.fromAmino(object.left) : undefined, + right: object?.right ? CompressedExistenceProof.fromAmino(object.right) : undefined + }; + }, + toAmino(message: CompressedNonExistenceProof): CompressedNonExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.left = message.left ? CompressedExistenceProof.toAmino(message.left) : undefined; + obj.right = message.right ? CompressedExistenceProof.toAmino(message.right) : undefined; + return obj; + }, + fromAminoMsg(object: CompressedNonExistenceProofAminoMsg): CompressedNonExistenceProof { + return CompressedNonExistenceProof.fromAmino(object.value); + }, + fromProtoMsg(message: CompressedNonExistenceProofProtoMsg): CompressedNonExistenceProof { + return CompressedNonExistenceProof.decode(message.value); + }, + toProto(message: CompressedNonExistenceProof): Uint8Array { + return CompressedNonExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: CompressedNonExistenceProof): CompressedNonExistenceProofProtoMsg { + return { + typeUrl: "/ics23.CompressedNonExistenceProof", + value: CompressedNonExistenceProof.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts index f90d3cb643..66d5472589 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/config.ts @@ -59,6 +59,7 @@ function createBaseConfig(): Config { }; } export const Config = { + typeUrl: "/cosmos.app.v1alpha1.Config", encode(message: Config, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.modules) { ModuleConfig.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -119,6 +120,41 @@ export const Config = { obj.modules = []; } return obj; + }, + fromAmino(object: ConfigAmino): Config { + return { + modules: Array.isArray(object?.modules) ? object.modules.map((e: any) => ModuleConfig.fromAmino(e)) : [] + }; + }, + toAmino(message: Config): ConfigAmino { + const obj: any = {}; + if (message.modules) { + obj.modules = message.modules.map(e => e ? ModuleConfig.toAmino(e) : undefined); + } else { + obj.modules = []; + } + return obj; + }, + fromAminoMsg(object: ConfigAminoMsg): Config { + return Config.fromAmino(object.value); + }, + toAminoMsg(message: Config): ConfigAminoMsg { + return { + type: "cosmos-sdk/Config", + value: Config.toAmino(message) + }; + }, + fromProtoMsg(message: ConfigProtoMsg): Config { + return Config.decode(message.value); + }, + toProto(message: Config): Uint8Array { + return Config.encode(message).finish(); + }, + toProtoMsg(message: Config): ConfigProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.Config", + value: Config.encode(message).finish() + }; } }; function createBaseModuleConfig(): ModuleConfig { @@ -128,6 +164,7 @@ function createBaseModuleConfig(): ModuleConfig { }; } export const ModuleConfig = { + typeUrl: "/cosmos.app.v1alpha1.ModuleConfig", encode(message: ModuleConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -192,5 +229,38 @@ export const ModuleConfig = { obj.name = message.name; message.config !== undefined && (obj.config = message.config ? Any.toSDK(message.config) : undefined); return obj; + }, + fromAmino(object: ModuleConfigAmino): ModuleConfig { + return { + name: object.name, + config: object?.config ? Any.fromAmino(object.config) : undefined + }; + }, + toAmino(message: ModuleConfig): ModuleConfigAmino { + const obj: any = {}; + obj.name = message.name; + obj.config = message.config ? Any.toAmino(message.config) : undefined; + return obj; + }, + fromAminoMsg(object: ModuleConfigAminoMsg): ModuleConfig { + return ModuleConfig.fromAmino(object.value); + }, + toAminoMsg(message: ModuleConfig): ModuleConfigAminoMsg { + return { + type: "cosmos-sdk/ModuleConfig", + value: ModuleConfig.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleConfigProtoMsg): ModuleConfig { + return ModuleConfig.decode(message.value); + }, + toProto(message: ModuleConfig): Uint8Array { + return ModuleConfig.encode(message).finish(); + }, + toProtoMsg(message: ModuleConfig): ModuleConfigProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.ModuleConfig", + value: ModuleConfig.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts index 9209a16928..76b4830a64 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/module.ts @@ -109,6 +109,7 @@ function createBaseModuleDescriptor(): ModuleDescriptor { }; } export const ModuleDescriptor = { + typeUrl: "/cosmos.app.v1alpha1.ModuleDescriptor", encode(message: ModuleDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.goImport !== "") { writer.uint32(10).string(message.goImport); @@ -201,6 +202,49 @@ export const ModuleDescriptor = { obj.can_migrate_from = []; } return obj; + }, + fromAmino(object: ModuleDescriptorAmino): ModuleDescriptor { + return { + goImport: object.go_import, + usePackage: Array.isArray(object?.use_package) ? object.use_package.map((e: any) => PackageReference.fromAmino(e)) : [], + canMigrateFrom: Array.isArray(object?.can_migrate_from) ? object.can_migrate_from.map((e: any) => MigrateFromInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: ModuleDescriptor): ModuleDescriptorAmino { + const obj: any = {}; + obj.go_import = message.goImport; + if (message.usePackage) { + obj.use_package = message.usePackage.map(e => e ? PackageReference.toAmino(e) : undefined); + } else { + obj.use_package = []; + } + if (message.canMigrateFrom) { + obj.can_migrate_from = message.canMigrateFrom.map(e => e ? MigrateFromInfo.toAmino(e) : undefined); + } else { + obj.can_migrate_from = []; + } + return obj; + }, + fromAminoMsg(object: ModuleDescriptorAminoMsg): ModuleDescriptor { + return ModuleDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: ModuleDescriptor): ModuleDescriptorAminoMsg { + return { + type: "cosmos-sdk/ModuleDescriptor", + value: ModuleDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleDescriptorProtoMsg): ModuleDescriptor { + return ModuleDescriptor.decode(message.value); + }, + toProto(message: ModuleDescriptor): Uint8Array { + return ModuleDescriptor.encode(message).finish(); + }, + toProtoMsg(message: ModuleDescriptor): ModuleDescriptorProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.ModuleDescriptor", + value: ModuleDescriptor.encode(message).finish() + }; } }; function createBasePackageReference(): PackageReference { @@ -210,6 +254,7 @@ function createBasePackageReference(): PackageReference { }; } export const PackageReference = { + typeUrl: "/cosmos.app.v1alpha1.PackageReference", encode(message: PackageReference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -274,6 +319,39 @@ export const PackageReference = { obj.name = message.name; obj.revision = message.revision; return obj; + }, + fromAmino(object: PackageReferenceAmino): PackageReference { + return { + name: object.name, + revision: object.revision + }; + }, + toAmino(message: PackageReference): PackageReferenceAmino { + const obj: any = {}; + obj.name = message.name; + obj.revision = message.revision; + return obj; + }, + fromAminoMsg(object: PackageReferenceAminoMsg): PackageReference { + return PackageReference.fromAmino(object.value); + }, + toAminoMsg(message: PackageReference): PackageReferenceAminoMsg { + return { + type: "cosmos-sdk/PackageReference", + value: PackageReference.toAmino(message) + }; + }, + fromProtoMsg(message: PackageReferenceProtoMsg): PackageReference { + return PackageReference.decode(message.value); + }, + toProto(message: PackageReference): Uint8Array { + return PackageReference.encode(message).finish(); + }, + toProtoMsg(message: PackageReference): PackageReferenceProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.PackageReference", + value: PackageReference.encode(message).finish() + }; } }; function createBaseMigrateFromInfo(): MigrateFromInfo { @@ -282,6 +360,7 @@ function createBaseMigrateFromInfo(): MigrateFromInfo { }; } export const MigrateFromInfo = { + typeUrl: "/cosmos.app.v1alpha1.MigrateFromInfo", encode(message: MigrateFromInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.module !== "") { writer.uint32(10).string(message.module); @@ -334,5 +413,36 @@ export const MigrateFromInfo = { const obj: any = {}; obj.module = message.module; return obj; + }, + fromAmino(object: MigrateFromInfoAmino): MigrateFromInfo { + return { + module: object.module + }; + }, + toAmino(message: MigrateFromInfo): MigrateFromInfoAmino { + const obj: any = {}; + obj.module = message.module; + return obj; + }, + fromAminoMsg(object: MigrateFromInfoAminoMsg): MigrateFromInfo { + return MigrateFromInfo.fromAmino(object.value); + }, + toAminoMsg(message: MigrateFromInfo): MigrateFromInfoAminoMsg { + return { + type: "cosmos-sdk/MigrateFromInfo", + value: MigrateFromInfo.toAmino(message) + }; + }, + fromProtoMsg(message: MigrateFromInfoProtoMsg): MigrateFromInfo { + return MigrateFromInfo.decode(message.value); + }, + toProto(message: MigrateFromInfo): Uint8Array { + return MigrateFromInfo.encode(message).finish(); + }, + toProtoMsg(message: MigrateFromInfo): MigrateFromInfoProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.MigrateFromInfo", + value: MigrateFromInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/query.ts index 688589a530..d84d4d6fe4 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/app/v1alpha1/query.ts @@ -19,6 +19,7 @@ function createBaseQueryConfigRequest(): QueryConfigRequest { return {}; } export const QueryConfigRequest = { + typeUrl: "/cosmos.app.v1alpha1.QueryConfigRequest", encode(_: QueryConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -56,6 +57,34 @@ export const QueryConfigRequest = { toSDK(_: QueryConfigRequest): QueryConfigRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryConfigRequestAmino): QueryConfigRequest { + return {}; + }, + toAmino(_: QueryConfigRequest): QueryConfigRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryConfigRequestAminoMsg): QueryConfigRequest { + return QueryConfigRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConfigRequest): QueryConfigRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConfigRequest", + value: QueryConfigRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConfigRequestProtoMsg): QueryConfigRequest { + return QueryConfigRequest.decode(message.value); + }, + toProto(message: QueryConfigRequest): Uint8Array { + return QueryConfigRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConfigRequest): QueryConfigRequestProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.QueryConfigRequest", + value: QueryConfigRequest.encode(message).finish() + }; } }; function createBaseQueryConfigResponse(): QueryConfigResponse { @@ -64,6 +93,7 @@ function createBaseQueryConfigResponse(): QueryConfigResponse { }; } export const QueryConfigResponse = { + typeUrl: "/cosmos.app.v1alpha1.QueryConfigResponse", encode(message: QueryConfigResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.config !== undefined) { Config.encode(message.config, writer.uint32(10).fork()).ldelim(); @@ -116,5 +146,36 @@ export const QueryConfigResponse = { const obj: any = {}; message.config !== undefined && (obj.config = message.config ? Config.toSDK(message.config) : undefined); return obj; + }, + fromAmino(object: QueryConfigResponseAmino): QueryConfigResponse { + return { + config: object?.config ? Config.fromAmino(object.config) : undefined + }; + }, + toAmino(message: QueryConfigResponse): QueryConfigResponseAmino { + const obj: any = {}; + obj.config = message.config ? Config.toAmino(message.config) : undefined; + return obj; + }, + fromAminoMsg(object: QueryConfigResponseAminoMsg): QueryConfigResponse { + return QueryConfigResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConfigResponse): QueryConfigResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConfigResponse", + value: QueryConfigResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConfigResponseProtoMsg): QueryConfigResponse { + return QueryConfigResponse.decode(message.value); + }, + toProto(message: QueryConfigResponse): Uint8Array { + return QueryConfigResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConfigResponse): QueryConfigResponseProtoMsg { + return { + typeUrl: "/cosmos.app.v1alpha1.QueryConfigResponse", + value: QueryConfigResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts index d19bae3696..5ee167e06f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/auth.ts @@ -61,6 +61,7 @@ function createBaseBaseAccount(): BaseAccount { }; } export const BaseAccount = { + typeUrl: "/cosmos.auth.v1beta1.BaseAccount", encode(message: BaseAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -149,6 +150,43 @@ export const BaseAccount = { obj.account_number = message.accountNumber; obj.sequence = message.sequence; return obj; + }, + fromAmino(object: BaseAccountAmino): BaseAccount { + return { + address: object.address, + pubKey: object?.pub_key ? Any.fromAmino(object.pub_key) : undefined, + accountNumber: BigInt(object.account_number), + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: BaseAccount): BaseAccountAmino { + const obj: any = {}; + obj.address = message.address; + obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey) : undefined; + obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BaseAccountAminoMsg): BaseAccount { + return BaseAccount.fromAmino(object.value); + }, + toAminoMsg(message: BaseAccount): BaseAccountAminoMsg { + return { + type: "cosmos-sdk/BaseAccount", + value: BaseAccount.toAmino(message) + }; + }, + fromProtoMsg(message: BaseAccountProtoMsg): BaseAccount { + return BaseAccount.decode(message.value); + }, + toProto(message: BaseAccount): Uint8Array { + return BaseAccount.encode(message).finish(); + }, + toProtoMsg(message: BaseAccount): BaseAccountProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.BaseAccount", + value: BaseAccount.encode(message).finish() + }; } }; function createBaseModuleAccount(): ModuleAccount { @@ -159,6 +197,7 @@ function createBaseModuleAccount(): ModuleAccount { }; } export const ModuleAccount = { + typeUrl: "/cosmos.auth.v1beta1.ModuleAccount", encode(message: ModuleAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseAccount !== undefined) { BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim(); @@ -243,6 +282,45 @@ export const ModuleAccount = { obj.permissions = []; } return obj; + }, + fromAmino(object: ModuleAccountAmino): ModuleAccount { + return { + baseAccount: object?.base_account ? BaseAccount.fromAmino(object.base_account) : undefined, + name: object.name, + permissions: Array.isArray(object?.permissions) ? object.permissions.map((e: any) => e) : [] + }; + }, + toAmino(message: ModuleAccount): ModuleAccountAmino { + const obj: any = {}; + obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; + obj.name = message.name; + if (message.permissions) { + obj.permissions = message.permissions.map(e => e); + } else { + obj.permissions = []; + } + return obj; + }, + fromAminoMsg(object: ModuleAccountAminoMsg): ModuleAccount { + return ModuleAccount.fromAmino(object.value); + }, + toAminoMsg(message: ModuleAccount): ModuleAccountAminoMsg { + return { + type: "cosmos-sdk/ModuleAccount", + value: ModuleAccount.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleAccountProtoMsg): ModuleAccount { + return ModuleAccount.decode(message.value); + }, + toProto(message: ModuleAccount): Uint8Array { + return ModuleAccount.encode(message).finish(); + }, + toProtoMsg(message: ModuleAccount): ModuleAccountProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.ModuleAccount", + value: ModuleAccount.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -255,6 +333,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmos.auth.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxMemoCharacters !== BigInt(0)) { writer.uint32(8).uint64(message.maxMemoCharacters); @@ -355,5 +434,44 @@ export const Params = { obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519; obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + maxMemoCharacters: BigInt(object.max_memo_characters), + txSigLimit: BigInt(object.tx_sig_limit), + txSizeCostPerByte: BigInt(object.tx_size_cost_per_byte), + sigVerifyCostEd25519: BigInt(object.sig_verify_cost_ed25519), + sigVerifyCostSecp256k1: BigInt(object.sig_verify_cost_secp256k1) + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.max_memo_characters = message.maxMemoCharacters ? message.maxMemoCharacters.toString() : undefined; + obj.tx_sig_limit = message.txSigLimit ? message.txSigLimit.toString() : undefined; + obj.tx_size_cost_per_byte = message.txSizeCostPerByte ? message.txSizeCostPerByte.toString() : undefined; + obj.sig_verify_cost_ed25519 = message.sigVerifyCostEd25519 ? message.sigVerifyCostEd25519.toString() : undefined; + obj.sig_verify_cost_secp256k1 = message.sigVerifyCostSecp256k1 ? message.sigVerifyCostSecp256k1.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts index 805eb4d138..e83b43c6a3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/genesis.ts @@ -22,6 +22,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.auth.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -94,5 +95,42 @@ export const GenesisState = { obj.accounts = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts index 1df8f70d05..9bbadac797 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/auth/v1beta1/query.ts @@ -134,6 +134,7 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest { }; } export const QueryAccountsRequest = { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountsRequest", encode(message: QueryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -186,6 +187,37 @@ export const QueryAccountsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAccountsRequestAmino): QueryAccountsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAccountsRequest): QueryAccountsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountsRequestAminoMsg): QueryAccountsRequest { + return QueryAccountsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountsRequest): QueryAccountsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAccountsRequest", + value: QueryAccountsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountsRequestProtoMsg): QueryAccountsRequest { + return QueryAccountsRequest.decode(message.value); + }, + toProto(message: QueryAccountsRequest): Uint8Array { + return QueryAccountsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountsRequest): QueryAccountsRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountsRequest", + value: QueryAccountsRequest.encode(message).finish() + }; } }; function createBaseQueryAccountsResponse(): QueryAccountsResponse { @@ -195,6 +227,7 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse { }; } export const QueryAccountsResponse = { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse", encode(message: QueryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -267,6 +300,43 @@ export const QueryAccountsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAccountsResponseAmino): QueryAccountsResponse { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Any.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAccountsResponse): QueryAccountsResponseAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountsResponseAminoMsg): QueryAccountsResponse { + return QueryAccountsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountsResponse): QueryAccountsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAccountsResponse", + value: QueryAccountsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountsResponseProtoMsg): QueryAccountsResponse { + return QueryAccountsResponse.decode(message.value); + }, + toProto(message: QueryAccountsResponse): Uint8Array { + return QueryAccountsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountsResponse): QueryAccountsResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse", + value: QueryAccountsResponse.encode(message).finish() + }; } }; function createBaseQueryAccountRequest(): QueryAccountRequest { @@ -275,6 +345,7 @@ function createBaseQueryAccountRequest(): QueryAccountRequest { }; } export const QueryAccountRequest = { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountRequest", encode(message: QueryAccountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -327,12 +398,44 @@ export const QueryAccountRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryAccountRequestAmino): QueryAccountRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryAccountRequest): QueryAccountRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryAccountRequestAminoMsg): QueryAccountRequest { + return QueryAccountRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountRequest): QueryAccountRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAccountRequest", + value: QueryAccountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountRequestProtoMsg): QueryAccountRequest { + return QueryAccountRequest.decode(message.value); + }, + toProto(message: QueryAccountRequest): Uint8Array { + return QueryAccountRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountRequest): QueryAccountRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountRequest", + value: QueryAccountRequest.encode(message).finish() + }; } }; function createBaseQueryModuleAccountsRequest(): QueryModuleAccountsRequest { return {}; } export const QueryModuleAccountsRequest = { + typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsRequest", encode(_: QueryModuleAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -370,6 +473,34 @@ export const QueryModuleAccountsRequest = { toSDK(_: QueryModuleAccountsRequest): QueryModuleAccountsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryModuleAccountsRequestAmino): QueryModuleAccountsRequest { + return {}; + }, + toAmino(_: QueryModuleAccountsRequest): QueryModuleAccountsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryModuleAccountsRequestAminoMsg): QueryModuleAccountsRequest { + return QueryModuleAccountsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryModuleAccountsRequest): QueryModuleAccountsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryModuleAccountsRequest", + value: QueryModuleAccountsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryModuleAccountsRequestProtoMsg): QueryModuleAccountsRequest { + return QueryModuleAccountsRequest.decode(message.value); + }, + toProto(message: QueryModuleAccountsRequest): Uint8Array { + return QueryModuleAccountsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryModuleAccountsRequest): QueryModuleAccountsRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsRequest", + value: QueryModuleAccountsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -378,6 +509,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.auth.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -430,6 +562,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryAccountResponse(): QueryAccountResponse { @@ -438,6 +601,7 @@ function createBaseQueryAccountResponse(): QueryAccountResponse { }; } export const QueryAccountResponse = { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse", encode(message: QueryAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.account !== undefined) { Any.encode(message.account, writer.uint32(10).fork()).ldelim(); @@ -490,12 +654,44 @@ export const QueryAccountResponse = { const obj: any = {}; message.account !== undefined && (obj.account = message.account ? Any.toSDK(message.account) : undefined); return obj; + }, + fromAmino(object: QueryAccountResponseAmino): QueryAccountResponse { + return { + account: object?.account ? Any.fromAmino(object.account) : undefined + }; + }, + toAmino(message: QueryAccountResponse): QueryAccountResponseAmino { + const obj: any = {}; + obj.account = message.account ? Any.toAmino(message.account) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAccountResponseAminoMsg): QueryAccountResponse { + return QueryAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAccountResponse): QueryAccountResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAccountResponse", + value: QueryAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAccountResponseProtoMsg): QueryAccountResponse { + return QueryAccountResponse.decode(message.value); + }, + toProto(message: QueryAccountResponse): Uint8Array { + return QueryAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAccountResponse): QueryAccountResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse", + value: QueryAccountResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/cosmos.auth.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -533,6 +729,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryModuleAccountsResponse(): QueryModuleAccountsResponse { @@ -541,6 +765,7 @@ function createBaseQueryModuleAccountsResponse(): QueryModuleAccountsResponse { }; } export const QueryModuleAccountsResponse = { + typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse", encode(message: QueryModuleAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -601,12 +826,48 @@ export const QueryModuleAccountsResponse = { obj.accounts = []; } return obj; + }, + fromAmino(object: QueryModuleAccountsResponseAmino): QueryModuleAccountsResponse { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryModuleAccountsResponse): QueryModuleAccountsResponseAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + return obj; + }, + fromAminoMsg(object: QueryModuleAccountsResponseAminoMsg): QueryModuleAccountsResponse { + return QueryModuleAccountsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryModuleAccountsResponse): QueryModuleAccountsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryModuleAccountsResponse", + value: QueryModuleAccountsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryModuleAccountsResponseProtoMsg): QueryModuleAccountsResponse { + return QueryModuleAccountsResponse.decode(message.value); + }, + toProto(message: QueryModuleAccountsResponse): Uint8Array { + return QueryModuleAccountsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryModuleAccountsResponse): QueryModuleAccountsResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse", + value: QueryModuleAccountsResponse.encode(message).finish() + }; } }; function createBaseBech32PrefixRequest(): Bech32PrefixRequest { return {}; } export const Bech32PrefixRequest = { + typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixRequest", encode(_: Bech32PrefixRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -644,6 +905,34 @@ export const Bech32PrefixRequest = { toSDK(_: Bech32PrefixRequest): Bech32PrefixRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: Bech32PrefixRequestAmino): Bech32PrefixRequest { + return {}; + }, + toAmino(_: Bech32PrefixRequest): Bech32PrefixRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: Bech32PrefixRequestAminoMsg): Bech32PrefixRequest { + return Bech32PrefixRequest.fromAmino(object.value); + }, + toAminoMsg(message: Bech32PrefixRequest): Bech32PrefixRequestAminoMsg { + return { + type: "cosmos-sdk/Bech32PrefixRequest", + value: Bech32PrefixRequest.toAmino(message) + }; + }, + fromProtoMsg(message: Bech32PrefixRequestProtoMsg): Bech32PrefixRequest { + return Bech32PrefixRequest.decode(message.value); + }, + toProto(message: Bech32PrefixRequest): Uint8Array { + return Bech32PrefixRequest.encode(message).finish(); + }, + toProtoMsg(message: Bech32PrefixRequest): Bech32PrefixRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixRequest", + value: Bech32PrefixRequest.encode(message).finish() + }; } }; function createBaseBech32PrefixResponse(): Bech32PrefixResponse { @@ -652,6 +941,7 @@ function createBaseBech32PrefixResponse(): Bech32PrefixResponse { }; } export const Bech32PrefixResponse = { + typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixResponse", encode(message: Bech32PrefixResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bech32Prefix !== "") { writer.uint32(10).string(message.bech32Prefix); @@ -704,6 +994,37 @@ export const Bech32PrefixResponse = { const obj: any = {}; obj.bech32_prefix = message.bech32Prefix; return obj; + }, + fromAmino(object: Bech32PrefixResponseAmino): Bech32PrefixResponse { + return { + bech32Prefix: object.bech32_prefix + }; + }, + toAmino(message: Bech32PrefixResponse): Bech32PrefixResponseAmino { + const obj: any = {}; + obj.bech32_prefix = message.bech32Prefix; + return obj; + }, + fromAminoMsg(object: Bech32PrefixResponseAminoMsg): Bech32PrefixResponse { + return Bech32PrefixResponse.fromAmino(object.value); + }, + toAminoMsg(message: Bech32PrefixResponse): Bech32PrefixResponseAminoMsg { + return { + type: "cosmos-sdk/Bech32PrefixResponse", + value: Bech32PrefixResponse.toAmino(message) + }; + }, + fromProtoMsg(message: Bech32PrefixResponseProtoMsg): Bech32PrefixResponse { + return Bech32PrefixResponse.decode(message.value); + }, + toProto(message: Bech32PrefixResponse): Uint8Array { + return Bech32PrefixResponse.encode(message).finish(); + }, + toProtoMsg(message: Bech32PrefixResponse): Bech32PrefixResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixResponse", + value: Bech32PrefixResponse.encode(message).finish() + }; } }; function createBaseAddressBytesToStringRequest(): AddressBytesToStringRequest { @@ -712,6 +1033,7 @@ function createBaseAddressBytesToStringRequest(): AddressBytesToStringRequest { }; } export const AddressBytesToStringRequest = { + typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringRequest", encode(message: AddressBytesToStringRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressBytes.length !== 0) { writer.uint32(10).bytes(message.addressBytes); @@ -764,6 +1086,37 @@ export const AddressBytesToStringRequest = { const obj: any = {}; obj.address_bytes = message.addressBytes; return obj; + }, + fromAmino(object: AddressBytesToStringRequestAmino): AddressBytesToStringRequest { + return { + addressBytes: object.address_bytes + }; + }, + toAmino(message: AddressBytesToStringRequest): AddressBytesToStringRequestAmino { + const obj: any = {}; + obj.address_bytes = message.addressBytes; + return obj; + }, + fromAminoMsg(object: AddressBytesToStringRequestAminoMsg): AddressBytesToStringRequest { + return AddressBytesToStringRequest.fromAmino(object.value); + }, + toAminoMsg(message: AddressBytesToStringRequest): AddressBytesToStringRequestAminoMsg { + return { + type: "cosmos-sdk/AddressBytesToStringRequest", + value: AddressBytesToStringRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AddressBytesToStringRequestProtoMsg): AddressBytesToStringRequest { + return AddressBytesToStringRequest.decode(message.value); + }, + toProto(message: AddressBytesToStringRequest): Uint8Array { + return AddressBytesToStringRequest.encode(message).finish(); + }, + toProtoMsg(message: AddressBytesToStringRequest): AddressBytesToStringRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringRequest", + value: AddressBytesToStringRequest.encode(message).finish() + }; } }; function createBaseAddressBytesToStringResponse(): AddressBytesToStringResponse { @@ -772,6 +1125,7 @@ function createBaseAddressBytesToStringResponse(): AddressBytesToStringResponse }; } export const AddressBytesToStringResponse = { + typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringResponse", encode(message: AddressBytesToStringResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressString !== "") { writer.uint32(10).string(message.addressString); @@ -824,6 +1178,37 @@ export const AddressBytesToStringResponse = { const obj: any = {}; obj.address_string = message.addressString; return obj; + }, + fromAmino(object: AddressBytesToStringResponseAmino): AddressBytesToStringResponse { + return { + addressString: object.address_string + }; + }, + toAmino(message: AddressBytesToStringResponse): AddressBytesToStringResponseAmino { + const obj: any = {}; + obj.address_string = message.addressString; + return obj; + }, + fromAminoMsg(object: AddressBytesToStringResponseAminoMsg): AddressBytesToStringResponse { + return AddressBytesToStringResponse.fromAmino(object.value); + }, + toAminoMsg(message: AddressBytesToStringResponse): AddressBytesToStringResponseAminoMsg { + return { + type: "cosmos-sdk/AddressBytesToStringResponse", + value: AddressBytesToStringResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AddressBytesToStringResponseProtoMsg): AddressBytesToStringResponse { + return AddressBytesToStringResponse.decode(message.value); + }, + toProto(message: AddressBytesToStringResponse): Uint8Array { + return AddressBytesToStringResponse.encode(message).finish(); + }, + toProtoMsg(message: AddressBytesToStringResponse): AddressBytesToStringResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringResponse", + value: AddressBytesToStringResponse.encode(message).finish() + }; } }; function createBaseAddressStringToBytesRequest(): AddressStringToBytesRequest { @@ -832,6 +1217,7 @@ function createBaseAddressStringToBytesRequest(): AddressStringToBytesRequest { }; } export const AddressStringToBytesRequest = { + typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesRequest", encode(message: AddressStringToBytesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressString !== "") { writer.uint32(10).string(message.addressString); @@ -884,6 +1270,37 @@ export const AddressStringToBytesRequest = { const obj: any = {}; obj.address_string = message.addressString; return obj; + }, + fromAmino(object: AddressStringToBytesRequestAmino): AddressStringToBytesRequest { + return { + addressString: object.address_string + }; + }, + toAmino(message: AddressStringToBytesRequest): AddressStringToBytesRequestAmino { + const obj: any = {}; + obj.address_string = message.addressString; + return obj; + }, + fromAminoMsg(object: AddressStringToBytesRequestAminoMsg): AddressStringToBytesRequest { + return AddressStringToBytesRequest.fromAmino(object.value); + }, + toAminoMsg(message: AddressStringToBytesRequest): AddressStringToBytesRequestAminoMsg { + return { + type: "cosmos-sdk/AddressStringToBytesRequest", + value: AddressStringToBytesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AddressStringToBytesRequestProtoMsg): AddressStringToBytesRequest { + return AddressStringToBytesRequest.decode(message.value); + }, + toProto(message: AddressStringToBytesRequest): Uint8Array { + return AddressStringToBytesRequest.encode(message).finish(); + }, + toProtoMsg(message: AddressStringToBytesRequest): AddressStringToBytesRequestProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesRequest", + value: AddressStringToBytesRequest.encode(message).finish() + }; } }; function createBaseAddressStringToBytesResponse(): AddressStringToBytesResponse { @@ -892,6 +1309,7 @@ function createBaseAddressStringToBytesResponse(): AddressStringToBytesResponse }; } export const AddressStringToBytesResponse = { + typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesResponse", encode(message: AddressStringToBytesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressBytes.length !== 0) { writer.uint32(10).bytes(message.addressBytes); @@ -944,5 +1362,36 @@ export const AddressStringToBytesResponse = { const obj: any = {}; obj.address_bytes = message.addressBytes; return obj; + }, + fromAmino(object: AddressStringToBytesResponseAmino): AddressStringToBytesResponse { + return { + addressBytes: object.address_bytes + }; + }, + toAmino(message: AddressStringToBytesResponse): AddressStringToBytesResponseAmino { + const obj: any = {}; + obj.address_bytes = message.addressBytes; + return obj; + }, + fromAminoMsg(object: AddressStringToBytesResponseAminoMsg): AddressStringToBytesResponse { + return AddressStringToBytesResponse.fromAmino(object.value); + }, + toAminoMsg(message: AddressStringToBytesResponse): AddressStringToBytesResponseAminoMsg { + return { + type: "cosmos-sdk/AddressStringToBytesResponse", + value: AddressStringToBytesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AddressStringToBytesResponseProtoMsg): AddressStringToBytesResponse { + return AddressStringToBytesResponse.decode(message.value); + }, + toProto(message: AddressStringToBytesResponse): Uint8Array { + return AddressStringToBytesResponse.encode(message).finish(); + }, + toProtoMsg(message: AddressStringToBytesResponse): AddressStringToBytesResponseProtoMsg { + return { + typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesResponse", + value: AddressStringToBytesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts index f40facbc59..7e93265c39 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/authz.ts @@ -74,6 +74,7 @@ function createBaseGenericAuthorization(): GenericAuthorization { }; } export const GenericAuthorization = { + typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization", encode(message: GenericAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msg !== "") { writer.uint32(10).string(message.msg); @@ -126,6 +127,37 @@ export const GenericAuthorization = { const obj: any = {}; obj.msg = message.msg; return obj; + }, + fromAmino(object: GenericAuthorizationAmino): GenericAuthorization { + return { + msg: object.msg + }; + }, + toAmino(message: GenericAuthorization): GenericAuthorizationAmino { + const obj: any = {}; + obj.msg = message.msg; + return obj; + }, + fromAminoMsg(object: GenericAuthorizationAminoMsg): GenericAuthorization { + return GenericAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: GenericAuthorization): GenericAuthorizationAminoMsg { + return { + type: "cosmos-sdk/GenericAuthorization", + value: GenericAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: GenericAuthorizationProtoMsg): GenericAuthorization { + return GenericAuthorization.decode(message.value); + }, + toProto(message: GenericAuthorization): Uint8Array { + return GenericAuthorization.encode(message).finish(); + }, + toProtoMsg(message: GenericAuthorization): GenericAuthorizationProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization", + value: GenericAuthorization.encode(message).finish() + }; } }; function createBaseGrant(): Grant { @@ -135,6 +167,7 @@ function createBaseGrant(): Grant { }; } export const Grant = { + typeUrl: "/cosmos.authz.v1beta1.Grant", encode(message: Grant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authorization !== undefined) { Any.encode(message.authorization, writer.uint32(10).fork()).ldelim(); @@ -199,6 +232,39 @@ export const Grant = { message.authorization !== undefined && (obj.authorization = message.authorization ? Any.toSDK(message.authorization) : undefined); message.expiration !== undefined && (obj.expiration = message.expiration ?? undefined); return obj; + }, + fromAmino(object: GrantAmino): Grant { + return { + authorization: object?.authorization ? Any.fromAmino(object.authorization) : undefined, + expiration: object?.expiration + }; + }, + toAmino(message: Grant): GrantAmino { + const obj: any = {}; + obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined; + obj.expiration = message.expiration; + return obj; + }, + fromAminoMsg(object: GrantAminoMsg): Grant { + return Grant.fromAmino(object.value); + }, + toAminoMsg(message: Grant): GrantAminoMsg { + return { + type: "cosmos-sdk/Grant", + value: Grant.toAmino(message) + }; + }, + fromProtoMsg(message: GrantProtoMsg): Grant { + return Grant.decode(message.value); + }, + toProto(message: Grant): Uint8Array { + return Grant.encode(message).finish(); + }, + toProtoMsg(message: Grant): GrantProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.Grant", + value: Grant.encode(message).finish() + }; } }; function createBaseGrantAuthorization(): GrantAuthorization { @@ -210,6 +276,7 @@ function createBaseGrantAuthorization(): GrantAuthorization { }; } export const GrantAuthorization = { + typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization", encode(message: GrantAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -298,6 +365,43 @@ export const GrantAuthorization = { message.authorization !== undefined && (obj.authorization = message.authorization ? Any.toSDK(message.authorization) : undefined); message.expiration !== undefined && (obj.expiration = message.expiration ?? undefined); return obj; + }, + fromAmino(object: GrantAuthorizationAmino): GrantAuthorization { + return { + granter: object.granter, + grantee: object.grantee, + authorization: object?.authorization ? Any.fromAmino(object.authorization) : undefined, + expiration: object.expiration + }; + }, + toAmino(message: GrantAuthorization): GrantAuthorizationAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + obj.authorization = message.authorization ? Any.toAmino(message.authorization) : undefined; + obj.expiration = message.expiration; + return obj; + }, + fromAminoMsg(object: GrantAuthorizationAminoMsg): GrantAuthorization { + return GrantAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: GrantAuthorization): GrantAuthorizationAminoMsg { + return { + type: "cosmos-sdk/GrantAuthorization", + value: GrantAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: GrantAuthorizationProtoMsg): GrantAuthorization { + return GrantAuthorization.decode(message.value); + }, + toProto(message: GrantAuthorization): Uint8Array { + return GrantAuthorization.encode(message).finish(); + }, + toProtoMsg(message: GrantAuthorization): GrantAuthorizationProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization", + value: GrantAuthorization.encode(message).finish() + }; } }; function createBaseGrantQueueItem(): GrantQueueItem { @@ -306,6 +410,7 @@ function createBaseGrantQueueItem(): GrantQueueItem { }; } export const GrantQueueItem = { + typeUrl: "/cosmos.authz.v1beta1.GrantQueueItem", encode(message: GrantQueueItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.msgTypeUrls) { writer.uint32(10).string(v!); @@ -366,5 +471,40 @@ export const GrantQueueItem = { obj.msg_type_urls = []; } return obj; + }, + fromAmino(object: GrantQueueItemAmino): GrantQueueItem { + return { + msgTypeUrls: Array.isArray(object?.msg_type_urls) ? object.msg_type_urls.map((e: any) => e) : [] + }; + }, + toAmino(message: GrantQueueItem): GrantQueueItemAmino { + const obj: any = {}; + if (message.msgTypeUrls) { + obj.msg_type_urls = message.msgTypeUrls.map(e => e); + } else { + obj.msg_type_urls = []; + } + return obj; + }, + fromAminoMsg(object: GrantQueueItemAminoMsg): GrantQueueItem { + return GrantQueueItem.fromAmino(object.value); + }, + toAminoMsg(message: GrantQueueItem): GrantQueueItemAminoMsg { + return { + type: "cosmos-sdk/GrantQueueItem", + value: GrantQueueItem.toAmino(message) + }; + }, + fromProtoMsg(message: GrantQueueItemProtoMsg): GrantQueueItem { + return GrantQueueItem.decode(message.value); + }, + toProto(message: GrantQueueItem): Uint8Array { + return GrantQueueItem.encode(message).finish(); + }, + toProtoMsg(message: GrantQueueItem): GrantQueueItemProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.GrantQueueItem", + value: GrantQueueItem.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts index 94c5229606..2f65b59f80 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/genesis.ts @@ -16,6 +16,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.authz.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.authorization) { GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -76,5 +77,40 @@ export const GenesisState = { obj.authorization = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + authorization: Array.isArray(object?.authorization) ? object.authorization.map((e: any) => GrantAuthorization.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.authorization) { + obj.authorization = message.authorization.map(e => e ? GrantAuthorization.toAmino(e) : undefined); + } else { + obj.authorization = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts index ad12174462..622e9d6f69 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/query.ts @@ -86,6 +86,7 @@ function createBaseQueryGrantsRequest(): QueryGrantsRequest { }; } export const QueryGrantsRequest = { + typeUrl: "/cosmos.authz.v1beta1.QueryGrantsRequest", encode(message: QueryGrantsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -174,6 +175,43 @@ export const QueryGrantsRequest = { obj.msg_type_url = message.msgTypeUrl; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGrantsRequestAmino): QueryGrantsRequest { + return { + granter: object.granter, + grantee: object.grantee, + msgTypeUrl: object.msg_type_url, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGrantsRequest): QueryGrantsRequestAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + obj.msg_type_url = message.msgTypeUrl; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGrantsRequestAminoMsg): QueryGrantsRequest { + return QueryGrantsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGrantsRequest): QueryGrantsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGrantsRequest", + value: QueryGrantsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGrantsRequestProtoMsg): QueryGrantsRequest { + return QueryGrantsRequest.decode(message.value); + }, + toProto(message: QueryGrantsRequest): Uint8Array { + return QueryGrantsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGrantsRequest): QueryGrantsRequestProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.QueryGrantsRequest", + value: QueryGrantsRequest.encode(message).finish() + }; } }; function createBaseQueryGrantsResponse(): QueryGrantsResponse { @@ -183,6 +221,7 @@ function createBaseQueryGrantsResponse(): QueryGrantsResponse { }; } export const QueryGrantsResponse = { + typeUrl: "/cosmos.authz.v1beta1.QueryGrantsResponse", encode(message: QueryGrantsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -255,6 +294,43 @@ export const QueryGrantsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGrantsResponseAmino): QueryGrantsResponse { + return { + grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => Grant.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGrantsResponse): QueryGrantsResponseAmino { + const obj: any = {}; + if (message.grants) { + obj.grants = message.grants.map(e => e ? Grant.toAmino(e) : undefined); + } else { + obj.grants = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGrantsResponseAminoMsg): QueryGrantsResponse { + return QueryGrantsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGrantsResponse): QueryGrantsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGrantsResponse", + value: QueryGrantsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGrantsResponseProtoMsg): QueryGrantsResponse { + return QueryGrantsResponse.decode(message.value); + }, + toProto(message: QueryGrantsResponse): Uint8Array { + return QueryGrantsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGrantsResponse): QueryGrantsResponseProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.QueryGrantsResponse", + value: QueryGrantsResponse.encode(message).finish() + }; } }; function createBaseQueryGranterGrantsRequest(): QueryGranterGrantsRequest { @@ -264,6 +340,7 @@ function createBaseQueryGranterGrantsRequest(): QueryGranterGrantsRequest { }; } export const QueryGranterGrantsRequest = { + typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsRequest", encode(message: QueryGranterGrantsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -328,6 +405,39 @@ export const QueryGranterGrantsRequest = { obj.granter = message.granter; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGranterGrantsRequestAmino): QueryGranterGrantsRequest { + return { + granter: object.granter, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGranterGrantsRequestAminoMsg): QueryGranterGrantsRequest { + return QueryGranterGrantsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGranterGrantsRequest", + value: QueryGranterGrantsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGranterGrantsRequestProtoMsg): QueryGranterGrantsRequest { + return QueryGranterGrantsRequest.decode(message.value); + }, + toProto(message: QueryGranterGrantsRequest): Uint8Array { + return QueryGranterGrantsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGranterGrantsRequest): QueryGranterGrantsRequestProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsRequest", + value: QueryGranterGrantsRequest.encode(message).finish() + }; } }; function createBaseQueryGranterGrantsResponse(): QueryGranterGrantsResponse { @@ -337,6 +447,7 @@ function createBaseQueryGranterGrantsResponse(): QueryGranterGrantsResponse { }; } export const QueryGranterGrantsResponse = { + typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsResponse", encode(message: QueryGranterGrantsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -409,6 +520,43 @@ export const QueryGranterGrantsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGranterGrantsResponseAmino): QueryGranterGrantsResponse { + return { + grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => GrantAuthorization.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGranterGrantsResponse): QueryGranterGrantsResponseAmino { + const obj: any = {}; + if (message.grants) { + obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); + } else { + obj.grants = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGranterGrantsResponseAminoMsg): QueryGranterGrantsResponse { + return QueryGranterGrantsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGranterGrantsResponse): QueryGranterGrantsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGranterGrantsResponse", + value: QueryGranterGrantsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGranterGrantsResponseProtoMsg): QueryGranterGrantsResponse { + return QueryGranterGrantsResponse.decode(message.value); + }, + toProto(message: QueryGranterGrantsResponse): Uint8Array { + return QueryGranterGrantsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGranterGrantsResponse): QueryGranterGrantsResponseProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsResponse", + value: QueryGranterGrantsResponse.encode(message).finish() + }; } }; function createBaseQueryGranteeGrantsRequest(): QueryGranteeGrantsRequest { @@ -418,6 +566,7 @@ function createBaseQueryGranteeGrantsRequest(): QueryGranteeGrantsRequest { }; } export const QueryGranteeGrantsRequest = { + typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsRequest", encode(message: QueryGranteeGrantsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.grantee !== "") { writer.uint32(10).string(message.grantee); @@ -482,6 +631,39 @@ export const QueryGranteeGrantsRequest = { obj.grantee = message.grantee; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGranteeGrantsRequestAmino): QueryGranteeGrantsRequest { + return { + grantee: object.grantee, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAmino { + const obj: any = {}; + obj.grantee = message.grantee; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGranteeGrantsRequestAminoMsg): QueryGranteeGrantsRequest { + return QueryGranteeGrantsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGranteeGrantsRequest", + value: QueryGranteeGrantsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGranteeGrantsRequestProtoMsg): QueryGranteeGrantsRequest { + return QueryGranteeGrantsRequest.decode(message.value); + }, + toProto(message: QueryGranteeGrantsRequest): Uint8Array { + return QueryGranteeGrantsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGranteeGrantsRequest): QueryGranteeGrantsRequestProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsRequest", + value: QueryGranteeGrantsRequest.encode(message).finish() + }; } }; function createBaseQueryGranteeGrantsResponse(): QueryGranteeGrantsResponse { @@ -491,6 +673,7 @@ function createBaseQueryGranteeGrantsResponse(): QueryGranteeGrantsResponse { }; } export const QueryGranteeGrantsResponse = { + typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsResponse", encode(message: QueryGranteeGrantsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -563,5 +746,42 @@ export const QueryGranteeGrantsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGranteeGrantsResponseAmino): QueryGranteeGrantsResponse { + return { + grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => GrantAuthorization.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGranteeGrantsResponse): QueryGranteeGrantsResponseAmino { + const obj: any = {}; + if (message.grants) { + obj.grants = message.grants.map(e => e ? GrantAuthorization.toAmino(e) : undefined); + } else { + obj.grants = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGranteeGrantsResponseAminoMsg): QueryGranteeGrantsResponse { + return QueryGranteeGrantsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGranteeGrantsResponse): QueryGranteeGrantsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGranteeGrantsResponse", + value: QueryGranteeGrantsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGranteeGrantsResponseProtoMsg): QueryGranteeGrantsResponse { + return QueryGranteeGrantsResponse.decode(message.value); + }, + toProto(message: QueryGranteeGrantsResponse): Uint8Array { + return QueryGranteeGrantsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGranteeGrantsResponse): QueryGranteeGrantsResponseProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsResponse", + value: QueryGranteeGrantsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts index e4ad89cfd4..74fe88a855 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/authz/v1beta1/tx.ts @@ -86,6 +86,7 @@ function createBaseMsgGrant(): MsgGrant { }; } export const MsgGrant = { + typeUrl: "/cosmos.authz.v1beta1.MsgGrant", encode(message: MsgGrant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -162,6 +163,41 @@ export const MsgGrant = { obj.grantee = message.grantee; message.grant !== undefined && (obj.grant = message.grant ? Grant.toSDK(message.grant) : undefined); return obj; + }, + fromAmino(object: MsgGrantAmino): MsgGrant { + return { + granter: object.granter, + grantee: object.grantee, + grant: object?.grant ? Grant.fromAmino(object.grant) : undefined + }; + }, + toAmino(message: MsgGrant): MsgGrantAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + obj.grant = message.grant ? Grant.toAmino(message.grant) : undefined; + return obj; + }, + fromAminoMsg(object: MsgGrantAminoMsg): MsgGrant { + return MsgGrant.fromAmino(object.value); + }, + toAminoMsg(message: MsgGrant): MsgGrantAminoMsg { + return { + type: "cosmos-sdk/MsgGrant", + value: MsgGrant.toAmino(message) + }; + }, + fromProtoMsg(message: MsgGrantProtoMsg): MsgGrant { + return MsgGrant.decode(message.value); + }, + toProto(message: MsgGrant): Uint8Array { + return MsgGrant.encode(message).finish(); + }, + toProtoMsg(message: MsgGrant): MsgGrantProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.MsgGrant", + value: MsgGrant.encode(message).finish() + }; } }; function createBaseMsgExecResponse(): MsgExecResponse { @@ -170,6 +206,7 @@ function createBaseMsgExecResponse(): MsgExecResponse { }; } export const MsgExecResponse = { + typeUrl: "/cosmos.authz.v1beta1.MsgExecResponse", encode(message: MsgExecResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.results) { writer.uint32(10).bytes(v!); @@ -230,6 +267,41 @@ export const MsgExecResponse = { obj.results = []; } return obj; + }, + fromAmino(object: MsgExecResponseAmino): MsgExecResponse { + return { + results: Array.isArray(object?.results) ? object.results.map((e: any) => e) : [] + }; + }, + toAmino(message: MsgExecResponse): MsgExecResponseAmino { + const obj: any = {}; + if (message.results) { + obj.results = message.results.map(e => e); + } else { + obj.results = []; + } + return obj; + }, + fromAminoMsg(object: MsgExecResponseAminoMsg): MsgExecResponse { + return MsgExecResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExecResponse): MsgExecResponseAminoMsg { + return { + type: "cosmos-sdk/MsgExecResponse", + value: MsgExecResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecResponseProtoMsg): MsgExecResponse { + return MsgExecResponse.decode(message.value); + }, + toProto(message: MsgExecResponse): Uint8Array { + return MsgExecResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExecResponse): MsgExecResponseProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.MsgExecResponse", + value: MsgExecResponse.encode(message).finish() + }; } }; function createBaseMsgExec(): MsgExec { @@ -239,6 +311,7 @@ function createBaseMsgExec(): MsgExec { }; } export const MsgExec = { + typeUrl: "/cosmos.authz.v1beta1.MsgExec", encode(message: MsgExec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.grantee !== "") { writer.uint32(10).string(message.grantee); @@ -311,12 +384,50 @@ export const MsgExec = { obj.msgs = []; } return obj; + }, + fromAmino(object: MsgExecAmino): MsgExec { + return { + grantee: object.grantee, + msgs: Array.isArray(object?.msgs) ? object.msgs.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgExec): MsgExecAmino { + const obj: any = {}; + obj.grantee = message.grantee; + if (message.msgs) { + obj.msgs = message.msgs.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.msgs = []; + } + return obj; + }, + fromAminoMsg(object: MsgExecAminoMsg): MsgExec { + return MsgExec.fromAmino(object.value); + }, + toAminoMsg(message: MsgExec): MsgExecAminoMsg { + return { + type: "cosmos-sdk/MsgExec", + value: MsgExec.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecProtoMsg): MsgExec { + return MsgExec.decode(message.value); + }, + toProto(message: MsgExec): Uint8Array { + return MsgExec.encode(message).finish(); + }, + toProtoMsg(message: MsgExec): MsgExecProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.MsgExec", + value: MsgExec.encode(message).finish() + }; } }; function createBaseMsgGrantResponse(): MsgGrantResponse { return {}; } export const MsgGrantResponse = { + typeUrl: "/cosmos.authz.v1beta1.MsgGrantResponse", encode(_: MsgGrantResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -354,6 +465,34 @@ export const MsgGrantResponse = { toSDK(_: MsgGrantResponse): MsgGrantResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgGrantResponseAmino): MsgGrantResponse { + return {}; + }, + toAmino(_: MsgGrantResponse): MsgGrantResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgGrantResponseAminoMsg): MsgGrantResponse { + return MsgGrantResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgGrantResponse): MsgGrantResponseAminoMsg { + return { + type: "cosmos-sdk/MsgGrantResponse", + value: MsgGrantResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgGrantResponseProtoMsg): MsgGrantResponse { + return MsgGrantResponse.decode(message.value); + }, + toProto(message: MsgGrantResponse): Uint8Array { + return MsgGrantResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgGrantResponse): MsgGrantResponseProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.MsgGrantResponse", + value: MsgGrantResponse.encode(message).finish() + }; } }; function createBaseMsgRevoke(): MsgRevoke { @@ -364,6 +503,7 @@ function createBaseMsgRevoke(): MsgRevoke { }; } export const MsgRevoke = { + typeUrl: "/cosmos.authz.v1beta1.MsgRevoke", encode(message: MsgRevoke, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -440,12 +580,48 @@ export const MsgRevoke = { obj.grantee = message.grantee; obj.msg_type_url = message.msgTypeUrl; return obj; + }, + fromAmino(object: MsgRevokeAmino): MsgRevoke { + return { + granter: object.granter, + grantee: object.grantee, + msgTypeUrl: object.msg_type_url + }; + }, + toAmino(message: MsgRevoke): MsgRevokeAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + obj.msg_type_url = message.msgTypeUrl; + return obj; + }, + fromAminoMsg(object: MsgRevokeAminoMsg): MsgRevoke { + return MsgRevoke.fromAmino(object.value); + }, + toAminoMsg(message: MsgRevoke): MsgRevokeAminoMsg { + return { + type: "cosmos-sdk/MsgRevoke", + value: MsgRevoke.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRevokeProtoMsg): MsgRevoke { + return MsgRevoke.decode(message.value); + }, + toProto(message: MsgRevoke): Uint8Array { + return MsgRevoke.encode(message).finish(); + }, + toProtoMsg(message: MsgRevoke): MsgRevokeProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.MsgRevoke", + value: MsgRevoke.encode(message).finish() + }; } }; function createBaseMsgRevokeResponse(): MsgRevokeResponse { return {}; } export const MsgRevokeResponse = { + typeUrl: "/cosmos.authz.v1beta1.MsgRevokeResponse", encode(_: MsgRevokeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -483,5 +659,33 @@ export const MsgRevokeResponse = { toSDK(_: MsgRevokeResponse): MsgRevokeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRevokeResponseAmino): MsgRevokeResponse { + return {}; + }, + toAmino(_: MsgRevokeResponse): MsgRevokeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRevokeResponseAminoMsg): MsgRevokeResponse { + return MsgRevokeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRevokeResponse): MsgRevokeResponseAminoMsg { + return { + type: "cosmos-sdk/MsgRevokeResponse", + value: MsgRevokeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRevokeResponseProtoMsg): MsgRevokeResponse { + return MsgRevokeResponse.decode(message.value); + }, + toProto(message: MsgRevokeResponse): Uint8Array { + return MsgRevokeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRevokeResponse): MsgRevokeResponseProtoMsg { + return { + typeUrl: "/cosmos.authz.v1beta1.MsgRevokeResponse", + value: MsgRevokeResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts index fc31081727..3db07b4032 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/authz.ts @@ -26,6 +26,7 @@ function createBaseSendAuthorization(): SendAuthorization { }; } export const SendAuthorization = { + typeUrl: "/cosmos.bank.v1beta1.SendAuthorization", encode(message: SendAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.spendLimit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -86,5 +87,40 @@ export const SendAuthorization = { obj.spend_limit = []; } return obj; + }, + fromAmino(object: SendAuthorizationAmino): SendAuthorization { + return { + spendLimit: Array.isArray(object?.spend_limit) ? object.spend_limit.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: SendAuthorization): SendAuthorizationAmino { + const obj: any = {}; + if (message.spendLimit) { + obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.spend_limit = []; + } + return obj; + }, + fromAminoMsg(object: SendAuthorizationAminoMsg): SendAuthorization { + return SendAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: SendAuthorization): SendAuthorizationAminoMsg { + return { + type: "cosmos-sdk/SendAuthorization", + value: SendAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: SendAuthorizationProtoMsg): SendAuthorization { + return SendAuthorization.decode(message.value); + }, + toProto(message: SendAuthorization): Uint8Array { + return SendAuthorization.encode(message).finish(); + }, + toProtoMsg(message: SendAuthorization): SendAuthorizationProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.SendAuthorization", + value: SendAuthorization.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts index 03d38c8207..2f078e4a6f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/bank.ts @@ -156,6 +156,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmos.bank.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.sendEnabled) { SendEnabled.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -228,6 +229,43 @@ export const Params = { } obj.default_send_enabled = message.defaultSendEnabled; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + sendEnabled: Array.isArray(object?.send_enabled) ? object.send_enabled.map((e: any) => SendEnabled.fromAmino(e)) : [], + defaultSendEnabled: object.default_send_enabled + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.sendEnabled) { + obj.send_enabled = message.sendEnabled.map(e => e ? SendEnabled.toAmino(e) : undefined); + } else { + obj.send_enabled = []; + } + obj.default_send_enabled = message.defaultSendEnabled; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseSendEnabled(): SendEnabled { @@ -237,6 +275,7 @@ function createBaseSendEnabled(): SendEnabled { }; } export const SendEnabled = { + typeUrl: "/cosmos.bank.v1beta1.SendEnabled", encode(message: SendEnabled, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -301,6 +340,39 @@ export const SendEnabled = { obj.denom = message.denom; obj.enabled = message.enabled; return obj; + }, + fromAmino(object: SendEnabledAmino): SendEnabled { + return { + denom: object.denom, + enabled: object.enabled + }; + }, + toAmino(message: SendEnabled): SendEnabledAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.enabled = message.enabled; + return obj; + }, + fromAminoMsg(object: SendEnabledAminoMsg): SendEnabled { + return SendEnabled.fromAmino(object.value); + }, + toAminoMsg(message: SendEnabled): SendEnabledAminoMsg { + return { + type: "cosmos-sdk/SendEnabled", + value: SendEnabled.toAmino(message) + }; + }, + fromProtoMsg(message: SendEnabledProtoMsg): SendEnabled { + return SendEnabled.decode(message.value); + }, + toProto(message: SendEnabled): Uint8Array { + return SendEnabled.encode(message).finish(); + }, + toProtoMsg(message: SendEnabled): SendEnabledProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.SendEnabled", + value: SendEnabled.encode(message).finish() + }; } }; function createBaseInput(): Input { @@ -310,6 +382,7 @@ function createBaseInput(): Input { }; } export const Input = { + typeUrl: "/cosmos.bank.v1beta1.Input", encode(message: Input, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -382,6 +455,43 @@ export const Input = { obj.coins = []; } return obj; + }, + fromAmino(object: InputAmino): Input { + return { + address: object.address, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Input): InputAmino { + const obj: any = {}; + obj.address = message.address; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: InputAminoMsg): Input { + return Input.fromAmino(object.value); + }, + toAminoMsg(message: Input): InputAminoMsg { + return { + type: "cosmos-sdk/Input", + value: Input.toAmino(message) + }; + }, + fromProtoMsg(message: InputProtoMsg): Input { + return Input.decode(message.value); + }, + toProto(message: Input): Uint8Array { + return Input.encode(message).finish(); + }, + toProtoMsg(message: Input): InputProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.Input", + value: Input.encode(message).finish() + }; } }; function createBaseOutput(): Output { @@ -391,6 +501,7 @@ function createBaseOutput(): Output { }; } export const Output = { + typeUrl: "/cosmos.bank.v1beta1.Output", encode(message: Output, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -463,6 +574,43 @@ export const Output = { obj.coins = []; } return obj; + }, + fromAmino(object: OutputAmino): Output { + return { + address: object.address, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Output): OutputAmino { + const obj: any = {}; + obj.address = message.address; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: OutputAminoMsg): Output { + return Output.fromAmino(object.value); + }, + toAminoMsg(message: Output): OutputAminoMsg { + return { + type: "cosmos-sdk/Output", + value: Output.toAmino(message) + }; + }, + fromProtoMsg(message: OutputProtoMsg): Output { + return Output.decode(message.value); + }, + toProto(message: Output): Uint8Array { + return Output.encode(message).finish(); + }, + toProtoMsg(message: Output): OutputProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.Output", + value: Output.encode(message).finish() + }; } }; function createBaseSupply(): Supply { @@ -471,6 +619,7 @@ function createBaseSupply(): Supply { }; } export const Supply = { + typeUrl: "/cosmos.bank.v1beta1.Supply", encode(message: Supply, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.total) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -531,6 +680,41 @@ export const Supply = { obj.total = []; } return obj; + }, + fromAmino(object: SupplyAmino): Supply { + return { + total: Array.isArray(object?.total) ? object.total.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Supply): SupplyAmino { + const obj: any = {}; + if (message.total) { + obj.total = message.total.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total = []; + } + return obj; + }, + fromAminoMsg(object: SupplyAminoMsg): Supply { + return Supply.fromAmino(object.value); + }, + toAminoMsg(message: Supply): SupplyAminoMsg { + return { + type: "cosmos-sdk/Supply", + value: Supply.toAmino(message) + }; + }, + fromProtoMsg(message: SupplyProtoMsg): Supply { + return Supply.decode(message.value); + }, + toProto(message: Supply): Uint8Array { + return Supply.encode(message).finish(); + }, + toProtoMsg(message: Supply): SupplyProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.Supply", + value: Supply.encode(message).finish() + }; } }; function createBaseDenomUnit(): DenomUnit { @@ -541,6 +725,7 @@ function createBaseDenomUnit(): DenomUnit { }; } export const DenomUnit = { + typeUrl: "/cosmos.bank.v1beta1.DenomUnit", encode(message: DenomUnit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -625,6 +810,45 @@ export const DenomUnit = { obj.aliases = []; } return obj; + }, + fromAmino(object: DenomUnitAmino): DenomUnit { + return { + denom: object.denom, + exponent: object.exponent, + aliases: Array.isArray(object?.aliases) ? object.aliases.map((e: any) => e) : [] + }; + }, + toAmino(message: DenomUnit): DenomUnitAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.exponent = message.exponent; + if (message.aliases) { + obj.aliases = message.aliases.map(e => e); + } else { + obj.aliases = []; + } + return obj; + }, + fromAminoMsg(object: DenomUnitAminoMsg): DenomUnit { + return DenomUnit.fromAmino(object.value); + }, + toAminoMsg(message: DenomUnit): DenomUnitAminoMsg { + return { + type: "cosmos-sdk/DenomUnit", + value: DenomUnit.toAmino(message) + }; + }, + fromProtoMsg(message: DenomUnitProtoMsg): DenomUnit { + return DenomUnit.decode(message.value); + }, + toProto(message: DenomUnit): Uint8Array { + return DenomUnit.encode(message).finish(); + }, + toProtoMsg(message: DenomUnit): DenomUnitProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.DenomUnit", + value: DenomUnit.encode(message).finish() + }; } }; function createBaseMetadata(): Metadata { @@ -640,6 +864,7 @@ function createBaseMetadata(): Metadata { }; } export const Metadata = { + typeUrl: "/cosmos.bank.v1beta1.Metadata", encode(message: Metadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(10).string(message.description); @@ -784,5 +1009,54 @@ export const Metadata = { obj.uri = message.uri; obj.uri_hash = message.uriHash; return obj; + }, + fromAmino(object: MetadataAmino): Metadata { + return { + description: object.description, + denomUnits: Array.isArray(object?.denom_units) ? object.denom_units.map((e: any) => DenomUnit.fromAmino(e)) : [], + base: object.base, + display: object.display, + name: object.name, + symbol: object.symbol, + uri: object.uri, + uriHash: object.uri_hash + }; + }, + toAmino(message: Metadata): MetadataAmino { + const obj: any = {}; + obj.description = message.description; + if (message.denomUnits) { + obj.denom_units = message.denomUnits.map(e => e ? DenomUnit.toAmino(e) : undefined); + } else { + obj.denom_units = []; + } + obj.base = message.base; + obj.display = message.display; + obj.name = message.name; + obj.symbol = message.symbol; + obj.uri = message.uri; + obj.uri_hash = message.uriHash; + return obj; + }, + fromAminoMsg(object: MetadataAminoMsg): Metadata { + return Metadata.fromAmino(object.value); + }, + toAminoMsg(message: Metadata): MetadataAminoMsg { + return { + type: "cosmos-sdk/Metadata", + value: Metadata.toAmino(message) + }; + }, + fromProtoMsg(message: MetadataProtoMsg): Metadata { + return Metadata.decode(message.value); + }, + toProto(message: Metadata): Uint8Array { + return Metadata.encode(message).finish(); + }, + toProtoMsg(message: Metadata): MetadataProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.Metadata", + value: Metadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts index 1da9febab6..5b0c7a0dd1 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/genesis.ts @@ -51,6 +51,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.bank.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -163,6 +164,55 @@ export const GenesisState = { obj.denom_metadata = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + balances: Array.isArray(object?.balances) ? object.balances.map((e: any) => Balance.fromAmino(e)) : [], + supply: Array.isArray(object?.supply) ? object.supply.map((e: any) => Coin.fromAmino(e)) : [], + denomMetadata: Array.isArray(object?.denom_metadata) ? object.denom_metadata.map((e: any) => Metadata.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.balances) { + obj.balances = message.balances.map(e => e ? Balance.toAmino(e) : undefined); + } else { + obj.balances = []; + } + if (message.supply) { + obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.supply = []; + } + if (message.denomMetadata) { + obj.denom_metadata = message.denomMetadata.map(e => e ? Metadata.toAmino(e) : undefined); + } else { + obj.denom_metadata = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseBalance(): Balance { @@ -172,6 +222,7 @@ function createBaseBalance(): Balance { }; } export const Balance = { + typeUrl: "/cosmos.bank.v1beta1.Balance", encode(message: Balance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -244,5 +295,42 @@ export const Balance = { obj.coins = []; } return obj; + }, + fromAmino(object: BalanceAmino): Balance { + return { + address: object.address, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Balance): BalanceAmino { + const obj: any = {}; + obj.address = message.address; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: BalanceAminoMsg): Balance { + return Balance.fromAmino(object.value); + }, + toAminoMsg(message: Balance): BalanceAminoMsg { + return { + type: "cosmos-sdk/Balance", + value: Balance.toAmino(message) + }; + }, + fromProtoMsg(message: BalanceProtoMsg): Balance { + return Balance.decode(message.value); + }, + toProto(message: Balance): Uint8Array { + return Balance.encode(message).finish(); + }, + toProtoMsg(message: Balance): BalanceProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.Balance", + value: Balance.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts index 3a7af66a1a..e51b06a1a4 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/query.ts @@ -271,6 +271,7 @@ function createBaseQueryBalanceRequest(): QueryBalanceRequest { }; } export const QueryBalanceRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryBalanceRequest", encode(message: QueryBalanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -335,6 +336,39 @@ export const QueryBalanceRequest = { obj.address = message.address; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryBalanceRequestAmino): QueryBalanceRequest { + return { + address: object.address, + denom: object.denom + }; + }, + toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { + return QueryBalanceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryBalanceRequest): QueryBalanceRequestAminoMsg { + return { + type: "cosmos-sdk/QueryBalanceRequest", + value: QueryBalanceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBalanceRequestProtoMsg): QueryBalanceRequest { + return QueryBalanceRequest.decode(message.value); + }, + toProto(message: QueryBalanceRequest): Uint8Array { + return QueryBalanceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBalanceRequest): QueryBalanceRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryBalanceRequest", + value: QueryBalanceRequest.encode(message).finish() + }; } }; function createBaseQueryBalanceResponse(): QueryBalanceResponse { @@ -343,6 +377,7 @@ function createBaseQueryBalanceResponse(): QueryBalanceResponse { }; } export const QueryBalanceResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryBalanceResponse", encode(message: QueryBalanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.balance !== undefined) { Coin.encode(message.balance, writer.uint32(10).fork()).ldelim(); @@ -395,6 +430,37 @@ export const QueryBalanceResponse = { const obj: any = {}; message.balance !== undefined && (obj.balance = message.balance ? Coin.toSDK(message.balance) : undefined); return obj; + }, + fromAmino(object: QueryBalanceResponseAmino): QueryBalanceResponse { + return { + balance: object?.balance ? Coin.fromAmino(object.balance) : undefined + }; + }, + toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { + const obj: any = {}; + obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; + return obj; + }, + fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { + return QueryBalanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryBalanceResponse): QueryBalanceResponseAminoMsg { + return { + type: "cosmos-sdk/QueryBalanceResponse", + value: QueryBalanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBalanceResponseProtoMsg): QueryBalanceResponse { + return QueryBalanceResponse.decode(message.value); + }, + toProto(message: QueryBalanceResponse): Uint8Array { + return QueryBalanceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBalanceResponse): QueryBalanceResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryBalanceResponse", + value: QueryBalanceResponse.encode(message).finish() + }; } }; function createBaseQueryAllBalancesRequest(): QueryAllBalancesRequest { @@ -404,6 +470,7 @@ function createBaseQueryAllBalancesRequest(): QueryAllBalancesRequest { }; } export const QueryAllBalancesRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesRequest", encode(message: QueryAllBalancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -468,6 +535,39 @@ export const QueryAllBalancesRequest = { obj.address = message.address; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllBalancesRequestAmino): QueryAllBalancesRequest { + return { + address: object.address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllBalancesRequest): QueryAllBalancesRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllBalancesRequestAminoMsg): QueryAllBalancesRequest { + return QueryAllBalancesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllBalancesRequest): QueryAllBalancesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAllBalancesRequest", + value: QueryAllBalancesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllBalancesRequestProtoMsg): QueryAllBalancesRequest { + return QueryAllBalancesRequest.decode(message.value); + }, + toProto(message: QueryAllBalancesRequest): Uint8Array { + return QueryAllBalancesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllBalancesRequest): QueryAllBalancesRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesRequest", + value: QueryAllBalancesRequest.encode(message).finish() + }; } }; function createBaseQueryAllBalancesResponse(): QueryAllBalancesResponse { @@ -477,6 +577,7 @@ function createBaseQueryAllBalancesResponse(): QueryAllBalancesResponse { }; } export const QueryAllBalancesResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesResponse", encode(message: QueryAllBalancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.balances) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -549,6 +650,43 @@ export const QueryAllBalancesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllBalancesResponseAmino): QueryAllBalancesResponse { + return { + balances: Array.isArray(object?.balances) ? object.balances.map((e: any) => Coin.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllBalancesResponse): QueryAllBalancesResponseAmino { + const obj: any = {}; + if (message.balances) { + obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.balances = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllBalancesResponseAminoMsg): QueryAllBalancesResponse { + return QueryAllBalancesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllBalancesResponse): QueryAllBalancesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAllBalancesResponse", + value: QueryAllBalancesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllBalancesResponseProtoMsg): QueryAllBalancesResponse { + return QueryAllBalancesResponse.decode(message.value); + }, + toProto(message: QueryAllBalancesResponse): Uint8Array { + return QueryAllBalancesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllBalancesResponse): QueryAllBalancesResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesResponse", + value: QueryAllBalancesResponse.encode(message).finish() + }; } }; function createBaseQuerySpendableBalancesRequest(): QuerySpendableBalancesRequest { @@ -558,6 +696,7 @@ function createBaseQuerySpendableBalancesRequest(): QuerySpendableBalancesReques }; } export const QuerySpendableBalancesRequest = { + typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest", encode(message: QuerySpendableBalancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -622,6 +761,39 @@ export const QuerySpendableBalancesRequest = { obj.address = message.address; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QuerySpendableBalancesRequestAmino): QuerySpendableBalancesRequest { + return { + address: object.address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySpendableBalancesRequestAminoMsg): QuerySpendableBalancesRequest { + return QuerySpendableBalancesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestAminoMsg { + return { + type: "cosmos-sdk/QuerySpendableBalancesRequest", + value: QuerySpendableBalancesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySpendableBalancesRequestProtoMsg): QuerySpendableBalancesRequest { + return QuerySpendableBalancesRequest.decode(message.value); + }, + toProto(message: QuerySpendableBalancesRequest): Uint8Array { + return QuerySpendableBalancesRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySpendableBalancesRequest): QuerySpendableBalancesRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest", + value: QuerySpendableBalancesRequest.encode(message).finish() + }; } }; function createBaseQuerySpendableBalancesResponse(): QuerySpendableBalancesResponse { @@ -631,6 +803,7 @@ function createBaseQuerySpendableBalancesResponse(): QuerySpendableBalancesRespo }; } export const QuerySpendableBalancesResponse = { + typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse", encode(message: QuerySpendableBalancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.balances) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -703,6 +876,43 @@ export const QuerySpendableBalancesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QuerySpendableBalancesResponseAmino): QuerySpendableBalancesResponse { + return { + balances: Array.isArray(object?.balances) ? object.balances.map((e: any) => Coin.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QuerySpendableBalancesResponse): QuerySpendableBalancesResponseAmino { + const obj: any = {}; + if (message.balances) { + obj.balances = message.balances.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.balances = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySpendableBalancesResponseAminoMsg): QuerySpendableBalancesResponse { + return QuerySpendableBalancesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySpendableBalancesResponse): QuerySpendableBalancesResponseAminoMsg { + return { + type: "cosmos-sdk/QuerySpendableBalancesResponse", + value: QuerySpendableBalancesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySpendableBalancesResponseProtoMsg): QuerySpendableBalancesResponse { + return QuerySpendableBalancesResponse.decode(message.value); + }, + toProto(message: QuerySpendableBalancesResponse): Uint8Array { + return QuerySpendableBalancesResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySpendableBalancesResponse): QuerySpendableBalancesResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse", + value: QuerySpendableBalancesResponse.encode(message).finish() + }; } }; function createBaseQueryTotalSupplyRequest(): QueryTotalSupplyRequest { @@ -711,6 +921,7 @@ function createBaseQueryTotalSupplyRequest(): QueryTotalSupplyRequest { }; } export const QueryTotalSupplyRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyRequest", encode(message: QueryTotalSupplyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -763,6 +974,37 @@ export const QueryTotalSupplyRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryTotalSupplyRequestAmino): QueryTotalSupplyRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryTotalSupplyRequest): QueryTotalSupplyRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalSupplyRequestAminoMsg): QueryTotalSupplyRequest { + return QueryTotalSupplyRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalSupplyRequest): QueryTotalSupplyRequestAminoMsg { + return { + type: "cosmos-sdk/QueryTotalSupplyRequest", + value: QueryTotalSupplyRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalSupplyRequestProtoMsg): QueryTotalSupplyRequest { + return QueryTotalSupplyRequest.decode(message.value); + }, + toProto(message: QueryTotalSupplyRequest): Uint8Array { + return QueryTotalSupplyRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalSupplyRequest): QueryTotalSupplyRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyRequest", + value: QueryTotalSupplyRequest.encode(message).finish() + }; } }; function createBaseQueryTotalSupplyResponse(): QueryTotalSupplyResponse { @@ -772,6 +1014,7 @@ function createBaseQueryTotalSupplyResponse(): QueryTotalSupplyResponse { }; } export const QueryTotalSupplyResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyResponse", encode(message: QueryTotalSupplyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.supply) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -844,6 +1087,43 @@ export const QueryTotalSupplyResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryTotalSupplyResponseAmino): QueryTotalSupplyResponse { + return { + supply: Array.isArray(object?.supply) ? object.supply.map((e: any) => Coin.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryTotalSupplyResponse): QueryTotalSupplyResponseAmino { + const obj: any = {}; + if (message.supply) { + obj.supply = message.supply.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.supply = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalSupplyResponseAminoMsg): QueryTotalSupplyResponse { + return QueryTotalSupplyResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalSupplyResponse): QueryTotalSupplyResponseAminoMsg { + return { + type: "cosmos-sdk/QueryTotalSupplyResponse", + value: QueryTotalSupplyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalSupplyResponseProtoMsg): QueryTotalSupplyResponse { + return QueryTotalSupplyResponse.decode(message.value); + }, + toProto(message: QueryTotalSupplyResponse): Uint8Array { + return QueryTotalSupplyResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalSupplyResponse): QueryTotalSupplyResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyResponse", + value: QueryTotalSupplyResponse.encode(message).finish() + }; } }; function createBaseQuerySupplyOfRequest(): QuerySupplyOfRequest { @@ -852,6 +1132,7 @@ function createBaseQuerySupplyOfRequest(): QuerySupplyOfRequest { }; } export const QuerySupplyOfRequest = { + typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfRequest", encode(message: QuerySupplyOfRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -904,6 +1185,37 @@ export const QuerySupplyOfRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QuerySupplyOfRequestAmino): QuerySupplyOfRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QuerySupplyOfRequest): QuerySupplyOfRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QuerySupplyOfRequestAminoMsg): QuerySupplyOfRequest { + return QuerySupplyOfRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySupplyOfRequest): QuerySupplyOfRequestAminoMsg { + return { + type: "cosmos-sdk/QuerySupplyOfRequest", + value: QuerySupplyOfRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySupplyOfRequestProtoMsg): QuerySupplyOfRequest { + return QuerySupplyOfRequest.decode(message.value); + }, + toProto(message: QuerySupplyOfRequest): Uint8Array { + return QuerySupplyOfRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySupplyOfRequest): QuerySupplyOfRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfRequest", + value: QuerySupplyOfRequest.encode(message).finish() + }; } }; function createBaseQuerySupplyOfResponse(): QuerySupplyOfResponse { @@ -912,6 +1224,7 @@ function createBaseQuerySupplyOfResponse(): QuerySupplyOfResponse { }; } export const QuerySupplyOfResponse = { + typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfResponse", encode(message: QuerySupplyOfResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.amount !== undefined) { Coin.encode(message.amount, writer.uint32(10).fork()).ldelim(); @@ -964,12 +1277,44 @@ export const QuerySupplyOfResponse = { const obj: any = {}; message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: QuerySupplyOfResponseAmino): QuerySupplyOfResponse { + return { + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: QuerySupplyOfResponse): QuerySupplyOfResponseAmino { + const obj: any = {}; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySupplyOfResponseAminoMsg): QuerySupplyOfResponse { + return QuerySupplyOfResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySupplyOfResponse): QuerySupplyOfResponseAminoMsg { + return { + type: "cosmos-sdk/QuerySupplyOfResponse", + value: QuerySupplyOfResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySupplyOfResponseProtoMsg): QuerySupplyOfResponse { + return QuerySupplyOfResponse.decode(message.value); + }, + toProto(message: QuerySupplyOfResponse): Uint8Array { + return QuerySupplyOfResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySupplyOfResponse): QuerySupplyOfResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfResponse", + value: QuerySupplyOfResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1007,6 +1352,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -1015,6 +1388,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -1067,6 +1441,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryDenomsMetadataRequest(): QueryDenomsMetadataRequest { @@ -1075,6 +1480,7 @@ function createBaseQueryDenomsMetadataRequest(): QueryDenomsMetadataRequest { }; } export const QueryDenomsMetadataRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest", encode(message: QueryDenomsMetadataRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -1127,6 +1533,37 @@ export const QueryDenomsMetadataRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDenomsMetadataRequestAmino): QueryDenomsMetadataRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDenomsMetadataRequest): QueryDenomsMetadataRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomsMetadataRequestAminoMsg): QueryDenomsMetadataRequest { + return QueryDenomsMetadataRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomsMetadataRequest): QueryDenomsMetadataRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDenomsMetadataRequest", + value: QueryDenomsMetadataRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomsMetadataRequestProtoMsg): QueryDenomsMetadataRequest { + return QueryDenomsMetadataRequest.decode(message.value); + }, + toProto(message: QueryDenomsMetadataRequest): Uint8Array { + return QueryDenomsMetadataRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomsMetadataRequest): QueryDenomsMetadataRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest", + value: QueryDenomsMetadataRequest.encode(message).finish() + }; } }; function createBaseQueryDenomsMetadataResponse(): QueryDenomsMetadataResponse { @@ -1136,6 +1573,7 @@ function createBaseQueryDenomsMetadataResponse(): QueryDenomsMetadataResponse { }; } export const QueryDenomsMetadataResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse", encode(message: QueryDenomsMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.metadatas) { Metadata.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1208,6 +1646,43 @@ export const QueryDenomsMetadataResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDenomsMetadataResponseAmino): QueryDenomsMetadataResponse { + return { + metadatas: Array.isArray(object?.metadatas) ? object.metadatas.map((e: any) => Metadata.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDenomsMetadataResponse): QueryDenomsMetadataResponseAmino { + const obj: any = {}; + if (message.metadatas) { + obj.metadatas = message.metadatas.map(e => e ? Metadata.toAmino(e) : undefined); + } else { + obj.metadatas = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomsMetadataResponseAminoMsg): QueryDenomsMetadataResponse { + return QueryDenomsMetadataResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomsMetadataResponse): QueryDenomsMetadataResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDenomsMetadataResponse", + value: QueryDenomsMetadataResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomsMetadataResponseProtoMsg): QueryDenomsMetadataResponse { + return QueryDenomsMetadataResponse.decode(message.value); + }, + toProto(message: QueryDenomsMetadataResponse): Uint8Array { + return QueryDenomsMetadataResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomsMetadataResponse): QueryDenomsMetadataResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse", + value: QueryDenomsMetadataResponse.encode(message).finish() + }; } }; function createBaseQueryDenomMetadataRequest(): QueryDenomMetadataRequest { @@ -1216,6 +1691,7 @@ function createBaseQueryDenomMetadataRequest(): QueryDenomMetadataRequest { }; } export const QueryDenomMetadataRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataRequest", encode(message: QueryDenomMetadataRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -1268,6 +1744,37 @@ export const QueryDenomMetadataRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryDenomMetadataRequestAmino): QueryDenomMetadataRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryDenomMetadataRequestAminoMsg): QueryDenomMetadataRequest { + return QueryDenomMetadataRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDenomMetadataRequest", + value: QueryDenomMetadataRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomMetadataRequestProtoMsg): QueryDenomMetadataRequest { + return QueryDenomMetadataRequest.decode(message.value); + }, + toProto(message: QueryDenomMetadataRequest): Uint8Array { + return QueryDenomMetadataRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomMetadataRequest): QueryDenomMetadataRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataRequest", + value: QueryDenomMetadataRequest.encode(message).finish() + }; } }; function createBaseQueryDenomMetadataResponse(): QueryDenomMetadataResponse { @@ -1276,6 +1783,7 @@ function createBaseQueryDenomMetadataResponse(): QueryDenomMetadataResponse { }; } export const QueryDenomMetadataResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataResponse", encode(message: QueryDenomMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metadata !== undefined) { Metadata.encode(message.metadata, writer.uint32(10).fork()).ldelim(); @@ -1328,6 +1836,37 @@ export const QueryDenomMetadataResponse = { const obj: any = {}; message.metadata !== undefined && (obj.metadata = message.metadata ? Metadata.toSDK(message.metadata) : undefined); return obj; + }, + fromAmino(object: QueryDenomMetadataResponseAmino): QueryDenomMetadataResponse { + return { + metadata: object?.metadata ? Metadata.fromAmino(object.metadata) : undefined + }; + }, + toAmino(message: QueryDenomMetadataResponse): QueryDenomMetadataResponseAmino { + const obj: any = {}; + obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomMetadataResponseAminoMsg): QueryDenomMetadataResponse { + return QueryDenomMetadataResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomMetadataResponse): QueryDenomMetadataResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDenomMetadataResponse", + value: QueryDenomMetadataResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomMetadataResponseProtoMsg): QueryDenomMetadataResponse { + return QueryDenomMetadataResponse.decode(message.value); + }, + toProto(message: QueryDenomMetadataResponse): Uint8Array { + return QueryDenomMetadataResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomMetadataResponse): QueryDenomMetadataResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataResponse", + value: QueryDenomMetadataResponse.encode(message).finish() + }; } }; function createBaseQueryDenomOwnersRequest(): QueryDenomOwnersRequest { @@ -1337,6 +1876,7 @@ function createBaseQueryDenomOwnersRequest(): QueryDenomOwnersRequest { }; } export const QueryDenomOwnersRequest = { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersRequest", encode(message: QueryDenomOwnersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -1401,6 +1941,39 @@ export const QueryDenomOwnersRequest = { obj.denom = message.denom; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDenomOwnersRequestAmino): QueryDenomOwnersRequest { + return { + denom: object.denom, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomOwnersRequestAminoMsg): QueryDenomOwnersRequest { + return QueryDenomOwnersRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDenomOwnersRequest", + value: QueryDenomOwnersRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomOwnersRequestProtoMsg): QueryDenomOwnersRequest { + return QueryDenomOwnersRequest.decode(message.value); + }, + toProto(message: QueryDenomOwnersRequest): Uint8Array { + return QueryDenomOwnersRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomOwnersRequest): QueryDenomOwnersRequestProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersRequest", + value: QueryDenomOwnersRequest.encode(message).finish() + }; } }; function createBaseDenomOwner(): DenomOwner { @@ -1410,6 +1983,7 @@ function createBaseDenomOwner(): DenomOwner { }; } export const DenomOwner = { + typeUrl: "/cosmos.bank.v1beta1.DenomOwner", encode(message: DenomOwner, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1474,6 +2048,39 @@ export const DenomOwner = { obj.address = message.address; message.balance !== undefined && (obj.balance = message.balance ? Coin.toSDK(message.balance) : undefined); return obj; + }, + fromAmino(object: DenomOwnerAmino): DenomOwner { + return { + address: object.address, + balance: object?.balance ? Coin.fromAmino(object.balance) : undefined + }; + }, + toAmino(message: DenomOwner): DenomOwnerAmino { + const obj: any = {}; + obj.address = message.address; + obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; + return obj; + }, + fromAminoMsg(object: DenomOwnerAminoMsg): DenomOwner { + return DenomOwner.fromAmino(object.value); + }, + toAminoMsg(message: DenomOwner): DenomOwnerAminoMsg { + return { + type: "cosmos-sdk/DenomOwner", + value: DenomOwner.toAmino(message) + }; + }, + fromProtoMsg(message: DenomOwnerProtoMsg): DenomOwner { + return DenomOwner.decode(message.value); + }, + toProto(message: DenomOwner): Uint8Array { + return DenomOwner.encode(message).finish(); + }, + toProtoMsg(message: DenomOwner): DenomOwnerProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.DenomOwner", + value: DenomOwner.encode(message).finish() + }; } }; function createBaseQueryDenomOwnersResponse(): QueryDenomOwnersResponse { @@ -1483,6 +2090,7 @@ function createBaseQueryDenomOwnersResponse(): QueryDenomOwnersResponse { }; } export const QueryDenomOwnersResponse = { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersResponse", encode(message: QueryDenomOwnersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.denomOwners) { DenomOwner.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1555,5 +2163,42 @@ export const QueryDenomOwnersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDenomOwnersResponseAmino): QueryDenomOwnersResponse { + return { + denomOwners: Array.isArray(object?.denom_owners) ? object.denom_owners.map((e: any) => DenomOwner.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDenomOwnersResponse): QueryDenomOwnersResponseAmino { + const obj: any = {}; + if (message.denomOwners) { + obj.denom_owners = message.denomOwners.map(e => e ? DenomOwner.toAmino(e) : undefined); + } else { + obj.denom_owners = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomOwnersResponseAminoMsg): QueryDenomOwnersResponse { + return QueryDenomOwnersResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomOwnersResponse): QueryDenomOwnersResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDenomOwnersResponse", + value: QueryDenomOwnersResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomOwnersResponseProtoMsg): QueryDenomOwnersResponse { + return QueryDenomOwnersResponse.decode(message.value); + }, + toProto(message: QueryDenomOwnersResponse): Uint8Array { + return QueryDenomOwnersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomOwnersResponse): QueryDenomOwnersResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersResponse", + value: QueryDenomOwnersResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts index 059653caa2..626cb6f8a0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/bank/v1beta1/tx.ts @@ -41,6 +41,7 @@ function createBaseMsgSend(): MsgSend { }; } export const MsgSend = { + typeUrl: "/cosmos.bank.v1beta1.MsgSend", encode(message: MsgSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); @@ -125,12 +126,52 @@ export const MsgSend = { obj.amount = []; } return obj; + }, + fromAmino(object: MsgSendAmino): MsgSend { + return { + fromAddress: object.from_address, + toAddress: object.to_address, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSend): MsgSendAmino { + const obj: any = {}; + obj.from_address = message.fromAddress; + obj.to_address = message.toAddress; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: MsgSendAminoMsg): MsgSend { + return MsgSend.fromAmino(object.value); + }, + toAminoMsg(message: MsgSend): MsgSendAminoMsg { + return { + type: "cosmos-sdk/MsgSend", + value: MsgSend.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSendProtoMsg): MsgSend { + return MsgSend.decode(message.value); + }, + toProto(message: MsgSend): Uint8Array { + return MsgSend.encode(message).finish(); + }, + toProtoMsg(message: MsgSend): MsgSendProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.MsgSend", + value: MsgSend.encode(message).finish() + }; } }; function createBaseMsgSendResponse(): MsgSendResponse { return {}; } export const MsgSendResponse = { + typeUrl: "/cosmos.bank.v1beta1.MsgSendResponse", encode(_: MsgSendResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -168,6 +209,34 @@ export const MsgSendResponse = { toSDK(_: MsgSendResponse): MsgSendResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSendResponseAmino): MsgSendResponse { + return {}; + }, + toAmino(_: MsgSendResponse): MsgSendResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSendResponseAminoMsg): MsgSendResponse { + return MsgSendResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSendResponse): MsgSendResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSendResponse", + value: MsgSendResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSendResponseProtoMsg): MsgSendResponse { + return MsgSendResponse.decode(message.value); + }, + toProto(message: MsgSendResponse): Uint8Array { + return MsgSendResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSendResponse): MsgSendResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.MsgSendResponse", + value: MsgSendResponse.encode(message).finish() + }; } }; function createBaseMsgMultiSend(): MsgMultiSend { @@ -177,6 +246,7 @@ function createBaseMsgMultiSend(): MsgMultiSend { }; } export const MsgMultiSend = { + typeUrl: "/cosmos.bank.v1beta1.MsgMultiSend", encode(message: MsgMultiSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.inputs) { Input.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -257,12 +327,54 @@ export const MsgMultiSend = { obj.outputs = []; } return obj; + }, + fromAmino(object: MsgMultiSendAmino): MsgMultiSend { + return { + inputs: Array.isArray(object?.inputs) ? object.inputs.map((e: any) => Input.fromAmino(e)) : [], + outputs: Array.isArray(object?.outputs) ? object.outputs.map((e: any) => Output.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgMultiSend): MsgMultiSendAmino { + const obj: any = {}; + if (message.inputs) { + obj.inputs = message.inputs.map(e => e ? Input.toAmino(e) : undefined); + } else { + obj.inputs = []; + } + if (message.outputs) { + obj.outputs = message.outputs.map(e => e ? Output.toAmino(e) : undefined); + } else { + obj.outputs = []; + } + return obj; + }, + fromAminoMsg(object: MsgMultiSendAminoMsg): MsgMultiSend { + return MsgMultiSend.fromAmino(object.value); + }, + toAminoMsg(message: MsgMultiSend): MsgMultiSendAminoMsg { + return { + type: "cosmos-sdk/MsgMultiSend", + value: MsgMultiSend.toAmino(message) + }; + }, + fromProtoMsg(message: MsgMultiSendProtoMsg): MsgMultiSend { + return MsgMultiSend.decode(message.value); + }, + toProto(message: MsgMultiSend): Uint8Array { + return MsgMultiSend.encode(message).finish(); + }, + toProtoMsg(message: MsgMultiSend): MsgMultiSendProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.MsgMultiSend", + value: MsgMultiSend.encode(message).finish() + }; } }; function createBaseMsgMultiSendResponse(): MsgMultiSendResponse { return {}; } export const MsgMultiSendResponse = { + typeUrl: "/cosmos.bank.v1beta1.MsgMultiSendResponse", encode(_: MsgMultiSendResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -300,5 +412,33 @@ export const MsgMultiSendResponse = { toSDK(_: MsgMultiSendResponse): MsgMultiSendResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgMultiSendResponseAmino): MsgMultiSendResponse { + return {}; + }, + toAmino(_: MsgMultiSendResponse): MsgMultiSendResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgMultiSendResponseAminoMsg): MsgMultiSendResponse { + return MsgMultiSendResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgMultiSendResponse): MsgMultiSendResponseAminoMsg { + return { + type: "cosmos-sdk/MsgMultiSendResponse", + value: MsgMultiSendResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgMultiSendResponseProtoMsg): MsgMultiSendResponse { + return MsgMultiSendResponse.decode(message.value); + }, + toProto(message: MsgMultiSendResponse): Uint8Array { + return MsgMultiSendResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgMultiSendResponse): MsgMultiSendResponseProtoMsg { + return { + typeUrl: "/cosmos.bank.v1beta1.MsgMultiSendResponse", + value: MsgMultiSendResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/abci/v1beta1/abci.ts index abf0c9fcdc..db9800e7b6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/abci/v1beta1/abci.ts @@ -260,6 +260,7 @@ function createBaseTxResponse(): TxResponse { }; } export const TxResponse = { + typeUrl: "/cosmos.base.abci.v1beta1.TxResponse", encode(message: TxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -472,6 +473,69 @@ export const TxResponse = { obj.events = []; } return obj; + }, + fromAmino(object: TxResponseAmino): TxResponse { + return { + height: BigInt(object.height), + txhash: object.txhash, + codespace: object.codespace, + code: object.code, + data: object.data, + rawLog: object.raw_log, + logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => ABCIMessageLog.fromAmino(e)) : [], + info: object.info, + gasWanted: BigInt(object.gas_wanted), + gasUsed: BigInt(object.gas_used), + tx: object?.tx ? Any.fromAmino(object.tx) : undefined, + timestamp: object.timestamp, + events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [] + }; + }, + toAmino(message: TxResponse): TxResponseAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.txhash = message.txhash; + obj.codespace = message.codespace; + obj.code = message.code; + obj.data = message.data; + obj.raw_log = message.rawLog; + if (message.logs) { + obj.logs = message.logs.map(e => e ? ABCIMessageLog.toAmino(e) : undefined); + } else { + obj.logs = []; + } + obj.info = message.info; + obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + obj.tx = message.tx ? Any.toAmino(message.tx) : undefined; + obj.timestamp = message.timestamp; + if (message.events) { + obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); + } else { + obj.events = []; + } + return obj; + }, + fromAminoMsg(object: TxResponseAminoMsg): TxResponse { + return TxResponse.fromAmino(object.value); + }, + toAminoMsg(message: TxResponse): TxResponseAminoMsg { + return { + type: "cosmos-sdk/TxResponse", + value: TxResponse.toAmino(message) + }; + }, + fromProtoMsg(message: TxResponseProtoMsg): TxResponse { + return TxResponse.decode(message.value); + }, + toProto(message: TxResponse): Uint8Array { + return TxResponse.encode(message).finish(); + }, + toProtoMsg(message: TxResponse): TxResponseProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.TxResponse", + value: TxResponse.encode(message).finish() + }; } }; function createBaseABCIMessageLog(): ABCIMessageLog { @@ -482,6 +546,7 @@ function createBaseABCIMessageLog(): ABCIMessageLog { }; } export const ABCIMessageLog = { + typeUrl: "/cosmos.base.abci.v1beta1.ABCIMessageLog", encode(message: ABCIMessageLog, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msgIndex !== 0) { writer.uint32(8).uint32(message.msgIndex); @@ -566,6 +631,45 @@ export const ABCIMessageLog = { obj.events = []; } return obj; + }, + fromAmino(object: ABCIMessageLogAmino): ABCIMessageLog { + return { + msgIndex: object.msg_index, + log: object.log, + events: Array.isArray(object?.events) ? object.events.map((e: any) => StringEvent.fromAmino(e)) : [] + }; + }, + toAmino(message: ABCIMessageLog): ABCIMessageLogAmino { + const obj: any = {}; + obj.msg_index = message.msgIndex; + obj.log = message.log; + if (message.events) { + obj.events = message.events.map(e => e ? StringEvent.toAmino(e) : undefined); + } else { + obj.events = []; + } + return obj; + }, + fromAminoMsg(object: ABCIMessageLogAminoMsg): ABCIMessageLog { + return ABCIMessageLog.fromAmino(object.value); + }, + toAminoMsg(message: ABCIMessageLog): ABCIMessageLogAminoMsg { + return { + type: "cosmos-sdk/ABCIMessageLog", + value: ABCIMessageLog.toAmino(message) + }; + }, + fromProtoMsg(message: ABCIMessageLogProtoMsg): ABCIMessageLog { + return ABCIMessageLog.decode(message.value); + }, + toProto(message: ABCIMessageLog): Uint8Array { + return ABCIMessageLog.encode(message).finish(); + }, + toProtoMsg(message: ABCIMessageLog): ABCIMessageLogProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.ABCIMessageLog", + value: ABCIMessageLog.encode(message).finish() + }; } }; function createBaseStringEvent(): StringEvent { @@ -575,6 +679,7 @@ function createBaseStringEvent(): StringEvent { }; } export const StringEvent = { + typeUrl: "/cosmos.base.abci.v1beta1.StringEvent", encode(message: StringEvent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -647,6 +752,43 @@ export const StringEvent = { obj.attributes = []; } return obj; + }, + fromAmino(object: StringEventAmino): StringEvent { + return { + type: object.type, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromAmino(e)) : [] + }; + }, + toAmino(message: StringEvent): StringEventAmino { + const obj: any = {}; + obj.type = message.type; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? Attribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: StringEventAminoMsg): StringEvent { + return StringEvent.fromAmino(object.value); + }, + toAminoMsg(message: StringEvent): StringEventAminoMsg { + return { + type: "cosmos-sdk/StringEvent", + value: StringEvent.toAmino(message) + }; + }, + fromProtoMsg(message: StringEventProtoMsg): StringEvent { + return StringEvent.decode(message.value); + }, + toProto(message: StringEvent): Uint8Array { + return StringEvent.encode(message).finish(); + }, + toProtoMsg(message: StringEvent): StringEventProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.StringEvent", + value: StringEvent.encode(message).finish() + }; } }; function createBaseAttribute(): Attribute { @@ -656,6 +798,7 @@ function createBaseAttribute(): Attribute { }; } export const Attribute = { + typeUrl: "/cosmos.base.abci.v1beta1.Attribute", encode(message: Attribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); @@ -720,6 +863,39 @@ export const Attribute = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeAmino): Attribute { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Attribute): AttributeAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeAminoMsg): Attribute { + return Attribute.fromAmino(object.value); + }, + toAminoMsg(message: Attribute): AttributeAminoMsg { + return { + type: "cosmos-sdk/Attribute", + value: Attribute.toAmino(message) + }; + }, + fromProtoMsg(message: AttributeProtoMsg): Attribute { + return Attribute.decode(message.value); + }, + toProto(message: Attribute): Uint8Array { + return Attribute.encode(message).finish(); + }, + toProtoMsg(message: Attribute): AttributeProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.Attribute", + value: Attribute.encode(message).finish() + }; } }; function createBaseGasInfo(): GasInfo { @@ -729,6 +905,7 @@ function createBaseGasInfo(): GasInfo { }; } export const GasInfo = { + typeUrl: "/cosmos.base.abci.v1beta1.GasInfo", encode(message: GasInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gasWanted !== BigInt(0)) { writer.uint32(8).uint64(message.gasWanted); @@ -793,6 +970,39 @@ export const GasInfo = { obj.gas_wanted = message.gasWanted; obj.gas_used = message.gasUsed; return obj; + }, + fromAmino(object: GasInfoAmino): GasInfo { + return { + gasWanted: BigInt(object.gas_wanted), + gasUsed: BigInt(object.gas_used) + }; + }, + toAmino(message: GasInfo): GasInfoAmino { + const obj: any = {}; + obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GasInfoAminoMsg): GasInfo { + return GasInfo.fromAmino(object.value); + }, + toAminoMsg(message: GasInfo): GasInfoAminoMsg { + return { + type: "cosmos-sdk/GasInfo", + value: GasInfo.toAmino(message) + }; + }, + fromProtoMsg(message: GasInfoProtoMsg): GasInfo { + return GasInfo.decode(message.value); + }, + toProto(message: GasInfo): Uint8Array { + return GasInfo.encode(message).finish(); + }, + toProtoMsg(message: GasInfo): GasInfoProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.GasInfo", + value: GasInfo.encode(message).finish() + }; } }; function createBaseResult(): Result { @@ -804,6 +1014,7 @@ function createBaseResult(): Result { }; } export const Result = { + typeUrl: "/cosmos.base.abci.v1beta1.Result", encode(message: Result, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); @@ -908,6 +1119,51 @@ export const Result = { obj.msg_responses = []; } return obj; + }, + fromAmino(object: ResultAmino): Result { + return { + data: object.data, + log: object.log, + events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [], + msgResponses: Array.isArray(object?.msg_responses) ? object.msg_responses.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: Result): ResultAmino { + const obj: any = {}; + obj.data = message.data; + obj.log = message.log; + if (message.events) { + obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); + } else { + obj.events = []; + } + if (message.msgResponses) { + obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.msg_responses = []; + } + return obj; + }, + fromAminoMsg(object: ResultAminoMsg): Result { + return Result.fromAmino(object.value); + }, + toAminoMsg(message: Result): ResultAminoMsg { + return { + type: "cosmos-sdk/Result", + value: Result.toAmino(message) + }; + }, + fromProtoMsg(message: ResultProtoMsg): Result { + return Result.decode(message.value); + }, + toProto(message: Result): Uint8Array { + return Result.encode(message).finish(); + }, + toProtoMsg(message: Result): ResultProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.Result", + value: Result.encode(message).finish() + }; } }; function createBaseSimulationResponse(): SimulationResponse { @@ -917,6 +1173,7 @@ function createBaseSimulationResponse(): SimulationResponse { }; } export const SimulationResponse = { + typeUrl: "/cosmos.base.abci.v1beta1.SimulationResponse", encode(message: SimulationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gasInfo !== undefined) { GasInfo.encode(message.gasInfo, writer.uint32(10).fork()).ldelim(); @@ -981,6 +1238,39 @@ export const SimulationResponse = { message.gasInfo !== undefined && (obj.gas_info = message.gasInfo ? GasInfo.toSDK(message.gasInfo) : undefined); message.result !== undefined && (obj.result = message.result ? Result.toSDK(message.result) : undefined); return obj; + }, + fromAmino(object: SimulationResponseAmino): SimulationResponse { + return { + gasInfo: object?.gas_info ? GasInfo.fromAmino(object.gas_info) : undefined, + result: object?.result ? Result.fromAmino(object.result) : undefined + }; + }, + toAmino(message: SimulationResponse): SimulationResponseAmino { + const obj: any = {}; + obj.gas_info = message.gasInfo ? GasInfo.toAmino(message.gasInfo) : undefined; + obj.result = message.result ? Result.toAmino(message.result) : undefined; + return obj; + }, + fromAminoMsg(object: SimulationResponseAminoMsg): SimulationResponse { + return SimulationResponse.fromAmino(object.value); + }, + toAminoMsg(message: SimulationResponse): SimulationResponseAminoMsg { + return { + type: "cosmos-sdk/SimulationResponse", + value: SimulationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SimulationResponseProtoMsg): SimulationResponse { + return SimulationResponse.decode(message.value); + }, + toProto(message: SimulationResponse): Uint8Array { + return SimulationResponse.encode(message).finish(); + }, + toProtoMsg(message: SimulationResponse): SimulationResponseProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.SimulationResponse", + value: SimulationResponse.encode(message).finish() + }; } }; function createBaseMsgData(): MsgData { @@ -990,6 +1280,7 @@ function createBaseMsgData(): MsgData { }; } export const MsgData = { + typeUrl: "/cosmos.base.abci.v1beta1.MsgData", encode(message: MsgData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msgType !== "") { writer.uint32(10).string(message.msgType); @@ -1054,6 +1345,39 @@ export const MsgData = { obj.msg_type = message.msgType; obj.data = message.data; return obj; + }, + fromAmino(object: MsgDataAmino): MsgData { + return { + msgType: object.msg_type, + data: object.data + }; + }, + toAmino(message: MsgData): MsgDataAmino { + const obj: any = {}; + obj.msg_type = message.msgType; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: MsgDataAminoMsg): MsgData { + return MsgData.fromAmino(object.value); + }, + toAminoMsg(message: MsgData): MsgDataAminoMsg { + return { + type: "cosmos-sdk/MsgData", + value: MsgData.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDataProtoMsg): MsgData { + return MsgData.decode(message.value); + }, + toProto(message: MsgData): Uint8Array { + return MsgData.encode(message).finish(); + }, + toProtoMsg(message: MsgData): MsgDataProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.MsgData", + value: MsgData.encode(message).finish() + }; } }; function createBaseTxMsgData(): TxMsgData { @@ -1063,6 +1387,7 @@ function createBaseTxMsgData(): TxMsgData { }; } export const TxMsgData = { + typeUrl: "/cosmos.base.abci.v1beta1.TxMsgData", encode(message: TxMsgData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { MsgData.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1143,6 +1468,47 @@ export const TxMsgData = { obj.msg_responses = []; } return obj; + }, + fromAmino(object: TxMsgDataAmino): TxMsgData { + return { + data: Array.isArray(object?.data) ? object.data.map((e: any) => MsgData.fromAmino(e)) : [], + msgResponses: Array.isArray(object?.msg_responses) ? object.msg_responses.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: TxMsgData): TxMsgDataAmino { + const obj: any = {}; + if (message.data) { + obj.data = message.data.map(e => e ? MsgData.toAmino(e) : undefined); + } else { + obj.data = []; + } + if (message.msgResponses) { + obj.msg_responses = message.msgResponses.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.msg_responses = []; + } + return obj; + }, + fromAminoMsg(object: TxMsgDataAminoMsg): TxMsgData { + return TxMsgData.fromAmino(object.value); + }, + toAminoMsg(message: TxMsgData): TxMsgDataAminoMsg { + return { + type: "cosmos-sdk/TxMsgData", + value: TxMsgData.toAmino(message) + }; + }, + fromProtoMsg(message: TxMsgDataProtoMsg): TxMsgData { + return TxMsgData.decode(message.value); + }, + toProto(message: TxMsgData): Uint8Array { + return TxMsgData.encode(message).finish(); + }, + toProtoMsg(message: TxMsgData): TxMsgDataProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.TxMsgData", + value: TxMsgData.encode(message).finish() + }; } }; function createBaseSearchTxsResult(): SearchTxsResult { @@ -1156,6 +1522,7 @@ function createBaseSearchTxsResult(): SearchTxsResult { }; } export const SearchTxsResult = { + typeUrl: "/cosmos.base.abci.v1beta1.SearchTxsResult", encode(message: SearchTxsResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.totalCount !== BigInt(0)) { writer.uint32(8).uint64(message.totalCount); @@ -1276,5 +1643,50 @@ export const SearchTxsResult = { obj.txs = []; } return obj; + }, + fromAmino(object: SearchTxsResultAmino): SearchTxsResult { + return { + totalCount: BigInt(object.total_count), + count: BigInt(object.count), + pageNumber: BigInt(object.page_number), + pageTotal: BigInt(object.page_total), + limit: BigInt(object.limit), + txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => TxResponse.fromAmino(e)) : [] + }; + }, + toAmino(message: SearchTxsResult): SearchTxsResultAmino { + const obj: any = {}; + obj.total_count = message.totalCount ? message.totalCount.toString() : undefined; + obj.count = message.count ? message.count.toString() : undefined; + obj.page_number = message.pageNumber ? message.pageNumber.toString() : undefined; + obj.page_total = message.pageTotal ? message.pageTotal.toString() : undefined; + obj.limit = message.limit ? message.limit.toString() : undefined; + if (message.txs) { + obj.txs = message.txs.map(e => e ? TxResponse.toAmino(e) : undefined); + } else { + obj.txs = []; + } + return obj; + }, + fromAminoMsg(object: SearchTxsResultAminoMsg): SearchTxsResult { + return SearchTxsResult.fromAmino(object.value); + }, + toAminoMsg(message: SearchTxsResult): SearchTxsResultAminoMsg { + return { + type: "cosmos-sdk/SearchTxsResult", + value: SearchTxsResult.toAmino(message) + }; + }, + fromProtoMsg(message: SearchTxsResultProtoMsg): SearchTxsResult { + return SearchTxsResult.decode(message.value); + }, + toProto(message: SearchTxsResult): Uint8Array { + return SearchTxsResult.encode(message).finish(); + }, + toProtoMsg(message: SearchTxsResult): SearchTxsResultProtoMsg { + return { + typeUrl: "/cosmos.base.abci.v1beta1.SearchTxsResult", + value: SearchTxsResult.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/kv/v1beta1/kv.ts index 0eec46b323..fc2e0c5699 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/kv/v1beta1/kv.ts @@ -25,6 +25,7 @@ function createBasePairs(): Pairs { }; } export const Pairs = { + typeUrl: "/cosmos.base.kv.v1beta1.Pairs", encode(message: Pairs, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pairs) { Pair.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -85,6 +86,41 @@ export const Pairs = { obj.pairs = []; } return obj; + }, + fromAmino(object: PairsAmino): Pairs { + return { + pairs: Array.isArray(object?.pairs) ? object.pairs.map((e: any) => Pair.fromAmino(e)) : [] + }; + }, + toAmino(message: Pairs): PairsAmino { + const obj: any = {}; + if (message.pairs) { + obj.pairs = message.pairs.map(e => e ? Pair.toAmino(e) : undefined); + } else { + obj.pairs = []; + } + return obj; + }, + fromAminoMsg(object: PairsAminoMsg): Pairs { + return Pairs.fromAmino(object.value); + }, + toAminoMsg(message: Pairs): PairsAminoMsg { + return { + type: "cosmos-sdk/Pairs", + value: Pairs.toAmino(message) + }; + }, + fromProtoMsg(message: PairsProtoMsg): Pairs { + return Pairs.decode(message.value); + }, + toProto(message: Pairs): Uint8Array { + return Pairs.encode(message).finish(); + }, + toProtoMsg(message: Pairs): PairsProtoMsg { + return { + typeUrl: "/cosmos.base.kv.v1beta1.Pairs", + value: Pairs.encode(message).finish() + }; } }; function createBasePair(): Pair { @@ -94,6 +130,7 @@ function createBasePair(): Pair { }; } export const Pair = { + typeUrl: "/cosmos.base.kv.v1beta1.Pair", encode(message: Pair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -158,5 +195,38 @@ export const Pair = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: PairAmino): Pair { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Pair): PairAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: PairAminoMsg): Pair { + return Pair.fromAmino(object.value); + }, + toAminoMsg(message: Pair): PairAminoMsg { + return { + type: "cosmos-sdk/Pair", + value: Pair.toAmino(message) + }; + }, + fromProtoMsg(message: PairProtoMsg): Pair { + return Pair.decode(message.value); + }, + toProto(message: Pair): Uint8Array { + return Pair.encode(message).finish(); + }, + toProtoMsg(message: Pair): PairProtoMsg { + return { + typeUrl: "/cosmos.base.kv.v1beta1.Pair", + value: Pair.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/node/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/node/v1beta1/query.ts index 88a4f256e1..fe49bcf90e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/node/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/node/v1beta1/query.ts @@ -17,6 +17,7 @@ function createBaseConfigRequest(): ConfigRequest { return {}; } export const ConfigRequest = { + typeUrl: "/cosmos.base.node.v1beta1.ConfigRequest", encode(_: ConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -54,6 +55,34 @@ export const ConfigRequest = { toSDK(_: ConfigRequest): ConfigRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ConfigRequestAmino): ConfigRequest { + return {}; + }, + toAmino(_: ConfigRequest): ConfigRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ConfigRequestAminoMsg): ConfigRequest { + return ConfigRequest.fromAmino(object.value); + }, + toAminoMsg(message: ConfigRequest): ConfigRequestAminoMsg { + return { + type: "cosmos-sdk/ConfigRequest", + value: ConfigRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ConfigRequestProtoMsg): ConfigRequest { + return ConfigRequest.decode(message.value); + }, + toProto(message: ConfigRequest): Uint8Array { + return ConfigRequest.encode(message).finish(); + }, + toProtoMsg(message: ConfigRequest): ConfigRequestProtoMsg { + return { + typeUrl: "/cosmos.base.node.v1beta1.ConfigRequest", + value: ConfigRequest.encode(message).finish() + }; } }; function createBaseConfigResponse(): ConfigResponse { @@ -62,6 +91,7 @@ function createBaseConfigResponse(): ConfigResponse { }; } export const ConfigResponse = { + typeUrl: "/cosmos.base.node.v1beta1.ConfigResponse", encode(message: ConfigResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.minimumGasPrice !== "") { writer.uint32(10).string(message.minimumGasPrice); @@ -114,5 +144,36 @@ export const ConfigResponse = { const obj: any = {}; obj.minimum_gas_price = message.minimumGasPrice; return obj; + }, + fromAmino(object: ConfigResponseAmino): ConfigResponse { + return { + minimumGasPrice: object.minimum_gas_price + }; + }, + toAmino(message: ConfigResponse): ConfigResponseAmino { + const obj: any = {}; + obj.minimum_gas_price = message.minimumGasPrice; + return obj; + }, + fromAminoMsg(object: ConfigResponseAminoMsg): ConfigResponse { + return ConfigResponse.fromAmino(object.value); + }, + toAminoMsg(message: ConfigResponse): ConfigResponseAminoMsg { + return { + type: "cosmos-sdk/ConfigResponse", + value: ConfigResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ConfigResponseProtoMsg): ConfigResponse { + return ConfigResponse.decode(message.value); + }, + toProto(message: ConfigResponse): Uint8Array { + return ConfigResponse.encode(message).finish(); + }, + toProtoMsg(message: ConfigResponse): ConfigResponseProtoMsg { + return { + typeUrl: "/cosmos.base.node.v1beta1.ConfigResponse", + value: ConfigResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/query/v1beta1/pagination.ts index 69c6c82c0e..11b58fe55d 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/query/v1beta1/pagination.ts @@ -103,6 +103,7 @@ function createBasePageRequest(): PageRequest { }; } export const PageRequest = { + typeUrl: "/cosmos.base.query.v1beta1.PageRequest", encode(message: PageRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -203,6 +204,45 @@ export const PageRequest = { obj.count_total = message.countTotal; obj.reverse = message.reverse; return obj; + }, + fromAmino(object: PageRequestAmino): PageRequest { + return { + key: object.key, + offset: BigInt(object.offset), + limit: BigInt(object.limit), + countTotal: object.count_total, + reverse: object.reverse + }; + }, + toAmino(message: PageRequest): PageRequestAmino { + const obj: any = {}; + obj.key = message.key; + obj.offset = message.offset ? message.offset.toString() : undefined; + obj.limit = message.limit ? message.limit.toString() : undefined; + obj.count_total = message.countTotal; + obj.reverse = message.reverse; + return obj; + }, + fromAminoMsg(object: PageRequestAminoMsg): PageRequest { + return PageRequest.fromAmino(object.value); + }, + toAminoMsg(message: PageRequest): PageRequestAminoMsg { + return { + type: "cosmos-sdk/PageRequest", + value: PageRequest.toAmino(message) + }; + }, + fromProtoMsg(message: PageRequestProtoMsg): PageRequest { + return PageRequest.decode(message.value); + }, + toProto(message: PageRequest): Uint8Array { + return PageRequest.encode(message).finish(); + }, + toProtoMsg(message: PageRequest): PageRequestProtoMsg { + return { + typeUrl: "/cosmos.base.query.v1beta1.PageRequest", + value: PageRequest.encode(message).finish() + }; } }; function createBasePageResponse(): PageResponse { @@ -212,6 +252,7 @@ function createBasePageResponse(): PageResponse { }; } export const PageResponse = { + typeUrl: "/cosmos.base.query.v1beta1.PageResponse", encode(message: PageResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nextKey.length !== 0) { writer.uint32(10).bytes(message.nextKey); @@ -276,5 +317,38 @@ export const PageResponse = { obj.next_key = message.nextKey; obj.total = message.total; return obj; + }, + fromAmino(object: PageResponseAmino): PageResponse { + return { + nextKey: object.next_key, + total: BigInt(object.total) + }; + }, + toAmino(message: PageResponse): PageResponseAmino { + const obj: any = {}; + obj.next_key = message.nextKey; + obj.total = message.total ? message.total.toString() : undefined; + return obj; + }, + fromAminoMsg(object: PageResponseAminoMsg): PageResponse { + return PageResponse.fromAmino(object.value); + }, + toAminoMsg(message: PageResponse): PageResponseAminoMsg { + return { + type: "cosmos-sdk/PageResponse", + value: PageResponse.toAmino(message) + }; + }, + fromProtoMsg(message: PageResponseProtoMsg): PageResponse { + return PageResponse.decode(message.value); + }, + toProto(message: PageResponse): Uint8Array { + return PageResponse.encode(message).finish(); + }, + toProtoMsg(message: PageResponse): PageResponseProtoMsg { + return { + typeUrl: "/cosmos.base.query.v1beta1.PageResponse", + value: PageResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v1beta1/reflection.ts index 99597dd816..66110987ca 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v1beta1/reflection.ts @@ -47,6 +47,7 @@ function createBaseListAllInterfacesRequest(): ListAllInterfacesRequest { return {}; } export const ListAllInterfacesRequest = { + typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesRequest", encode(_: ListAllInterfacesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -84,6 +85,34 @@ export const ListAllInterfacesRequest = { toSDK(_: ListAllInterfacesRequest): ListAllInterfacesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ListAllInterfacesRequestAmino): ListAllInterfacesRequest { + return {}; + }, + toAmino(_: ListAllInterfacesRequest): ListAllInterfacesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ListAllInterfacesRequestAminoMsg): ListAllInterfacesRequest { + return ListAllInterfacesRequest.fromAmino(object.value); + }, + toAminoMsg(message: ListAllInterfacesRequest): ListAllInterfacesRequestAminoMsg { + return { + type: "cosmos-sdk/ListAllInterfacesRequest", + value: ListAllInterfacesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ListAllInterfacesRequestProtoMsg): ListAllInterfacesRequest { + return ListAllInterfacesRequest.decode(message.value); + }, + toProto(message: ListAllInterfacesRequest): Uint8Array { + return ListAllInterfacesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListAllInterfacesRequest): ListAllInterfacesRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesRequest", + value: ListAllInterfacesRequest.encode(message).finish() + }; } }; function createBaseListAllInterfacesResponse(): ListAllInterfacesResponse { @@ -92,6 +121,7 @@ function createBaseListAllInterfacesResponse(): ListAllInterfacesResponse { }; } export const ListAllInterfacesResponse = { + typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesResponse", encode(message: ListAllInterfacesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.interfaceNames) { writer.uint32(10).string(v!); @@ -152,6 +182,41 @@ export const ListAllInterfacesResponse = { obj.interface_names = []; } return obj; + }, + fromAmino(object: ListAllInterfacesResponseAmino): ListAllInterfacesResponse { + return { + interfaceNames: Array.isArray(object?.interface_names) ? object.interface_names.map((e: any) => e) : [] + }; + }, + toAmino(message: ListAllInterfacesResponse): ListAllInterfacesResponseAmino { + const obj: any = {}; + if (message.interfaceNames) { + obj.interface_names = message.interfaceNames.map(e => e); + } else { + obj.interface_names = []; + } + return obj; + }, + fromAminoMsg(object: ListAllInterfacesResponseAminoMsg): ListAllInterfacesResponse { + return ListAllInterfacesResponse.fromAmino(object.value); + }, + toAminoMsg(message: ListAllInterfacesResponse): ListAllInterfacesResponseAminoMsg { + return { + type: "cosmos-sdk/ListAllInterfacesResponse", + value: ListAllInterfacesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ListAllInterfacesResponseProtoMsg): ListAllInterfacesResponse { + return ListAllInterfacesResponse.decode(message.value); + }, + toProto(message: ListAllInterfacesResponse): Uint8Array { + return ListAllInterfacesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListAllInterfacesResponse): ListAllInterfacesResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesResponse", + value: ListAllInterfacesResponse.encode(message).finish() + }; } }; function createBaseListImplementationsRequest(): ListImplementationsRequest { @@ -160,6 +225,7 @@ function createBaseListImplementationsRequest(): ListImplementationsRequest { }; } export const ListImplementationsRequest = { + typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsRequest", encode(message: ListImplementationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.interfaceName !== "") { writer.uint32(10).string(message.interfaceName); @@ -212,6 +278,37 @@ export const ListImplementationsRequest = { const obj: any = {}; obj.interface_name = message.interfaceName; return obj; + }, + fromAmino(object: ListImplementationsRequestAmino): ListImplementationsRequest { + return { + interfaceName: object.interface_name + }; + }, + toAmino(message: ListImplementationsRequest): ListImplementationsRequestAmino { + const obj: any = {}; + obj.interface_name = message.interfaceName; + return obj; + }, + fromAminoMsg(object: ListImplementationsRequestAminoMsg): ListImplementationsRequest { + return ListImplementationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: ListImplementationsRequest): ListImplementationsRequestAminoMsg { + return { + type: "cosmos-sdk/ListImplementationsRequest", + value: ListImplementationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ListImplementationsRequestProtoMsg): ListImplementationsRequest { + return ListImplementationsRequest.decode(message.value); + }, + toProto(message: ListImplementationsRequest): Uint8Array { + return ListImplementationsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListImplementationsRequest): ListImplementationsRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsRequest", + value: ListImplementationsRequest.encode(message).finish() + }; } }; function createBaseListImplementationsResponse(): ListImplementationsResponse { @@ -220,6 +317,7 @@ function createBaseListImplementationsResponse(): ListImplementationsResponse { }; } export const ListImplementationsResponse = { + typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsResponse", encode(message: ListImplementationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.implementationMessageNames) { writer.uint32(10).string(v!); @@ -280,5 +378,40 @@ export const ListImplementationsResponse = { obj.implementation_message_names = []; } return obj; + }, + fromAmino(object: ListImplementationsResponseAmino): ListImplementationsResponse { + return { + implementationMessageNames: Array.isArray(object?.implementation_message_names) ? object.implementation_message_names.map((e: any) => e) : [] + }; + }, + toAmino(message: ListImplementationsResponse): ListImplementationsResponseAmino { + const obj: any = {}; + if (message.implementationMessageNames) { + obj.implementation_message_names = message.implementationMessageNames.map(e => e); + } else { + obj.implementation_message_names = []; + } + return obj; + }, + fromAminoMsg(object: ListImplementationsResponseAminoMsg): ListImplementationsResponse { + return ListImplementationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: ListImplementationsResponse): ListImplementationsResponseAminoMsg { + return { + type: "cosmos-sdk/ListImplementationsResponse", + value: ListImplementationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ListImplementationsResponseProtoMsg): ListImplementationsResponse { + return ListImplementationsResponse.decode(message.value); + }, + toProto(message: ListImplementationsResponse): Uint8Array { + return ListImplementationsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListImplementationsResponse): ListImplementationsResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsResponse", + value: ListImplementationsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v2alpha1/reflection.ts index 7b20d14289..d5128377df 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/reflection/v2alpha1/reflection.ts @@ -319,6 +319,7 @@ function createBaseAppDescriptor(): AppDescriptor { }; } export const AppDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.AppDescriptor", encode(message: AppDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authn !== undefined) { AuthnDescriptor.encode(message.authn, writer.uint32(10).fork()).ldelim(); @@ -431,6 +432,47 @@ export const AppDescriptor = { message.queryServices !== undefined && (obj.query_services = message.queryServices ? QueryServicesDescriptor.toSDK(message.queryServices) : undefined); message.tx !== undefined && (obj.tx = message.tx ? TxDescriptor.toSDK(message.tx) : undefined); return obj; + }, + fromAmino(object: AppDescriptorAmino): AppDescriptor { + return { + authn: object?.authn ? AuthnDescriptor.fromAmino(object.authn) : undefined, + chain: object?.chain ? ChainDescriptor.fromAmino(object.chain) : undefined, + codec: object?.codec ? CodecDescriptor.fromAmino(object.codec) : undefined, + configuration: object?.configuration ? ConfigurationDescriptor.fromAmino(object.configuration) : undefined, + queryServices: object?.query_services ? QueryServicesDescriptor.fromAmino(object.query_services) : undefined, + tx: object?.tx ? TxDescriptor.fromAmino(object.tx) : undefined + }; + }, + toAmino(message: AppDescriptor): AppDescriptorAmino { + const obj: any = {}; + obj.authn = message.authn ? AuthnDescriptor.toAmino(message.authn) : undefined; + obj.chain = message.chain ? ChainDescriptor.toAmino(message.chain) : undefined; + obj.codec = message.codec ? CodecDescriptor.toAmino(message.codec) : undefined; + obj.configuration = message.configuration ? ConfigurationDescriptor.toAmino(message.configuration) : undefined; + obj.query_services = message.queryServices ? QueryServicesDescriptor.toAmino(message.queryServices) : undefined; + obj.tx = message.tx ? TxDescriptor.toAmino(message.tx) : undefined; + return obj; + }, + fromAminoMsg(object: AppDescriptorAminoMsg): AppDescriptor { + return AppDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: AppDescriptor): AppDescriptorAminoMsg { + return { + type: "cosmos-sdk/AppDescriptor", + value: AppDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: AppDescriptorProtoMsg): AppDescriptor { + return AppDescriptor.decode(message.value); + }, + toProto(message: AppDescriptor): Uint8Array { + return AppDescriptor.encode(message).finish(); + }, + toProtoMsg(message: AppDescriptor): AppDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.AppDescriptor", + value: AppDescriptor.encode(message).finish() + }; } }; function createBaseTxDescriptor(): TxDescriptor { @@ -440,6 +482,7 @@ function createBaseTxDescriptor(): TxDescriptor { }; } export const TxDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.TxDescriptor", encode(message: TxDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); @@ -512,6 +555,43 @@ export const TxDescriptor = { obj.msgs = []; } return obj; + }, + fromAmino(object: TxDescriptorAmino): TxDescriptor { + return { + fullname: object.fullname, + msgs: Array.isArray(object?.msgs) ? object.msgs.map((e: any) => MsgDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: TxDescriptor): TxDescriptorAmino { + const obj: any = {}; + obj.fullname = message.fullname; + if (message.msgs) { + obj.msgs = message.msgs.map(e => e ? MsgDescriptor.toAmino(e) : undefined); + } else { + obj.msgs = []; + } + return obj; + }, + fromAminoMsg(object: TxDescriptorAminoMsg): TxDescriptor { + return TxDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: TxDescriptor): TxDescriptorAminoMsg { + return { + type: "cosmos-sdk/TxDescriptor", + value: TxDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: TxDescriptorProtoMsg): TxDescriptor { + return TxDescriptor.decode(message.value); + }, + toProto(message: TxDescriptor): Uint8Array { + return TxDescriptor.encode(message).finish(); + }, + toProtoMsg(message: TxDescriptor): TxDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.TxDescriptor", + value: TxDescriptor.encode(message).finish() + }; } }; function createBaseAuthnDescriptor(): AuthnDescriptor { @@ -520,6 +600,7 @@ function createBaseAuthnDescriptor(): AuthnDescriptor { }; } export const AuthnDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.AuthnDescriptor", encode(message: AuthnDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signModes) { SigningModeDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -580,6 +661,41 @@ export const AuthnDescriptor = { obj.sign_modes = []; } return obj; + }, + fromAmino(object: AuthnDescriptorAmino): AuthnDescriptor { + return { + signModes: Array.isArray(object?.sign_modes) ? object.sign_modes.map((e: any) => SigningModeDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: AuthnDescriptor): AuthnDescriptorAmino { + const obj: any = {}; + if (message.signModes) { + obj.sign_modes = message.signModes.map(e => e ? SigningModeDescriptor.toAmino(e) : undefined); + } else { + obj.sign_modes = []; + } + return obj; + }, + fromAminoMsg(object: AuthnDescriptorAminoMsg): AuthnDescriptor { + return AuthnDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: AuthnDescriptor): AuthnDescriptorAminoMsg { + return { + type: "cosmos-sdk/AuthnDescriptor", + value: AuthnDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: AuthnDescriptorProtoMsg): AuthnDescriptor { + return AuthnDescriptor.decode(message.value); + }, + toProto(message: AuthnDescriptor): Uint8Array { + return AuthnDescriptor.encode(message).finish(); + }, + toProtoMsg(message: AuthnDescriptor): AuthnDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.AuthnDescriptor", + value: AuthnDescriptor.encode(message).finish() + }; } }; function createBaseSigningModeDescriptor(): SigningModeDescriptor { @@ -590,6 +706,7 @@ function createBaseSigningModeDescriptor(): SigningModeDescriptor { }; } export const SigningModeDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.SigningModeDescriptor", encode(message: SigningModeDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -666,6 +783,41 @@ export const SigningModeDescriptor = { obj.number = message.number; obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; return obj; + }, + fromAmino(object: SigningModeDescriptorAmino): SigningModeDescriptor { + return { + name: object.name, + number: object.number, + authnInfoProviderMethodFullname: object.authn_info_provider_method_fullname + }; + }, + toAmino(message: SigningModeDescriptor): SigningModeDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + obj.number = message.number; + obj.authn_info_provider_method_fullname = message.authnInfoProviderMethodFullname; + return obj; + }, + fromAminoMsg(object: SigningModeDescriptorAminoMsg): SigningModeDescriptor { + return SigningModeDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: SigningModeDescriptor): SigningModeDescriptorAminoMsg { + return { + type: "cosmos-sdk/SigningModeDescriptor", + value: SigningModeDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: SigningModeDescriptorProtoMsg): SigningModeDescriptor { + return SigningModeDescriptor.decode(message.value); + }, + toProto(message: SigningModeDescriptor): Uint8Array { + return SigningModeDescriptor.encode(message).finish(); + }, + toProtoMsg(message: SigningModeDescriptor): SigningModeDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.SigningModeDescriptor", + value: SigningModeDescriptor.encode(message).finish() + }; } }; function createBaseChainDescriptor(): ChainDescriptor { @@ -674,6 +826,7 @@ function createBaseChainDescriptor(): ChainDescriptor { }; } export const ChainDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.ChainDescriptor", encode(message: ChainDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -726,6 +879,37 @@ export const ChainDescriptor = { const obj: any = {}; obj.id = message.id; return obj; + }, + fromAmino(object: ChainDescriptorAmino): ChainDescriptor { + return { + id: object.id + }; + }, + toAmino(message: ChainDescriptor): ChainDescriptorAmino { + const obj: any = {}; + obj.id = message.id; + return obj; + }, + fromAminoMsg(object: ChainDescriptorAminoMsg): ChainDescriptor { + return ChainDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: ChainDescriptor): ChainDescriptorAminoMsg { + return { + type: "cosmos-sdk/ChainDescriptor", + value: ChainDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: ChainDescriptorProtoMsg): ChainDescriptor { + return ChainDescriptor.decode(message.value); + }, + toProto(message: ChainDescriptor): Uint8Array { + return ChainDescriptor.encode(message).finish(); + }, + toProtoMsg(message: ChainDescriptor): ChainDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.ChainDescriptor", + value: ChainDescriptor.encode(message).finish() + }; } }; function createBaseCodecDescriptor(): CodecDescriptor { @@ -734,6 +918,7 @@ function createBaseCodecDescriptor(): CodecDescriptor { }; } export const CodecDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.CodecDescriptor", encode(message: CodecDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.interfaces) { InterfaceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -794,6 +979,41 @@ export const CodecDescriptor = { obj.interfaces = []; } return obj; + }, + fromAmino(object: CodecDescriptorAmino): CodecDescriptor { + return { + interfaces: Array.isArray(object?.interfaces) ? object.interfaces.map((e: any) => InterfaceDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: CodecDescriptor): CodecDescriptorAmino { + const obj: any = {}; + if (message.interfaces) { + obj.interfaces = message.interfaces.map(e => e ? InterfaceDescriptor.toAmino(e) : undefined); + } else { + obj.interfaces = []; + } + return obj; + }, + fromAminoMsg(object: CodecDescriptorAminoMsg): CodecDescriptor { + return CodecDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: CodecDescriptor): CodecDescriptorAminoMsg { + return { + type: "cosmos-sdk/CodecDescriptor", + value: CodecDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: CodecDescriptorProtoMsg): CodecDescriptor { + return CodecDescriptor.decode(message.value); + }, + toProto(message: CodecDescriptor): Uint8Array { + return CodecDescriptor.encode(message).finish(); + }, + toProtoMsg(message: CodecDescriptor): CodecDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.CodecDescriptor", + value: CodecDescriptor.encode(message).finish() + }; } }; function createBaseInterfaceDescriptor(): InterfaceDescriptor { @@ -804,6 +1024,7 @@ function createBaseInterfaceDescriptor(): InterfaceDescriptor { }; } export const InterfaceDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceDescriptor", encode(message: InterfaceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); @@ -896,6 +1117,49 @@ export const InterfaceDescriptor = { obj.interface_implementers = []; } return obj; + }, + fromAmino(object: InterfaceDescriptorAmino): InterfaceDescriptor { + return { + fullname: object.fullname, + interfaceAcceptingMessages: Array.isArray(object?.interface_accepting_messages) ? object.interface_accepting_messages.map((e: any) => InterfaceAcceptingMessageDescriptor.fromAmino(e)) : [], + interfaceImplementers: Array.isArray(object?.interface_implementers) ? object.interface_implementers.map((e: any) => InterfaceImplementerDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { + const obj: any = {}; + obj.fullname = message.fullname; + if (message.interfaceAcceptingMessages) { + obj.interface_accepting_messages = message.interfaceAcceptingMessages.map(e => e ? InterfaceAcceptingMessageDescriptor.toAmino(e) : undefined); + } else { + obj.interface_accepting_messages = []; + } + if (message.interfaceImplementers) { + obj.interface_implementers = message.interfaceImplementers.map(e => e ? InterfaceImplementerDescriptor.toAmino(e) : undefined); + } else { + obj.interface_implementers = []; + } + return obj; + }, + fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { + return InterfaceDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: InterfaceDescriptor): InterfaceDescriptorAminoMsg { + return { + type: "cosmos-sdk/InterfaceDescriptor", + value: InterfaceDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: InterfaceDescriptorProtoMsg): InterfaceDescriptor { + return InterfaceDescriptor.decode(message.value); + }, + toProto(message: InterfaceDescriptor): Uint8Array { + return InterfaceDescriptor.encode(message).finish(); + }, + toProtoMsg(message: InterfaceDescriptor): InterfaceDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceDescriptor", + value: InterfaceDescriptor.encode(message).finish() + }; } }; function createBaseInterfaceImplementerDescriptor(): InterfaceImplementerDescriptor { @@ -905,6 +1169,7 @@ function createBaseInterfaceImplementerDescriptor(): InterfaceImplementerDescrip }; } export const InterfaceImplementerDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceImplementerDescriptor", encode(message: InterfaceImplementerDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); @@ -969,6 +1234,39 @@ export const InterfaceImplementerDescriptor = { obj.fullname = message.fullname; obj.type_url = message.typeUrl; return obj; + }, + fromAmino(object: InterfaceImplementerDescriptorAmino): InterfaceImplementerDescriptor { + return { + fullname: object.fullname, + typeUrl: object.type_url + }; + }, + toAmino(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAmino { + const obj: any = {}; + obj.fullname = message.fullname; + obj.type_url = message.typeUrl; + return obj; + }, + fromAminoMsg(object: InterfaceImplementerDescriptorAminoMsg): InterfaceImplementerDescriptor { + return InterfaceImplementerDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorAminoMsg { + return { + type: "cosmos-sdk/InterfaceImplementerDescriptor", + value: InterfaceImplementerDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: InterfaceImplementerDescriptorProtoMsg): InterfaceImplementerDescriptor { + return InterfaceImplementerDescriptor.decode(message.value); + }, + toProto(message: InterfaceImplementerDescriptor): Uint8Array { + return InterfaceImplementerDescriptor.encode(message).finish(); + }, + toProtoMsg(message: InterfaceImplementerDescriptor): InterfaceImplementerDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceImplementerDescriptor", + value: InterfaceImplementerDescriptor.encode(message).finish() + }; } }; function createBaseInterfaceAcceptingMessageDescriptor(): InterfaceAcceptingMessageDescriptor { @@ -978,6 +1276,7 @@ function createBaseInterfaceAcceptingMessageDescriptor(): InterfaceAcceptingMess }; } export const InterfaceAcceptingMessageDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor", encode(message: InterfaceAcceptingMessageDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); @@ -1050,6 +1349,43 @@ export const InterfaceAcceptingMessageDescriptor = { obj.field_descriptor_names = []; } return obj; + }, + fromAmino(object: InterfaceAcceptingMessageDescriptorAmino): InterfaceAcceptingMessageDescriptor { + return { + fullname: object.fullname, + fieldDescriptorNames: Array.isArray(object?.field_descriptor_names) ? object.field_descriptor_names.map((e: any) => e) : [] + }; + }, + toAmino(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAmino { + const obj: any = {}; + obj.fullname = message.fullname; + if (message.fieldDescriptorNames) { + obj.field_descriptor_names = message.fieldDescriptorNames.map(e => e); + } else { + obj.field_descriptor_names = []; + } + return obj; + }, + fromAminoMsg(object: InterfaceAcceptingMessageDescriptorAminoMsg): InterfaceAcceptingMessageDescriptor { + return InterfaceAcceptingMessageDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorAminoMsg { + return { + type: "cosmos-sdk/InterfaceAcceptingMessageDescriptor", + value: InterfaceAcceptingMessageDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: InterfaceAcceptingMessageDescriptorProtoMsg): InterfaceAcceptingMessageDescriptor { + return InterfaceAcceptingMessageDescriptor.decode(message.value); + }, + toProto(message: InterfaceAcceptingMessageDescriptor): Uint8Array { + return InterfaceAcceptingMessageDescriptor.encode(message).finish(); + }, + toProtoMsg(message: InterfaceAcceptingMessageDescriptor): InterfaceAcceptingMessageDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor", + value: InterfaceAcceptingMessageDescriptor.encode(message).finish() + }; } }; function createBaseConfigurationDescriptor(): ConfigurationDescriptor { @@ -1058,6 +1394,7 @@ function createBaseConfigurationDescriptor(): ConfigurationDescriptor { }; } export const ConfigurationDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.ConfigurationDescriptor", encode(message: ConfigurationDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bech32AccountAddressPrefix !== "") { writer.uint32(10).string(message.bech32AccountAddressPrefix); @@ -1110,6 +1447,37 @@ export const ConfigurationDescriptor = { const obj: any = {}; obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; return obj; + }, + fromAmino(object: ConfigurationDescriptorAmino): ConfigurationDescriptor { + return { + bech32AccountAddressPrefix: object.bech32_account_address_prefix + }; + }, + toAmino(message: ConfigurationDescriptor): ConfigurationDescriptorAmino { + const obj: any = {}; + obj.bech32_account_address_prefix = message.bech32AccountAddressPrefix; + return obj; + }, + fromAminoMsg(object: ConfigurationDescriptorAminoMsg): ConfigurationDescriptor { + return ConfigurationDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: ConfigurationDescriptor): ConfigurationDescriptorAminoMsg { + return { + type: "cosmos-sdk/ConfigurationDescriptor", + value: ConfigurationDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: ConfigurationDescriptorProtoMsg): ConfigurationDescriptor { + return ConfigurationDescriptor.decode(message.value); + }, + toProto(message: ConfigurationDescriptor): Uint8Array { + return ConfigurationDescriptor.encode(message).finish(); + }, + toProtoMsg(message: ConfigurationDescriptor): ConfigurationDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.ConfigurationDescriptor", + value: ConfigurationDescriptor.encode(message).finish() + }; } }; function createBaseMsgDescriptor(): MsgDescriptor { @@ -1118,6 +1486,7 @@ function createBaseMsgDescriptor(): MsgDescriptor { }; } export const MsgDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.MsgDescriptor", encode(message: MsgDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msgTypeUrl !== "") { writer.uint32(10).string(message.msgTypeUrl); @@ -1170,12 +1539,44 @@ export const MsgDescriptor = { const obj: any = {}; obj.msg_type_url = message.msgTypeUrl; return obj; + }, + fromAmino(object: MsgDescriptorAmino): MsgDescriptor { + return { + msgTypeUrl: object.msg_type_url + }; + }, + toAmino(message: MsgDescriptor): MsgDescriptorAmino { + const obj: any = {}; + obj.msg_type_url = message.msgTypeUrl; + return obj; + }, + fromAminoMsg(object: MsgDescriptorAminoMsg): MsgDescriptor { + return MsgDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: MsgDescriptor): MsgDescriptorAminoMsg { + return { + type: "cosmos-sdk/MsgDescriptor", + value: MsgDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDescriptorProtoMsg): MsgDescriptor { + return MsgDescriptor.decode(message.value); + }, + toProto(message: MsgDescriptor): Uint8Array { + return MsgDescriptor.encode(message).finish(); + }, + toProtoMsg(message: MsgDescriptor): MsgDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.MsgDescriptor", + value: MsgDescriptor.encode(message).finish() + }; } }; function createBaseGetAuthnDescriptorRequest(): GetAuthnDescriptorRequest { return {}; } export const GetAuthnDescriptorRequest = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest", encode(_: GetAuthnDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1213,6 +1614,34 @@ export const GetAuthnDescriptorRequest = { toSDK(_: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetAuthnDescriptorRequestAmino): GetAuthnDescriptorRequest { + return {}; + }, + toAmino(_: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetAuthnDescriptorRequestAminoMsg): GetAuthnDescriptorRequest { + return GetAuthnDescriptorRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestAminoMsg { + return { + type: "cosmos-sdk/GetAuthnDescriptorRequest", + value: GetAuthnDescriptorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetAuthnDescriptorRequestProtoMsg): GetAuthnDescriptorRequest { + return GetAuthnDescriptorRequest.decode(message.value); + }, + toProto(message: GetAuthnDescriptorRequest): Uint8Array { + return GetAuthnDescriptorRequest.encode(message).finish(); + }, + toProtoMsg(message: GetAuthnDescriptorRequest): GetAuthnDescriptorRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest", + value: GetAuthnDescriptorRequest.encode(message).finish() + }; } }; function createBaseGetAuthnDescriptorResponse(): GetAuthnDescriptorResponse { @@ -1221,6 +1650,7 @@ function createBaseGetAuthnDescriptorResponse(): GetAuthnDescriptorResponse { }; } export const GetAuthnDescriptorResponse = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse", encode(message: GetAuthnDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authn !== undefined) { AuthnDescriptor.encode(message.authn, writer.uint32(10).fork()).ldelim(); @@ -1273,12 +1703,44 @@ export const GetAuthnDescriptorResponse = { const obj: any = {}; message.authn !== undefined && (obj.authn = message.authn ? AuthnDescriptor.toSDK(message.authn) : undefined); return obj; + }, + fromAmino(object: GetAuthnDescriptorResponseAmino): GetAuthnDescriptorResponse { + return { + authn: object?.authn ? AuthnDescriptor.fromAmino(object.authn) : undefined + }; + }, + toAmino(message: GetAuthnDescriptorResponse): GetAuthnDescriptorResponseAmino { + const obj: any = {}; + obj.authn = message.authn ? AuthnDescriptor.toAmino(message.authn) : undefined; + return obj; + }, + fromAminoMsg(object: GetAuthnDescriptorResponseAminoMsg): GetAuthnDescriptorResponse { + return GetAuthnDescriptorResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetAuthnDescriptorResponse): GetAuthnDescriptorResponseAminoMsg { + return { + type: "cosmos-sdk/GetAuthnDescriptorResponse", + value: GetAuthnDescriptorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetAuthnDescriptorResponseProtoMsg): GetAuthnDescriptorResponse { + return GetAuthnDescriptorResponse.decode(message.value); + }, + toProto(message: GetAuthnDescriptorResponse): Uint8Array { + return GetAuthnDescriptorResponse.encode(message).finish(); + }, + toProtoMsg(message: GetAuthnDescriptorResponse): GetAuthnDescriptorResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse", + value: GetAuthnDescriptorResponse.encode(message).finish() + }; } }; function createBaseGetChainDescriptorRequest(): GetChainDescriptorRequest { return {}; } export const GetChainDescriptorRequest = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest", encode(_: GetChainDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1316,6 +1778,34 @@ export const GetChainDescriptorRequest = { toSDK(_: GetChainDescriptorRequest): GetChainDescriptorRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetChainDescriptorRequestAmino): GetChainDescriptorRequest { + return {}; + }, + toAmino(_: GetChainDescriptorRequest): GetChainDescriptorRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetChainDescriptorRequestAminoMsg): GetChainDescriptorRequest { + return GetChainDescriptorRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetChainDescriptorRequest): GetChainDescriptorRequestAminoMsg { + return { + type: "cosmos-sdk/GetChainDescriptorRequest", + value: GetChainDescriptorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetChainDescriptorRequestProtoMsg): GetChainDescriptorRequest { + return GetChainDescriptorRequest.decode(message.value); + }, + toProto(message: GetChainDescriptorRequest): Uint8Array { + return GetChainDescriptorRequest.encode(message).finish(); + }, + toProtoMsg(message: GetChainDescriptorRequest): GetChainDescriptorRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest", + value: GetChainDescriptorRequest.encode(message).finish() + }; } }; function createBaseGetChainDescriptorResponse(): GetChainDescriptorResponse { @@ -1324,6 +1814,7 @@ function createBaseGetChainDescriptorResponse(): GetChainDescriptorResponse { }; } export const GetChainDescriptorResponse = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorResponse", encode(message: GetChainDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.chain !== undefined) { ChainDescriptor.encode(message.chain, writer.uint32(10).fork()).ldelim(); @@ -1376,12 +1867,44 @@ export const GetChainDescriptorResponse = { const obj: any = {}; message.chain !== undefined && (obj.chain = message.chain ? ChainDescriptor.toSDK(message.chain) : undefined); return obj; + }, + fromAmino(object: GetChainDescriptorResponseAmino): GetChainDescriptorResponse { + return { + chain: object?.chain ? ChainDescriptor.fromAmino(object.chain) : undefined + }; + }, + toAmino(message: GetChainDescriptorResponse): GetChainDescriptorResponseAmino { + const obj: any = {}; + obj.chain = message.chain ? ChainDescriptor.toAmino(message.chain) : undefined; + return obj; + }, + fromAminoMsg(object: GetChainDescriptorResponseAminoMsg): GetChainDescriptorResponse { + return GetChainDescriptorResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetChainDescriptorResponse): GetChainDescriptorResponseAminoMsg { + return { + type: "cosmos-sdk/GetChainDescriptorResponse", + value: GetChainDescriptorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetChainDescriptorResponseProtoMsg): GetChainDescriptorResponse { + return GetChainDescriptorResponse.decode(message.value); + }, + toProto(message: GetChainDescriptorResponse): Uint8Array { + return GetChainDescriptorResponse.encode(message).finish(); + }, + toProtoMsg(message: GetChainDescriptorResponse): GetChainDescriptorResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorResponse", + value: GetChainDescriptorResponse.encode(message).finish() + }; } }; function createBaseGetCodecDescriptorRequest(): GetCodecDescriptorRequest { return {}; } export const GetCodecDescriptorRequest = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorRequest", encode(_: GetCodecDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1419,6 +1942,34 @@ export const GetCodecDescriptorRequest = { toSDK(_: GetCodecDescriptorRequest): GetCodecDescriptorRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetCodecDescriptorRequestAmino): GetCodecDescriptorRequest { + return {}; + }, + toAmino(_: GetCodecDescriptorRequest): GetCodecDescriptorRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetCodecDescriptorRequestAminoMsg): GetCodecDescriptorRequest { + return GetCodecDescriptorRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetCodecDescriptorRequest): GetCodecDescriptorRequestAminoMsg { + return { + type: "cosmos-sdk/GetCodecDescriptorRequest", + value: GetCodecDescriptorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetCodecDescriptorRequestProtoMsg): GetCodecDescriptorRequest { + return GetCodecDescriptorRequest.decode(message.value); + }, + toProto(message: GetCodecDescriptorRequest): Uint8Array { + return GetCodecDescriptorRequest.encode(message).finish(); + }, + toProtoMsg(message: GetCodecDescriptorRequest): GetCodecDescriptorRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorRequest", + value: GetCodecDescriptorRequest.encode(message).finish() + }; } }; function createBaseGetCodecDescriptorResponse(): GetCodecDescriptorResponse { @@ -1427,6 +1978,7 @@ function createBaseGetCodecDescriptorResponse(): GetCodecDescriptorResponse { }; } export const GetCodecDescriptorResponse = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorResponse", encode(message: GetCodecDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codec !== undefined) { CodecDescriptor.encode(message.codec, writer.uint32(10).fork()).ldelim(); @@ -1479,12 +2031,44 @@ export const GetCodecDescriptorResponse = { const obj: any = {}; message.codec !== undefined && (obj.codec = message.codec ? CodecDescriptor.toSDK(message.codec) : undefined); return obj; + }, + fromAmino(object: GetCodecDescriptorResponseAmino): GetCodecDescriptorResponse { + return { + codec: object?.codec ? CodecDescriptor.fromAmino(object.codec) : undefined + }; + }, + toAmino(message: GetCodecDescriptorResponse): GetCodecDescriptorResponseAmino { + const obj: any = {}; + obj.codec = message.codec ? CodecDescriptor.toAmino(message.codec) : undefined; + return obj; + }, + fromAminoMsg(object: GetCodecDescriptorResponseAminoMsg): GetCodecDescriptorResponse { + return GetCodecDescriptorResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetCodecDescriptorResponse): GetCodecDescriptorResponseAminoMsg { + return { + type: "cosmos-sdk/GetCodecDescriptorResponse", + value: GetCodecDescriptorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetCodecDescriptorResponseProtoMsg): GetCodecDescriptorResponse { + return GetCodecDescriptorResponse.decode(message.value); + }, + toProto(message: GetCodecDescriptorResponse): Uint8Array { + return GetCodecDescriptorResponse.encode(message).finish(); + }, + toProtoMsg(message: GetCodecDescriptorResponse): GetCodecDescriptorResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorResponse", + value: GetCodecDescriptorResponse.encode(message).finish() + }; } }; function createBaseGetConfigurationDescriptorRequest(): GetConfigurationDescriptorRequest { return {}; } export const GetConfigurationDescriptorRequest = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorRequest", encode(_: GetConfigurationDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1522,6 +2106,34 @@ export const GetConfigurationDescriptorRequest = { toSDK(_: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetConfigurationDescriptorRequestAmino): GetConfigurationDescriptorRequest { + return {}; + }, + toAmino(_: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetConfigurationDescriptorRequestAminoMsg): GetConfigurationDescriptorRequest { + return GetConfigurationDescriptorRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestAminoMsg { + return { + type: "cosmos-sdk/GetConfigurationDescriptorRequest", + value: GetConfigurationDescriptorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetConfigurationDescriptorRequestProtoMsg): GetConfigurationDescriptorRequest { + return GetConfigurationDescriptorRequest.decode(message.value); + }, + toProto(message: GetConfigurationDescriptorRequest): Uint8Array { + return GetConfigurationDescriptorRequest.encode(message).finish(); + }, + toProtoMsg(message: GetConfigurationDescriptorRequest): GetConfigurationDescriptorRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorRequest", + value: GetConfigurationDescriptorRequest.encode(message).finish() + }; } }; function createBaseGetConfigurationDescriptorResponse(): GetConfigurationDescriptorResponse { @@ -1530,6 +2142,7 @@ function createBaseGetConfigurationDescriptorResponse(): GetConfigurationDescrip }; } export const GetConfigurationDescriptorResponse = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorResponse", encode(message: GetConfigurationDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.config !== undefined) { ConfigurationDescriptor.encode(message.config, writer.uint32(10).fork()).ldelim(); @@ -1582,12 +2195,44 @@ export const GetConfigurationDescriptorResponse = { const obj: any = {}; message.config !== undefined && (obj.config = message.config ? ConfigurationDescriptor.toSDK(message.config) : undefined); return obj; + }, + fromAmino(object: GetConfigurationDescriptorResponseAmino): GetConfigurationDescriptorResponse { + return { + config: object?.config ? ConfigurationDescriptor.fromAmino(object.config) : undefined + }; + }, + toAmino(message: GetConfigurationDescriptorResponse): GetConfigurationDescriptorResponseAmino { + const obj: any = {}; + obj.config = message.config ? ConfigurationDescriptor.toAmino(message.config) : undefined; + return obj; + }, + fromAminoMsg(object: GetConfigurationDescriptorResponseAminoMsg): GetConfigurationDescriptorResponse { + return GetConfigurationDescriptorResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetConfigurationDescriptorResponse): GetConfigurationDescriptorResponseAminoMsg { + return { + type: "cosmos-sdk/GetConfigurationDescriptorResponse", + value: GetConfigurationDescriptorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetConfigurationDescriptorResponseProtoMsg): GetConfigurationDescriptorResponse { + return GetConfigurationDescriptorResponse.decode(message.value); + }, + toProto(message: GetConfigurationDescriptorResponse): Uint8Array { + return GetConfigurationDescriptorResponse.encode(message).finish(); + }, + toProtoMsg(message: GetConfigurationDescriptorResponse): GetConfigurationDescriptorResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorResponse", + value: GetConfigurationDescriptorResponse.encode(message).finish() + }; } }; function createBaseGetQueryServicesDescriptorRequest(): GetQueryServicesDescriptorRequest { return {}; } export const GetQueryServicesDescriptorRequest = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorRequest", encode(_: GetQueryServicesDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1625,6 +2270,34 @@ export const GetQueryServicesDescriptorRequest = { toSDK(_: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetQueryServicesDescriptorRequestAmino): GetQueryServicesDescriptorRequest { + return {}; + }, + toAmino(_: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetQueryServicesDescriptorRequestAminoMsg): GetQueryServicesDescriptorRequest { + return GetQueryServicesDescriptorRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestAminoMsg { + return { + type: "cosmos-sdk/GetQueryServicesDescriptorRequest", + value: GetQueryServicesDescriptorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetQueryServicesDescriptorRequestProtoMsg): GetQueryServicesDescriptorRequest { + return GetQueryServicesDescriptorRequest.decode(message.value); + }, + toProto(message: GetQueryServicesDescriptorRequest): Uint8Array { + return GetQueryServicesDescriptorRequest.encode(message).finish(); + }, + toProtoMsg(message: GetQueryServicesDescriptorRequest): GetQueryServicesDescriptorRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorRequest", + value: GetQueryServicesDescriptorRequest.encode(message).finish() + }; } }; function createBaseGetQueryServicesDescriptorResponse(): GetQueryServicesDescriptorResponse { @@ -1633,6 +2306,7 @@ function createBaseGetQueryServicesDescriptorResponse(): GetQueryServicesDescrip }; } export const GetQueryServicesDescriptorResponse = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorResponse", encode(message: GetQueryServicesDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.queries !== undefined) { QueryServicesDescriptor.encode(message.queries, writer.uint32(10).fork()).ldelim(); @@ -1685,12 +2359,44 @@ export const GetQueryServicesDescriptorResponse = { const obj: any = {}; message.queries !== undefined && (obj.queries = message.queries ? QueryServicesDescriptor.toSDK(message.queries) : undefined); return obj; + }, + fromAmino(object: GetQueryServicesDescriptorResponseAmino): GetQueryServicesDescriptorResponse { + return { + queries: object?.queries ? QueryServicesDescriptor.fromAmino(object.queries) : undefined + }; + }, + toAmino(message: GetQueryServicesDescriptorResponse): GetQueryServicesDescriptorResponseAmino { + const obj: any = {}; + obj.queries = message.queries ? QueryServicesDescriptor.toAmino(message.queries) : undefined; + return obj; + }, + fromAminoMsg(object: GetQueryServicesDescriptorResponseAminoMsg): GetQueryServicesDescriptorResponse { + return GetQueryServicesDescriptorResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetQueryServicesDescriptorResponse): GetQueryServicesDescriptorResponseAminoMsg { + return { + type: "cosmos-sdk/GetQueryServicesDescriptorResponse", + value: GetQueryServicesDescriptorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetQueryServicesDescriptorResponseProtoMsg): GetQueryServicesDescriptorResponse { + return GetQueryServicesDescriptorResponse.decode(message.value); + }, + toProto(message: GetQueryServicesDescriptorResponse): Uint8Array { + return GetQueryServicesDescriptorResponse.encode(message).finish(); + }, + toProtoMsg(message: GetQueryServicesDescriptorResponse): GetQueryServicesDescriptorResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorResponse", + value: GetQueryServicesDescriptorResponse.encode(message).finish() + }; } }; function createBaseGetTxDescriptorRequest(): GetTxDescriptorRequest { return {}; } export const GetTxDescriptorRequest = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorRequest", encode(_: GetTxDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1728,6 +2434,34 @@ export const GetTxDescriptorRequest = { toSDK(_: GetTxDescriptorRequest): GetTxDescriptorRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetTxDescriptorRequestAmino): GetTxDescriptorRequest { + return {}; + }, + toAmino(_: GetTxDescriptorRequest): GetTxDescriptorRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetTxDescriptorRequestAminoMsg): GetTxDescriptorRequest { + return GetTxDescriptorRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetTxDescriptorRequest): GetTxDescriptorRequestAminoMsg { + return { + type: "cosmos-sdk/GetTxDescriptorRequest", + value: GetTxDescriptorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetTxDescriptorRequestProtoMsg): GetTxDescriptorRequest { + return GetTxDescriptorRequest.decode(message.value); + }, + toProto(message: GetTxDescriptorRequest): Uint8Array { + return GetTxDescriptorRequest.encode(message).finish(); + }, + toProtoMsg(message: GetTxDescriptorRequest): GetTxDescriptorRequestProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorRequest", + value: GetTxDescriptorRequest.encode(message).finish() + }; } }; function createBaseGetTxDescriptorResponse(): GetTxDescriptorResponse { @@ -1736,6 +2470,7 @@ function createBaseGetTxDescriptorResponse(): GetTxDescriptorResponse { }; } export const GetTxDescriptorResponse = { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorResponse", encode(message: GetTxDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx !== undefined) { TxDescriptor.encode(message.tx, writer.uint32(10).fork()).ldelim(); @@ -1788,6 +2523,37 @@ export const GetTxDescriptorResponse = { const obj: any = {}; message.tx !== undefined && (obj.tx = message.tx ? TxDescriptor.toSDK(message.tx) : undefined); return obj; + }, + fromAmino(object: GetTxDescriptorResponseAmino): GetTxDescriptorResponse { + return { + tx: object?.tx ? TxDescriptor.fromAmino(object.tx) : undefined + }; + }, + toAmino(message: GetTxDescriptorResponse): GetTxDescriptorResponseAmino { + const obj: any = {}; + obj.tx = message.tx ? TxDescriptor.toAmino(message.tx) : undefined; + return obj; + }, + fromAminoMsg(object: GetTxDescriptorResponseAminoMsg): GetTxDescriptorResponse { + return GetTxDescriptorResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetTxDescriptorResponse): GetTxDescriptorResponseAminoMsg { + return { + type: "cosmos-sdk/GetTxDescriptorResponse", + value: GetTxDescriptorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetTxDescriptorResponseProtoMsg): GetTxDescriptorResponse { + return GetTxDescriptorResponse.decode(message.value); + }, + toProto(message: GetTxDescriptorResponse): Uint8Array { + return GetTxDescriptorResponse.encode(message).finish(); + }, + toProtoMsg(message: GetTxDescriptorResponse): GetTxDescriptorResponseProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorResponse", + value: GetTxDescriptorResponse.encode(message).finish() + }; } }; function createBaseQueryServicesDescriptor(): QueryServicesDescriptor { @@ -1796,6 +2562,7 @@ function createBaseQueryServicesDescriptor(): QueryServicesDescriptor { }; } export const QueryServicesDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServicesDescriptor", encode(message: QueryServicesDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.queryServices) { QueryServiceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1856,6 +2623,41 @@ export const QueryServicesDescriptor = { obj.query_services = []; } return obj; + }, + fromAmino(object: QueryServicesDescriptorAmino): QueryServicesDescriptor { + return { + queryServices: Array.isArray(object?.query_services) ? object.query_services.map((e: any) => QueryServiceDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryServicesDescriptor): QueryServicesDescriptorAmino { + const obj: any = {}; + if (message.queryServices) { + obj.query_services = message.queryServices.map(e => e ? QueryServiceDescriptor.toAmino(e) : undefined); + } else { + obj.query_services = []; + } + return obj; + }, + fromAminoMsg(object: QueryServicesDescriptorAminoMsg): QueryServicesDescriptor { + return QueryServicesDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: QueryServicesDescriptor): QueryServicesDescriptorAminoMsg { + return { + type: "cosmos-sdk/QueryServicesDescriptor", + value: QueryServicesDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: QueryServicesDescriptorProtoMsg): QueryServicesDescriptor { + return QueryServicesDescriptor.decode(message.value); + }, + toProto(message: QueryServicesDescriptor): Uint8Array { + return QueryServicesDescriptor.encode(message).finish(); + }, + toProtoMsg(message: QueryServicesDescriptor): QueryServicesDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServicesDescriptor", + value: QueryServicesDescriptor.encode(message).finish() + }; } }; function createBaseQueryServiceDescriptor(): QueryServiceDescriptor { @@ -1866,6 +2668,7 @@ function createBaseQueryServiceDescriptor(): QueryServiceDescriptor { }; } export const QueryServiceDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServiceDescriptor", encode(message: QueryServiceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); @@ -1950,6 +2753,45 @@ export const QueryServiceDescriptor = { obj.methods = []; } return obj; + }, + fromAmino(object: QueryServiceDescriptorAmino): QueryServiceDescriptor { + return { + fullname: object.fullname, + isModule: object.is_module, + methods: Array.isArray(object?.methods) ? object.methods.map((e: any) => QueryMethodDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryServiceDescriptor): QueryServiceDescriptorAmino { + const obj: any = {}; + obj.fullname = message.fullname; + obj.is_module = message.isModule; + if (message.methods) { + obj.methods = message.methods.map(e => e ? QueryMethodDescriptor.toAmino(e) : undefined); + } else { + obj.methods = []; + } + return obj; + }, + fromAminoMsg(object: QueryServiceDescriptorAminoMsg): QueryServiceDescriptor { + return QueryServiceDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: QueryServiceDescriptor): QueryServiceDescriptorAminoMsg { + return { + type: "cosmos-sdk/QueryServiceDescriptor", + value: QueryServiceDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: QueryServiceDescriptorProtoMsg): QueryServiceDescriptor { + return QueryServiceDescriptor.decode(message.value); + }, + toProto(message: QueryServiceDescriptor): Uint8Array { + return QueryServiceDescriptor.encode(message).finish(); + }, + toProtoMsg(message: QueryServiceDescriptor): QueryServiceDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServiceDescriptor", + value: QueryServiceDescriptor.encode(message).finish() + }; } }; function createBaseQueryMethodDescriptor(): QueryMethodDescriptor { @@ -1959,6 +2801,7 @@ function createBaseQueryMethodDescriptor(): QueryMethodDescriptor { }; } export const QueryMethodDescriptor = { + typeUrl: "/cosmos.base.reflection.v2alpha1.QueryMethodDescriptor", encode(message: QueryMethodDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2023,5 +2866,38 @@ export const QueryMethodDescriptor = { obj.name = message.name; obj.full_query_path = message.fullQueryPath; return obj; + }, + fromAmino(object: QueryMethodDescriptorAmino): QueryMethodDescriptor { + return { + name: object.name, + fullQueryPath: object.full_query_path + }; + }, + toAmino(message: QueryMethodDescriptor): QueryMethodDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + obj.full_query_path = message.fullQueryPath; + return obj; + }, + fromAminoMsg(object: QueryMethodDescriptorAminoMsg): QueryMethodDescriptor { + return QueryMethodDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: QueryMethodDescriptor): QueryMethodDescriptorAminoMsg { + return { + type: "cosmos-sdk/QueryMethodDescriptor", + value: QueryMethodDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: QueryMethodDescriptorProtoMsg): QueryMethodDescriptor { + return QueryMethodDescriptor.decode(message.value); + }, + toProto(message: QueryMethodDescriptor): Uint8Array { + return QueryMethodDescriptor.encode(message).finish(); + }, + toProtoMsg(message: QueryMethodDescriptor): QueryMethodDescriptorProtoMsg { + return { + typeUrl: "/cosmos.base.reflection.v2alpha1.QueryMethodDescriptor", + value: QueryMethodDescriptor.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/snapshots/v1beta1/snapshot.ts index 1ca438dc9a..dbdac054ba 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -114,6 +114,7 @@ function createBaseSnapshot(): Snapshot { }; } export const Snapshot = { + typeUrl: "/cosmos.base.snapshots.v1beta1.Snapshot", encode(message: Snapshot, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).uint64(message.height); @@ -214,6 +215,45 @@ export const Snapshot = { obj.hash = message.hash; message.metadata !== undefined && (obj.metadata = message.metadata ? Metadata.toSDK(message.metadata) : undefined); return obj; + }, + fromAmino(object: SnapshotAmino): Snapshot { + return { + height: BigInt(object.height), + format: object.format, + chunks: object.chunks, + hash: object.hash, + metadata: object?.metadata ? Metadata.fromAmino(object.metadata) : undefined + }; + }, + toAmino(message: Snapshot): SnapshotAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.format = message.format; + obj.chunks = message.chunks; + obj.hash = message.hash; + obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; + return obj; + }, + fromAminoMsg(object: SnapshotAminoMsg): Snapshot { + return Snapshot.fromAmino(object.value); + }, + toAminoMsg(message: Snapshot): SnapshotAminoMsg { + return { + type: "cosmos-sdk/Snapshot", + value: Snapshot.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotProtoMsg): Snapshot { + return Snapshot.decode(message.value); + }, + toProto(message: Snapshot): Uint8Array { + return Snapshot.encode(message).finish(); + }, + toProtoMsg(message: Snapshot): SnapshotProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.Snapshot", + value: Snapshot.encode(message).finish() + }; } }; function createBaseMetadata(): Metadata { @@ -222,6 +262,7 @@ function createBaseMetadata(): Metadata { }; } export const Metadata = { + typeUrl: "/cosmos.base.snapshots.v1beta1.Metadata", encode(message: Metadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.chunkHashes) { writer.uint32(10).bytes(v!); @@ -282,6 +323,41 @@ export const Metadata = { obj.chunk_hashes = []; } return obj; + }, + fromAmino(object: MetadataAmino): Metadata { + return { + chunkHashes: Array.isArray(object?.chunk_hashes) ? object.chunk_hashes.map((e: any) => e) : [] + }; + }, + toAmino(message: Metadata): MetadataAmino { + const obj: any = {}; + if (message.chunkHashes) { + obj.chunk_hashes = message.chunkHashes.map(e => e); + } else { + obj.chunk_hashes = []; + } + return obj; + }, + fromAminoMsg(object: MetadataAminoMsg): Metadata { + return Metadata.fromAmino(object.value); + }, + toAminoMsg(message: Metadata): MetadataAminoMsg { + return { + type: "cosmos-sdk/Metadata", + value: Metadata.toAmino(message) + }; + }, + fromProtoMsg(message: MetadataProtoMsg): Metadata { + return Metadata.decode(message.value); + }, + toProto(message: Metadata): Uint8Array { + return Metadata.encode(message).finish(); + }, + toProtoMsg(message: Metadata): MetadataProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.Metadata", + value: Metadata.encode(message).finish() + }; } }; function createBaseSnapshotItem(): SnapshotItem { @@ -295,6 +371,7 @@ function createBaseSnapshotItem(): SnapshotItem { }; } export const SnapshotItem = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotItem", encode(message: SnapshotItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.store !== undefined) { SnapshotStoreItem.encode(message.store, writer.uint32(10).fork()).ldelim(); @@ -407,6 +484,47 @@ export const SnapshotItem = { message.kv !== undefined && (obj.kv = message.kv ? SnapshotKVItem.toSDK(message.kv) : undefined); message.schema !== undefined && (obj.schema = message.schema ? SnapshotSchema.toSDK(message.schema) : undefined); return obj; + }, + fromAmino(object: SnapshotItemAmino): SnapshotItem { + return { + store: object?.store ? SnapshotStoreItem.fromAmino(object.store) : undefined, + iavl: object?.iavl ? SnapshotIAVLItem.fromAmino(object.iavl) : undefined, + extension: object?.extension ? SnapshotExtensionMeta.fromAmino(object.extension) : undefined, + extensionPayload: object?.extension_payload ? SnapshotExtensionPayload.fromAmino(object.extension_payload) : undefined, + kv: object?.kv ? SnapshotKVItem.fromAmino(object.kv) : undefined, + schema: object?.schema ? SnapshotSchema.fromAmino(object.schema) : undefined + }; + }, + toAmino(message: SnapshotItem): SnapshotItemAmino { + const obj: any = {}; + obj.store = message.store ? SnapshotStoreItem.toAmino(message.store) : undefined; + obj.iavl = message.iavl ? SnapshotIAVLItem.toAmino(message.iavl) : undefined; + obj.extension = message.extension ? SnapshotExtensionMeta.toAmino(message.extension) : undefined; + obj.extension_payload = message.extensionPayload ? SnapshotExtensionPayload.toAmino(message.extensionPayload) : undefined; + obj.kv = message.kv ? SnapshotKVItem.toAmino(message.kv) : undefined; + obj.schema = message.schema ? SnapshotSchema.toAmino(message.schema) : undefined; + return obj; + }, + fromAminoMsg(object: SnapshotItemAminoMsg): SnapshotItem { + return SnapshotItem.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotItem): SnapshotItemAminoMsg { + return { + type: "cosmos-sdk/SnapshotItem", + value: SnapshotItem.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotItemProtoMsg): SnapshotItem { + return SnapshotItem.decode(message.value); + }, + toProto(message: SnapshotItem): Uint8Array { + return SnapshotItem.encode(message).finish(); + }, + toProtoMsg(message: SnapshotItem): SnapshotItemProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotItem", + value: SnapshotItem.encode(message).finish() + }; } }; function createBaseSnapshotStoreItem(): SnapshotStoreItem { @@ -415,6 +533,7 @@ function createBaseSnapshotStoreItem(): SnapshotStoreItem { }; } export const SnapshotStoreItem = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotStoreItem", encode(message: SnapshotStoreItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -467,6 +586,37 @@ export const SnapshotStoreItem = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: SnapshotStoreItemAmino): SnapshotStoreItem { + return { + name: object.name + }; + }, + toAmino(message: SnapshotStoreItem): SnapshotStoreItemAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: SnapshotStoreItemAminoMsg): SnapshotStoreItem { + return SnapshotStoreItem.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotStoreItem): SnapshotStoreItemAminoMsg { + return { + type: "cosmos-sdk/SnapshotStoreItem", + value: SnapshotStoreItem.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotStoreItemProtoMsg): SnapshotStoreItem { + return SnapshotStoreItem.decode(message.value); + }, + toProto(message: SnapshotStoreItem): Uint8Array { + return SnapshotStoreItem.encode(message).finish(); + }, + toProtoMsg(message: SnapshotStoreItem): SnapshotStoreItemProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotStoreItem", + value: SnapshotStoreItem.encode(message).finish() + }; } }; function createBaseSnapshotIAVLItem(): SnapshotIAVLItem { @@ -478,6 +628,7 @@ function createBaseSnapshotIAVLItem(): SnapshotIAVLItem { }; } export const SnapshotIAVLItem = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotIAVLItem", encode(message: SnapshotIAVLItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -566,6 +717,43 @@ export const SnapshotIAVLItem = { obj.version = message.version; obj.height = message.height; return obj; + }, + fromAmino(object: SnapshotIAVLItemAmino): SnapshotIAVLItem { + return { + key: object.key, + value: object.value, + version: BigInt(object.version), + height: object.height + }; + }, + toAmino(message: SnapshotIAVLItem): SnapshotIAVLItemAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + obj.version = message.version ? message.version.toString() : undefined; + obj.height = message.height; + return obj; + }, + fromAminoMsg(object: SnapshotIAVLItemAminoMsg): SnapshotIAVLItem { + return SnapshotIAVLItem.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotIAVLItem): SnapshotIAVLItemAminoMsg { + return { + type: "cosmos-sdk/SnapshotIAVLItem", + value: SnapshotIAVLItem.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotIAVLItemProtoMsg): SnapshotIAVLItem { + return SnapshotIAVLItem.decode(message.value); + }, + toProto(message: SnapshotIAVLItem): Uint8Array { + return SnapshotIAVLItem.encode(message).finish(); + }, + toProtoMsg(message: SnapshotIAVLItem): SnapshotIAVLItemProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotIAVLItem", + value: SnapshotIAVLItem.encode(message).finish() + }; } }; function createBaseSnapshotExtensionMeta(): SnapshotExtensionMeta { @@ -575,6 +763,7 @@ function createBaseSnapshotExtensionMeta(): SnapshotExtensionMeta { }; } export const SnapshotExtensionMeta = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta", encode(message: SnapshotExtensionMeta, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -639,6 +828,39 @@ export const SnapshotExtensionMeta = { obj.name = message.name; obj.format = message.format; return obj; + }, + fromAmino(object: SnapshotExtensionMetaAmino): SnapshotExtensionMeta { + return { + name: object.name, + format: object.format + }; + }, + toAmino(message: SnapshotExtensionMeta): SnapshotExtensionMetaAmino { + const obj: any = {}; + obj.name = message.name; + obj.format = message.format; + return obj; + }, + fromAminoMsg(object: SnapshotExtensionMetaAminoMsg): SnapshotExtensionMeta { + return SnapshotExtensionMeta.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotExtensionMeta): SnapshotExtensionMetaAminoMsg { + return { + type: "cosmos-sdk/SnapshotExtensionMeta", + value: SnapshotExtensionMeta.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotExtensionMetaProtoMsg): SnapshotExtensionMeta { + return SnapshotExtensionMeta.decode(message.value); + }, + toProto(message: SnapshotExtensionMeta): Uint8Array { + return SnapshotExtensionMeta.encode(message).finish(); + }, + toProtoMsg(message: SnapshotExtensionMeta): SnapshotExtensionMetaProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta", + value: SnapshotExtensionMeta.encode(message).finish() + }; } }; function createBaseSnapshotExtensionPayload(): SnapshotExtensionPayload { @@ -647,6 +869,7 @@ function createBaseSnapshotExtensionPayload(): SnapshotExtensionPayload { }; } export const SnapshotExtensionPayload = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload", encode(message: SnapshotExtensionPayload, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.payload.length !== 0) { writer.uint32(10).bytes(message.payload); @@ -699,6 +922,37 @@ export const SnapshotExtensionPayload = { const obj: any = {}; obj.payload = message.payload; return obj; + }, + fromAmino(object: SnapshotExtensionPayloadAmino): SnapshotExtensionPayload { + return { + payload: object.payload + }; + }, + toAmino(message: SnapshotExtensionPayload): SnapshotExtensionPayloadAmino { + const obj: any = {}; + obj.payload = message.payload; + return obj; + }, + fromAminoMsg(object: SnapshotExtensionPayloadAminoMsg): SnapshotExtensionPayload { + return SnapshotExtensionPayload.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotExtensionPayload): SnapshotExtensionPayloadAminoMsg { + return { + type: "cosmos-sdk/SnapshotExtensionPayload", + value: SnapshotExtensionPayload.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotExtensionPayloadProtoMsg): SnapshotExtensionPayload { + return SnapshotExtensionPayload.decode(message.value); + }, + toProto(message: SnapshotExtensionPayload): Uint8Array { + return SnapshotExtensionPayload.encode(message).finish(); + }, + toProtoMsg(message: SnapshotExtensionPayload): SnapshotExtensionPayloadProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload", + value: SnapshotExtensionPayload.encode(message).finish() + }; } }; function createBaseSnapshotKVItem(): SnapshotKVItem { @@ -708,6 +962,7 @@ function createBaseSnapshotKVItem(): SnapshotKVItem { }; } export const SnapshotKVItem = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotKVItem", encode(message: SnapshotKVItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -772,6 +1027,39 @@ export const SnapshotKVItem = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: SnapshotKVItemAmino): SnapshotKVItem { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: SnapshotKVItem): SnapshotKVItemAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: SnapshotKVItemAminoMsg): SnapshotKVItem { + return SnapshotKVItem.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotKVItem): SnapshotKVItemAminoMsg { + return { + type: "cosmos-sdk/SnapshotKVItem", + value: SnapshotKVItem.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotKVItemProtoMsg): SnapshotKVItem { + return SnapshotKVItem.decode(message.value); + }, + toProto(message: SnapshotKVItem): Uint8Array { + return SnapshotKVItem.encode(message).finish(); + }, + toProtoMsg(message: SnapshotKVItem): SnapshotKVItemProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotKVItem", + value: SnapshotKVItem.encode(message).finish() + }; } }; function createBaseSnapshotSchema(): SnapshotSchema { @@ -780,6 +1068,7 @@ function createBaseSnapshotSchema(): SnapshotSchema { }; } export const SnapshotSchema = { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotSchema", encode(message: SnapshotSchema, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.keys) { writer.uint32(10).bytes(v!); @@ -840,5 +1129,40 @@ export const SnapshotSchema = { obj.keys = []; } return obj; + }, + fromAmino(object: SnapshotSchemaAmino): SnapshotSchema { + return { + keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => e) : [] + }; + }, + toAmino(message: SnapshotSchema): SnapshotSchemaAmino { + const obj: any = {}; + if (message.keys) { + obj.keys = message.keys.map(e => e); + } else { + obj.keys = []; + } + return obj; + }, + fromAminoMsg(object: SnapshotSchemaAminoMsg): SnapshotSchema { + return SnapshotSchema.fromAmino(object.value); + }, + toAminoMsg(message: SnapshotSchema): SnapshotSchemaAminoMsg { + return { + type: "cosmos-sdk/SnapshotSchema", + value: SnapshotSchema.toAmino(message) + }; + }, + fromProtoMsg(message: SnapshotSchemaProtoMsg): SnapshotSchema { + return SnapshotSchema.decode(message.value); + }, + toProto(message: SnapshotSchema): Uint8Array { + return SnapshotSchema.encode(message).finish(); + }, + toProtoMsg(message: SnapshotSchema): SnapshotSchemaProtoMsg { + return { + typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotSchema", + value: SnapshotSchema.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/commit_info.ts index 69aec85f14..8bb9ef7e26 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/commit_info.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/commit_info.ts @@ -56,6 +56,7 @@ function createBaseCommitInfo(): CommitInfo { }; } export const CommitInfo = { + typeUrl: "/cosmos.base.store.v1beta1.CommitInfo", encode(message: CommitInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.version !== BigInt(0)) { writer.uint32(8).int64(message.version); @@ -128,6 +129,43 @@ export const CommitInfo = { obj.store_infos = []; } return obj; + }, + fromAmino(object: CommitInfoAmino): CommitInfo { + return { + version: BigInt(object.version), + storeInfos: Array.isArray(object?.store_infos) ? object.store_infos.map((e: any) => StoreInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: CommitInfo): CommitInfoAmino { + const obj: any = {}; + obj.version = message.version ? message.version.toString() : undefined; + if (message.storeInfos) { + obj.store_infos = message.storeInfos.map(e => e ? StoreInfo.toAmino(e) : undefined); + } else { + obj.store_infos = []; + } + return obj; + }, + fromAminoMsg(object: CommitInfoAminoMsg): CommitInfo { + return CommitInfo.fromAmino(object.value); + }, + toAminoMsg(message: CommitInfo): CommitInfoAminoMsg { + return { + type: "cosmos-sdk/CommitInfo", + value: CommitInfo.toAmino(message) + }; + }, + fromProtoMsg(message: CommitInfoProtoMsg): CommitInfo { + return CommitInfo.decode(message.value); + }, + toProto(message: CommitInfo): Uint8Array { + return CommitInfo.encode(message).finish(); + }, + toProtoMsg(message: CommitInfo): CommitInfoProtoMsg { + return { + typeUrl: "/cosmos.base.store.v1beta1.CommitInfo", + value: CommitInfo.encode(message).finish() + }; } }; function createBaseStoreInfo(): StoreInfo { @@ -137,6 +175,7 @@ function createBaseStoreInfo(): StoreInfo { }; } export const StoreInfo = { + typeUrl: "/cosmos.base.store.v1beta1.StoreInfo", encode(message: StoreInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -201,6 +240,39 @@ export const StoreInfo = { obj.name = message.name; message.commitId !== undefined && (obj.commit_id = message.commitId ? CommitID.toSDK(message.commitId) : undefined); return obj; + }, + fromAmino(object: StoreInfoAmino): StoreInfo { + return { + name: object.name, + commitId: object?.commit_id ? CommitID.fromAmino(object.commit_id) : undefined + }; + }, + toAmino(message: StoreInfo): StoreInfoAmino { + const obj: any = {}; + obj.name = message.name; + obj.commit_id = message.commitId ? CommitID.toAmino(message.commitId) : undefined; + return obj; + }, + fromAminoMsg(object: StoreInfoAminoMsg): StoreInfo { + return StoreInfo.fromAmino(object.value); + }, + toAminoMsg(message: StoreInfo): StoreInfoAminoMsg { + return { + type: "cosmos-sdk/StoreInfo", + value: StoreInfo.toAmino(message) + }; + }, + fromProtoMsg(message: StoreInfoProtoMsg): StoreInfo { + return StoreInfo.decode(message.value); + }, + toProto(message: StoreInfo): Uint8Array { + return StoreInfo.encode(message).finish(); + }, + toProtoMsg(message: StoreInfo): StoreInfoProtoMsg { + return { + typeUrl: "/cosmos.base.store.v1beta1.StoreInfo", + value: StoreInfo.encode(message).finish() + }; } }; function createBaseCommitID(): CommitID { @@ -210,6 +282,7 @@ function createBaseCommitID(): CommitID { }; } export const CommitID = { + typeUrl: "/cosmos.base.store.v1beta1.CommitID", encode(message: CommitID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.version !== BigInt(0)) { writer.uint32(8).int64(message.version); @@ -274,5 +347,38 @@ export const CommitID = { obj.version = message.version; obj.hash = message.hash; return obj; + }, + fromAmino(object: CommitIDAmino): CommitID { + return { + version: BigInt(object.version), + hash: object.hash + }; + }, + toAmino(message: CommitID): CommitIDAmino { + const obj: any = {}; + obj.version = message.version ? message.version.toString() : undefined; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: CommitIDAminoMsg): CommitID { + return CommitID.fromAmino(object.value); + }, + toAminoMsg(message: CommitID): CommitIDAminoMsg { + return { + type: "cosmos-sdk/CommitID", + value: CommitID.toAmino(message) + }; + }, + fromProtoMsg(message: CommitIDProtoMsg): CommitID { + return CommitID.decode(message.value); + }, + toProto(message: CommitID): Uint8Array { + return CommitID.encode(message).finish(); + }, + toProtoMsg(message: CommitID): CommitIDProtoMsg { + return { + typeUrl: "/cosmos.base.store.v1beta1.CommitID", + value: CommitID.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/listening.ts index cf9d06ad27..83243b1038 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/store/v1beta1/listening.ts @@ -38,6 +38,7 @@ function createBaseStoreKVPair(): StoreKVPair { }; } export const StoreKVPair = { + typeUrl: "/cosmos.base.store.v1beta1.StoreKVPair", encode(message: StoreKVPair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.storeKey !== "") { writer.uint32(10).string(message.storeKey); @@ -126,5 +127,42 @@ export const StoreKVPair = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: StoreKVPairAmino): StoreKVPair { + return { + storeKey: object.store_key, + delete: object.delete, + key: object.key, + value: object.value + }; + }, + toAmino(message: StoreKVPair): StoreKVPairAmino { + const obj: any = {}; + obj.store_key = message.storeKey; + obj.delete = message.delete; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: StoreKVPairAminoMsg): StoreKVPair { + return StoreKVPair.fromAmino(object.value); + }, + toAminoMsg(message: StoreKVPair): StoreKVPairAminoMsg { + return { + type: "cosmos-sdk/StoreKVPair", + value: StoreKVPair.toAmino(message) + }; + }, + fromProtoMsg(message: StoreKVPairProtoMsg): StoreKVPair { + return StoreKVPair.decode(message.value); + }, + toProto(message: StoreKVPair): Uint8Array { + return StoreKVPair.encode(message).finish(); + }, + toProtoMsg(message: StoreKVPair): StoreKVPairProtoMsg { + return { + typeUrl: "/cosmos.base.store.v1beta1.StoreKVPair", + value: StoreKVPair.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/tendermint/v1beta1/query.ts index 6f388f5267..d0b78b7fe4 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/tendermint/v1beta1/query.ts @@ -169,6 +169,7 @@ function createBaseGetValidatorSetByHeightRequest(): GetValidatorSetByHeightRequ }; } export const GetValidatorSetByHeightRequest = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest", encode(message: GetValidatorSetByHeightRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -233,6 +234,39 @@ export const GetValidatorSetByHeightRequest = { obj.height = message.height; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetValidatorSetByHeightRequestAmino): GetValidatorSetByHeightRequest { + return { + height: BigInt(object.height), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetValidatorSetByHeightRequestAminoMsg): GetValidatorSetByHeightRequest { + return GetValidatorSetByHeightRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestAminoMsg { + return { + type: "cosmos-sdk/GetValidatorSetByHeightRequest", + value: GetValidatorSetByHeightRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetValidatorSetByHeightRequestProtoMsg): GetValidatorSetByHeightRequest { + return GetValidatorSetByHeightRequest.decode(message.value); + }, + toProto(message: GetValidatorSetByHeightRequest): Uint8Array { + return GetValidatorSetByHeightRequest.encode(message).finish(); + }, + toProtoMsg(message: GetValidatorSetByHeightRequest): GetValidatorSetByHeightRequestProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest", + value: GetValidatorSetByHeightRequest.encode(message).finish() + }; } }; function createBaseGetValidatorSetByHeightResponse(): GetValidatorSetByHeightResponse { @@ -243,6 +277,7 @@ function createBaseGetValidatorSetByHeightResponse(): GetValidatorSetByHeightRes }; } export const GetValidatorSetByHeightResponse = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse", encode(message: GetValidatorSetByHeightResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockHeight !== BigInt(0)) { writer.uint32(8).int64(message.blockHeight); @@ -327,6 +362,45 @@ export const GetValidatorSetByHeightResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetValidatorSetByHeightResponseAmino): GetValidatorSetByHeightResponse { + return { + blockHeight: BigInt(object.block_height), + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAmino { + const obj: any = {}; + obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + if (message.validators) { + obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetValidatorSetByHeightResponseAminoMsg): GetValidatorSetByHeightResponse { + return GetValidatorSetByHeightResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseAminoMsg { + return { + type: "cosmos-sdk/GetValidatorSetByHeightResponse", + value: GetValidatorSetByHeightResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetValidatorSetByHeightResponseProtoMsg): GetValidatorSetByHeightResponse { + return GetValidatorSetByHeightResponse.decode(message.value); + }, + toProto(message: GetValidatorSetByHeightResponse): Uint8Array { + return GetValidatorSetByHeightResponse.encode(message).finish(); + }, + toProtoMsg(message: GetValidatorSetByHeightResponse): GetValidatorSetByHeightResponseProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse", + value: GetValidatorSetByHeightResponse.encode(message).finish() + }; } }; function createBaseGetLatestValidatorSetRequest(): GetLatestValidatorSetRequest { @@ -335,6 +409,7 @@ function createBaseGetLatestValidatorSetRequest(): GetLatestValidatorSetRequest }; } export const GetLatestValidatorSetRequest = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest", encode(message: GetLatestValidatorSetRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -387,6 +462,37 @@ export const GetLatestValidatorSetRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetLatestValidatorSetRequestAmino): GetLatestValidatorSetRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetLatestValidatorSetRequest): GetLatestValidatorSetRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetLatestValidatorSetRequestAminoMsg): GetLatestValidatorSetRequest { + return GetLatestValidatorSetRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetLatestValidatorSetRequest): GetLatestValidatorSetRequestAminoMsg { + return { + type: "cosmos-sdk/GetLatestValidatorSetRequest", + value: GetLatestValidatorSetRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetLatestValidatorSetRequestProtoMsg): GetLatestValidatorSetRequest { + return GetLatestValidatorSetRequest.decode(message.value); + }, + toProto(message: GetLatestValidatorSetRequest): Uint8Array { + return GetLatestValidatorSetRequest.encode(message).finish(); + }, + toProtoMsg(message: GetLatestValidatorSetRequest): GetLatestValidatorSetRequestProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest", + value: GetLatestValidatorSetRequest.encode(message).finish() + }; } }; function createBaseGetLatestValidatorSetResponse(): GetLatestValidatorSetResponse { @@ -397,6 +503,7 @@ function createBaseGetLatestValidatorSetResponse(): GetLatestValidatorSetRespons }; } export const GetLatestValidatorSetResponse = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse", encode(message: GetLatestValidatorSetResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockHeight !== BigInt(0)) { writer.uint32(8).int64(message.blockHeight); @@ -481,6 +588,45 @@ export const GetLatestValidatorSetResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetLatestValidatorSetResponseAmino): GetLatestValidatorSetResponse { + return { + blockHeight: BigInt(object.block_height), + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAmino { + const obj: any = {}; + obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + if (message.validators) { + obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetLatestValidatorSetResponseAminoMsg): GetLatestValidatorSetResponse { + return GetLatestValidatorSetResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseAminoMsg { + return { + type: "cosmos-sdk/GetLatestValidatorSetResponse", + value: GetLatestValidatorSetResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetLatestValidatorSetResponseProtoMsg): GetLatestValidatorSetResponse { + return GetLatestValidatorSetResponse.decode(message.value); + }, + toProto(message: GetLatestValidatorSetResponse): Uint8Array { + return GetLatestValidatorSetResponse.encode(message).finish(); + }, + toProtoMsg(message: GetLatestValidatorSetResponse): GetLatestValidatorSetResponseProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse", + value: GetLatestValidatorSetResponse.encode(message).finish() + }; } }; function createBaseValidator(): Validator { @@ -492,6 +638,7 @@ function createBaseValidator(): Validator { }; } export const Validator = { + typeUrl: "/cosmos.base.tendermint.v1beta1.Validator", encode(message: Validator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -580,6 +727,43 @@ export const Validator = { obj.voting_power = message.votingPower; obj.proposer_priority = message.proposerPriority; return obj; + }, + fromAmino(object: ValidatorAmino): Validator { + return { + address: object.address, + pubKey: object?.pub_key ? Any.fromAmino(object.pub_key) : undefined, + votingPower: BigInt(object.voting_power), + proposerPriority: BigInt(object.proposer_priority) + }; + }, + toAmino(message: Validator): ValidatorAmino { + const obj: any = {}; + obj.address = message.address; + obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey) : undefined; + obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority ? message.proposerPriority.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorAminoMsg): Validator { + return Validator.fromAmino(object.value); + }, + toAminoMsg(message: Validator): ValidatorAminoMsg { + return { + type: "cosmos-sdk/Validator", + value: Validator.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorProtoMsg): Validator { + return Validator.decode(message.value); + }, + toProto(message: Validator): Uint8Array { + return Validator.encode(message).finish(); + }, + toProtoMsg(message: Validator): ValidatorProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.Validator", + value: Validator.encode(message).finish() + }; } }; function createBaseGetBlockByHeightRequest(): GetBlockByHeightRequest { @@ -588,6 +772,7 @@ function createBaseGetBlockByHeightRequest(): GetBlockByHeightRequest { }; } export const GetBlockByHeightRequest = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest", encode(message: GetBlockByHeightRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -640,6 +825,37 @@ export const GetBlockByHeightRequest = { const obj: any = {}; obj.height = message.height; return obj; + }, + fromAmino(object: GetBlockByHeightRequestAmino): GetBlockByHeightRequest { + return { + height: BigInt(object.height) + }; + }, + toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GetBlockByHeightRequestAminoMsg): GetBlockByHeightRequest { + return GetBlockByHeightRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetBlockByHeightRequest): GetBlockByHeightRequestAminoMsg { + return { + type: "cosmos-sdk/GetBlockByHeightRequest", + value: GetBlockByHeightRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetBlockByHeightRequestProtoMsg): GetBlockByHeightRequest { + return GetBlockByHeightRequest.decode(message.value); + }, + toProto(message: GetBlockByHeightRequest): Uint8Array { + return GetBlockByHeightRequest.encode(message).finish(); + }, + toProtoMsg(message: GetBlockByHeightRequest): GetBlockByHeightRequestProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest", + value: GetBlockByHeightRequest.encode(message).finish() + }; } }; function createBaseGetBlockByHeightResponse(): GetBlockByHeightResponse { @@ -649,6 +865,7 @@ function createBaseGetBlockByHeightResponse(): GetBlockByHeightResponse { }; } export const GetBlockByHeightResponse = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse", encode(message: GetBlockByHeightResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockId !== undefined) { BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim(); @@ -713,12 +930,46 @@ export const GetBlockByHeightResponse = { message.blockId !== undefined && (obj.block_id = message.blockId ? BlockID.toSDK(message.blockId) : undefined); message.block !== undefined && (obj.block = message.block ? Block.toSDK(message.block) : undefined); return obj; + }, + fromAmino(object: GetBlockByHeightResponseAmino): GetBlockByHeightResponse { + return { + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + block: object?.block ? Block.fromAmino(object.block) : undefined + }; + }, + toAmino(message: GetBlockByHeightResponse): GetBlockByHeightResponseAmino { + const obj: any = {}; + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + obj.block = message.block ? Block.toAmino(message.block) : undefined; + return obj; + }, + fromAminoMsg(object: GetBlockByHeightResponseAminoMsg): GetBlockByHeightResponse { + return GetBlockByHeightResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetBlockByHeightResponse): GetBlockByHeightResponseAminoMsg { + return { + type: "cosmos-sdk/GetBlockByHeightResponse", + value: GetBlockByHeightResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetBlockByHeightResponseProtoMsg): GetBlockByHeightResponse { + return GetBlockByHeightResponse.decode(message.value); + }, + toProto(message: GetBlockByHeightResponse): Uint8Array { + return GetBlockByHeightResponse.encode(message).finish(); + }, + toProtoMsg(message: GetBlockByHeightResponse): GetBlockByHeightResponseProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse", + value: GetBlockByHeightResponse.encode(message).finish() + }; } }; function createBaseGetLatestBlockRequest(): GetLatestBlockRequest { return {}; } export const GetLatestBlockRequest = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockRequest", encode(_: GetLatestBlockRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -756,6 +1007,34 @@ export const GetLatestBlockRequest = { toSDK(_: GetLatestBlockRequest): GetLatestBlockRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetLatestBlockRequestAmino): GetLatestBlockRequest { + return {}; + }, + toAmino(_: GetLatestBlockRequest): GetLatestBlockRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetLatestBlockRequestAminoMsg): GetLatestBlockRequest { + return GetLatestBlockRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetLatestBlockRequest): GetLatestBlockRequestAminoMsg { + return { + type: "cosmos-sdk/GetLatestBlockRequest", + value: GetLatestBlockRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetLatestBlockRequestProtoMsg): GetLatestBlockRequest { + return GetLatestBlockRequest.decode(message.value); + }, + toProto(message: GetLatestBlockRequest): Uint8Array { + return GetLatestBlockRequest.encode(message).finish(); + }, + toProtoMsg(message: GetLatestBlockRequest): GetLatestBlockRequestProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockRequest", + value: GetLatestBlockRequest.encode(message).finish() + }; } }; function createBaseGetLatestBlockResponse(): GetLatestBlockResponse { @@ -765,6 +1044,7 @@ function createBaseGetLatestBlockResponse(): GetLatestBlockResponse { }; } export const GetLatestBlockResponse = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockResponse", encode(message: GetLatestBlockResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockId !== undefined) { BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim(); @@ -829,12 +1109,46 @@ export const GetLatestBlockResponse = { message.blockId !== undefined && (obj.block_id = message.blockId ? BlockID.toSDK(message.blockId) : undefined); message.block !== undefined && (obj.block = message.block ? Block.toSDK(message.block) : undefined); return obj; + }, + fromAmino(object: GetLatestBlockResponseAmino): GetLatestBlockResponse { + return { + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + block: object?.block ? Block.fromAmino(object.block) : undefined + }; + }, + toAmino(message: GetLatestBlockResponse): GetLatestBlockResponseAmino { + const obj: any = {}; + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + obj.block = message.block ? Block.toAmino(message.block) : undefined; + return obj; + }, + fromAminoMsg(object: GetLatestBlockResponseAminoMsg): GetLatestBlockResponse { + return GetLatestBlockResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetLatestBlockResponse): GetLatestBlockResponseAminoMsg { + return { + type: "cosmos-sdk/GetLatestBlockResponse", + value: GetLatestBlockResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetLatestBlockResponseProtoMsg): GetLatestBlockResponse { + return GetLatestBlockResponse.decode(message.value); + }, + toProto(message: GetLatestBlockResponse): Uint8Array { + return GetLatestBlockResponse.encode(message).finish(); + }, + toProtoMsg(message: GetLatestBlockResponse): GetLatestBlockResponseProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockResponse", + value: GetLatestBlockResponse.encode(message).finish() + }; } }; function createBaseGetSyncingRequest(): GetSyncingRequest { return {}; } export const GetSyncingRequest = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingRequest", encode(_: GetSyncingRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -872,6 +1186,34 @@ export const GetSyncingRequest = { toSDK(_: GetSyncingRequest): GetSyncingRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetSyncingRequestAmino): GetSyncingRequest { + return {}; + }, + toAmino(_: GetSyncingRequest): GetSyncingRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetSyncingRequestAminoMsg): GetSyncingRequest { + return GetSyncingRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetSyncingRequest): GetSyncingRequestAminoMsg { + return { + type: "cosmos-sdk/GetSyncingRequest", + value: GetSyncingRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetSyncingRequestProtoMsg): GetSyncingRequest { + return GetSyncingRequest.decode(message.value); + }, + toProto(message: GetSyncingRequest): Uint8Array { + return GetSyncingRequest.encode(message).finish(); + }, + toProtoMsg(message: GetSyncingRequest): GetSyncingRequestProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingRequest", + value: GetSyncingRequest.encode(message).finish() + }; } }; function createBaseGetSyncingResponse(): GetSyncingResponse { @@ -880,6 +1222,7 @@ function createBaseGetSyncingResponse(): GetSyncingResponse { }; } export const GetSyncingResponse = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingResponse", encode(message: GetSyncingResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.syncing === true) { writer.uint32(8).bool(message.syncing); @@ -932,12 +1275,44 @@ export const GetSyncingResponse = { const obj: any = {}; obj.syncing = message.syncing; return obj; + }, + fromAmino(object: GetSyncingResponseAmino): GetSyncingResponse { + return { + syncing: object.syncing + }; + }, + toAmino(message: GetSyncingResponse): GetSyncingResponseAmino { + const obj: any = {}; + obj.syncing = message.syncing; + return obj; + }, + fromAminoMsg(object: GetSyncingResponseAminoMsg): GetSyncingResponse { + return GetSyncingResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetSyncingResponse): GetSyncingResponseAminoMsg { + return { + type: "cosmos-sdk/GetSyncingResponse", + value: GetSyncingResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetSyncingResponseProtoMsg): GetSyncingResponse { + return GetSyncingResponse.decode(message.value); + }, + toProto(message: GetSyncingResponse): Uint8Array { + return GetSyncingResponse.encode(message).finish(); + }, + toProtoMsg(message: GetSyncingResponse): GetSyncingResponseProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingResponse", + value: GetSyncingResponse.encode(message).finish() + }; } }; function createBaseGetNodeInfoRequest(): GetNodeInfoRequest { return {}; } export const GetNodeInfoRequest = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoRequest", encode(_: GetNodeInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -975,6 +1350,34 @@ export const GetNodeInfoRequest = { toSDK(_: GetNodeInfoRequest): GetNodeInfoRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetNodeInfoRequestAmino): GetNodeInfoRequest { + return {}; + }, + toAmino(_: GetNodeInfoRequest): GetNodeInfoRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetNodeInfoRequestAminoMsg): GetNodeInfoRequest { + return GetNodeInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetNodeInfoRequest): GetNodeInfoRequestAminoMsg { + return { + type: "cosmos-sdk/GetNodeInfoRequest", + value: GetNodeInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetNodeInfoRequestProtoMsg): GetNodeInfoRequest { + return GetNodeInfoRequest.decode(message.value); + }, + toProto(message: GetNodeInfoRequest): Uint8Array { + return GetNodeInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: GetNodeInfoRequest): GetNodeInfoRequestProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoRequest", + value: GetNodeInfoRequest.encode(message).finish() + }; } }; function createBaseGetNodeInfoResponse(): GetNodeInfoResponse { @@ -984,6 +1387,7 @@ function createBaseGetNodeInfoResponse(): GetNodeInfoResponse { }; } export const GetNodeInfoResponse = { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoResponse", encode(message: GetNodeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nodeInfo !== undefined) { NodeInfo.encode(message.nodeInfo, writer.uint32(10).fork()).ldelim(); @@ -1048,6 +1452,39 @@ export const GetNodeInfoResponse = { message.nodeInfo !== undefined && (obj.node_info = message.nodeInfo ? NodeInfo.toSDK(message.nodeInfo) : undefined); message.applicationVersion !== undefined && (obj.application_version = message.applicationVersion ? VersionInfo.toSDK(message.applicationVersion) : undefined); return obj; + }, + fromAmino(object: GetNodeInfoResponseAmino): GetNodeInfoResponse { + return { + nodeInfo: object?.node_info ? NodeInfo.fromAmino(object.node_info) : undefined, + applicationVersion: object?.application_version ? VersionInfo.fromAmino(object.application_version) : undefined + }; + }, + toAmino(message: GetNodeInfoResponse): GetNodeInfoResponseAmino { + const obj: any = {}; + obj.node_info = message.nodeInfo ? NodeInfo.toAmino(message.nodeInfo) : undefined; + obj.application_version = message.applicationVersion ? VersionInfo.toAmino(message.applicationVersion) : undefined; + return obj; + }, + fromAminoMsg(object: GetNodeInfoResponseAminoMsg): GetNodeInfoResponse { + return GetNodeInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetNodeInfoResponse): GetNodeInfoResponseAminoMsg { + return { + type: "cosmos-sdk/GetNodeInfoResponse", + value: GetNodeInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetNodeInfoResponseProtoMsg): GetNodeInfoResponse { + return GetNodeInfoResponse.decode(message.value); + }, + toProto(message: GetNodeInfoResponse): Uint8Array { + return GetNodeInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: GetNodeInfoResponse): GetNodeInfoResponseProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoResponse", + value: GetNodeInfoResponse.encode(message).finish() + }; } }; function createBaseVersionInfo(): VersionInfo { @@ -1063,6 +1500,7 @@ function createBaseVersionInfo(): VersionInfo { }; } export const VersionInfo = { + typeUrl: "/cosmos.base.tendermint.v1beta1.VersionInfo", encode(message: VersionInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1207,6 +1645,55 @@ export const VersionInfo = { } obj.cosmos_sdk_version = message.cosmosSdkVersion; return obj; + }, + fromAmino(object: VersionInfoAmino): VersionInfo { + return { + name: object.name, + appName: object.app_name, + version: object.version, + gitCommit: object.git_commit, + buildTags: object.build_tags, + goVersion: object.go_version, + buildDeps: Array.isArray(object?.build_deps) ? object.build_deps.map((e: any) => Module.fromAmino(e)) : [], + cosmosSdkVersion: object.cosmos_sdk_version + }; + }, + toAmino(message: VersionInfo): VersionInfoAmino { + const obj: any = {}; + obj.name = message.name; + obj.app_name = message.appName; + obj.version = message.version; + obj.git_commit = message.gitCommit; + obj.build_tags = message.buildTags; + obj.go_version = message.goVersion; + if (message.buildDeps) { + obj.build_deps = message.buildDeps.map(e => e ? Module.toAmino(e) : undefined); + } else { + obj.build_deps = []; + } + obj.cosmos_sdk_version = message.cosmosSdkVersion; + return obj; + }, + fromAminoMsg(object: VersionInfoAminoMsg): VersionInfo { + return VersionInfo.fromAmino(object.value); + }, + toAminoMsg(message: VersionInfo): VersionInfoAminoMsg { + return { + type: "cosmos-sdk/VersionInfo", + value: VersionInfo.toAmino(message) + }; + }, + fromProtoMsg(message: VersionInfoProtoMsg): VersionInfo { + return VersionInfo.decode(message.value); + }, + toProto(message: VersionInfo): Uint8Array { + return VersionInfo.encode(message).finish(); + }, + toProtoMsg(message: VersionInfo): VersionInfoProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.VersionInfo", + value: VersionInfo.encode(message).finish() + }; } }; function createBaseModule(): Module { @@ -1217,6 +1704,7 @@ function createBaseModule(): Module { }; } export const Module = { + typeUrl: "/cosmos.base.tendermint.v1beta1.Module", encode(message: Module, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path !== "") { writer.uint32(10).string(message.path); @@ -1293,5 +1781,40 @@ export const Module = { obj.version = message.version; obj.sum = message.sum; return obj; + }, + fromAmino(object: ModuleAmino): Module { + return { + path: object.path, + version: object.version, + sum: object.sum + }; + }, + toAmino(message: Module): ModuleAmino { + const obj: any = {}; + obj.path = message.path; + obj.version = message.version; + obj.sum = message.sum; + return obj; + }, + fromAminoMsg(object: ModuleAminoMsg): Module { + return Module.fromAmino(object.value); + }, + toAminoMsg(message: Module): ModuleAminoMsg { + return { + type: "cosmos-sdk/Module", + value: Module.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleProtoMsg): Module { + return Module.decode(message.value); + }, + toProto(message: Module): Uint8Array { + return Module.encode(message).finish(); + }, + toProtoMsg(message: Module): ModuleProtoMsg { + return { + typeUrl: "/cosmos.base.tendermint.v1beta1.Module", + value: Module.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts index 3cd9a0b427..747f676202 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/base/v1beta1/coin.ts @@ -64,6 +64,7 @@ function createBaseCoin(): Coin { }; } export const Coin = { + typeUrl: "/cosmos.base.v1beta1.Coin", encode(message: Coin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -128,6 +129,39 @@ export const Coin = { obj.denom = message.denom; obj.amount = message.amount; return obj; + }, + fromAmino(object: CoinAmino): Coin { + return { + denom: object.denom, + amount: object.amount + }; + }, + toAmino(message: Coin): CoinAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.amount = message.amount; + return obj; + }, + fromAminoMsg(object: CoinAminoMsg): Coin { + return Coin.fromAmino(object.value); + }, + toAminoMsg(message: Coin): CoinAminoMsg { + return { + type: "cosmos-sdk/Coin", + value: Coin.toAmino(message) + }; + }, + fromProtoMsg(message: CoinProtoMsg): Coin { + return Coin.decode(message.value); + }, + toProto(message: Coin): Uint8Array { + return Coin.encode(message).finish(); + }, + toProtoMsg(message: Coin): CoinProtoMsg { + return { + typeUrl: "/cosmos.base.v1beta1.Coin", + value: Coin.encode(message).finish() + }; } }; function createBaseDecCoin(): DecCoin { @@ -137,6 +171,7 @@ function createBaseDecCoin(): DecCoin { }; } export const DecCoin = { + typeUrl: "/cosmos.base.v1beta1.DecCoin", encode(message: DecCoin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -201,6 +236,39 @@ export const DecCoin = { obj.denom = message.denom; obj.amount = message.amount; return obj; + }, + fromAmino(object: DecCoinAmino): DecCoin { + return { + denom: object.denom, + amount: object.amount + }; + }, + toAmino(message: DecCoin): DecCoinAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.amount = message.amount; + return obj; + }, + fromAminoMsg(object: DecCoinAminoMsg): DecCoin { + return DecCoin.fromAmino(object.value); + }, + toAminoMsg(message: DecCoin): DecCoinAminoMsg { + return { + type: "cosmos-sdk/DecCoin", + value: DecCoin.toAmino(message) + }; + }, + fromProtoMsg(message: DecCoinProtoMsg): DecCoin { + return DecCoin.decode(message.value); + }, + toProto(message: DecCoin): Uint8Array { + return DecCoin.encode(message).finish(); + }, + toProtoMsg(message: DecCoin): DecCoinProtoMsg { + return { + typeUrl: "/cosmos.base.v1beta1.DecCoin", + value: DecCoin.encode(message).finish() + }; } }; function createBaseIntProto(): IntProto { @@ -209,6 +277,7 @@ function createBaseIntProto(): IntProto { }; } export const IntProto = { + typeUrl: "/cosmos.base.v1beta1.IntProto", encode(message: IntProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.int !== "") { writer.uint32(10).string(message.int); @@ -261,6 +330,37 @@ export const IntProto = { const obj: any = {}; obj.int = message.int; return obj; + }, + fromAmino(object: IntProtoAmino): IntProto { + return { + int: object.int + }; + }, + toAmino(message: IntProto): IntProtoAmino { + const obj: any = {}; + obj.int = message.int; + return obj; + }, + fromAminoMsg(object: IntProtoAminoMsg): IntProto { + return IntProto.fromAmino(object.value); + }, + toAminoMsg(message: IntProto): IntProtoAminoMsg { + return { + type: "cosmos-sdk/IntProto", + value: IntProto.toAmino(message) + }; + }, + fromProtoMsg(message: IntProtoProtoMsg): IntProto { + return IntProto.decode(message.value); + }, + toProto(message: IntProto): Uint8Array { + return IntProto.encode(message).finish(); + }, + toProtoMsg(message: IntProto): IntProtoProtoMsg { + return { + typeUrl: "/cosmos.base.v1beta1.IntProto", + value: IntProto.encode(message).finish() + }; } }; function createBaseDecProto(): DecProto { @@ -269,6 +369,7 @@ function createBaseDecProto(): DecProto { }; } export const DecProto = { + typeUrl: "/cosmos.base.v1beta1.DecProto", encode(message: DecProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.dec !== "") { writer.uint32(10).string(message.dec); @@ -321,5 +422,36 @@ export const DecProto = { const obj: any = {}; obj.dec = message.dec; return obj; + }, + fromAmino(object: DecProtoAmino): DecProto { + return { + dec: object.dec + }; + }, + toAmino(message: DecProto): DecProtoAmino { + const obj: any = {}; + obj.dec = message.dec; + return obj; + }, + fromAminoMsg(object: DecProtoAminoMsg): DecProto { + return DecProto.fromAmino(object.value); + }, + toAminoMsg(message: DecProto): DecProtoAminoMsg { + return { + type: "cosmos-sdk/DecProto", + value: DecProto.toAmino(message) + }; + }, + fromProtoMsg(message: DecProtoProtoMsg): DecProto { + return DecProto.decode(message.value); + }, + toProto(message: DecProto): Uint8Array { + return DecProto.encode(message).finish(); + }, + toProtoMsg(message: DecProto): DecProtoProtoMsg { + return { + typeUrl: "/cosmos.base.v1beta1.DecProto", + value: DecProto.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts index 26bbcfd7a2..a9cb19310c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/capability.ts @@ -51,6 +51,7 @@ function createBaseCapability(): Capability { }; } export const Capability = { + typeUrl: "/cosmos.capability.v1beta1.Capability", encode(message: Capability, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); @@ -103,6 +104,37 @@ export const Capability = { const obj: any = {}; obj.index = message.index; return obj; + }, + fromAmino(object: CapabilityAmino): Capability { + return { + index: BigInt(object.index) + }; + }, + toAmino(message: Capability): CapabilityAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + return obj; + }, + fromAminoMsg(object: CapabilityAminoMsg): Capability { + return Capability.fromAmino(object.value); + }, + toAminoMsg(message: Capability): CapabilityAminoMsg { + return { + type: "cosmos-sdk/Capability", + value: Capability.toAmino(message) + }; + }, + fromProtoMsg(message: CapabilityProtoMsg): Capability { + return Capability.decode(message.value); + }, + toProto(message: Capability): Uint8Array { + return Capability.encode(message).finish(); + }, + toProtoMsg(message: Capability): CapabilityProtoMsg { + return { + typeUrl: "/cosmos.capability.v1beta1.Capability", + value: Capability.encode(message).finish() + }; } }; function createBaseOwner(): Owner { @@ -112,6 +144,7 @@ function createBaseOwner(): Owner { }; } export const Owner = { + typeUrl: "/cosmos.capability.v1beta1.Owner", encode(message: Owner, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.module !== "") { writer.uint32(10).string(message.module); @@ -176,6 +209,39 @@ export const Owner = { obj.module = message.module; obj.name = message.name; return obj; + }, + fromAmino(object: OwnerAmino): Owner { + return { + module: object.module, + name: object.name + }; + }, + toAmino(message: Owner): OwnerAmino { + const obj: any = {}; + obj.module = message.module; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: OwnerAminoMsg): Owner { + return Owner.fromAmino(object.value); + }, + toAminoMsg(message: Owner): OwnerAminoMsg { + return { + type: "cosmos-sdk/Owner", + value: Owner.toAmino(message) + }; + }, + fromProtoMsg(message: OwnerProtoMsg): Owner { + return Owner.decode(message.value); + }, + toProto(message: Owner): Uint8Array { + return Owner.encode(message).finish(); + }, + toProtoMsg(message: Owner): OwnerProtoMsg { + return { + typeUrl: "/cosmos.capability.v1beta1.Owner", + value: Owner.encode(message).finish() + }; } }; function createBaseCapabilityOwners(): CapabilityOwners { @@ -184,6 +250,7 @@ function createBaseCapabilityOwners(): CapabilityOwners { }; } export const CapabilityOwners = { + typeUrl: "/cosmos.capability.v1beta1.CapabilityOwners", encode(message: CapabilityOwners, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.owners) { Owner.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -244,5 +311,40 @@ export const CapabilityOwners = { obj.owners = []; } return obj; + }, + fromAmino(object: CapabilityOwnersAmino): CapabilityOwners { + return { + owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => Owner.fromAmino(e)) : [] + }; + }, + toAmino(message: CapabilityOwners): CapabilityOwnersAmino { + const obj: any = {}; + if (message.owners) { + obj.owners = message.owners.map(e => e ? Owner.toAmino(e) : undefined); + } else { + obj.owners = []; + } + return obj; + }, + fromAminoMsg(object: CapabilityOwnersAminoMsg): CapabilityOwners { + return CapabilityOwners.fromAmino(object.value); + }, + toAminoMsg(message: CapabilityOwners): CapabilityOwnersAminoMsg { + return { + type: "cosmos-sdk/CapabilityOwners", + value: CapabilityOwners.toAmino(message) + }; + }, + fromProtoMsg(message: CapabilityOwnersProtoMsg): CapabilityOwners { + return CapabilityOwners.decode(message.value); + }, + toProto(message: CapabilityOwners): Uint8Array { + return CapabilityOwners.encode(message).finish(); + }, + toProtoMsg(message: CapabilityOwners): CapabilityOwnersProtoMsg { + return { + typeUrl: "/cosmos.capability.v1beta1.CapabilityOwners", + value: CapabilityOwners.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts index 86cef39b5a..6648e70766 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/capability/v1beta1/genesis.ts @@ -36,6 +36,7 @@ function createBaseGenesisOwners(): GenesisOwners { }; } export const GenesisOwners = { + typeUrl: "/cosmos.capability.v1beta1.GenesisOwners", encode(message: GenesisOwners, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); @@ -100,6 +101,39 @@ export const GenesisOwners = { obj.index = message.index; message.indexOwners !== undefined && (obj.index_owners = message.indexOwners ? CapabilityOwners.toSDK(message.indexOwners) : undefined); return obj; + }, + fromAmino(object: GenesisOwnersAmino): GenesisOwners { + return { + index: BigInt(object.index), + indexOwners: object?.index_owners ? CapabilityOwners.fromAmino(object.index_owners) : undefined + }; + }, + toAmino(message: GenesisOwners): GenesisOwnersAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + obj.index_owners = message.indexOwners ? CapabilityOwners.toAmino(message.indexOwners) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisOwnersAminoMsg): GenesisOwners { + return GenesisOwners.fromAmino(object.value); + }, + toAminoMsg(message: GenesisOwners): GenesisOwnersAminoMsg { + return { + type: "cosmos-sdk/GenesisOwners", + value: GenesisOwners.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisOwnersProtoMsg): GenesisOwners { + return GenesisOwners.decode(message.value); + }, + toProto(message: GenesisOwners): Uint8Array { + return GenesisOwners.encode(message).finish(); + }, + toProtoMsg(message: GenesisOwners): GenesisOwnersProtoMsg { + return { + typeUrl: "/cosmos.capability.v1beta1.GenesisOwners", + value: GenesisOwners.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -109,6 +143,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.capability.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); @@ -181,5 +216,42 @@ export const GenesisState = { obj.owners = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + index: BigInt(object.index), + owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => GenesisOwners.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + if (message.owners) { + obj.owners = message.owners.map(e => e ? GenesisOwners.toAmino(e) : undefined); + } else { + obj.owners = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.capability.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/genesis.ts index 6cbd786dfc..c864031aef 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/genesis.ts @@ -20,6 +20,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.crisis.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.constantFee !== undefined) { Coin.encode(message.constantFee, writer.uint32(26).fork()).ldelim(); @@ -72,5 +73,36 @@ export const GenesisState = { const obj: any = {}; message.constantFee !== undefined && (obj.constant_fee = message.constantFee ? Coin.toSDK(message.constantFee) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + constantFee: object?.constant_fee ? Coin.fromAmino(object.constant_fee) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.constant_fee = message.constantFee ? Coin.toAmino(message.constantFee) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.crisis.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts index 43d8125fd7..871b9206ce 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crisis/v1beta1/tx.ts @@ -25,6 +25,7 @@ function createBaseMsgVerifyInvariant(): MsgVerifyInvariant { }; } export const MsgVerifyInvariant = { + typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariant", encode(message: MsgVerifyInvariant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -101,12 +102,48 @@ export const MsgVerifyInvariant = { obj.invariant_module_name = message.invariantModuleName; obj.invariant_route = message.invariantRoute; return obj; + }, + fromAmino(object: MsgVerifyInvariantAmino): MsgVerifyInvariant { + return { + sender: object.sender, + invariantModuleName: object.invariant_module_name, + invariantRoute: object.invariant_route + }; + }, + toAmino(message: MsgVerifyInvariant): MsgVerifyInvariantAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.invariant_module_name = message.invariantModuleName; + obj.invariant_route = message.invariantRoute; + return obj; + }, + fromAminoMsg(object: MsgVerifyInvariantAminoMsg): MsgVerifyInvariant { + return MsgVerifyInvariant.fromAmino(object.value); + }, + toAminoMsg(message: MsgVerifyInvariant): MsgVerifyInvariantAminoMsg { + return { + type: "cosmos-sdk/MsgVerifyInvariant", + value: MsgVerifyInvariant.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVerifyInvariantProtoMsg): MsgVerifyInvariant { + return MsgVerifyInvariant.decode(message.value); + }, + toProto(message: MsgVerifyInvariant): Uint8Array { + return MsgVerifyInvariant.encode(message).finish(); + }, + toProtoMsg(message: MsgVerifyInvariant): MsgVerifyInvariantProtoMsg { + return { + typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariant", + value: MsgVerifyInvariant.encode(message).finish() + }; } }; function createBaseMsgVerifyInvariantResponse(): MsgVerifyInvariantResponse { return {}; } export const MsgVerifyInvariantResponse = { + typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariantResponse", encode(_: MsgVerifyInvariantResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -144,5 +181,33 @@ export const MsgVerifyInvariantResponse = { toSDK(_: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgVerifyInvariantResponseAmino): MsgVerifyInvariantResponse { + return {}; + }, + toAmino(_: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgVerifyInvariantResponseAminoMsg): MsgVerifyInvariantResponse { + return MsgVerifyInvariantResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseAminoMsg { + return { + type: "cosmos-sdk/MsgVerifyInvariantResponse", + value: MsgVerifyInvariantResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVerifyInvariantResponseProtoMsg): MsgVerifyInvariantResponse { + return MsgVerifyInvariantResponse.decode(message.value); + }, + toProto(message: MsgVerifyInvariantResponse): Uint8Array { + return MsgVerifyInvariantResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgVerifyInvariantResponse): MsgVerifyInvariantResponseProtoMsg { + return { + typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariantResponse", + value: MsgVerifyInvariantResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/ed25519/keys.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/ed25519/keys.ts index c300fdcba1..312738c28c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/ed25519/keys.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/ed25519/keys.ts @@ -41,6 +41,7 @@ function createBasePubKey(): PubKey { }; } export const PubKey = { + typeUrl: "/cosmos.crypto.ed25519.PubKey", encode(message: PubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -93,6 +94,37 @@ export const PubKey = { const obj: any = {}; obj.key = message.key; return obj; + }, + fromAmino(object: PubKeyAmino): PubKey { + return { + key: object.key + }; + }, + toAmino(message: PubKey): PubKeyAmino { + const obj: any = {}; + obj.key = message.key; + return obj; + }, + fromAminoMsg(object: PubKeyAminoMsg): PubKey { + return PubKey.fromAmino(object.value); + }, + toAminoMsg(message: PubKey): PubKeyAminoMsg { + return { + type: "cosmos-sdk/PubKey", + value: PubKey.toAmino(message) + }; + }, + fromProtoMsg(message: PubKeyProtoMsg): PubKey { + return PubKey.decode(message.value); + }, + toProto(message: PubKey): Uint8Array { + return PubKey.encode(message).finish(); + }, + toProtoMsg(message: PubKey): PubKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.ed25519.PubKey", + value: PubKey.encode(message).finish() + }; } }; function createBasePrivKey(): PrivKey { @@ -101,6 +133,7 @@ function createBasePrivKey(): PrivKey { }; } export const PrivKey = { + typeUrl: "/cosmos.crypto.ed25519.PrivKey", encode(message: PrivKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -153,5 +186,36 @@ export const PrivKey = { const obj: any = {}; obj.key = message.key; return obj; + }, + fromAmino(object: PrivKeyAmino): PrivKey { + return { + key: object.key + }; + }, + toAmino(message: PrivKey): PrivKeyAmino { + const obj: any = {}; + obj.key = message.key; + return obj; + }, + fromAminoMsg(object: PrivKeyAminoMsg): PrivKey { + return PrivKey.fromAmino(object.value); + }, + toAminoMsg(message: PrivKey): PrivKeyAminoMsg { + return { + type: "cosmos-sdk/PrivKey", + value: PrivKey.toAmino(message) + }; + }, + fromProtoMsg(message: PrivKeyProtoMsg): PrivKey { + return PrivKey.decode(message.value); + }, + toProto(message: PrivKey): Uint8Array { + return PrivKey.encode(message).finish(); + }, + toProtoMsg(message: PrivKey): PrivKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.ed25519.PrivKey", + value: PrivKey.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/hd/v1/hd.ts index 315e8e4f97..c6d9592114 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/hd/v1/hd.ts @@ -35,6 +35,7 @@ function createBaseBIP44Params(): BIP44Params { }; } export const BIP44Params = { + typeUrl: "/cosmos.crypto.hd.v1.BIP44Params", encode(message: BIP44Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.purpose !== 0) { writer.uint32(8).uint32(message.purpose); @@ -135,5 +136,44 @@ export const BIP44Params = { obj.change = message.change; obj.address_index = message.addressIndex; return obj; + }, + fromAmino(object: BIP44ParamsAmino): BIP44Params { + return { + purpose: object.purpose, + coinType: object.coin_type, + account: object.account, + change: object.change, + addressIndex: object.address_index + }; + }, + toAmino(message: BIP44Params): BIP44ParamsAmino { + const obj: any = {}; + obj.purpose = message.purpose; + obj.coin_type = message.coinType; + obj.account = message.account; + obj.change = message.change; + obj.address_index = message.addressIndex; + return obj; + }, + fromAminoMsg(object: BIP44ParamsAminoMsg): BIP44Params { + return BIP44Params.fromAmino(object.value); + }, + toAminoMsg(message: BIP44Params): BIP44ParamsAminoMsg { + return { + type: "cosmos-sdk/BIP44Params", + value: BIP44Params.toAmino(message) + }; + }, + fromProtoMsg(message: BIP44ParamsProtoMsg): BIP44Params { + return BIP44Params.decode(message.value); + }, + toProto(message: BIP44Params): Uint8Array { + return BIP44Params.encode(message).finish(); + }, + toProtoMsg(message: BIP44Params): BIP44ParamsProtoMsg { + return { + typeUrl: "/cosmos.crypto.hd.v1.BIP44Params", + value: BIP44Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/keyring/v1/record.ts index fff55d5021..ba458bad16 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/keyring/v1/record.ts @@ -70,6 +70,7 @@ function createBaseRecord(): Record { }; } export const Record = { + typeUrl: "/cosmos.crypto.keyring.v1.Record", encode(message: Record, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -182,6 +183,47 @@ export const Record = { message.multi !== undefined && (obj.multi = message.multi ? Record_Multi.toSDK(message.multi) : undefined); message.offline !== undefined && (obj.offline = message.offline ? Record_Offline.toSDK(message.offline) : undefined); return obj; + }, + fromAmino(object: RecordAmino): Record { + return { + name: object.name, + pubKey: object?.pub_key ? Any.fromAmino(object.pub_key) : undefined, + local: object?.local ? Record_Local.fromAmino(object.local) : undefined, + ledger: object?.ledger ? Record_Ledger.fromAmino(object.ledger) : undefined, + multi: object?.multi ? Record_Multi.fromAmino(object.multi) : undefined, + offline: object?.offline ? Record_Offline.fromAmino(object.offline) : undefined + }; + }, + toAmino(message: Record): RecordAmino { + const obj: any = {}; + obj.name = message.name; + obj.pub_key = message.pubKey ? Any.toAmino(message.pubKey) : undefined; + obj.local = message.local ? Record_Local.toAmino(message.local) : undefined; + obj.ledger = message.ledger ? Record_Ledger.toAmino(message.ledger) : undefined; + obj.multi = message.multi ? Record_Multi.toAmino(message.multi) : undefined; + obj.offline = message.offline ? Record_Offline.toAmino(message.offline) : undefined; + return obj; + }, + fromAminoMsg(object: RecordAminoMsg): Record { + return Record.fromAmino(object.value); + }, + toAminoMsg(message: Record): RecordAminoMsg { + return { + type: "cosmos-sdk/Record", + value: Record.toAmino(message) + }; + }, + fromProtoMsg(message: RecordProtoMsg): Record { + return Record.decode(message.value); + }, + toProto(message: Record): Uint8Array { + return Record.encode(message).finish(); + }, + toProtoMsg(message: Record): RecordProtoMsg { + return { + typeUrl: "/cosmos.crypto.keyring.v1.Record", + value: Record.encode(message).finish() + }; } }; function createBaseRecord_Local(): Record_Local { @@ -191,6 +233,7 @@ function createBaseRecord_Local(): Record_Local { }; } export const Record_Local = { + typeUrl: "/cosmos.crypto.keyring.v1.Local", encode(message: Record_Local, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.privKey !== undefined) { Any.encode(message.privKey, writer.uint32(10).fork()).ldelim(); @@ -255,6 +298,39 @@ export const Record_Local = { message.privKey !== undefined && (obj.priv_key = message.privKey ? Any.toSDK(message.privKey) : undefined); obj.priv_key_type = message.privKeyType; return obj; + }, + fromAmino(object: Record_LocalAmino): Record_Local { + return { + privKey: object?.priv_key ? Any.fromAmino(object.priv_key) : undefined, + privKeyType: object.priv_key_type + }; + }, + toAmino(message: Record_Local): Record_LocalAmino { + const obj: any = {}; + obj.priv_key = message.privKey ? Any.toAmino(message.privKey) : undefined; + obj.priv_key_type = message.privKeyType; + return obj; + }, + fromAminoMsg(object: Record_LocalAminoMsg): Record_Local { + return Record_Local.fromAmino(object.value); + }, + toAminoMsg(message: Record_Local): Record_LocalAminoMsg { + return { + type: "cosmos-sdk/Local", + value: Record_Local.toAmino(message) + }; + }, + fromProtoMsg(message: Record_LocalProtoMsg): Record_Local { + return Record_Local.decode(message.value); + }, + toProto(message: Record_Local): Uint8Array { + return Record_Local.encode(message).finish(); + }, + toProtoMsg(message: Record_Local): Record_LocalProtoMsg { + return { + typeUrl: "/cosmos.crypto.keyring.v1.Local", + value: Record_Local.encode(message).finish() + }; } }; function createBaseRecord_Ledger(): Record_Ledger { @@ -263,6 +339,7 @@ function createBaseRecord_Ledger(): Record_Ledger { }; } export const Record_Ledger = { + typeUrl: "/cosmos.crypto.keyring.v1.Ledger", encode(message: Record_Ledger, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path !== undefined) { BIP44Params.encode(message.path, writer.uint32(10).fork()).ldelim(); @@ -315,12 +392,44 @@ export const Record_Ledger = { const obj: any = {}; message.path !== undefined && (obj.path = message.path ? BIP44Params.toSDK(message.path) : undefined); return obj; + }, + fromAmino(object: Record_LedgerAmino): Record_Ledger { + return { + path: object?.path ? BIP44Params.fromAmino(object.path) : undefined + }; + }, + toAmino(message: Record_Ledger): Record_LedgerAmino { + const obj: any = {}; + obj.path = message.path ? BIP44Params.toAmino(message.path) : undefined; + return obj; + }, + fromAminoMsg(object: Record_LedgerAminoMsg): Record_Ledger { + return Record_Ledger.fromAmino(object.value); + }, + toAminoMsg(message: Record_Ledger): Record_LedgerAminoMsg { + return { + type: "cosmos-sdk/Ledger", + value: Record_Ledger.toAmino(message) + }; + }, + fromProtoMsg(message: Record_LedgerProtoMsg): Record_Ledger { + return Record_Ledger.decode(message.value); + }, + toProto(message: Record_Ledger): Uint8Array { + return Record_Ledger.encode(message).finish(); + }, + toProtoMsg(message: Record_Ledger): Record_LedgerProtoMsg { + return { + typeUrl: "/cosmos.crypto.keyring.v1.Ledger", + value: Record_Ledger.encode(message).finish() + }; } }; function createBaseRecord_Multi(): Record_Multi { return {}; } export const Record_Multi = { + typeUrl: "/cosmos.crypto.keyring.v1.Multi", encode(_: Record_Multi, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -358,12 +467,41 @@ export const Record_Multi = { toSDK(_: Record_Multi): Record_MultiSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: Record_MultiAmino): Record_Multi { + return {}; + }, + toAmino(_: Record_Multi): Record_MultiAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: Record_MultiAminoMsg): Record_Multi { + return Record_Multi.fromAmino(object.value); + }, + toAminoMsg(message: Record_Multi): Record_MultiAminoMsg { + return { + type: "cosmos-sdk/Multi", + value: Record_Multi.toAmino(message) + }; + }, + fromProtoMsg(message: Record_MultiProtoMsg): Record_Multi { + return Record_Multi.decode(message.value); + }, + toProto(message: Record_Multi): Uint8Array { + return Record_Multi.encode(message).finish(); + }, + toProtoMsg(message: Record_Multi): Record_MultiProtoMsg { + return { + typeUrl: "/cosmos.crypto.keyring.v1.Multi", + value: Record_Multi.encode(message).finish() + }; } }; function createBaseRecord_Offline(): Record_Offline { return {}; } export const Record_Offline = { + typeUrl: "/cosmos.crypto.keyring.v1.Offline", encode(_: Record_Offline, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -401,5 +539,33 @@ export const Record_Offline = { toSDK(_: Record_Offline): Record_OfflineSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: Record_OfflineAmino): Record_Offline { + return {}; + }, + toAmino(_: Record_Offline): Record_OfflineAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: Record_OfflineAminoMsg): Record_Offline { + return Record_Offline.fromAmino(object.value); + }, + toAminoMsg(message: Record_Offline): Record_OfflineAminoMsg { + return { + type: "cosmos-sdk/Offline", + value: Record_Offline.toAmino(message) + }; + }, + fromProtoMsg(message: Record_OfflineProtoMsg): Record_Offline { + return Record_Offline.decode(message.value); + }, + toProto(message: Record_Offline): Uint8Array { + return Record_Offline.encode(message).finish(); + }, + toProtoMsg(message: Record_Offline): Record_OfflineProtoMsg { + return { + typeUrl: "/cosmos.crypto.keyring.v1.Offline", + value: Record_Offline.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts index 3b879de0e3..9ae38ac7ad 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/keys.ts @@ -27,6 +27,7 @@ function createBaseLegacyAminoPubKey(): LegacyAminoPubKey { }; } export const LegacyAminoPubKey = { + typeUrl: "/cosmos.crypto.multisig.LegacyAminoPubKey", encode(message: LegacyAminoPubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.threshold !== 0) { writer.uint32(8).uint32(message.threshold); @@ -99,5 +100,42 @@ export const LegacyAminoPubKey = { obj.public_keys = []; } return obj; + }, + fromAmino(object: LegacyAminoPubKeyAmino): LegacyAminoPubKey { + return { + threshold: object.threshold, + publicKeys: Array.isArray(object?.public_keys) ? object.public_keys.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: LegacyAminoPubKey): LegacyAminoPubKeyAmino { + const obj: any = {}; + obj.threshold = message.threshold; + if (message.publicKeys) { + obj.public_keys = message.publicKeys.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.public_keys = []; + } + return obj; + }, + fromAminoMsg(object: LegacyAminoPubKeyAminoMsg): LegacyAminoPubKey { + return LegacyAminoPubKey.fromAmino(object.value); + }, + toAminoMsg(message: LegacyAminoPubKey): LegacyAminoPubKeyAminoMsg { + return { + type: "cosmos-sdk/LegacyAminoPubKey", + value: LegacyAminoPubKey.toAmino(message) + }; + }, + fromProtoMsg(message: LegacyAminoPubKeyProtoMsg): LegacyAminoPubKey { + return LegacyAminoPubKey.decode(message.value); + }, + toProto(message: LegacyAminoPubKey): Uint8Array { + return LegacyAminoPubKey.encode(message).finish(); + }, + toProtoMsg(message: LegacyAminoPubKey): LegacyAminoPubKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.multisig.LegacyAminoPubKey", + value: LegacyAminoPubKey.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/v1beta1/multisig.ts index 1ae9a0d290..c68d342239 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -43,6 +43,7 @@ function createBaseMultiSignature(): MultiSignature { }; } export const MultiSignature = { + typeUrl: "/cosmos.crypto.multisig.v1beta1.MultiSignature", encode(message: MultiSignature, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signatures) { writer.uint32(10).bytes(v!); @@ -103,6 +104,41 @@ export const MultiSignature = { obj.signatures = []; } return obj; + }, + fromAmino(object: MultiSignatureAmino): MultiSignature { + return { + signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => e) : [] + }; + }, + toAmino(message: MultiSignature): MultiSignatureAmino { + const obj: any = {}; + if (message.signatures) { + obj.signatures = message.signatures.map(e => e); + } else { + obj.signatures = []; + } + return obj; + }, + fromAminoMsg(object: MultiSignatureAminoMsg): MultiSignature { + return MultiSignature.fromAmino(object.value); + }, + toAminoMsg(message: MultiSignature): MultiSignatureAminoMsg { + return { + type: "cosmos-sdk/MultiSignature", + value: MultiSignature.toAmino(message) + }; + }, + fromProtoMsg(message: MultiSignatureProtoMsg): MultiSignature { + return MultiSignature.decode(message.value); + }, + toProto(message: MultiSignature): Uint8Array { + return MultiSignature.encode(message).finish(); + }, + toProtoMsg(message: MultiSignature): MultiSignatureProtoMsg { + return { + typeUrl: "/cosmos.crypto.multisig.v1beta1.MultiSignature", + value: MultiSignature.encode(message).finish() + }; } }; function createBaseCompactBitArray(): CompactBitArray { @@ -112,6 +148,7 @@ function createBaseCompactBitArray(): CompactBitArray { }; } export const CompactBitArray = { + typeUrl: "/cosmos.crypto.multisig.v1beta1.CompactBitArray", encode(message: CompactBitArray, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.extraBitsStored !== 0) { writer.uint32(8).uint32(message.extraBitsStored); @@ -176,5 +213,38 @@ export const CompactBitArray = { obj.extra_bits_stored = message.extraBitsStored; obj.elems = message.elems; return obj; + }, + fromAmino(object: CompactBitArrayAmino): CompactBitArray { + return { + extraBitsStored: object.extra_bits_stored, + elems: object.elems + }; + }, + toAmino(message: CompactBitArray): CompactBitArrayAmino { + const obj: any = {}; + obj.extra_bits_stored = message.extraBitsStored; + obj.elems = message.elems; + return obj; + }, + fromAminoMsg(object: CompactBitArrayAminoMsg): CompactBitArray { + return CompactBitArray.fromAmino(object.value); + }, + toAminoMsg(message: CompactBitArray): CompactBitArrayAminoMsg { + return { + type: "cosmos-sdk/CompactBitArray", + value: CompactBitArray.toAmino(message) + }; + }, + fromProtoMsg(message: CompactBitArrayProtoMsg): CompactBitArray { + return CompactBitArray.decode(message.value); + }, + toProto(message: CompactBitArray): Uint8Array { + return CompactBitArray.encode(message).finish(); + }, + toProtoMsg(message: CompactBitArray): CompactBitArrayProtoMsg { + return { + typeUrl: "/cosmos.crypto.multisig.v1beta1.CompactBitArray", + value: CompactBitArray.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256k1/keys.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256k1/keys.ts index ef24435f01..6681aebafc 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256k1/keys.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256k1/keys.ts @@ -35,6 +35,7 @@ function createBasePubKey(): PubKey { }; } export const PubKey = { + typeUrl: "/cosmos.crypto.secp256k1.PubKey", encode(message: PubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -87,6 +88,37 @@ export const PubKey = { const obj: any = {}; obj.key = message.key; return obj; + }, + fromAmino(object: PubKeyAmino): PubKey { + return { + key: object.key + }; + }, + toAmino(message: PubKey): PubKeyAmino { + const obj: any = {}; + obj.key = message.key; + return obj; + }, + fromAminoMsg(object: PubKeyAminoMsg): PubKey { + return PubKey.fromAmino(object.value); + }, + toAminoMsg(message: PubKey): PubKeyAminoMsg { + return { + type: "cosmos-sdk/PubKey", + value: PubKey.toAmino(message) + }; + }, + fromProtoMsg(message: PubKeyProtoMsg): PubKey { + return PubKey.decode(message.value); + }, + toProto(message: PubKey): Uint8Array { + return PubKey.encode(message).finish(); + }, + toProtoMsg(message: PubKey): PubKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.secp256k1.PubKey", + value: PubKey.encode(message).finish() + }; } }; function createBasePrivKey(): PrivKey { @@ -95,6 +127,7 @@ function createBasePrivKey(): PrivKey { }; } export const PrivKey = { + typeUrl: "/cosmos.crypto.secp256k1.PrivKey", encode(message: PrivKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -147,5 +180,36 @@ export const PrivKey = { const obj: any = {}; obj.key = message.key; return obj; + }, + fromAmino(object: PrivKeyAmino): PrivKey { + return { + key: object.key + }; + }, + toAmino(message: PrivKey): PrivKeyAmino { + const obj: any = {}; + obj.key = message.key; + return obj; + }, + fromAminoMsg(object: PrivKeyAminoMsg): PrivKey { + return PrivKey.fromAmino(object.value); + }, + toAminoMsg(message: PrivKey): PrivKeyAminoMsg { + return { + type: "cosmos-sdk/PrivKey", + value: PrivKey.toAmino(message) + }; + }, + fromProtoMsg(message: PrivKeyProtoMsg): PrivKey { + return PrivKey.decode(message.value); + }, + toProto(message: PrivKey): Uint8Array { + return PrivKey.encode(message).finish(); + }, + toProtoMsg(message: PrivKey): PrivKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.secp256k1.PrivKey", + value: PrivKey.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256r1/keys.ts b/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256r1/keys.ts index d18ec2dbdd..e58fc6b966 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256r1/keys.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/crypto/secp256r1/keys.ts @@ -28,6 +28,7 @@ function createBasePubKey(): PubKey { }; } export const PubKey = { + typeUrl: "/cosmos.crypto.secp256r1.PubKey", encode(message: PubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -80,6 +81,37 @@ export const PubKey = { const obj: any = {}; obj.key = message.key; return obj; + }, + fromAmino(object: PubKeyAmino): PubKey { + return { + key: object.key + }; + }, + toAmino(message: PubKey): PubKeyAmino { + const obj: any = {}; + obj.key = message.key; + return obj; + }, + fromAminoMsg(object: PubKeyAminoMsg): PubKey { + return PubKey.fromAmino(object.value); + }, + toAminoMsg(message: PubKey): PubKeyAminoMsg { + return { + type: "cosmos-sdk/PubKey", + value: PubKey.toAmino(message) + }; + }, + fromProtoMsg(message: PubKeyProtoMsg): PubKey { + return PubKey.decode(message.value); + }, + toProto(message: PubKey): Uint8Array { + return PubKey.encode(message).finish(); + }, + toProtoMsg(message: PubKey): PubKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.secp256r1.PubKey", + value: PubKey.encode(message).finish() + }; } }; function createBasePrivKey(): PrivKey { @@ -88,6 +120,7 @@ function createBasePrivKey(): PrivKey { }; } export const PrivKey = { + typeUrl: "/cosmos.crypto.secp256r1.PrivKey", encode(message: PrivKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.secret.length !== 0) { writer.uint32(10).bytes(message.secret); @@ -140,5 +173,36 @@ export const PrivKey = { const obj: any = {}; obj.secret = message.secret; return obj; + }, + fromAmino(object: PrivKeyAmino): PrivKey { + return { + secret: object.secret + }; + }, + toAmino(message: PrivKey): PrivKeyAmino { + const obj: any = {}; + obj.secret = message.secret; + return obj; + }, + fromAminoMsg(object: PrivKeyAminoMsg): PrivKey { + return PrivKey.fromAmino(object.value); + }, + toAminoMsg(message: PrivKey): PrivKeyAminoMsg { + return { + type: "cosmos-sdk/PrivKey", + value: PrivKey.toAmino(message) + }; + }, + fromProtoMsg(message: PrivKeyProtoMsg): PrivKey { + return PrivKey.decode(message.value); + }, + toProto(message: PrivKey): Uint8Array { + return PrivKey.encode(message).finish(); + }, + toProtoMsg(message: PrivKey): PrivKeyProtoMsg { + return { + typeUrl: "/cosmos.crypto.secp256r1.PrivKey", + value: PrivKey.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts index 4c44a44e6d..583b79b3d0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/distribution.ts @@ -230,6 +230,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmos.distribution.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.communityTax !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.communityTax, 18).atomics); @@ -318,6 +319,43 @@ export const Params = { obj.bonus_proposer_reward = message.bonusProposerReward; obj.withdraw_addr_enabled = message.withdrawAddrEnabled; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + communityTax: object.community_tax, + baseProposerReward: object.base_proposer_reward, + bonusProposerReward: object.bonus_proposer_reward, + withdrawAddrEnabled: object.withdraw_addr_enabled + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.community_tax = message.communityTax; + obj.base_proposer_reward = message.baseProposerReward; + obj.bonus_proposer_reward = message.bonusProposerReward; + obj.withdraw_addr_enabled = message.withdrawAddrEnabled; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseValidatorHistoricalRewards(): ValidatorHistoricalRewards { @@ -327,6 +365,7 @@ function createBaseValidatorHistoricalRewards(): ValidatorHistoricalRewards { }; } export const ValidatorHistoricalRewards = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewards", encode(message: ValidatorHistoricalRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.cumulativeRewardRatio) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -399,6 +438,43 @@ export const ValidatorHistoricalRewards = { } obj.reference_count = message.referenceCount; return obj; + }, + fromAmino(object: ValidatorHistoricalRewardsAmino): ValidatorHistoricalRewards { + return { + cumulativeRewardRatio: Array.isArray(object?.cumulative_reward_ratio) ? object.cumulative_reward_ratio.map((e: any) => DecCoin.fromAmino(e)) : [], + referenceCount: object.reference_count + }; + }, + toAmino(message: ValidatorHistoricalRewards): ValidatorHistoricalRewardsAmino { + const obj: any = {}; + if (message.cumulativeRewardRatio) { + obj.cumulative_reward_ratio = message.cumulativeRewardRatio.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.cumulative_reward_ratio = []; + } + obj.reference_count = message.referenceCount; + return obj; + }, + fromAminoMsg(object: ValidatorHistoricalRewardsAminoMsg): ValidatorHistoricalRewards { + return ValidatorHistoricalRewards.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorHistoricalRewards): ValidatorHistoricalRewardsAminoMsg { + return { + type: "cosmos-sdk/ValidatorHistoricalRewards", + value: ValidatorHistoricalRewards.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorHistoricalRewardsProtoMsg): ValidatorHistoricalRewards { + return ValidatorHistoricalRewards.decode(message.value); + }, + toProto(message: ValidatorHistoricalRewards): Uint8Array { + return ValidatorHistoricalRewards.encode(message).finish(); + }, + toProtoMsg(message: ValidatorHistoricalRewards): ValidatorHistoricalRewardsProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewards", + value: ValidatorHistoricalRewards.encode(message).finish() + }; } }; function createBaseValidatorCurrentRewards(): ValidatorCurrentRewards { @@ -408,6 +484,7 @@ function createBaseValidatorCurrentRewards(): ValidatorCurrentRewards { }; } export const ValidatorCurrentRewards = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards", encode(message: ValidatorCurrentRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -480,6 +557,43 @@ export const ValidatorCurrentRewards = { } obj.period = message.period; return obj; + }, + fromAmino(object: ValidatorCurrentRewardsAmino): ValidatorCurrentRewards { + return { + rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromAmino(e)) : [], + period: BigInt(object.period) + }; + }, + toAmino(message: ValidatorCurrentRewards): ValidatorCurrentRewardsAmino { + const obj: any = {}; + if (message.rewards) { + obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.rewards = []; + } + obj.period = message.period ? message.period.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorCurrentRewardsAminoMsg): ValidatorCurrentRewards { + return ValidatorCurrentRewards.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorCurrentRewards): ValidatorCurrentRewardsAminoMsg { + return { + type: "cosmos-sdk/ValidatorCurrentRewards", + value: ValidatorCurrentRewards.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorCurrentRewardsProtoMsg): ValidatorCurrentRewards { + return ValidatorCurrentRewards.decode(message.value); + }, + toProto(message: ValidatorCurrentRewards): Uint8Array { + return ValidatorCurrentRewards.encode(message).finish(); + }, + toProtoMsg(message: ValidatorCurrentRewards): ValidatorCurrentRewardsProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards", + value: ValidatorCurrentRewards.encode(message).finish() + }; } }; function createBaseValidatorAccumulatedCommission(): ValidatorAccumulatedCommission { @@ -488,6 +602,7 @@ function createBaseValidatorAccumulatedCommission(): ValidatorAccumulatedCommiss }; } export const ValidatorAccumulatedCommission = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommission", encode(message: ValidatorAccumulatedCommission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.commission) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -548,6 +663,41 @@ export const ValidatorAccumulatedCommission = { obj.commission = []; } return obj; + }, + fromAmino(object: ValidatorAccumulatedCommissionAmino): ValidatorAccumulatedCommission { + return { + commission: Array.isArray(object?.commission) ? object.commission.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: ValidatorAccumulatedCommission): ValidatorAccumulatedCommissionAmino { + const obj: any = {}; + if (message.commission) { + obj.commission = message.commission.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.commission = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorAccumulatedCommissionAminoMsg): ValidatorAccumulatedCommission { + return ValidatorAccumulatedCommission.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorAccumulatedCommission): ValidatorAccumulatedCommissionAminoMsg { + return { + type: "cosmos-sdk/ValidatorAccumulatedCommission", + value: ValidatorAccumulatedCommission.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorAccumulatedCommissionProtoMsg): ValidatorAccumulatedCommission { + return ValidatorAccumulatedCommission.decode(message.value); + }, + toProto(message: ValidatorAccumulatedCommission): Uint8Array { + return ValidatorAccumulatedCommission.encode(message).finish(); + }, + toProtoMsg(message: ValidatorAccumulatedCommission): ValidatorAccumulatedCommissionProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommission", + value: ValidatorAccumulatedCommission.encode(message).finish() + }; } }; function createBaseValidatorOutstandingRewards(): ValidatorOutstandingRewards { @@ -556,6 +706,7 @@ function createBaseValidatorOutstandingRewards(): ValidatorOutstandingRewards { }; } export const ValidatorOutstandingRewards = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewards", encode(message: ValidatorOutstandingRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -616,6 +767,41 @@ export const ValidatorOutstandingRewards = { obj.rewards = []; } return obj; + }, + fromAmino(object: ValidatorOutstandingRewardsAmino): ValidatorOutstandingRewards { + return { + rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: ValidatorOutstandingRewards): ValidatorOutstandingRewardsAmino { + const obj: any = {}; + if (message.rewards) { + obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.rewards = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorOutstandingRewardsAminoMsg): ValidatorOutstandingRewards { + return ValidatorOutstandingRewards.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorOutstandingRewards): ValidatorOutstandingRewardsAminoMsg { + return { + type: "cosmos-sdk/ValidatorOutstandingRewards", + value: ValidatorOutstandingRewards.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorOutstandingRewardsProtoMsg): ValidatorOutstandingRewards { + return ValidatorOutstandingRewards.decode(message.value); + }, + toProto(message: ValidatorOutstandingRewards): Uint8Array { + return ValidatorOutstandingRewards.encode(message).finish(); + }, + toProtoMsg(message: ValidatorOutstandingRewards): ValidatorOutstandingRewardsProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewards", + value: ValidatorOutstandingRewards.encode(message).finish() + }; } }; function createBaseValidatorSlashEvent(): ValidatorSlashEvent { @@ -625,6 +811,7 @@ function createBaseValidatorSlashEvent(): ValidatorSlashEvent { }; } export const ValidatorSlashEvent = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvent", encode(message: ValidatorSlashEvent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorPeriod !== BigInt(0)) { writer.uint32(8).uint64(message.validatorPeriod); @@ -689,6 +876,39 @@ export const ValidatorSlashEvent = { obj.validator_period = message.validatorPeriod; obj.fraction = message.fraction; return obj; + }, + fromAmino(object: ValidatorSlashEventAmino): ValidatorSlashEvent { + return { + validatorPeriod: BigInt(object.validator_period), + fraction: object.fraction + }; + }, + toAmino(message: ValidatorSlashEvent): ValidatorSlashEventAmino { + const obj: any = {}; + obj.validator_period = message.validatorPeriod ? message.validatorPeriod.toString() : undefined; + obj.fraction = message.fraction; + return obj; + }, + fromAminoMsg(object: ValidatorSlashEventAminoMsg): ValidatorSlashEvent { + return ValidatorSlashEvent.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorSlashEvent): ValidatorSlashEventAminoMsg { + return { + type: "cosmos-sdk/ValidatorSlashEvent", + value: ValidatorSlashEvent.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorSlashEventProtoMsg): ValidatorSlashEvent { + return ValidatorSlashEvent.decode(message.value); + }, + toProto(message: ValidatorSlashEvent): Uint8Array { + return ValidatorSlashEvent.encode(message).finish(); + }, + toProtoMsg(message: ValidatorSlashEvent): ValidatorSlashEventProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvent", + value: ValidatorSlashEvent.encode(message).finish() + }; } }; function createBaseValidatorSlashEvents(): ValidatorSlashEvents { @@ -697,6 +917,7 @@ function createBaseValidatorSlashEvents(): ValidatorSlashEvents { }; } export const ValidatorSlashEvents = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvents", encode(message: ValidatorSlashEvents, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validatorSlashEvents) { ValidatorSlashEvent.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -757,6 +978,41 @@ export const ValidatorSlashEvents = { obj.validator_slash_events = []; } return obj; + }, + fromAmino(object: ValidatorSlashEventsAmino): ValidatorSlashEvents { + return { + validatorSlashEvents: Array.isArray(object?.validator_slash_events) ? object.validator_slash_events.map((e: any) => ValidatorSlashEvent.fromAmino(e)) : [] + }; + }, + toAmino(message: ValidatorSlashEvents): ValidatorSlashEventsAmino { + const obj: any = {}; + if (message.validatorSlashEvents) { + obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); + } else { + obj.validator_slash_events = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorSlashEventsAminoMsg): ValidatorSlashEvents { + return ValidatorSlashEvents.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorSlashEvents): ValidatorSlashEventsAminoMsg { + return { + type: "cosmos-sdk/ValidatorSlashEvents", + value: ValidatorSlashEvents.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorSlashEventsProtoMsg): ValidatorSlashEvents { + return ValidatorSlashEvents.decode(message.value); + }, + toProto(message: ValidatorSlashEvents): Uint8Array { + return ValidatorSlashEvents.encode(message).finish(); + }, + toProtoMsg(message: ValidatorSlashEvents): ValidatorSlashEventsProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvents", + value: ValidatorSlashEvents.encode(message).finish() + }; } }; function createBaseFeePool(): FeePool { @@ -765,6 +1021,7 @@ function createBaseFeePool(): FeePool { }; } export const FeePool = { + typeUrl: "/cosmos.distribution.v1beta1.FeePool", encode(message: FeePool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.communityPool) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -825,6 +1082,41 @@ export const FeePool = { obj.community_pool = []; } return obj; + }, + fromAmino(object: FeePoolAmino): FeePool { + return { + communityPool: Array.isArray(object?.community_pool) ? object.community_pool.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: FeePool): FeePoolAmino { + const obj: any = {}; + if (message.communityPool) { + obj.community_pool = message.communityPool.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.community_pool = []; + } + return obj; + }, + fromAminoMsg(object: FeePoolAminoMsg): FeePool { + return FeePool.fromAmino(object.value); + }, + toAminoMsg(message: FeePool): FeePoolAminoMsg { + return { + type: "cosmos-sdk/FeePool", + value: FeePool.toAmino(message) + }; + }, + fromProtoMsg(message: FeePoolProtoMsg): FeePool { + return FeePool.decode(message.value); + }, + toProto(message: FeePool): Uint8Array { + return FeePool.encode(message).finish(); + }, + toProtoMsg(message: FeePool): FeePoolProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.FeePool", + value: FeePool.encode(message).finish() + }; } }; function createBaseCommunityPoolSpendProposal(): CommunityPoolSpendProposal { @@ -836,6 +1128,7 @@ function createBaseCommunityPoolSpendProposal(): CommunityPoolSpendProposal { }; } export const CommunityPoolSpendProposal = { + typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal", encode(message: CommunityPoolSpendProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -932,6 +1225,47 @@ export const CommunityPoolSpendProposal = { obj.amount = []; } return obj; + }, + fromAmino(object: CommunityPoolSpendProposalAmino): CommunityPoolSpendProposal { + return { + title: object.title, + description: object.description, + recipient: object.recipient, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.recipient = message.recipient; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: CommunityPoolSpendProposalAminoMsg): CommunityPoolSpendProposal { + return CommunityPoolSpendProposal.fromAmino(object.value); + }, + toAminoMsg(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalAminoMsg { + return { + type: "cosmos-sdk/CommunityPoolSpendProposal", + value: CommunityPoolSpendProposal.toAmino(message) + }; + }, + fromProtoMsg(message: CommunityPoolSpendProposalProtoMsg): CommunityPoolSpendProposal { + return CommunityPoolSpendProposal.decode(message.value); + }, + toProto(message: CommunityPoolSpendProposal): Uint8Array { + return CommunityPoolSpendProposal.encode(message).finish(); + }, + toProtoMsg(message: CommunityPoolSpendProposal): CommunityPoolSpendProposalProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal", + value: CommunityPoolSpendProposal.encode(message).finish() + }; } }; function createBaseDelegatorStartingInfo(): DelegatorStartingInfo { @@ -942,6 +1276,7 @@ function createBaseDelegatorStartingInfo(): DelegatorStartingInfo { }; } export const DelegatorStartingInfo = { + typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo", encode(message: DelegatorStartingInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.previousPeriod !== BigInt(0)) { writer.uint32(8).uint64(message.previousPeriod); @@ -1018,6 +1353,41 @@ export const DelegatorStartingInfo = { obj.stake = message.stake; obj.height = message.height; return obj; + }, + fromAmino(object: DelegatorStartingInfoAmino): DelegatorStartingInfo { + return { + previousPeriod: BigInt(object.previous_period), + stake: object.stake, + height: BigInt(object.height) + }; + }, + toAmino(message: DelegatorStartingInfo): DelegatorStartingInfoAmino { + const obj: any = {}; + obj.previous_period = message.previousPeriod ? message.previousPeriod.toString() : undefined; + obj.stake = message.stake; + obj.height = message.height ? message.height.toString() : undefined; + return obj; + }, + fromAminoMsg(object: DelegatorStartingInfoAminoMsg): DelegatorStartingInfo { + return DelegatorStartingInfo.fromAmino(object.value); + }, + toAminoMsg(message: DelegatorStartingInfo): DelegatorStartingInfoAminoMsg { + return { + type: "cosmos-sdk/DelegatorStartingInfo", + value: DelegatorStartingInfo.toAmino(message) + }; + }, + fromProtoMsg(message: DelegatorStartingInfoProtoMsg): DelegatorStartingInfo { + return DelegatorStartingInfo.decode(message.value); + }, + toProto(message: DelegatorStartingInfo): Uint8Array { + return DelegatorStartingInfo.encode(message).finish(); + }, + toProtoMsg(message: DelegatorStartingInfo): DelegatorStartingInfoProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo", + value: DelegatorStartingInfo.encode(message).finish() + }; } }; function createBaseDelegationDelegatorReward(): DelegationDelegatorReward { @@ -1027,6 +1397,7 @@ function createBaseDelegationDelegatorReward(): DelegationDelegatorReward { }; } export const DelegationDelegatorReward = { + typeUrl: "/cosmos.distribution.v1beta1.DelegationDelegatorReward", encode(message: DelegationDelegatorReward, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -1099,6 +1470,43 @@ export const DelegationDelegatorReward = { obj.reward = []; } return obj; + }, + fromAmino(object: DelegationDelegatorRewardAmino): DelegationDelegatorReward { + return { + validatorAddress: object.validator_address, + reward: Array.isArray(object?.reward) ? object.reward.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: DelegationDelegatorReward): DelegationDelegatorRewardAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + if (message.reward) { + obj.reward = message.reward.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.reward = []; + } + return obj; + }, + fromAminoMsg(object: DelegationDelegatorRewardAminoMsg): DelegationDelegatorReward { + return DelegationDelegatorReward.fromAmino(object.value); + }, + toAminoMsg(message: DelegationDelegatorReward): DelegationDelegatorRewardAminoMsg { + return { + type: "cosmos-sdk/DelegationDelegatorReward", + value: DelegationDelegatorReward.toAmino(message) + }; + }, + fromProtoMsg(message: DelegationDelegatorRewardProtoMsg): DelegationDelegatorReward { + return DelegationDelegatorReward.decode(message.value); + }, + toProto(message: DelegationDelegatorReward): Uint8Array { + return DelegationDelegatorReward.encode(message).finish(); + }, + toProtoMsg(message: DelegationDelegatorReward): DelegationDelegatorRewardProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.DelegationDelegatorReward", + value: DelegationDelegatorReward.encode(message).finish() + }; } }; function createBaseCommunityPoolSpendProposalWithDeposit(): CommunityPoolSpendProposalWithDeposit { @@ -1111,6 +1519,7 @@ function createBaseCommunityPoolSpendProposalWithDeposit(): CommunityPoolSpendPr }; } export const CommunityPoolSpendProposalWithDeposit = { + typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit", encode(message: CommunityPoolSpendProposalWithDeposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -1211,5 +1620,44 @@ export const CommunityPoolSpendProposalWithDeposit = { obj.amount = message.amount; obj.deposit = message.deposit; return obj; + }, + fromAmino(object: CommunityPoolSpendProposalWithDepositAmino): CommunityPoolSpendProposalWithDeposit { + return { + title: object.title, + description: object.description, + recipient: object.recipient, + amount: object.amount, + deposit: object.deposit + }; + }, + toAmino(message: CommunityPoolSpendProposalWithDeposit): CommunityPoolSpendProposalWithDepositAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.recipient = message.recipient; + obj.amount = message.amount; + obj.deposit = message.deposit; + return obj; + }, + fromAminoMsg(object: CommunityPoolSpendProposalWithDepositAminoMsg): CommunityPoolSpendProposalWithDeposit { + return CommunityPoolSpendProposalWithDeposit.fromAmino(object.value); + }, + toAminoMsg(message: CommunityPoolSpendProposalWithDeposit): CommunityPoolSpendProposalWithDepositAminoMsg { + return { + type: "cosmos-sdk/CommunityPoolSpendProposalWithDeposit", + value: CommunityPoolSpendProposalWithDeposit.toAmino(message) + }; + }, + fromProtoMsg(message: CommunityPoolSpendProposalWithDepositProtoMsg): CommunityPoolSpendProposalWithDeposit { + return CommunityPoolSpendProposalWithDeposit.decode(message.value); + }, + toProto(message: CommunityPoolSpendProposalWithDeposit): Uint8Array { + return CommunityPoolSpendProposalWithDeposit.encode(message).finish(); + }, + toProtoMsg(message: CommunityPoolSpendProposalWithDeposit): CommunityPoolSpendProposalWithDepositProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit", + value: CommunityPoolSpendProposalWithDeposit.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts index 6cd7b42ca9..3ee2ea1d03 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/genesis.ts @@ -162,6 +162,7 @@ function createBaseDelegatorWithdrawInfo(): DelegatorWithdrawInfo { }; } export const DelegatorWithdrawInfo = { + typeUrl: "/cosmos.distribution.v1beta1.DelegatorWithdrawInfo", encode(message: DelegatorWithdrawInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -226,6 +227,39 @@ export const DelegatorWithdrawInfo = { obj.delegator_address = message.delegatorAddress; obj.withdraw_address = message.withdrawAddress; return obj; + }, + fromAmino(object: DelegatorWithdrawInfoAmino): DelegatorWithdrawInfo { + return { + delegatorAddress: object.delegator_address, + withdrawAddress: object.withdraw_address + }; + }, + toAmino(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress; + return obj; + }, + fromAminoMsg(object: DelegatorWithdrawInfoAminoMsg): DelegatorWithdrawInfo { + return DelegatorWithdrawInfo.fromAmino(object.value); + }, + toAminoMsg(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoAminoMsg { + return { + type: "cosmos-sdk/DelegatorWithdrawInfo", + value: DelegatorWithdrawInfo.toAmino(message) + }; + }, + fromProtoMsg(message: DelegatorWithdrawInfoProtoMsg): DelegatorWithdrawInfo { + return DelegatorWithdrawInfo.decode(message.value); + }, + toProto(message: DelegatorWithdrawInfo): Uint8Array { + return DelegatorWithdrawInfo.encode(message).finish(); + }, + toProtoMsg(message: DelegatorWithdrawInfo): DelegatorWithdrawInfoProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.DelegatorWithdrawInfo", + value: DelegatorWithdrawInfo.encode(message).finish() + }; } }; function createBaseValidatorOutstandingRewardsRecord(): ValidatorOutstandingRewardsRecord { @@ -235,6 +269,7 @@ function createBaseValidatorOutstandingRewardsRecord(): ValidatorOutstandingRewa }; } export const ValidatorOutstandingRewardsRecord = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewardsRecord", encode(message: ValidatorOutstandingRewardsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -307,6 +342,43 @@ export const ValidatorOutstandingRewardsRecord = { obj.outstanding_rewards = []; } return obj; + }, + fromAmino(object: ValidatorOutstandingRewardsRecordAmino): ValidatorOutstandingRewardsRecord { + return { + validatorAddress: object.validator_address, + outstandingRewards: Array.isArray(object?.outstanding_rewards) ? object.outstanding_rewards.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + if (message.outstandingRewards) { + obj.outstanding_rewards = message.outstandingRewards.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.outstanding_rewards = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorOutstandingRewardsRecordAminoMsg): ValidatorOutstandingRewardsRecord { + return ValidatorOutstandingRewardsRecord.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordAminoMsg { + return { + type: "cosmos-sdk/ValidatorOutstandingRewardsRecord", + value: ValidatorOutstandingRewardsRecord.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorOutstandingRewardsRecordProtoMsg): ValidatorOutstandingRewardsRecord { + return ValidatorOutstandingRewardsRecord.decode(message.value); + }, + toProto(message: ValidatorOutstandingRewardsRecord): Uint8Array { + return ValidatorOutstandingRewardsRecord.encode(message).finish(); + }, + toProtoMsg(message: ValidatorOutstandingRewardsRecord): ValidatorOutstandingRewardsRecordProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewardsRecord", + value: ValidatorOutstandingRewardsRecord.encode(message).finish() + }; } }; function createBaseValidatorAccumulatedCommissionRecord(): ValidatorAccumulatedCommissionRecord { @@ -316,6 +388,7 @@ function createBaseValidatorAccumulatedCommissionRecord(): ValidatorAccumulatedC }; } export const ValidatorAccumulatedCommissionRecord = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommissionRecord", encode(message: ValidatorAccumulatedCommissionRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -380,6 +453,39 @@ export const ValidatorAccumulatedCommissionRecord = { obj.validator_address = message.validatorAddress; message.accumulated !== undefined && (obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toSDK(message.accumulated) : undefined); return obj; + }, + fromAmino(object: ValidatorAccumulatedCommissionRecordAmino): ValidatorAccumulatedCommissionRecord { + return { + validatorAddress: object.validator_address, + accumulated: object?.accumulated ? ValidatorAccumulatedCommission.fromAmino(object.accumulated) : undefined + }; + }, + toAmino(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.accumulated = message.accumulated ? ValidatorAccumulatedCommission.toAmino(message.accumulated) : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorAccumulatedCommissionRecordAminoMsg): ValidatorAccumulatedCommissionRecord { + return ValidatorAccumulatedCommissionRecord.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordAminoMsg { + return { + type: "cosmos-sdk/ValidatorAccumulatedCommissionRecord", + value: ValidatorAccumulatedCommissionRecord.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorAccumulatedCommissionRecordProtoMsg): ValidatorAccumulatedCommissionRecord { + return ValidatorAccumulatedCommissionRecord.decode(message.value); + }, + toProto(message: ValidatorAccumulatedCommissionRecord): Uint8Array { + return ValidatorAccumulatedCommissionRecord.encode(message).finish(); + }, + toProtoMsg(message: ValidatorAccumulatedCommissionRecord): ValidatorAccumulatedCommissionRecordProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommissionRecord", + value: ValidatorAccumulatedCommissionRecord.encode(message).finish() + }; } }; function createBaseValidatorHistoricalRewardsRecord(): ValidatorHistoricalRewardsRecord { @@ -390,6 +496,7 @@ function createBaseValidatorHistoricalRewardsRecord(): ValidatorHistoricalReward }; } export const ValidatorHistoricalRewardsRecord = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewardsRecord", encode(message: ValidatorHistoricalRewardsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -466,6 +573,41 @@ export const ValidatorHistoricalRewardsRecord = { obj.period = message.period; message.rewards !== undefined && (obj.rewards = message.rewards ? ValidatorHistoricalRewards.toSDK(message.rewards) : undefined); return obj; + }, + fromAmino(object: ValidatorHistoricalRewardsRecordAmino): ValidatorHistoricalRewardsRecord { + return { + validatorAddress: object.validator_address, + period: BigInt(object.period), + rewards: object?.rewards ? ValidatorHistoricalRewards.fromAmino(object.rewards) : undefined + }; + }, + toAmino(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.period = message.period ? message.period.toString() : undefined; + obj.rewards = message.rewards ? ValidatorHistoricalRewards.toAmino(message.rewards) : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorHistoricalRewardsRecordAminoMsg): ValidatorHistoricalRewardsRecord { + return ValidatorHistoricalRewardsRecord.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordAminoMsg { + return { + type: "cosmos-sdk/ValidatorHistoricalRewardsRecord", + value: ValidatorHistoricalRewardsRecord.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorHistoricalRewardsRecordProtoMsg): ValidatorHistoricalRewardsRecord { + return ValidatorHistoricalRewardsRecord.decode(message.value); + }, + toProto(message: ValidatorHistoricalRewardsRecord): Uint8Array { + return ValidatorHistoricalRewardsRecord.encode(message).finish(); + }, + toProtoMsg(message: ValidatorHistoricalRewardsRecord): ValidatorHistoricalRewardsRecordProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewardsRecord", + value: ValidatorHistoricalRewardsRecord.encode(message).finish() + }; } }; function createBaseValidatorCurrentRewardsRecord(): ValidatorCurrentRewardsRecord { @@ -475,6 +617,7 @@ function createBaseValidatorCurrentRewardsRecord(): ValidatorCurrentRewardsRecor }; } export const ValidatorCurrentRewardsRecord = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewardsRecord", encode(message: ValidatorCurrentRewardsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -539,6 +682,39 @@ export const ValidatorCurrentRewardsRecord = { obj.validator_address = message.validatorAddress; message.rewards !== undefined && (obj.rewards = message.rewards ? ValidatorCurrentRewards.toSDK(message.rewards) : undefined); return obj; + }, + fromAmino(object: ValidatorCurrentRewardsRecordAmino): ValidatorCurrentRewardsRecord { + return { + validatorAddress: object.validator_address, + rewards: object?.rewards ? ValidatorCurrentRewards.fromAmino(object.rewards) : undefined + }; + }, + toAmino(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.rewards = message.rewards ? ValidatorCurrentRewards.toAmino(message.rewards) : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorCurrentRewardsRecordAminoMsg): ValidatorCurrentRewardsRecord { + return ValidatorCurrentRewardsRecord.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordAminoMsg { + return { + type: "cosmos-sdk/ValidatorCurrentRewardsRecord", + value: ValidatorCurrentRewardsRecord.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorCurrentRewardsRecordProtoMsg): ValidatorCurrentRewardsRecord { + return ValidatorCurrentRewardsRecord.decode(message.value); + }, + toProto(message: ValidatorCurrentRewardsRecord): Uint8Array { + return ValidatorCurrentRewardsRecord.encode(message).finish(); + }, + toProtoMsg(message: ValidatorCurrentRewardsRecord): ValidatorCurrentRewardsRecordProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewardsRecord", + value: ValidatorCurrentRewardsRecord.encode(message).finish() + }; } }; function createBaseDelegatorStartingInfoRecord(): DelegatorStartingInfoRecord { @@ -549,6 +725,7 @@ function createBaseDelegatorStartingInfoRecord(): DelegatorStartingInfoRecord { }; } export const DelegatorStartingInfoRecord = { + typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfoRecord", encode(message: DelegatorStartingInfoRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -625,6 +802,41 @@ export const DelegatorStartingInfoRecord = { obj.validator_address = message.validatorAddress; message.startingInfo !== undefined && (obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toSDK(message.startingInfo) : undefined); return obj; + }, + fromAmino(object: DelegatorStartingInfoRecordAmino): DelegatorStartingInfoRecord { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + startingInfo: object?.starting_info ? DelegatorStartingInfo.fromAmino(object.starting_info) : undefined + }; + }, + toAmino(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.starting_info = message.startingInfo ? DelegatorStartingInfo.toAmino(message.startingInfo) : undefined; + return obj; + }, + fromAminoMsg(object: DelegatorStartingInfoRecordAminoMsg): DelegatorStartingInfoRecord { + return DelegatorStartingInfoRecord.fromAmino(object.value); + }, + toAminoMsg(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordAminoMsg { + return { + type: "cosmos-sdk/DelegatorStartingInfoRecord", + value: DelegatorStartingInfoRecord.toAmino(message) + }; + }, + fromProtoMsg(message: DelegatorStartingInfoRecordProtoMsg): DelegatorStartingInfoRecord { + return DelegatorStartingInfoRecord.decode(message.value); + }, + toProto(message: DelegatorStartingInfoRecord): Uint8Array { + return DelegatorStartingInfoRecord.encode(message).finish(); + }, + toProtoMsg(message: DelegatorStartingInfoRecord): DelegatorStartingInfoRecordProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfoRecord", + value: DelegatorStartingInfoRecord.encode(message).finish() + }; } }; function createBaseValidatorSlashEventRecord(): ValidatorSlashEventRecord { @@ -636,6 +848,7 @@ function createBaseValidatorSlashEventRecord(): ValidatorSlashEventRecord { }; } export const ValidatorSlashEventRecord = { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEventRecord", encode(message: ValidatorSlashEventRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -724,6 +937,43 @@ export const ValidatorSlashEventRecord = { obj.period = message.period; message.validatorSlashEvent !== undefined && (obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toSDK(message.validatorSlashEvent) : undefined); return obj; + }, + fromAmino(object: ValidatorSlashEventRecordAmino): ValidatorSlashEventRecord { + return { + validatorAddress: object.validator_address, + height: BigInt(object.height), + period: BigInt(object.period), + validatorSlashEvent: object?.validator_slash_event ? ValidatorSlashEvent.fromAmino(object.validator_slash_event) : undefined + }; + }, + toAmino(message: ValidatorSlashEventRecord): ValidatorSlashEventRecordAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.height = message.height ? message.height.toString() : undefined; + obj.period = message.period ? message.period.toString() : undefined; + obj.validator_slash_event = message.validatorSlashEvent ? ValidatorSlashEvent.toAmino(message.validatorSlashEvent) : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorSlashEventRecordAminoMsg): ValidatorSlashEventRecord { + return ValidatorSlashEventRecord.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorSlashEventRecord): ValidatorSlashEventRecordAminoMsg { + return { + type: "cosmos-sdk/ValidatorSlashEventRecord", + value: ValidatorSlashEventRecord.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorSlashEventRecordProtoMsg): ValidatorSlashEventRecord { + return ValidatorSlashEventRecord.decode(message.value); + }, + toProto(message: ValidatorSlashEventRecord): Uint8Array { + return ValidatorSlashEventRecord.encode(message).finish(); + }, + toProtoMsg(message: ValidatorSlashEventRecord): ValidatorSlashEventRecordProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEventRecord", + value: ValidatorSlashEventRecord.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -741,6 +991,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.distribution.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -957,5 +1208,82 @@ export const GenesisState = { obj.validator_slash_events = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + feePool: object?.fee_pool ? FeePool.fromAmino(object.fee_pool) : undefined, + delegatorWithdrawInfos: Array.isArray(object?.delegator_withdraw_infos) ? object.delegator_withdraw_infos.map((e: any) => DelegatorWithdrawInfo.fromAmino(e)) : [], + previousProposer: object.previous_proposer, + outstandingRewards: Array.isArray(object?.outstanding_rewards) ? object.outstanding_rewards.map((e: any) => ValidatorOutstandingRewardsRecord.fromAmino(e)) : [], + validatorAccumulatedCommissions: Array.isArray(object?.validator_accumulated_commissions) ? object.validator_accumulated_commissions.map((e: any) => ValidatorAccumulatedCommissionRecord.fromAmino(e)) : [], + validatorHistoricalRewards: Array.isArray(object?.validator_historical_rewards) ? object.validator_historical_rewards.map((e: any) => ValidatorHistoricalRewardsRecord.fromAmino(e)) : [], + validatorCurrentRewards: Array.isArray(object?.validator_current_rewards) ? object.validator_current_rewards.map((e: any) => ValidatorCurrentRewardsRecord.fromAmino(e)) : [], + delegatorStartingInfos: Array.isArray(object?.delegator_starting_infos) ? object.delegator_starting_infos.map((e: any) => DelegatorStartingInfoRecord.fromAmino(e)) : [], + validatorSlashEvents: Array.isArray(object?.validator_slash_events) ? object.validator_slash_events.map((e: any) => ValidatorSlashEventRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.fee_pool = message.feePool ? FeePool.toAmino(message.feePool) : undefined; + if (message.delegatorWithdrawInfos) { + obj.delegator_withdraw_infos = message.delegatorWithdrawInfos.map(e => e ? DelegatorWithdrawInfo.toAmino(e) : undefined); + } else { + obj.delegator_withdraw_infos = []; + } + obj.previous_proposer = message.previousProposer; + if (message.outstandingRewards) { + obj.outstanding_rewards = message.outstandingRewards.map(e => e ? ValidatorOutstandingRewardsRecord.toAmino(e) : undefined); + } else { + obj.outstanding_rewards = []; + } + if (message.validatorAccumulatedCommissions) { + obj.validator_accumulated_commissions = message.validatorAccumulatedCommissions.map(e => e ? ValidatorAccumulatedCommissionRecord.toAmino(e) : undefined); + } else { + obj.validator_accumulated_commissions = []; + } + if (message.validatorHistoricalRewards) { + obj.validator_historical_rewards = message.validatorHistoricalRewards.map(e => e ? ValidatorHistoricalRewardsRecord.toAmino(e) : undefined); + } else { + obj.validator_historical_rewards = []; + } + if (message.validatorCurrentRewards) { + obj.validator_current_rewards = message.validatorCurrentRewards.map(e => e ? ValidatorCurrentRewardsRecord.toAmino(e) : undefined); + } else { + obj.validator_current_rewards = []; + } + if (message.delegatorStartingInfos) { + obj.delegator_starting_infos = message.delegatorStartingInfos.map(e => e ? DelegatorStartingInfoRecord.toAmino(e) : undefined); + } else { + obj.delegator_starting_infos = []; + } + if (message.validatorSlashEvents) { + obj.validator_slash_events = message.validatorSlashEvents.map(e => e ? ValidatorSlashEventRecord.toAmino(e) : undefined); + } else { + obj.validator_slash_events = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts index 9581bca58d..29658328f3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/query.ts @@ -273,6 +273,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -310,6 +311,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -318,6 +347,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -370,6 +400,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryValidatorOutstandingRewardsRequest(): QueryValidatorOutstandingRewardsRequest { @@ -378,6 +439,7 @@ function createBaseQueryValidatorOutstandingRewardsRequest(): QueryValidatorOuts }; } export const QueryValidatorOutstandingRewardsRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsRequest", encode(message: QueryValidatorOutstandingRewardsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -430,6 +492,37 @@ export const QueryValidatorOutstandingRewardsRequest = { const obj: any = {}; obj.validator_address = message.validatorAddress; return obj; + }, + fromAmino(object: QueryValidatorOutstandingRewardsRequestAmino): QueryValidatorOutstandingRewardsRequest { + return { + validatorAddress: object.validator_address + }; + }, + toAmino(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + return obj; + }, + fromAminoMsg(object: QueryValidatorOutstandingRewardsRequestAminoMsg): QueryValidatorOutstandingRewardsRequest { + return QueryValidatorOutstandingRewardsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorOutstandingRewardsRequest", + value: QueryValidatorOutstandingRewardsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorOutstandingRewardsRequestProtoMsg): QueryValidatorOutstandingRewardsRequest { + return QueryValidatorOutstandingRewardsRequest.decode(message.value); + }, + toProto(message: QueryValidatorOutstandingRewardsRequest): Uint8Array { + return QueryValidatorOutstandingRewardsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorOutstandingRewardsRequest): QueryValidatorOutstandingRewardsRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsRequest", + value: QueryValidatorOutstandingRewardsRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorOutstandingRewardsResponse(): QueryValidatorOutstandingRewardsResponse { @@ -438,6 +531,7 @@ function createBaseQueryValidatorOutstandingRewardsResponse(): QueryValidatorOut }; } export const QueryValidatorOutstandingRewardsResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsResponse", encode(message: QueryValidatorOutstandingRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rewards !== undefined) { ValidatorOutstandingRewards.encode(message.rewards, writer.uint32(10).fork()).ldelim(); @@ -490,6 +584,37 @@ export const QueryValidatorOutstandingRewardsResponse = { const obj: any = {}; message.rewards !== undefined && (obj.rewards = message.rewards ? ValidatorOutstandingRewards.toSDK(message.rewards) : undefined); return obj; + }, + fromAmino(object: QueryValidatorOutstandingRewardsResponseAmino): QueryValidatorOutstandingRewardsResponse { + return { + rewards: object?.rewards ? ValidatorOutstandingRewards.fromAmino(object.rewards) : undefined + }; + }, + toAmino(message: QueryValidatorOutstandingRewardsResponse): QueryValidatorOutstandingRewardsResponseAmino { + const obj: any = {}; + obj.rewards = message.rewards ? ValidatorOutstandingRewards.toAmino(message.rewards) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorOutstandingRewardsResponseAminoMsg): QueryValidatorOutstandingRewardsResponse { + return QueryValidatorOutstandingRewardsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorOutstandingRewardsResponse): QueryValidatorOutstandingRewardsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorOutstandingRewardsResponse", + value: QueryValidatorOutstandingRewardsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorOutstandingRewardsResponseProtoMsg): QueryValidatorOutstandingRewardsResponse { + return QueryValidatorOutstandingRewardsResponse.decode(message.value); + }, + toProto(message: QueryValidatorOutstandingRewardsResponse): Uint8Array { + return QueryValidatorOutstandingRewardsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorOutstandingRewardsResponse): QueryValidatorOutstandingRewardsResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsResponse", + value: QueryValidatorOutstandingRewardsResponse.encode(message).finish() + }; } }; function createBaseQueryValidatorCommissionRequest(): QueryValidatorCommissionRequest { @@ -498,6 +623,7 @@ function createBaseQueryValidatorCommissionRequest(): QueryValidatorCommissionRe }; } export const QueryValidatorCommissionRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionRequest", encode(message: QueryValidatorCommissionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -550,6 +676,37 @@ export const QueryValidatorCommissionRequest = { const obj: any = {}; obj.validator_address = message.validatorAddress; return obj; + }, + fromAmino(object: QueryValidatorCommissionRequestAmino): QueryValidatorCommissionRequest { + return { + validatorAddress: object.validator_address + }; + }, + toAmino(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + return obj; + }, + fromAminoMsg(object: QueryValidatorCommissionRequestAminoMsg): QueryValidatorCommissionRequest { + return QueryValidatorCommissionRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorCommissionRequest", + value: QueryValidatorCommissionRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorCommissionRequestProtoMsg): QueryValidatorCommissionRequest { + return QueryValidatorCommissionRequest.decode(message.value); + }, + toProto(message: QueryValidatorCommissionRequest): Uint8Array { + return QueryValidatorCommissionRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorCommissionRequest): QueryValidatorCommissionRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionRequest", + value: QueryValidatorCommissionRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorCommissionResponse(): QueryValidatorCommissionResponse { @@ -558,6 +715,7 @@ function createBaseQueryValidatorCommissionResponse(): QueryValidatorCommissionR }; } export const QueryValidatorCommissionResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionResponse", encode(message: QueryValidatorCommissionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.commission !== undefined) { ValidatorAccumulatedCommission.encode(message.commission, writer.uint32(10).fork()).ldelim(); @@ -610,6 +768,37 @@ export const QueryValidatorCommissionResponse = { const obj: any = {}; message.commission !== undefined && (obj.commission = message.commission ? ValidatorAccumulatedCommission.toSDK(message.commission) : undefined); return obj; + }, + fromAmino(object: QueryValidatorCommissionResponseAmino): QueryValidatorCommissionResponse { + return { + commission: object?.commission ? ValidatorAccumulatedCommission.fromAmino(object.commission) : undefined + }; + }, + toAmino(message: QueryValidatorCommissionResponse): QueryValidatorCommissionResponseAmino { + const obj: any = {}; + obj.commission = message.commission ? ValidatorAccumulatedCommission.toAmino(message.commission) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorCommissionResponseAminoMsg): QueryValidatorCommissionResponse { + return QueryValidatorCommissionResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorCommissionResponse): QueryValidatorCommissionResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorCommissionResponse", + value: QueryValidatorCommissionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorCommissionResponseProtoMsg): QueryValidatorCommissionResponse { + return QueryValidatorCommissionResponse.decode(message.value); + }, + toProto(message: QueryValidatorCommissionResponse): Uint8Array { + return QueryValidatorCommissionResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorCommissionResponse): QueryValidatorCommissionResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionResponse", + value: QueryValidatorCommissionResponse.encode(message).finish() + }; } }; function createBaseQueryValidatorSlashesRequest(): QueryValidatorSlashesRequest { @@ -621,6 +810,7 @@ function createBaseQueryValidatorSlashesRequest(): QueryValidatorSlashesRequest }; } export const QueryValidatorSlashesRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesRequest", encode(message: QueryValidatorSlashesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -709,6 +899,43 @@ export const QueryValidatorSlashesRequest = { obj.ending_height = message.endingHeight; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorSlashesRequestAmino): QueryValidatorSlashesRequest { + return { + validatorAddress: object.validator_address, + startingHeight: BigInt(object.starting_height), + endingHeight: BigInt(object.ending_height), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorSlashesRequest): QueryValidatorSlashesRequestAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.starting_height = message.startingHeight ? message.startingHeight.toString() : undefined; + obj.ending_height = message.endingHeight ? message.endingHeight.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorSlashesRequestAminoMsg): QueryValidatorSlashesRequest { + return QueryValidatorSlashesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorSlashesRequest): QueryValidatorSlashesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorSlashesRequest", + value: QueryValidatorSlashesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorSlashesRequestProtoMsg): QueryValidatorSlashesRequest { + return QueryValidatorSlashesRequest.decode(message.value); + }, + toProto(message: QueryValidatorSlashesRequest): Uint8Array { + return QueryValidatorSlashesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorSlashesRequest): QueryValidatorSlashesRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesRequest", + value: QueryValidatorSlashesRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorSlashesResponse(): QueryValidatorSlashesResponse { @@ -718,6 +945,7 @@ function createBaseQueryValidatorSlashesResponse(): QueryValidatorSlashesRespons }; } export const QueryValidatorSlashesResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesResponse", encode(message: QueryValidatorSlashesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.slashes) { ValidatorSlashEvent.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -790,6 +1018,43 @@ export const QueryValidatorSlashesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorSlashesResponseAmino): QueryValidatorSlashesResponse { + return { + slashes: Array.isArray(object?.slashes) ? object.slashes.map((e: any) => ValidatorSlashEvent.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorSlashesResponse): QueryValidatorSlashesResponseAmino { + const obj: any = {}; + if (message.slashes) { + obj.slashes = message.slashes.map(e => e ? ValidatorSlashEvent.toAmino(e) : undefined); + } else { + obj.slashes = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorSlashesResponseAminoMsg): QueryValidatorSlashesResponse { + return QueryValidatorSlashesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorSlashesResponse): QueryValidatorSlashesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorSlashesResponse", + value: QueryValidatorSlashesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorSlashesResponseProtoMsg): QueryValidatorSlashesResponse { + return QueryValidatorSlashesResponse.decode(message.value); + }, + toProto(message: QueryValidatorSlashesResponse): Uint8Array { + return QueryValidatorSlashesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorSlashesResponse): QueryValidatorSlashesResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesResponse", + value: QueryValidatorSlashesResponse.encode(message).finish() + }; } }; function createBaseQueryDelegationRewardsRequest(): QueryDelegationRewardsRequest { @@ -799,6 +1064,7 @@ function createBaseQueryDelegationRewardsRequest(): QueryDelegationRewardsReques }; } export const QueryDelegationRewardsRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsRequest", encode(message: QueryDelegationRewardsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -863,6 +1129,39 @@ export const QueryDelegationRewardsRequest = { obj.delegator_address = message.delegatorAddress; obj.validator_address = message.validatorAddress; return obj; + }, + fromAmino(object: QueryDelegationRewardsRequestAmino): QueryDelegationRewardsRequest { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address + }; + }, + toAmino(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + return obj; + }, + fromAminoMsg(object: QueryDelegationRewardsRequestAminoMsg): QueryDelegationRewardsRequest { + return QueryDelegationRewardsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegationRewardsRequest", + value: QueryDelegationRewardsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegationRewardsRequestProtoMsg): QueryDelegationRewardsRequest { + return QueryDelegationRewardsRequest.decode(message.value); + }, + toProto(message: QueryDelegationRewardsRequest): Uint8Array { + return QueryDelegationRewardsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegationRewardsRequest): QueryDelegationRewardsRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsRequest", + value: QueryDelegationRewardsRequest.encode(message).finish() + }; } }; function createBaseQueryDelegationRewardsResponse(): QueryDelegationRewardsResponse { @@ -871,6 +1170,7 @@ function createBaseQueryDelegationRewardsResponse(): QueryDelegationRewardsRespo }; } export const QueryDelegationRewardsResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsResponse", encode(message: QueryDelegationRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -931,6 +1231,41 @@ export const QueryDelegationRewardsResponse = { obj.rewards = []; } return obj; + }, + fromAmino(object: QueryDelegationRewardsResponseAmino): QueryDelegationRewardsResponse { + return { + rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryDelegationRewardsResponse): QueryDelegationRewardsResponseAmino { + const obj: any = {}; + if (message.rewards) { + obj.rewards = message.rewards.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.rewards = []; + } + return obj; + }, + fromAminoMsg(object: QueryDelegationRewardsResponseAminoMsg): QueryDelegationRewardsResponse { + return QueryDelegationRewardsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegationRewardsResponse): QueryDelegationRewardsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegationRewardsResponse", + value: QueryDelegationRewardsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegationRewardsResponseProtoMsg): QueryDelegationRewardsResponse { + return QueryDelegationRewardsResponse.decode(message.value); + }, + toProto(message: QueryDelegationRewardsResponse): Uint8Array { + return QueryDelegationRewardsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegationRewardsResponse): QueryDelegationRewardsResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsResponse", + value: QueryDelegationRewardsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegationTotalRewardsRequest(): QueryDelegationTotalRewardsRequest { @@ -939,6 +1274,7 @@ function createBaseQueryDelegationTotalRewardsRequest(): QueryDelegationTotalRew }; } export const QueryDelegationTotalRewardsRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsRequest", encode(message: QueryDelegationTotalRewardsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -991,6 +1327,37 @@ export const QueryDelegationTotalRewardsRequest = { const obj: any = {}; obj.delegator_address = message.delegatorAddress; return obj; + }, + fromAmino(object: QueryDelegationTotalRewardsRequestAmino): QueryDelegationTotalRewardsRequest { + return { + delegatorAddress: object.delegator_address + }; + }, + toAmino(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + return obj; + }, + fromAminoMsg(object: QueryDelegationTotalRewardsRequestAminoMsg): QueryDelegationTotalRewardsRequest { + return QueryDelegationTotalRewardsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegationTotalRewardsRequest", + value: QueryDelegationTotalRewardsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegationTotalRewardsRequestProtoMsg): QueryDelegationTotalRewardsRequest { + return QueryDelegationTotalRewardsRequest.decode(message.value); + }, + toProto(message: QueryDelegationTotalRewardsRequest): Uint8Array { + return QueryDelegationTotalRewardsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegationTotalRewardsRequest): QueryDelegationTotalRewardsRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsRequest", + value: QueryDelegationTotalRewardsRequest.encode(message).finish() + }; } }; function createBaseQueryDelegationTotalRewardsResponse(): QueryDelegationTotalRewardsResponse { @@ -1000,6 +1367,7 @@ function createBaseQueryDelegationTotalRewardsResponse(): QueryDelegationTotalRe }; } export const QueryDelegationTotalRewardsResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsResponse", encode(message: QueryDelegationTotalRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DelegationDelegatorReward.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1080,6 +1448,47 @@ export const QueryDelegationTotalRewardsResponse = { obj.total = []; } return obj; + }, + fromAmino(object: QueryDelegationTotalRewardsResponseAmino): QueryDelegationTotalRewardsResponse { + return { + rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DelegationDelegatorReward.fromAmino(e)) : [], + total: Array.isArray(object?.total) ? object.total.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryDelegationTotalRewardsResponse): QueryDelegationTotalRewardsResponseAmino { + const obj: any = {}; + if (message.rewards) { + obj.rewards = message.rewards.map(e => e ? DelegationDelegatorReward.toAmino(e) : undefined); + } else { + obj.rewards = []; + } + if (message.total) { + obj.total = message.total.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.total = []; + } + return obj; + }, + fromAminoMsg(object: QueryDelegationTotalRewardsResponseAminoMsg): QueryDelegationTotalRewardsResponse { + return QueryDelegationTotalRewardsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegationTotalRewardsResponse): QueryDelegationTotalRewardsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegationTotalRewardsResponse", + value: QueryDelegationTotalRewardsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegationTotalRewardsResponseProtoMsg): QueryDelegationTotalRewardsResponse { + return QueryDelegationTotalRewardsResponse.decode(message.value); + }, + toProto(message: QueryDelegationTotalRewardsResponse): Uint8Array { + return QueryDelegationTotalRewardsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegationTotalRewardsResponse): QueryDelegationTotalRewardsResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsResponse", + value: QueryDelegationTotalRewardsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRequest { @@ -1088,6 +1497,7 @@ function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRe }; } export const QueryDelegatorValidatorsRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsRequest", encode(message: QueryDelegatorValidatorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1140,6 +1550,37 @@ export const QueryDelegatorValidatorsRequest = { const obj: any = {}; obj.delegator_address = message.delegatorAddress; return obj; + }, + fromAmino(object: QueryDelegatorValidatorsRequestAmino): QueryDelegatorValidatorsRequest { + return { + delegatorAddress: object.delegator_address + }; + }, + toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + return obj; + }, + fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { + return QueryDelegatorValidatorsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorValidatorsRequest", + value: QueryDelegatorValidatorsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorValidatorsRequestProtoMsg): QueryDelegatorValidatorsRequest { + return QueryDelegatorValidatorsRequest.decode(message.value); + }, + toProto(message: QueryDelegatorValidatorsRequest): Uint8Array { + return QueryDelegatorValidatorsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsRequest", + value: QueryDelegatorValidatorsRequest.encode(message).finish() + }; } }; function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsResponse { @@ -1148,6 +1589,7 @@ function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsR }; } export const QueryDelegatorValidatorsResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsResponse", encode(message: QueryDelegatorValidatorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { writer.uint32(10).string(v!); @@ -1208,6 +1650,41 @@ export const QueryDelegatorValidatorsResponse = { obj.validators = []; } return obj; + }, + fromAmino(object: QueryDelegatorValidatorsResponseAmino): QueryDelegatorValidatorsResponse { + return { + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => e) : [] + }; + }, + toAmino(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseAmino { + const obj: any = {}; + if (message.validators) { + obj.validators = message.validators.map(e => e); + } else { + obj.validators = []; + } + return obj; + }, + fromAminoMsg(object: QueryDelegatorValidatorsResponseAminoMsg): QueryDelegatorValidatorsResponse { + return QueryDelegatorValidatorsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorValidatorsResponse", + value: QueryDelegatorValidatorsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorValidatorsResponseProtoMsg): QueryDelegatorValidatorsResponse { + return QueryDelegatorValidatorsResponse.decode(message.value); + }, + toProto(message: QueryDelegatorValidatorsResponse): Uint8Array { + return QueryDelegatorValidatorsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsResponse", + value: QueryDelegatorValidatorsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegatorWithdrawAddressRequest(): QueryDelegatorWithdrawAddressRequest { @@ -1216,6 +1693,7 @@ function createBaseQueryDelegatorWithdrawAddressRequest(): QueryDelegatorWithdra }; } export const QueryDelegatorWithdrawAddressRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressRequest", encode(message: QueryDelegatorWithdrawAddressRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1268,6 +1746,37 @@ export const QueryDelegatorWithdrawAddressRequest = { const obj: any = {}; obj.delegator_address = message.delegatorAddress; return obj; + }, + fromAmino(object: QueryDelegatorWithdrawAddressRequestAmino): QueryDelegatorWithdrawAddressRequest { + return { + delegatorAddress: object.delegator_address + }; + }, + toAmino(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + return obj; + }, + fromAminoMsg(object: QueryDelegatorWithdrawAddressRequestAminoMsg): QueryDelegatorWithdrawAddressRequest { + return QueryDelegatorWithdrawAddressRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorWithdrawAddressRequest", + value: QueryDelegatorWithdrawAddressRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorWithdrawAddressRequestProtoMsg): QueryDelegatorWithdrawAddressRequest { + return QueryDelegatorWithdrawAddressRequest.decode(message.value); + }, + toProto(message: QueryDelegatorWithdrawAddressRequest): Uint8Array { + return QueryDelegatorWithdrawAddressRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorWithdrawAddressRequest): QueryDelegatorWithdrawAddressRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressRequest", + value: QueryDelegatorWithdrawAddressRequest.encode(message).finish() + }; } }; function createBaseQueryDelegatorWithdrawAddressResponse(): QueryDelegatorWithdrawAddressResponse { @@ -1276,6 +1785,7 @@ function createBaseQueryDelegatorWithdrawAddressResponse(): QueryDelegatorWithdr }; } export const QueryDelegatorWithdrawAddressResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressResponse", encode(message: QueryDelegatorWithdrawAddressResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.withdrawAddress !== "") { writer.uint32(10).string(message.withdrawAddress); @@ -1328,12 +1838,44 @@ export const QueryDelegatorWithdrawAddressResponse = { const obj: any = {}; obj.withdraw_address = message.withdrawAddress; return obj; + }, + fromAmino(object: QueryDelegatorWithdrawAddressResponseAmino): QueryDelegatorWithdrawAddressResponse { + return { + withdrawAddress: object.withdraw_address + }; + }, + toAmino(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAmino { + const obj: any = {}; + obj.withdraw_address = message.withdrawAddress; + return obj; + }, + fromAminoMsg(object: QueryDelegatorWithdrawAddressResponseAminoMsg): QueryDelegatorWithdrawAddressResponse { + return QueryDelegatorWithdrawAddressResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorWithdrawAddressResponse", + value: QueryDelegatorWithdrawAddressResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorWithdrawAddressResponseProtoMsg): QueryDelegatorWithdrawAddressResponse { + return QueryDelegatorWithdrawAddressResponse.decode(message.value); + }, + toProto(message: QueryDelegatorWithdrawAddressResponse): Uint8Array { + return QueryDelegatorWithdrawAddressResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorWithdrawAddressResponse): QueryDelegatorWithdrawAddressResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressResponse", + value: QueryDelegatorWithdrawAddressResponse.encode(message).finish() + }; } }; function createBaseQueryCommunityPoolRequest(): QueryCommunityPoolRequest { return {}; } export const QueryCommunityPoolRequest = { + typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolRequest", encode(_: QueryCommunityPoolRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1371,6 +1913,34 @@ export const QueryCommunityPoolRequest = { toSDK(_: QueryCommunityPoolRequest): QueryCommunityPoolRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryCommunityPoolRequestAmino): QueryCommunityPoolRequest { + return {}; + }, + toAmino(_: QueryCommunityPoolRequest): QueryCommunityPoolRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryCommunityPoolRequestAminoMsg): QueryCommunityPoolRequest { + return QueryCommunityPoolRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCommunityPoolRequest): QueryCommunityPoolRequestAminoMsg { + return { + type: "cosmos-sdk/QueryCommunityPoolRequest", + value: QueryCommunityPoolRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCommunityPoolRequestProtoMsg): QueryCommunityPoolRequest { + return QueryCommunityPoolRequest.decode(message.value); + }, + toProto(message: QueryCommunityPoolRequest): Uint8Array { + return QueryCommunityPoolRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCommunityPoolRequest): QueryCommunityPoolRequestProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolRequest", + value: QueryCommunityPoolRequest.encode(message).finish() + }; } }; function createBaseQueryCommunityPoolResponse(): QueryCommunityPoolResponse { @@ -1379,6 +1949,7 @@ function createBaseQueryCommunityPoolResponse(): QueryCommunityPoolResponse { }; } export const QueryCommunityPoolResponse = { + typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolResponse", encode(message: QueryCommunityPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pool) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1439,5 +2010,40 @@ export const QueryCommunityPoolResponse = { obj.pool = []; } return obj; + }, + fromAmino(object: QueryCommunityPoolResponseAmino): QueryCommunityPoolResponse { + return { + pool: Array.isArray(object?.pool) ? object.pool.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryCommunityPoolResponse): QueryCommunityPoolResponseAmino { + const obj: any = {}; + if (message.pool) { + obj.pool = message.pool.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.pool = []; + } + return obj; + }, + fromAminoMsg(object: QueryCommunityPoolResponseAminoMsg): QueryCommunityPoolResponse { + return QueryCommunityPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCommunityPoolResponse): QueryCommunityPoolResponseAminoMsg { + return { + type: "cosmos-sdk/QueryCommunityPoolResponse", + value: QueryCommunityPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCommunityPoolResponseProtoMsg): QueryCommunityPoolResponse { + return QueryCommunityPoolResponse.decode(message.value); + }, + toProto(message: QueryCommunityPoolResponse): Uint8Array { + return QueryCommunityPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCommunityPoolResponse): QueryCommunityPoolResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolResponse", + value: QueryCommunityPoolResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts index 946488a8ea..aa8e5d29d1 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/distribution/v1beta1/tx.ts @@ -95,6 +95,7 @@ function createBaseMsgSetWithdrawAddress(): MsgSetWithdrawAddress { }; } export const MsgSetWithdrawAddress = { + typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", encode(message: MsgSetWithdrawAddress, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -159,12 +160,46 @@ export const MsgSetWithdrawAddress = { obj.delegator_address = message.delegatorAddress; obj.withdraw_address = message.withdrawAddress; return obj; + }, + fromAmino(object: MsgSetWithdrawAddressAmino): MsgSetWithdrawAddress { + return { + delegatorAddress: object.delegator_address, + withdrawAddress: object.withdraw_address + }; + }, + toAmino(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.withdraw_address = message.withdrawAddress; + return obj; + }, + fromAminoMsg(object: MsgSetWithdrawAddressAminoMsg): MsgSetWithdrawAddress { + return MsgSetWithdrawAddress.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressAminoMsg { + return { + type: "cosmos-sdk/MsgModifyWithdrawAddress", + value: MsgSetWithdrawAddress.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetWithdrawAddressProtoMsg): MsgSetWithdrawAddress { + return MsgSetWithdrawAddress.decode(message.value); + }, + toProto(message: MsgSetWithdrawAddress): Uint8Array { + return MsgSetWithdrawAddress.encode(message).finish(); + }, + toProtoMsg(message: MsgSetWithdrawAddress): MsgSetWithdrawAddressProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", + value: MsgSetWithdrawAddress.encode(message).finish() + }; } }; function createBaseMsgSetWithdrawAddressResponse(): MsgSetWithdrawAddressResponse { return {}; } export const MsgSetWithdrawAddressResponse = { + typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddressResponse", encode(_: MsgSetWithdrawAddressResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -202,6 +237,34 @@ export const MsgSetWithdrawAddressResponse = { toSDK(_: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetWithdrawAddressResponseAmino): MsgSetWithdrawAddressResponse { + return {}; + }, + toAmino(_: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetWithdrawAddressResponseAminoMsg): MsgSetWithdrawAddressResponse { + return MsgSetWithdrawAddressResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSetWithdrawAddressResponse", + value: MsgSetWithdrawAddressResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetWithdrawAddressResponseProtoMsg): MsgSetWithdrawAddressResponse { + return MsgSetWithdrawAddressResponse.decode(message.value); + }, + toProto(message: MsgSetWithdrawAddressResponse): Uint8Array { + return MsgSetWithdrawAddressResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetWithdrawAddressResponse): MsgSetWithdrawAddressResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddressResponse", + value: MsgSetWithdrawAddressResponse.encode(message).finish() + }; } }; function createBaseMsgWithdrawDelegatorReward(): MsgWithdrawDelegatorReward { @@ -211,6 +274,7 @@ function createBaseMsgWithdrawDelegatorReward(): MsgWithdrawDelegatorReward { }; } export const MsgWithdrawDelegatorReward = { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", encode(message: MsgWithdrawDelegatorReward, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -275,6 +339,39 @@ export const MsgWithdrawDelegatorReward = { obj.delegator_address = message.delegatorAddress; obj.validator_address = message.validatorAddress; return obj; + }, + fromAmino(object: MsgWithdrawDelegatorRewardAmino): MsgWithdrawDelegatorReward { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address + }; + }, + toAmino(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + return obj; + }, + fromAminoMsg(object: MsgWithdrawDelegatorRewardAminoMsg): MsgWithdrawDelegatorReward { + return MsgWithdrawDelegatorReward.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardAminoMsg { + return { + type: "cosmos-sdk/MsgWithdrawDelegationReward", + value: MsgWithdrawDelegatorReward.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawDelegatorRewardProtoMsg): MsgWithdrawDelegatorReward { + return MsgWithdrawDelegatorReward.decode(message.value); + }, + toProto(message: MsgWithdrawDelegatorReward): Uint8Array { + return MsgWithdrawDelegatorReward.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawDelegatorReward): MsgWithdrawDelegatorRewardProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", + value: MsgWithdrawDelegatorReward.encode(message).finish() + }; } }; function createBaseMsgWithdrawDelegatorRewardResponse(): MsgWithdrawDelegatorRewardResponse { @@ -283,6 +380,7 @@ function createBaseMsgWithdrawDelegatorRewardResponse(): MsgWithdrawDelegatorRew }; } export const MsgWithdrawDelegatorRewardResponse = { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorRewardResponse", encode(message: MsgWithdrawDelegatorRewardResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -343,6 +441,41 @@ export const MsgWithdrawDelegatorRewardResponse = { obj.amount = []; } return obj; + }, + fromAmino(object: MsgWithdrawDelegatorRewardResponseAmino): MsgWithdrawDelegatorRewardResponse { + return { + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgWithdrawDelegatorRewardResponse): MsgWithdrawDelegatorRewardResponseAmino { + const obj: any = {}; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: MsgWithdrawDelegatorRewardResponseAminoMsg): MsgWithdrawDelegatorRewardResponse { + return MsgWithdrawDelegatorRewardResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawDelegatorRewardResponse): MsgWithdrawDelegatorRewardResponseAminoMsg { + return { + type: "cosmos-sdk/MsgWithdrawDelegatorRewardResponse", + value: MsgWithdrawDelegatorRewardResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawDelegatorRewardResponseProtoMsg): MsgWithdrawDelegatorRewardResponse { + return MsgWithdrawDelegatorRewardResponse.decode(message.value); + }, + toProto(message: MsgWithdrawDelegatorRewardResponse): Uint8Array { + return MsgWithdrawDelegatorRewardResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawDelegatorRewardResponse): MsgWithdrawDelegatorRewardResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorRewardResponse", + value: MsgWithdrawDelegatorRewardResponse.encode(message).finish() + }; } }; function createBaseMsgWithdrawValidatorCommission(): MsgWithdrawValidatorCommission { @@ -351,6 +484,7 @@ function createBaseMsgWithdrawValidatorCommission(): MsgWithdrawValidatorCommiss }; } export const MsgWithdrawValidatorCommission = { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", encode(message: MsgWithdrawValidatorCommission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -403,6 +537,37 @@ export const MsgWithdrawValidatorCommission = { const obj: any = {}; obj.validator_address = message.validatorAddress; return obj; + }, + fromAmino(object: MsgWithdrawValidatorCommissionAmino): MsgWithdrawValidatorCommission { + return { + validatorAddress: object.validator_address + }; + }, + toAmino(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + return obj; + }, + fromAminoMsg(object: MsgWithdrawValidatorCommissionAminoMsg): MsgWithdrawValidatorCommission { + return MsgWithdrawValidatorCommission.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionAminoMsg { + return { + type: "cosmos-sdk/MsgWithdrawValidatorCommission", + value: MsgWithdrawValidatorCommission.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawValidatorCommissionProtoMsg): MsgWithdrawValidatorCommission { + return MsgWithdrawValidatorCommission.decode(message.value); + }, + toProto(message: MsgWithdrawValidatorCommission): Uint8Array { + return MsgWithdrawValidatorCommission.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawValidatorCommission): MsgWithdrawValidatorCommissionProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", + value: MsgWithdrawValidatorCommission.encode(message).finish() + }; } }; function createBaseMsgWithdrawValidatorCommissionResponse(): MsgWithdrawValidatorCommissionResponse { @@ -411,6 +576,7 @@ function createBaseMsgWithdrawValidatorCommissionResponse(): MsgWithdrawValidato }; } export const MsgWithdrawValidatorCommissionResponse = { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommissionResponse", encode(message: MsgWithdrawValidatorCommissionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -471,6 +637,41 @@ export const MsgWithdrawValidatorCommissionResponse = { obj.amount = []; } return obj; + }, + fromAmino(object: MsgWithdrawValidatorCommissionResponseAmino): MsgWithdrawValidatorCommissionResponse { + return { + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgWithdrawValidatorCommissionResponse): MsgWithdrawValidatorCommissionResponseAmino { + const obj: any = {}; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: MsgWithdrawValidatorCommissionResponseAminoMsg): MsgWithdrawValidatorCommissionResponse { + return MsgWithdrawValidatorCommissionResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawValidatorCommissionResponse): MsgWithdrawValidatorCommissionResponseAminoMsg { + return { + type: "cosmos-sdk/MsgWithdrawValidatorCommissionResponse", + value: MsgWithdrawValidatorCommissionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawValidatorCommissionResponseProtoMsg): MsgWithdrawValidatorCommissionResponse { + return MsgWithdrawValidatorCommissionResponse.decode(message.value); + }, + toProto(message: MsgWithdrawValidatorCommissionResponse): Uint8Array { + return MsgWithdrawValidatorCommissionResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawValidatorCommissionResponse): MsgWithdrawValidatorCommissionResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommissionResponse", + value: MsgWithdrawValidatorCommissionResponse.encode(message).finish() + }; } }; function createBaseMsgFundCommunityPool(): MsgFundCommunityPool { @@ -480,6 +681,7 @@ function createBaseMsgFundCommunityPool(): MsgFundCommunityPool { }; } export const MsgFundCommunityPool = { + typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPool", encode(message: MsgFundCommunityPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -552,12 +754,50 @@ export const MsgFundCommunityPool = { } obj.depositor = message.depositor; return obj; + }, + fromAmino(object: MsgFundCommunityPoolAmino): MsgFundCommunityPool { + return { + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [], + depositor: object.depositor + }; + }, + toAmino(message: MsgFundCommunityPool): MsgFundCommunityPoolAmino { + const obj: any = {}; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + obj.depositor = message.depositor; + return obj; + }, + fromAminoMsg(object: MsgFundCommunityPoolAminoMsg): MsgFundCommunityPool { + return MsgFundCommunityPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgFundCommunityPool): MsgFundCommunityPoolAminoMsg { + return { + type: "cosmos-sdk/MsgFundCommunityPool", + value: MsgFundCommunityPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgFundCommunityPoolProtoMsg): MsgFundCommunityPool { + return MsgFundCommunityPool.decode(message.value); + }, + toProto(message: MsgFundCommunityPool): Uint8Array { + return MsgFundCommunityPool.encode(message).finish(); + }, + toProtoMsg(message: MsgFundCommunityPool): MsgFundCommunityPoolProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPool", + value: MsgFundCommunityPool.encode(message).finish() + }; } }; function createBaseMsgFundCommunityPoolResponse(): MsgFundCommunityPoolResponse { return {}; } export const MsgFundCommunityPoolResponse = { + typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse", encode(_: MsgFundCommunityPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -595,5 +835,33 @@ export const MsgFundCommunityPoolResponse = { toSDK(_: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgFundCommunityPoolResponseAmino): MsgFundCommunityPoolResponse { + return {}; + }, + toAmino(_: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgFundCommunityPoolResponseAminoMsg): MsgFundCommunityPoolResponse { + return MsgFundCommunityPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseAminoMsg { + return { + type: "cosmos-sdk/MsgFundCommunityPoolResponse", + value: MsgFundCommunityPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgFundCommunityPoolResponseProtoMsg): MsgFundCommunityPoolResponse { + return MsgFundCommunityPoolResponse.decode(message.value); + }, + toProto(message: MsgFundCommunityPoolResponse): Uint8Array { + return MsgFundCommunityPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgFundCommunityPoolResponse): MsgFundCommunityPoolResponseProtoMsg { + return { + typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse", + value: MsgFundCommunityPoolResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts index da923620c0..db91fd6601 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/evidence.ts @@ -31,6 +31,7 @@ function createBaseEquivocation(): Equivocation { }; } export const Equivocation = { + typeUrl: "/cosmos.evidence.v1beta1.Equivocation", encode(message: Equivocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -119,5 +120,42 @@ export const Equivocation = { obj.power = message.power; obj.consensus_address = message.consensusAddress; return obj; + }, + fromAmino(object: EquivocationAmino): Equivocation { + return { + height: BigInt(object.height), + time: object.time, + power: BigInt(object.power), + consensusAddress: object.consensus_address + }; + }, + toAmino(message: Equivocation): EquivocationAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.time = message.time; + obj.power = message.power ? message.power.toString() : undefined; + obj.consensus_address = message.consensusAddress; + return obj; + }, + fromAminoMsg(object: EquivocationAminoMsg): Equivocation { + return Equivocation.fromAmino(object.value); + }, + toAminoMsg(message: Equivocation): EquivocationAminoMsg { + return { + type: "cosmos-sdk/Equivocation", + value: Equivocation.toAmino(message) + }; + }, + fromProtoMsg(message: EquivocationProtoMsg): Equivocation { + return Equivocation.decode(message.value); + }, + toProto(message: Equivocation): Uint8Array { + return Equivocation.encode(message).finish(); + }, + toProtoMsg(message: Equivocation): EquivocationProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.Equivocation", + value: Equivocation.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts index 7a17609369..1c2998e4e7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/genesis.ts @@ -17,6 +17,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.evidence.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.evidence) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -77,5 +78,40 @@ export const GenesisState = { obj.evidence = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + evidence: Array.isArray(object?.evidence) ? object.evidence.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.evidence) { + obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.evidence = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts index 7dedbc2de8..7571bce6fd 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/query.ts @@ -60,6 +60,7 @@ function createBaseQueryEvidenceRequest(): QueryEvidenceRequest { }; } export const QueryEvidenceRequest = { + typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceRequest", encode(message: QueryEvidenceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.evidenceHash.length !== 0) { writer.uint32(10).bytes(message.evidenceHash); @@ -112,6 +113,37 @@ export const QueryEvidenceRequest = { const obj: any = {}; obj.evidence_hash = message.evidenceHash; return obj; + }, + fromAmino(object: QueryEvidenceRequestAmino): QueryEvidenceRequest { + return { + evidenceHash: object.evidence_hash + }; + }, + toAmino(message: QueryEvidenceRequest): QueryEvidenceRequestAmino { + const obj: any = {}; + obj.evidence_hash = message.evidenceHash; + return obj; + }, + fromAminoMsg(object: QueryEvidenceRequestAminoMsg): QueryEvidenceRequest { + return QueryEvidenceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryEvidenceRequest): QueryEvidenceRequestAminoMsg { + return { + type: "cosmos-sdk/QueryEvidenceRequest", + value: QueryEvidenceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryEvidenceRequestProtoMsg): QueryEvidenceRequest { + return QueryEvidenceRequest.decode(message.value); + }, + toProto(message: QueryEvidenceRequest): Uint8Array { + return QueryEvidenceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryEvidenceRequest): QueryEvidenceRequestProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceRequest", + value: QueryEvidenceRequest.encode(message).finish() + }; } }; function createBaseQueryEvidenceResponse(): QueryEvidenceResponse { @@ -120,6 +152,7 @@ function createBaseQueryEvidenceResponse(): QueryEvidenceResponse { }; } export const QueryEvidenceResponse = { + typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceResponse", encode(message: QueryEvidenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.evidence !== undefined) { Any.encode(message.evidence, writer.uint32(10).fork()).ldelim(); @@ -172,6 +205,37 @@ export const QueryEvidenceResponse = { const obj: any = {}; message.evidence !== undefined && (obj.evidence = message.evidence ? Any.toSDK(message.evidence) : undefined); return obj; + }, + fromAmino(object: QueryEvidenceResponseAmino): QueryEvidenceResponse { + return { + evidence: object?.evidence ? Any.fromAmino(object.evidence) : undefined + }; + }, + toAmino(message: QueryEvidenceResponse): QueryEvidenceResponseAmino { + const obj: any = {}; + obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined; + return obj; + }, + fromAminoMsg(object: QueryEvidenceResponseAminoMsg): QueryEvidenceResponse { + return QueryEvidenceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryEvidenceResponse): QueryEvidenceResponseAminoMsg { + return { + type: "cosmos-sdk/QueryEvidenceResponse", + value: QueryEvidenceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryEvidenceResponseProtoMsg): QueryEvidenceResponse { + return QueryEvidenceResponse.decode(message.value); + }, + toProto(message: QueryEvidenceResponse): Uint8Array { + return QueryEvidenceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryEvidenceResponse): QueryEvidenceResponseProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceResponse", + value: QueryEvidenceResponse.encode(message).finish() + }; } }; function createBaseQueryAllEvidenceRequest(): QueryAllEvidenceRequest { @@ -180,6 +244,7 @@ function createBaseQueryAllEvidenceRequest(): QueryAllEvidenceRequest { }; } export const QueryAllEvidenceRequest = { + typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceRequest", encode(message: QueryAllEvidenceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -232,6 +297,37 @@ export const QueryAllEvidenceRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllEvidenceRequestAmino): QueryAllEvidenceRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllEvidenceRequest): QueryAllEvidenceRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllEvidenceRequestAminoMsg): QueryAllEvidenceRequest { + return QueryAllEvidenceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllEvidenceRequest): QueryAllEvidenceRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAllEvidenceRequest", + value: QueryAllEvidenceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllEvidenceRequestProtoMsg): QueryAllEvidenceRequest { + return QueryAllEvidenceRequest.decode(message.value); + }, + toProto(message: QueryAllEvidenceRequest): Uint8Array { + return QueryAllEvidenceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllEvidenceRequest): QueryAllEvidenceRequestProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceRequest", + value: QueryAllEvidenceRequest.encode(message).finish() + }; } }; function createBaseQueryAllEvidenceResponse(): QueryAllEvidenceResponse { @@ -241,6 +337,7 @@ function createBaseQueryAllEvidenceResponse(): QueryAllEvidenceResponse { }; } export const QueryAllEvidenceResponse = { + typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceResponse", encode(message: QueryAllEvidenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.evidence) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -313,5 +410,42 @@ export const QueryAllEvidenceResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllEvidenceResponseAmino): QueryAllEvidenceResponse { + return { + evidence: Array.isArray(object?.evidence) ? object.evidence.map((e: any) => Any.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllEvidenceResponse): QueryAllEvidenceResponseAmino { + const obj: any = {}; + if (message.evidence) { + obj.evidence = message.evidence.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.evidence = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllEvidenceResponseAminoMsg): QueryAllEvidenceResponse { + return QueryAllEvidenceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllEvidenceResponse): QueryAllEvidenceResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAllEvidenceResponse", + value: QueryAllEvidenceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllEvidenceResponseProtoMsg): QueryAllEvidenceResponse { + return QueryAllEvidenceResponse.decode(message.value); + }, + toProto(message: QueryAllEvidenceResponse): Uint8Array { + return QueryAllEvidenceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllEvidenceResponse): QueryAllEvidenceResponseProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceResponse", + value: QueryAllEvidenceResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts index 6940845437..2001e1e82c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/evidence/v1beta1/tx.ts @@ -34,6 +34,7 @@ function createBaseMsgSubmitEvidence(): MsgSubmitEvidence { }; } export const MsgSubmitEvidence = { + typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence", encode(message: MsgSubmitEvidence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.submitter !== "") { writer.uint32(10).string(message.submitter); @@ -98,6 +99,39 @@ export const MsgSubmitEvidence = { obj.submitter = message.submitter; message.evidence !== undefined && (obj.evidence = message.evidence ? Any.toSDK(message.evidence) : undefined); return obj; + }, + fromAmino(object: MsgSubmitEvidenceAmino): MsgSubmitEvidence { + return { + submitter: object.submitter, + evidence: object?.evidence ? Any.fromAmino(object.evidence) : undefined + }; + }, + toAmino(message: MsgSubmitEvidence): MsgSubmitEvidenceAmino { + const obj: any = {}; + obj.submitter = message.submitter; + obj.evidence = message.evidence ? Any.toAmino(message.evidence) : undefined; + return obj; + }, + fromAminoMsg(object: MsgSubmitEvidenceAminoMsg): MsgSubmitEvidence { + return MsgSubmitEvidence.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitEvidence): MsgSubmitEvidenceAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitEvidence", + value: MsgSubmitEvidence.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitEvidenceProtoMsg): MsgSubmitEvidence { + return MsgSubmitEvidence.decode(message.value); + }, + toProto(message: MsgSubmitEvidence): Uint8Array { + return MsgSubmitEvidence.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitEvidence): MsgSubmitEvidenceProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence", + value: MsgSubmitEvidence.encode(message).finish() + }; } }; function createBaseMsgSubmitEvidenceResponse(): MsgSubmitEvidenceResponse { @@ -106,6 +140,7 @@ function createBaseMsgSubmitEvidenceResponse(): MsgSubmitEvidenceResponse { }; } export const MsgSubmitEvidenceResponse = { + typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse", encode(message: MsgSubmitEvidenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash.length !== 0) { writer.uint32(34).bytes(message.hash); @@ -158,5 +193,36 @@ export const MsgSubmitEvidenceResponse = { const obj: any = {}; obj.hash = message.hash; return obj; + }, + fromAmino(object: MsgSubmitEvidenceResponseAmino): MsgSubmitEvidenceResponse { + return { + hash: object.hash + }; + }, + toAmino(message: MsgSubmitEvidenceResponse): MsgSubmitEvidenceResponseAmino { + const obj: any = {}; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: MsgSubmitEvidenceResponseAminoMsg): MsgSubmitEvidenceResponse { + return MsgSubmitEvidenceResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitEvidenceResponse): MsgSubmitEvidenceResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitEvidenceResponse", + value: MsgSubmitEvidenceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitEvidenceResponseProtoMsg): MsgSubmitEvidenceResponse { + return MsgSubmitEvidenceResponse.decode(message.value); + }, + toProto(message: MsgSubmitEvidenceResponse): Uint8Array { + return MsgSubmitEvidenceResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitEvidenceResponse): MsgSubmitEvidenceResponseProtoMsg { + return { + typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse", + value: MsgSubmitEvidenceResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts index e6dc5e031c..5405d422e0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/feegrant.ts @@ -98,6 +98,7 @@ function createBaseBasicAllowance(): BasicAllowance { }; } export const BasicAllowance = { + typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance", encode(message: BasicAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.spendLimit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -170,6 +171,43 @@ export const BasicAllowance = { } message.expiration !== undefined && (obj.expiration = message.expiration ?? undefined); return obj; + }, + fromAmino(object: BasicAllowanceAmino): BasicAllowance { + return { + spendLimit: Array.isArray(object?.spend_limit) ? object.spend_limit.map((e: any) => Coin.fromAmino(e)) : [], + expiration: object.expiration + }; + }, + toAmino(message: BasicAllowance): BasicAllowanceAmino { + const obj: any = {}; + if (message.spendLimit) { + obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.spend_limit = []; + } + obj.expiration = message.expiration; + return obj; + }, + fromAminoMsg(object: BasicAllowanceAminoMsg): BasicAllowance { + return BasicAllowance.fromAmino(object.value); + }, + toAminoMsg(message: BasicAllowance): BasicAllowanceAminoMsg { + return { + type: "cosmos-sdk/BasicAllowance", + value: BasicAllowance.toAmino(message) + }; + }, + fromProtoMsg(message: BasicAllowanceProtoMsg): BasicAllowance { + return BasicAllowance.decode(message.value); + }, + toProto(message: BasicAllowance): Uint8Array { + return BasicAllowance.encode(message).finish(); + }, + toProtoMsg(message: BasicAllowance): BasicAllowanceProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance", + value: BasicAllowance.encode(message).finish() + }; } }; function createBasePeriodicAllowance(): PeriodicAllowance { @@ -182,6 +220,7 @@ function createBasePeriodicAllowance(): PeriodicAllowance { }; } export const PeriodicAllowance = { + typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance", encode(message: PeriodicAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.basic !== undefined) { BasicAllowance.encode(message.basic, writer.uint32(10).fork()).ldelim(); @@ -298,6 +337,53 @@ export const PeriodicAllowance = { } message.periodReset !== undefined && (obj.period_reset = message.periodReset ?? undefined); return obj; + }, + fromAmino(object: PeriodicAllowanceAmino): PeriodicAllowance { + return { + basic: object?.basic ? BasicAllowance.fromAmino(object.basic) : undefined, + period: object?.period ? Duration.fromAmino(object.period) : undefined, + periodSpendLimit: Array.isArray(object?.period_spend_limit) ? object.period_spend_limit.map((e: any) => Coin.fromAmino(e)) : [], + periodCanSpend: Array.isArray(object?.period_can_spend) ? object.period_can_spend.map((e: any) => Coin.fromAmino(e)) : [], + periodReset: object.period_reset + }; + }, + toAmino(message: PeriodicAllowance): PeriodicAllowanceAmino { + const obj: any = {}; + obj.basic = message.basic ? BasicAllowance.toAmino(message.basic) : undefined; + obj.period = message.period ? Duration.toAmino(message.period) : undefined; + if (message.periodSpendLimit) { + obj.period_spend_limit = message.periodSpendLimit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.period_spend_limit = []; + } + if (message.periodCanSpend) { + obj.period_can_spend = message.periodCanSpend.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.period_can_spend = []; + } + obj.period_reset = message.periodReset; + return obj; + }, + fromAminoMsg(object: PeriodicAllowanceAminoMsg): PeriodicAllowance { + return PeriodicAllowance.fromAmino(object.value); + }, + toAminoMsg(message: PeriodicAllowance): PeriodicAllowanceAminoMsg { + return { + type: "cosmos-sdk/PeriodicAllowance", + value: PeriodicAllowance.toAmino(message) + }; + }, + fromProtoMsg(message: PeriodicAllowanceProtoMsg): PeriodicAllowance { + return PeriodicAllowance.decode(message.value); + }, + toProto(message: PeriodicAllowance): Uint8Array { + return PeriodicAllowance.encode(message).finish(); + }, + toProtoMsg(message: PeriodicAllowance): PeriodicAllowanceProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance", + value: PeriodicAllowance.encode(message).finish() + }; } }; function createBaseAllowedMsgAllowance(): AllowedMsgAllowance { @@ -307,6 +393,7 @@ function createBaseAllowedMsgAllowance(): AllowedMsgAllowance { }; } export const AllowedMsgAllowance = { + typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance", encode(message: AllowedMsgAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allowance !== undefined) { Any.encode(message.allowance, writer.uint32(10).fork()).ldelim(); @@ -379,6 +466,43 @@ export const AllowedMsgAllowance = { obj.allowed_messages = []; } return obj; + }, + fromAmino(object: AllowedMsgAllowanceAmino): AllowedMsgAllowance { + return { + allowance: object?.allowance ? Any.fromAmino(object.allowance) : undefined, + allowedMessages: Array.isArray(object?.allowed_messages) ? object.allowed_messages.map((e: any) => e) : [] + }; + }, + toAmino(message: AllowedMsgAllowance): AllowedMsgAllowanceAmino { + const obj: any = {}; + obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; + if (message.allowedMessages) { + obj.allowed_messages = message.allowedMessages.map(e => e); + } else { + obj.allowed_messages = []; + } + return obj; + }, + fromAminoMsg(object: AllowedMsgAllowanceAminoMsg): AllowedMsgAllowance { + return AllowedMsgAllowance.fromAmino(object.value); + }, + toAminoMsg(message: AllowedMsgAllowance): AllowedMsgAllowanceAminoMsg { + return { + type: "cosmos-sdk/AllowedMsgAllowance", + value: AllowedMsgAllowance.toAmino(message) + }; + }, + fromProtoMsg(message: AllowedMsgAllowanceProtoMsg): AllowedMsgAllowance { + return AllowedMsgAllowance.decode(message.value); + }, + toProto(message: AllowedMsgAllowance): Uint8Array { + return AllowedMsgAllowance.encode(message).finish(); + }, + toProtoMsg(message: AllowedMsgAllowance): AllowedMsgAllowanceProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance", + value: AllowedMsgAllowance.encode(message).finish() + }; } }; function createBaseGrant(): Grant { @@ -389,6 +513,7 @@ function createBaseGrant(): Grant { }; } export const Grant = { + typeUrl: "/cosmos.feegrant.v1beta1.Grant", encode(message: Grant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -465,5 +590,40 @@ export const Grant = { obj.grantee = message.grantee; message.allowance !== undefined && (obj.allowance = message.allowance ? Any.toSDK(message.allowance) : undefined); return obj; + }, + fromAmino(object: GrantAmino): Grant { + return { + granter: object.granter, + grantee: object.grantee, + allowance: object?.allowance ? Any.fromAmino(object.allowance) : undefined + }; + }, + toAmino(message: Grant): GrantAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; + return obj; + }, + fromAminoMsg(object: GrantAminoMsg): Grant { + return Grant.fromAmino(object.value); + }, + toAminoMsg(message: Grant): GrantAminoMsg { + return { + type: "cosmos-sdk/Grant", + value: Grant.toAmino(message) + }; + }, + fromProtoMsg(message: GrantProtoMsg): Grant { + return Grant.decode(message.value); + }, + toProto(message: Grant): Uint8Array { + return Grant.encode(message).finish(); + }, + toProtoMsg(message: Grant): GrantProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.Grant", + value: Grant.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts index 002537ddff..9aad37d86f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/genesis.ts @@ -16,6 +16,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.feegrant.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowances) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -76,5 +77,40 @@ export const GenesisState = { obj.allowances = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + allowances: Array.isArray(object?.allowances) ? object.allowances.map((e: any) => Grant.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.allowances) { + obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); + } else { + obj.allowances = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts index dd04d850b2..63fb155894 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/query.ts @@ -77,6 +77,7 @@ function createBaseQueryAllowanceRequest(): QueryAllowanceRequest { }; } export const QueryAllowanceRequest = { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceRequest", encode(message: QueryAllowanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -141,6 +142,39 @@ export const QueryAllowanceRequest = { obj.granter = message.granter; obj.grantee = message.grantee; return obj; + }, + fromAmino(object: QueryAllowanceRequestAmino): QueryAllowanceRequest { + return { + granter: object.granter, + grantee: object.grantee + }; + }, + toAmino(message: QueryAllowanceRequest): QueryAllowanceRequestAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + return obj; + }, + fromAminoMsg(object: QueryAllowanceRequestAminoMsg): QueryAllowanceRequest { + return QueryAllowanceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllowanceRequest): QueryAllowanceRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAllowanceRequest", + value: QueryAllowanceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllowanceRequestProtoMsg): QueryAllowanceRequest { + return QueryAllowanceRequest.decode(message.value); + }, + toProto(message: QueryAllowanceRequest): Uint8Array { + return QueryAllowanceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllowanceRequest): QueryAllowanceRequestProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceRequest", + value: QueryAllowanceRequest.encode(message).finish() + }; } }; function createBaseQueryAllowanceResponse(): QueryAllowanceResponse { @@ -149,6 +183,7 @@ function createBaseQueryAllowanceResponse(): QueryAllowanceResponse { }; } export const QueryAllowanceResponse = { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceResponse", encode(message: QueryAllowanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allowance !== undefined) { Grant.encode(message.allowance, writer.uint32(10).fork()).ldelim(); @@ -201,6 +236,37 @@ export const QueryAllowanceResponse = { const obj: any = {}; message.allowance !== undefined && (obj.allowance = message.allowance ? Grant.toSDK(message.allowance) : undefined); return obj; + }, + fromAmino(object: QueryAllowanceResponseAmino): QueryAllowanceResponse { + return { + allowance: object?.allowance ? Grant.fromAmino(object.allowance) : undefined + }; + }, + toAmino(message: QueryAllowanceResponse): QueryAllowanceResponseAmino { + const obj: any = {}; + obj.allowance = message.allowance ? Grant.toAmino(message.allowance) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllowanceResponseAminoMsg): QueryAllowanceResponse { + return QueryAllowanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllowanceResponse): QueryAllowanceResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAllowanceResponse", + value: QueryAllowanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllowanceResponseProtoMsg): QueryAllowanceResponse { + return QueryAllowanceResponse.decode(message.value); + }, + toProto(message: QueryAllowanceResponse): Uint8Array { + return QueryAllowanceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllowanceResponse): QueryAllowanceResponseProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceResponse", + value: QueryAllowanceResponse.encode(message).finish() + }; } }; function createBaseQueryAllowancesRequest(): QueryAllowancesRequest { @@ -210,6 +276,7 @@ function createBaseQueryAllowancesRequest(): QueryAllowancesRequest { }; } export const QueryAllowancesRequest = { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesRequest", encode(message: QueryAllowancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.grantee !== "") { writer.uint32(10).string(message.grantee); @@ -274,6 +341,39 @@ export const QueryAllowancesRequest = { obj.grantee = message.grantee; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllowancesRequestAmino): QueryAllowancesRequest { + return { + grantee: object.grantee, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllowancesRequest): QueryAllowancesRequestAmino { + const obj: any = {}; + obj.grantee = message.grantee; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllowancesRequestAminoMsg): QueryAllowancesRequest { + return QueryAllowancesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllowancesRequest): QueryAllowancesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAllowancesRequest", + value: QueryAllowancesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllowancesRequestProtoMsg): QueryAllowancesRequest { + return QueryAllowancesRequest.decode(message.value); + }, + toProto(message: QueryAllowancesRequest): Uint8Array { + return QueryAllowancesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllowancesRequest): QueryAllowancesRequestProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesRequest", + value: QueryAllowancesRequest.encode(message).finish() + }; } }; function createBaseQueryAllowancesResponse(): QueryAllowancesResponse { @@ -283,6 +383,7 @@ function createBaseQueryAllowancesResponse(): QueryAllowancesResponse { }; } export const QueryAllowancesResponse = { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesResponse", encode(message: QueryAllowancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowances) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -355,6 +456,43 @@ export const QueryAllowancesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllowancesResponseAmino): QueryAllowancesResponse { + return { + allowances: Array.isArray(object?.allowances) ? object.allowances.map((e: any) => Grant.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllowancesResponse): QueryAllowancesResponseAmino { + const obj: any = {}; + if (message.allowances) { + obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); + } else { + obj.allowances = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllowancesResponseAminoMsg): QueryAllowancesResponse { + return QueryAllowancesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllowancesResponse): QueryAllowancesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAllowancesResponse", + value: QueryAllowancesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllowancesResponseProtoMsg): QueryAllowancesResponse { + return QueryAllowancesResponse.decode(message.value); + }, + toProto(message: QueryAllowancesResponse): Uint8Array { + return QueryAllowancesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllowancesResponse): QueryAllowancesResponseProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesResponse", + value: QueryAllowancesResponse.encode(message).finish() + }; } }; function createBaseQueryAllowancesByGranterRequest(): QueryAllowancesByGranterRequest { @@ -364,6 +502,7 @@ function createBaseQueryAllowancesByGranterRequest(): QueryAllowancesByGranterRe }; } export const QueryAllowancesByGranterRequest = { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterRequest", encode(message: QueryAllowancesByGranterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -428,6 +567,39 @@ export const QueryAllowancesByGranterRequest = { obj.granter = message.granter; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllowancesByGranterRequestAmino): QueryAllowancesByGranterRequest { + return { + granter: object.granter, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllowancesByGranterRequestAminoMsg): QueryAllowancesByGranterRequest { + return QueryAllowancesByGranterRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAllowancesByGranterRequest", + value: QueryAllowancesByGranterRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllowancesByGranterRequestProtoMsg): QueryAllowancesByGranterRequest { + return QueryAllowancesByGranterRequest.decode(message.value); + }, + toProto(message: QueryAllowancesByGranterRequest): Uint8Array { + return QueryAllowancesByGranterRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllowancesByGranterRequest): QueryAllowancesByGranterRequestProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterRequest", + value: QueryAllowancesByGranterRequest.encode(message).finish() + }; } }; function createBaseQueryAllowancesByGranterResponse(): QueryAllowancesByGranterResponse { @@ -437,6 +609,7 @@ function createBaseQueryAllowancesByGranterResponse(): QueryAllowancesByGranterR }; } export const QueryAllowancesByGranterResponse = { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse", encode(message: QueryAllowancesByGranterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowances) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -509,5 +682,42 @@ export const QueryAllowancesByGranterResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllowancesByGranterResponseAmino): QueryAllowancesByGranterResponse { + return { + allowances: Array.isArray(object?.allowances) ? object.allowances.map((e: any) => Grant.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllowancesByGranterResponse): QueryAllowancesByGranterResponseAmino { + const obj: any = {}; + if (message.allowances) { + obj.allowances = message.allowances.map(e => e ? Grant.toAmino(e) : undefined); + } else { + obj.allowances = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllowancesByGranterResponseAminoMsg): QueryAllowancesByGranterResponse { + return QueryAllowancesByGranterResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllowancesByGranterResponse): QueryAllowancesByGranterResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAllowancesByGranterResponse", + value: QueryAllowancesByGranterResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllowancesByGranterResponseProtoMsg): QueryAllowancesByGranterResponse { + return QueryAllowancesByGranterResponse.decode(message.value); + }, + toProto(message: QueryAllowancesByGranterResponse): Uint8Array { + return QueryAllowancesByGranterResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllowancesByGranterResponse): QueryAllowancesByGranterResponseProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse", + value: QueryAllowancesByGranterResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts index 4d6339264b..cbc5e4a82a 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/feegrant/v1beta1/tx.ts @@ -51,6 +51,7 @@ function createBaseMsgGrantAllowance(): MsgGrantAllowance { }; } export const MsgGrantAllowance = { + typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance", encode(message: MsgGrantAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -127,12 +128,48 @@ export const MsgGrantAllowance = { obj.grantee = message.grantee; message.allowance !== undefined && (obj.allowance = message.allowance ? Any.toSDK(message.allowance) : undefined); return obj; + }, + fromAmino(object: MsgGrantAllowanceAmino): MsgGrantAllowance { + return { + granter: object.granter, + grantee: object.grantee, + allowance: object?.allowance ? Any.fromAmino(object.allowance) : undefined + }; + }, + toAmino(message: MsgGrantAllowance): MsgGrantAllowanceAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + obj.allowance = message.allowance ? Any.toAmino(message.allowance) : undefined; + return obj; + }, + fromAminoMsg(object: MsgGrantAllowanceAminoMsg): MsgGrantAllowance { + return MsgGrantAllowance.fromAmino(object.value); + }, + toAminoMsg(message: MsgGrantAllowance): MsgGrantAllowanceAminoMsg { + return { + type: "cosmos-sdk/MsgGrantAllowance", + value: MsgGrantAllowance.toAmino(message) + }; + }, + fromProtoMsg(message: MsgGrantAllowanceProtoMsg): MsgGrantAllowance { + return MsgGrantAllowance.decode(message.value); + }, + toProto(message: MsgGrantAllowance): Uint8Array { + return MsgGrantAllowance.encode(message).finish(); + }, + toProtoMsg(message: MsgGrantAllowance): MsgGrantAllowanceProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance", + value: MsgGrantAllowance.encode(message).finish() + }; } }; function createBaseMsgGrantAllowanceResponse(): MsgGrantAllowanceResponse { return {}; } export const MsgGrantAllowanceResponse = { + typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse", encode(_: MsgGrantAllowanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -170,6 +207,34 @@ export const MsgGrantAllowanceResponse = { toSDK(_: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgGrantAllowanceResponseAmino): MsgGrantAllowanceResponse { + return {}; + }, + toAmino(_: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgGrantAllowanceResponseAminoMsg): MsgGrantAllowanceResponse { + return MsgGrantAllowanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseAminoMsg { + return { + type: "cosmos-sdk/MsgGrantAllowanceResponse", + value: MsgGrantAllowanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgGrantAllowanceResponseProtoMsg): MsgGrantAllowanceResponse { + return MsgGrantAllowanceResponse.decode(message.value); + }, + toProto(message: MsgGrantAllowanceResponse): Uint8Array { + return MsgGrantAllowanceResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgGrantAllowanceResponse): MsgGrantAllowanceResponseProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse", + value: MsgGrantAllowanceResponse.encode(message).finish() + }; } }; function createBaseMsgRevokeAllowance(): MsgRevokeAllowance { @@ -179,6 +244,7 @@ function createBaseMsgRevokeAllowance(): MsgRevokeAllowance { }; } export const MsgRevokeAllowance = { + typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowance", encode(message: MsgRevokeAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); @@ -243,12 +309,46 @@ export const MsgRevokeAllowance = { obj.granter = message.granter; obj.grantee = message.grantee; return obj; + }, + fromAmino(object: MsgRevokeAllowanceAmino): MsgRevokeAllowance { + return { + granter: object.granter, + grantee: object.grantee + }; + }, + toAmino(message: MsgRevokeAllowance): MsgRevokeAllowanceAmino { + const obj: any = {}; + obj.granter = message.granter; + obj.grantee = message.grantee; + return obj; + }, + fromAminoMsg(object: MsgRevokeAllowanceAminoMsg): MsgRevokeAllowance { + return MsgRevokeAllowance.fromAmino(object.value); + }, + toAminoMsg(message: MsgRevokeAllowance): MsgRevokeAllowanceAminoMsg { + return { + type: "cosmos-sdk/MsgRevokeAllowance", + value: MsgRevokeAllowance.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRevokeAllowanceProtoMsg): MsgRevokeAllowance { + return MsgRevokeAllowance.decode(message.value); + }, + toProto(message: MsgRevokeAllowance): Uint8Array { + return MsgRevokeAllowance.encode(message).finish(); + }, + toProtoMsg(message: MsgRevokeAllowance): MsgRevokeAllowanceProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowance", + value: MsgRevokeAllowance.encode(message).finish() + }; } }; function createBaseMsgRevokeAllowanceResponse(): MsgRevokeAllowanceResponse { return {}; } export const MsgRevokeAllowanceResponse = { + typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse", encode(_: MsgRevokeAllowanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -286,5 +386,33 @@ export const MsgRevokeAllowanceResponse = { toSDK(_: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRevokeAllowanceResponseAmino): MsgRevokeAllowanceResponse { + return {}; + }, + toAmino(_: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRevokeAllowanceResponseAminoMsg): MsgRevokeAllowanceResponse { + return MsgRevokeAllowanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseAminoMsg { + return { + type: "cosmos-sdk/MsgRevokeAllowanceResponse", + value: MsgRevokeAllowanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRevokeAllowanceResponseProtoMsg): MsgRevokeAllowanceResponse { + return MsgRevokeAllowanceResponse.decode(message.value); + }, + toProto(message: MsgRevokeAllowanceResponse): Uint8Array { + return MsgRevokeAllowanceResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRevokeAllowanceResponse): MsgRevokeAllowanceResponseProtoMsg { + return { + typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse", + value: MsgRevokeAllowanceResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts index 3aeaa7f07b..f7a8a799c2 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/genutil/v1beta1/genesis.ts @@ -16,6 +16,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.genutil.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.genTxs) { writer.uint32(10).bytes(v!); @@ -76,5 +77,40 @@ export const GenesisState = { obj.gen_txs = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + genTxs: Array.isArray(object?.gen_txs) ? object.gen_txs.map((e: any) => e) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.genTxs) { + obj.gen_txs = message.genTxs.map(e => e); + } else { + obj.gen_txs = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.genutil.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts index 5a8889fc67..db60786f57 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/genesis.ts @@ -41,6 +41,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.gov.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.startingProposalId !== BigInt(0)) { writer.uint32(8).uint64(message.startingProposalId); @@ -189,5 +190,60 @@ export const GenesisState = { message.votingParams !== undefined && (obj.voting_params = message.votingParams ? VotingParams.toSDK(message.votingParams) : undefined); message.tallyParams !== undefined && (obj.tally_params = message.tallyParams ? TallyParams.toSDK(message.tallyParams) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + startingProposalId: BigInt(object.starting_proposal_id), + deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromAmino(e)) : [], + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], + proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], + depositParams: object?.deposit_params ? DepositParams.fromAmino(object.deposit_params) : undefined, + votingParams: object?.voting_params ? VotingParams.fromAmino(object.voting_params) : undefined, + tallyParams: object?.tally_params ? TallyParams.fromAmino(object.tally_params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + if (message.deposits) { + obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); + } else { + obj.deposits = []; + } + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + if (message.proposals) { + obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); + } else { + obj.proposals = []; + } + obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; + obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; + obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/v1/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts index 609c71b26a..18a54a18be 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/gov.ts @@ -284,6 +284,7 @@ function createBaseWeightedVoteOption(): WeightedVoteOption { }; } export const WeightedVoteOption = { + typeUrl: "/cosmos.gov.v1.WeightedVoteOption", encode(message: WeightedVoteOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.option !== 0) { writer.uint32(8).int32(message.option); @@ -348,6 +349,39 @@ export const WeightedVoteOption = { message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); obj.weight = message.weight; return obj; + }, + fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { + return { + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, + weight: object.weight + }; + }, + toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { + const obj: any = {}; + obj.option = message.option; + obj.weight = message.weight; + return obj; + }, + fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { + return WeightedVoteOption.fromAmino(object.value); + }, + toAminoMsg(message: WeightedVoteOption): WeightedVoteOptionAminoMsg { + return { + type: "cosmos-sdk/v1/WeightedVoteOption", + value: WeightedVoteOption.toAmino(message) + }; + }, + fromProtoMsg(message: WeightedVoteOptionProtoMsg): WeightedVoteOption { + return WeightedVoteOption.decode(message.value); + }, + toProto(message: WeightedVoteOption): Uint8Array { + return WeightedVoteOption.encode(message).finish(); + }, + toProtoMsg(message: WeightedVoteOption): WeightedVoteOptionProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.WeightedVoteOption", + value: WeightedVoteOption.encode(message).finish() + }; } }; function createBaseDeposit(): Deposit { @@ -358,6 +392,7 @@ function createBaseDeposit(): Deposit { }; } export const Deposit = { + typeUrl: "/cosmos.gov.v1.Deposit", encode(message: Deposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -442,6 +477,45 @@ export const Deposit = { obj.amount = []; } return obj; + }, + fromAmino(object: DepositAmino): Deposit { + return { + proposalId: BigInt(object.proposal_id), + depositor: object.depositor, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Deposit): DepositAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: DepositAminoMsg): Deposit { + return Deposit.fromAmino(object.value); + }, + toAminoMsg(message: Deposit): DepositAminoMsg { + return { + type: "cosmos-sdk/v1/Deposit", + value: Deposit.toAmino(message) + }; + }, + fromProtoMsg(message: DepositProtoMsg): Deposit { + return Deposit.decode(message.value); + }, + toProto(message: Deposit): Uint8Array { + return Deposit.encode(message).finish(); + }, + toProtoMsg(message: Deposit): DepositProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.Deposit", + value: Deposit.encode(message).finish() + }; } }; function createBaseProposal(): Proposal { @@ -459,6 +533,7 @@ function createBaseProposal(): Proposal { }; } export const Proposal = { + typeUrl: "/cosmos.gov.v1.Proposal", encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); @@ -635,6 +710,63 @@ export const Proposal = { message.votingEndTime !== undefined && (obj.voting_end_time = message.votingEndTime ?? undefined); obj.metadata = message.metadata; return obj; + }, + fromAmino(object: ProposalAmino): Proposal { + return { + id: BigInt(object.id), + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [], + status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, + finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined, + submitTime: object.submit_time, + depositEndTime: object.deposit_end_time, + totalDeposit: Array.isArray(object?.total_deposit) ? object.total_deposit.map((e: any) => Coin.fromAmino(e)) : [], + votingStartTime: object.voting_start_time, + votingEndTime: object.voting_end_time, + metadata: object.metadata + }; + }, + toAmino(message: Proposal): ProposalAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + if (message.messages) { + obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.messages = []; + } + obj.status = message.status; + obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; + obj.submit_time = message.submitTime; + obj.deposit_end_time = message.depositEndTime; + if (message.totalDeposit) { + obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total_deposit = []; + } + obj.voting_start_time = message.votingStartTime; + obj.voting_end_time = message.votingEndTime; + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: ProposalAminoMsg): Proposal { + return Proposal.fromAmino(object.value); + }, + toAminoMsg(message: Proposal): ProposalAminoMsg { + return { + type: "cosmos-sdk/v1/Proposal", + value: Proposal.toAmino(message) + }; + }, + fromProtoMsg(message: ProposalProtoMsg): Proposal { + return Proposal.decode(message.value); + }, + toProto(message: Proposal): Uint8Array { + return Proposal.encode(message).finish(); + }, + toProtoMsg(message: Proposal): ProposalProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.Proposal", + value: Proposal.encode(message).finish() + }; } }; function createBaseTallyResult(): TallyResult { @@ -646,6 +778,7 @@ function createBaseTallyResult(): TallyResult { }; } export const TallyResult = { + typeUrl: "/cosmos.gov.v1.TallyResult", encode(message: TallyResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.yesCount !== "") { writer.uint32(10).string(message.yesCount); @@ -734,6 +867,43 @@ export const TallyResult = { obj.no_count = message.noCount; obj.no_with_veto_count = message.noWithVetoCount; return obj; + }, + fromAmino(object: TallyResultAmino): TallyResult { + return { + yesCount: object.yes_count, + abstainCount: object.abstain_count, + noCount: object.no_count, + noWithVetoCount: object.no_with_veto_count + }; + }, + toAmino(message: TallyResult): TallyResultAmino { + const obj: any = {}; + obj.yes_count = message.yesCount; + obj.abstain_count = message.abstainCount; + obj.no_count = message.noCount; + obj.no_with_veto_count = message.noWithVetoCount; + return obj; + }, + fromAminoMsg(object: TallyResultAminoMsg): TallyResult { + return TallyResult.fromAmino(object.value); + }, + toAminoMsg(message: TallyResult): TallyResultAminoMsg { + return { + type: "cosmos-sdk/v1/TallyResult", + value: TallyResult.toAmino(message) + }; + }, + fromProtoMsg(message: TallyResultProtoMsg): TallyResult { + return TallyResult.decode(message.value); + }, + toProto(message: TallyResult): Uint8Array { + return TallyResult.encode(message).finish(); + }, + toProtoMsg(message: TallyResult): TallyResultProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.TallyResult", + value: TallyResult.encode(message).finish() + }; } }; function createBaseVote(): Vote { @@ -745,6 +915,7 @@ function createBaseVote(): Vote { }; } export const Vote = { + typeUrl: "/cosmos.gov.v1.Vote", encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -841,6 +1012,47 @@ export const Vote = { } obj.metadata = message.metadata; return obj; + }, + fromAmino(object: VoteAmino): Vote { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [], + metadata: object.metadata + }; + }, + toAmino(message: Vote): VoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + if (message.options) { + obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: VoteAminoMsg): Vote { + return Vote.fromAmino(object.value); + }, + toAminoMsg(message: Vote): VoteAminoMsg { + return { + type: "cosmos-sdk/v1/Vote", + value: Vote.toAmino(message) + }; + }, + fromProtoMsg(message: VoteProtoMsg): Vote { + return Vote.decode(message.value); + }, + toProto(message: Vote): Uint8Array { + return Vote.encode(message).finish(); + }, + toProtoMsg(message: Vote): VoteProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.Vote", + value: Vote.encode(message).finish() + }; } }; function createBaseDepositParams(): DepositParams { @@ -850,6 +1062,7 @@ function createBaseDepositParams(): DepositParams { }; } export const DepositParams = { + typeUrl: "/cosmos.gov.v1.DepositParams", encode(message: DepositParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.minDeposit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -922,6 +1135,43 @@ export const DepositParams = { } message.maxDepositPeriod !== undefined && (obj.max_deposit_period = message.maxDepositPeriod ? Duration.toSDK(message.maxDepositPeriod) : undefined); return obj; + }, + fromAmino(object: DepositParamsAmino): DepositParams { + return { + minDeposit: Array.isArray(object?.min_deposit) ? object.min_deposit.map((e: any) => Coin.fromAmino(e)) : [], + maxDepositPeriod: object?.max_deposit_period ? Duration.fromAmino(object.max_deposit_period) : undefined + }; + }, + toAmino(message: DepositParams): DepositParamsAmino { + const obj: any = {}; + if (message.minDeposit) { + obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.min_deposit = []; + } + obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; + return obj; + }, + fromAminoMsg(object: DepositParamsAminoMsg): DepositParams { + return DepositParams.fromAmino(object.value); + }, + toAminoMsg(message: DepositParams): DepositParamsAminoMsg { + return { + type: "cosmos-sdk/v1/DepositParams", + value: DepositParams.toAmino(message) + }; + }, + fromProtoMsg(message: DepositParamsProtoMsg): DepositParams { + return DepositParams.decode(message.value); + }, + toProto(message: DepositParams): Uint8Array { + return DepositParams.encode(message).finish(); + }, + toProtoMsg(message: DepositParams): DepositParamsProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.DepositParams", + value: DepositParams.encode(message).finish() + }; } }; function createBaseVotingParams(): VotingParams { @@ -930,6 +1180,7 @@ function createBaseVotingParams(): VotingParams { }; } export const VotingParams = { + typeUrl: "/cosmos.gov.v1.VotingParams", encode(message: VotingParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingPeriod !== undefined) { Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim(); @@ -982,6 +1233,37 @@ export const VotingParams = { const obj: any = {}; message.votingPeriod !== undefined && (obj.voting_period = message.votingPeriod ? Duration.toSDK(message.votingPeriod) : undefined); return obj; + }, + fromAmino(object: VotingParamsAmino): VotingParams { + return { + votingPeriod: object?.voting_period ? Duration.fromAmino(object.voting_period) : undefined + }; + }, + toAmino(message: VotingParams): VotingParamsAmino { + const obj: any = {}; + obj.voting_period = message.votingPeriod ? Duration.toAmino(message.votingPeriod) : undefined; + return obj; + }, + fromAminoMsg(object: VotingParamsAminoMsg): VotingParams { + return VotingParams.fromAmino(object.value); + }, + toAminoMsg(message: VotingParams): VotingParamsAminoMsg { + return { + type: "cosmos-sdk/v1/VotingParams", + value: VotingParams.toAmino(message) + }; + }, + fromProtoMsg(message: VotingParamsProtoMsg): VotingParams { + return VotingParams.decode(message.value); + }, + toProto(message: VotingParams): Uint8Array { + return VotingParams.encode(message).finish(); + }, + toProtoMsg(message: VotingParams): VotingParamsProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.VotingParams", + value: VotingParams.encode(message).finish() + }; } }; function createBaseTallyParams(): TallyParams { @@ -992,6 +1274,7 @@ function createBaseTallyParams(): TallyParams { }; } export const TallyParams = { + typeUrl: "/cosmos.gov.v1.TallyParams", encode(message: TallyParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quorum !== "") { writer.uint32(10).string(message.quorum); @@ -1068,5 +1351,40 @@ export const TallyParams = { obj.threshold = message.threshold; obj.veto_threshold = message.vetoThreshold; return obj; + }, + fromAmino(object: TallyParamsAmino): TallyParams { + return { + quorum: object.quorum, + threshold: object.threshold, + vetoThreshold: object.veto_threshold + }; + }, + toAmino(message: TallyParams): TallyParamsAmino { + const obj: any = {}; + obj.quorum = message.quorum; + obj.threshold = message.threshold; + obj.veto_threshold = message.vetoThreshold; + return obj; + }, + fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { + return TallyParams.fromAmino(object.value); + }, + toAminoMsg(message: TallyParams): TallyParamsAminoMsg { + return { + type: "cosmos-sdk/v1/TallyParams", + value: TallyParams.toAmino(message) + }; + }, + fromProtoMsg(message: TallyParamsProtoMsg): TallyParams { + return TallyParams.decode(message.value); + }, + toProto(message: TallyParams): Uint8Array { + return TallyParams.encode(message).finish(); + }, + toProtoMsg(message: TallyParams): TallyParamsProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.TallyParams", + value: TallyParams.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts index 3d9254839a..24c48650f5 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/query.ts @@ -195,6 +195,7 @@ function createBaseQueryProposalRequest(): QueryProposalRequest { }; } export const QueryProposalRequest = { + typeUrl: "/cosmos.gov.v1.QueryProposalRequest", encode(message: QueryProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -247,6 +248,37 @@ export const QueryProposalRequest = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: QueryProposalRequestAmino): QueryProposalRequest { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { + return QueryProposalRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalRequest): QueryProposalRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryProposalRequest", + value: QueryProposalRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalRequestProtoMsg): QueryProposalRequest { + return QueryProposalRequest.decode(message.value); + }, + toProto(message: QueryProposalRequest): Uint8Array { + return QueryProposalRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalRequest): QueryProposalRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryProposalRequest", + value: QueryProposalRequest.encode(message).finish() + }; } }; function createBaseQueryProposalResponse(): QueryProposalResponse { @@ -255,6 +287,7 @@ function createBaseQueryProposalResponse(): QueryProposalResponse { }; } export const QueryProposalResponse = { + typeUrl: "/cosmos.gov.v1.QueryProposalResponse", encode(message: QueryProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposal !== undefined) { Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim(); @@ -307,6 +340,37 @@ export const QueryProposalResponse = { const obj: any = {}; message.proposal !== undefined && (obj.proposal = message.proposal ? Proposal.toSDK(message.proposal) : undefined); return obj; + }, + fromAmino(object: QueryProposalResponseAmino): QueryProposalResponse { + return { + proposal: object?.proposal ? Proposal.fromAmino(object.proposal) : undefined + }; + }, + toAmino(message: QueryProposalResponse): QueryProposalResponseAmino { + const obj: any = {}; + obj.proposal = message.proposal ? Proposal.toAmino(message.proposal) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalResponseAminoMsg): QueryProposalResponse { + return QueryProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalResponse): QueryProposalResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryProposalResponse", + value: QueryProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalResponseProtoMsg): QueryProposalResponse { + return QueryProposalResponse.decode(message.value); + }, + toProto(message: QueryProposalResponse): Uint8Array { + return QueryProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalResponse): QueryProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryProposalResponse", + value: QueryProposalResponse.encode(message).finish() + }; } }; function createBaseQueryProposalsRequest(): QueryProposalsRequest { @@ -318,6 +382,7 @@ function createBaseQueryProposalsRequest(): QueryProposalsRequest { }; } export const QueryProposalsRequest = { + typeUrl: "/cosmos.gov.v1.QueryProposalsRequest", encode(message: QueryProposalsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalStatus !== 0) { writer.uint32(8).int32(message.proposalStatus); @@ -406,6 +471,43 @@ export const QueryProposalsRequest = { obj.depositor = message.depositor; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { + return { + proposalStatus: isSet(object.proposal_status) ? proposalStatusFromJSON(object.proposal_status) : -1, + voter: object.voter, + depositor: object.depositor, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { + const obj: any = {}; + obj.proposal_status = message.proposalStatus; + obj.voter = message.voter; + obj.depositor = message.depositor; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalsRequestAminoMsg): QueryProposalsRequest { + return QueryProposalsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalsRequest): QueryProposalsRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryProposalsRequest", + value: QueryProposalsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalsRequestProtoMsg): QueryProposalsRequest { + return QueryProposalsRequest.decode(message.value); + }, + toProto(message: QueryProposalsRequest): Uint8Array { + return QueryProposalsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalsRequest): QueryProposalsRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryProposalsRequest", + value: QueryProposalsRequest.encode(message).finish() + }; } }; function createBaseQueryProposalsResponse(): QueryProposalsResponse { @@ -415,6 +517,7 @@ function createBaseQueryProposalsResponse(): QueryProposalsResponse { }; } export const QueryProposalsResponse = { + typeUrl: "/cosmos.gov.v1.QueryProposalsResponse", encode(message: QueryProposalsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proposals) { Proposal.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -487,6 +590,43 @@ export const QueryProposalsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProposalsResponseAmino): QueryProposalsResponse { + return { + proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProposalsResponse): QueryProposalsResponseAmino { + const obj: any = {}; + if (message.proposals) { + obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); + } else { + obj.proposals = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalsResponseAminoMsg): QueryProposalsResponse { + return QueryProposalsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalsResponse): QueryProposalsResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryProposalsResponse", + value: QueryProposalsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalsResponseProtoMsg): QueryProposalsResponse { + return QueryProposalsResponse.decode(message.value); + }, + toProto(message: QueryProposalsResponse): Uint8Array { + return QueryProposalsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalsResponse): QueryProposalsResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryProposalsResponse", + value: QueryProposalsResponse.encode(message).finish() + }; } }; function createBaseQueryVoteRequest(): QueryVoteRequest { @@ -496,6 +636,7 @@ function createBaseQueryVoteRequest(): QueryVoteRequest { }; } export const QueryVoteRequest = { + typeUrl: "/cosmos.gov.v1.QueryVoteRequest", encode(message: QueryVoteRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -560,6 +701,39 @@ export const QueryVoteRequest = { obj.proposal_id = message.proposalId; obj.voter = message.voter; return obj; + }, + fromAmino(object: QueryVoteRequestAmino): QueryVoteRequest { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter + }; + }, + toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + return obj; + }, + fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { + return QueryVoteRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVoteRequest): QueryVoteRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryVoteRequest", + value: QueryVoteRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVoteRequestProtoMsg): QueryVoteRequest { + return QueryVoteRequest.decode(message.value); + }, + toProto(message: QueryVoteRequest): Uint8Array { + return QueryVoteRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVoteRequest): QueryVoteRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryVoteRequest", + value: QueryVoteRequest.encode(message).finish() + }; } }; function createBaseQueryVoteResponse(): QueryVoteResponse { @@ -568,6 +742,7 @@ function createBaseQueryVoteResponse(): QueryVoteResponse { }; } export const QueryVoteResponse = { + typeUrl: "/cosmos.gov.v1.QueryVoteResponse", encode(message: QueryVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.vote !== undefined) { Vote.encode(message.vote, writer.uint32(10).fork()).ldelim(); @@ -620,6 +795,37 @@ export const QueryVoteResponse = { const obj: any = {}; message.vote !== undefined && (obj.vote = message.vote ? Vote.toSDK(message.vote) : undefined); return obj; + }, + fromAmino(object: QueryVoteResponseAmino): QueryVoteResponse { + return { + vote: object?.vote ? Vote.fromAmino(object.vote) : undefined + }; + }, + toAmino(message: QueryVoteResponse): QueryVoteResponseAmino { + const obj: any = {}; + obj.vote = message.vote ? Vote.toAmino(message.vote) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVoteResponseAminoMsg): QueryVoteResponse { + return QueryVoteResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVoteResponse): QueryVoteResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryVoteResponse", + value: QueryVoteResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVoteResponseProtoMsg): QueryVoteResponse { + return QueryVoteResponse.decode(message.value); + }, + toProto(message: QueryVoteResponse): Uint8Array { + return QueryVoteResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVoteResponse): QueryVoteResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryVoteResponse", + value: QueryVoteResponse.encode(message).finish() + }; } }; function createBaseQueryVotesRequest(): QueryVotesRequest { @@ -629,6 +835,7 @@ function createBaseQueryVotesRequest(): QueryVotesRequest { }; } export const QueryVotesRequest = { + typeUrl: "/cosmos.gov.v1.QueryVotesRequest", encode(message: QueryVotesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -693,6 +900,39 @@ export const QueryVotesRequest = { obj.proposal_id = message.proposalId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesRequestAmino): QueryVotesRequest { + return { + proposalId: BigInt(object.proposal_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesRequestAminoMsg): QueryVotesRequest { + return QueryVotesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesRequest): QueryVotesRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryVotesRequest", + value: QueryVotesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesRequestProtoMsg): QueryVotesRequest { + return QueryVotesRequest.decode(message.value); + }, + toProto(message: QueryVotesRequest): Uint8Array { + return QueryVotesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesRequest): QueryVotesRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryVotesRequest", + value: QueryVotesRequest.encode(message).finish() + }; } }; function createBaseQueryVotesResponse(): QueryVotesResponse { @@ -702,6 +942,7 @@ function createBaseQueryVotesResponse(): QueryVotesResponse { }; } export const QueryVotesResponse = { + typeUrl: "/cosmos.gov.v1.QueryVotesResponse", encode(message: QueryVotesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -774,6 +1015,43 @@ export const QueryVotesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesResponseAmino): QueryVotesResponse { + return { + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesResponse): QueryVotesResponseAmino { + const obj: any = {}; + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesResponseAminoMsg): QueryVotesResponse { + return QueryVotesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesResponse): QueryVotesResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryVotesResponse", + value: QueryVotesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesResponseProtoMsg): QueryVotesResponse { + return QueryVotesResponse.decode(message.value); + }, + toProto(message: QueryVotesResponse): Uint8Array { + return QueryVotesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesResponse): QueryVotesResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryVotesResponse", + value: QueryVotesResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { @@ -782,6 +1060,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { }; } export const QueryParamsRequest = { + typeUrl: "/cosmos.gov.v1.QueryParamsRequest", encode(message: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.paramsType !== "") { writer.uint32(10).string(message.paramsType); @@ -834,6 +1113,37 @@ export const QueryParamsRequest = { const obj: any = {}; obj.params_type = message.paramsType; return obj; + }, + fromAmino(object: QueryParamsRequestAmino): QueryParamsRequest { + return { + paramsType: object.params_type + }; + }, + toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + obj.params_type = message.paramsType; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -844,6 +1154,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.gov.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingParams !== undefined) { VotingParams.encode(message.votingParams, writer.uint32(10).fork()).ldelim(); @@ -920,6 +1231,41 @@ export const QueryParamsResponse = { message.depositParams !== undefined && (obj.deposit_params = message.depositParams ? DepositParams.toSDK(message.depositParams) : undefined); message.tallyParams !== undefined && (obj.tally_params = message.tallyParams ? TallyParams.toSDK(message.tallyParams) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + votingParams: object?.voting_params ? VotingParams.fromAmino(object.voting_params) : undefined, + depositParams: object?.deposit_params ? DepositParams.fromAmino(object.deposit_params) : undefined, + tallyParams: object?.tally_params ? TallyParams.fromAmino(object.tally_params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; + obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; + obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryDepositRequest(): QueryDepositRequest { @@ -929,6 +1275,7 @@ function createBaseQueryDepositRequest(): QueryDepositRequest { }; } export const QueryDepositRequest = { + typeUrl: "/cosmos.gov.v1.QueryDepositRequest", encode(message: QueryDepositRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -993,6 +1340,39 @@ export const QueryDepositRequest = { obj.proposal_id = message.proposalId; obj.depositor = message.depositor; return obj; + }, + fromAmino(object: QueryDepositRequestAmino): QueryDepositRequest { + return { + proposalId: BigInt(object.proposal_id), + depositor: object.depositor + }; + }, + toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor; + return obj; + }, + fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { + return QueryDepositRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositRequest): QueryDepositRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryDepositRequest", + value: QueryDepositRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositRequestProtoMsg): QueryDepositRequest { + return QueryDepositRequest.decode(message.value); + }, + toProto(message: QueryDepositRequest): Uint8Array { + return QueryDepositRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositRequest): QueryDepositRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryDepositRequest", + value: QueryDepositRequest.encode(message).finish() + }; } }; function createBaseQueryDepositResponse(): QueryDepositResponse { @@ -1001,6 +1381,7 @@ function createBaseQueryDepositResponse(): QueryDepositResponse { }; } export const QueryDepositResponse = { + typeUrl: "/cosmos.gov.v1.QueryDepositResponse", encode(message: QueryDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deposit !== undefined) { Deposit.encode(message.deposit, writer.uint32(10).fork()).ldelim(); @@ -1053,6 +1434,37 @@ export const QueryDepositResponse = { const obj: any = {}; message.deposit !== undefined && (obj.deposit = message.deposit ? Deposit.toSDK(message.deposit) : undefined); return obj; + }, + fromAmino(object: QueryDepositResponseAmino): QueryDepositResponse { + return { + deposit: object?.deposit ? Deposit.fromAmino(object.deposit) : undefined + }; + }, + toAmino(message: QueryDepositResponse): QueryDepositResponseAmino { + const obj: any = {}; + obj.deposit = message.deposit ? Deposit.toAmino(message.deposit) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDepositResponseAminoMsg): QueryDepositResponse { + return QueryDepositResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositResponse): QueryDepositResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryDepositResponse", + value: QueryDepositResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositResponseProtoMsg): QueryDepositResponse { + return QueryDepositResponse.decode(message.value); + }, + toProto(message: QueryDepositResponse): Uint8Array { + return QueryDepositResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositResponse): QueryDepositResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryDepositResponse", + value: QueryDepositResponse.encode(message).finish() + }; } }; function createBaseQueryDepositsRequest(): QueryDepositsRequest { @@ -1062,6 +1474,7 @@ function createBaseQueryDepositsRequest(): QueryDepositsRequest { }; } export const QueryDepositsRequest = { + typeUrl: "/cosmos.gov.v1.QueryDepositsRequest", encode(message: QueryDepositsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1126,6 +1539,39 @@ export const QueryDepositsRequest = { obj.proposal_id = message.proposalId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDepositsRequestAmino): QueryDepositsRequest { + return { + proposalId: BigInt(object.proposal_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDepositsRequestAminoMsg): QueryDepositsRequest { + return QueryDepositsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositsRequest): QueryDepositsRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryDepositsRequest", + value: QueryDepositsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositsRequestProtoMsg): QueryDepositsRequest { + return QueryDepositsRequest.decode(message.value); + }, + toProto(message: QueryDepositsRequest): Uint8Array { + return QueryDepositsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositsRequest): QueryDepositsRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryDepositsRequest", + value: QueryDepositsRequest.encode(message).finish() + }; } }; function createBaseQueryDepositsResponse(): QueryDepositsResponse { @@ -1135,6 +1581,7 @@ function createBaseQueryDepositsResponse(): QueryDepositsResponse { }; } export const QueryDepositsResponse = { + typeUrl: "/cosmos.gov.v1.QueryDepositsResponse", encode(message: QueryDepositsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deposits) { Deposit.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1207,6 +1654,43 @@ export const QueryDepositsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDepositsResponseAmino): QueryDepositsResponse { + return { + deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDepositsResponse): QueryDepositsResponseAmino { + const obj: any = {}; + if (message.deposits) { + obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); + } else { + obj.deposits = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDepositsResponseAminoMsg): QueryDepositsResponse { + return QueryDepositsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositsResponse): QueryDepositsResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryDepositsResponse", + value: QueryDepositsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositsResponseProtoMsg): QueryDepositsResponse { + return QueryDepositsResponse.decode(message.value); + }, + toProto(message: QueryDepositsResponse): Uint8Array { + return QueryDepositsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositsResponse): QueryDepositsResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryDepositsResponse", + value: QueryDepositsResponse.encode(message).finish() + }; } }; function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { @@ -1215,6 +1699,7 @@ function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { }; } export const QueryTallyResultRequest = { + typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest", encode(message: QueryTallyResultRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1267,6 +1752,37 @@ export const QueryTallyResultRequest = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: QueryTallyResultRequestAmino): QueryTallyResultRequest { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { + return QueryTallyResultRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestAminoMsg { + return { + type: "cosmos-sdk/v1/QueryTallyResultRequest", + value: QueryTallyResultRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTallyResultRequestProtoMsg): QueryTallyResultRequest { + return QueryTallyResultRequest.decode(message.value); + }, + toProto(message: QueryTallyResultRequest): Uint8Array { + return QueryTallyResultRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest", + value: QueryTallyResultRequest.encode(message).finish() + }; } }; function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { @@ -1275,6 +1791,7 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { }; } export const QueryTallyResultResponse = { + typeUrl: "/cosmos.gov.v1.QueryTallyResultResponse", encode(message: QueryTallyResultResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tally !== undefined) { TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim(); @@ -1327,5 +1844,36 @@ export const QueryTallyResultResponse = { const obj: any = {}; message.tally !== undefined && (obj.tally = message.tally ? TallyResult.toSDK(message.tally) : undefined); return obj; + }, + fromAmino(object: QueryTallyResultResponseAmino): QueryTallyResultResponse { + return { + tally: object?.tally ? TallyResult.fromAmino(object.tally) : undefined + }; + }, + toAmino(message: QueryTallyResultResponse): QueryTallyResultResponseAmino { + const obj: any = {}; + obj.tally = message.tally ? TallyResult.toAmino(message.tally) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTallyResultResponseAminoMsg): QueryTallyResultResponse { + return QueryTallyResultResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseAminoMsg { + return { + type: "cosmos-sdk/v1/QueryTallyResultResponse", + value: QueryTallyResultResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTallyResultResponseProtoMsg): QueryTallyResultResponse { + return QueryTallyResultResponse.decode(message.value); + }, + toProto(message: QueryTallyResultResponse): Uint8Array { + return QueryTallyResultResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.QueryTallyResultResponse", + value: QueryTallyResultResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts index e43ce20328..77998587b2 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1/tx.ts @@ -116,6 +116,7 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal { }; } export const MsgSubmitProposal = { + typeUrl: "/cosmos.gov.v1.MsgSubmitProposal", encode(message: MsgSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.messages) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -220,6 +221,51 @@ export const MsgSubmitProposal = { obj.proposer = message.proposer; obj.metadata = message.metadata; return obj; + }, + fromAmino(object: MsgSubmitProposalAmino): MsgSubmitProposal { + return { + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [], + initialDeposit: Array.isArray(object?.initial_deposit) ? object.initial_deposit.map((e: any) => Coin.fromAmino(e)) : [], + proposer: object.proposer, + metadata: object.metadata + }; + }, + toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { + const obj: any = {}; + if (message.messages) { + obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.messages = []; + } + if (message.initialDeposit) { + obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.initial_deposit = []; + } + obj.proposer = message.proposer; + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { + return MsgSubmitProposal.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg { + return { + type: "cosmos-sdk/v1/MsgSubmitProposal", + value: MsgSubmitProposal.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal { + return MsgSubmitProposal.decode(message.value); + }, + toProto(message: MsgSubmitProposal): Uint8Array { + return MsgSubmitProposal.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgSubmitProposal", + value: MsgSubmitProposal.encode(message).finish() + }; } }; function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { @@ -228,6 +274,7 @@ function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { }; } export const MsgSubmitProposalResponse = { + typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse", encode(message: MsgSubmitProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -280,6 +327,37 @@ export const MsgSubmitProposalResponse = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: MsgSubmitProposalResponseAmino): MsgSubmitProposalResponse { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { + return MsgSubmitProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAminoMsg { + return { + type: "cosmos-sdk/v1/MsgSubmitProposalResponse", + value: MsgSubmitProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg): MsgSubmitProposalResponse { + return MsgSubmitProposalResponse.decode(message.value); + }, + toProto(message: MsgSubmitProposalResponse): Uint8Array { + return MsgSubmitProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse", + value: MsgSubmitProposalResponse.encode(message).finish() + }; } }; function createBaseMsgExecLegacyContent(): MsgExecLegacyContent { @@ -289,6 +367,7 @@ function createBaseMsgExecLegacyContent(): MsgExecLegacyContent { }; } export const MsgExecLegacyContent = { + typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent", encode(message: MsgExecLegacyContent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.content !== undefined) { Any.encode(message.content, writer.uint32(10).fork()).ldelim(); @@ -353,12 +432,46 @@ export const MsgExecLegacyContent = { message.content !== undefined && (obj.content = message.content ? Any.toSDK(message.content) : undefined); obj.authority = message.authority; return obj; + }, + fromAmino(object: MsgExecLegacyContentAmino): MsgExecLegacyContent { + return { + content: object?.content ? Any.fromAmino(object.content) : undefined, + authority: object.authority + }; + }, + toAmino(message: MsgExecLegacyContent): MsgExecLegacyContentAmino { + const obj: any = {}; + obj.content = message.content ? Any.toAmino(message.content) : undefined; + obj.authority = message.authority; + return obj; + }, + fromAminoMsg(object: MsgExecLegacyContentAminoMsg): MsgExecLegacyContent { + return MsgExecLegacyContent.fromAmino(object.value); + }, + toAminoMsg(message: MsgExecLegacyContent): MsgExecLegacyContentAminoMsg { + return { + type: "cosmos-sdk/v1/MsgExecLegacyContent", + value: MsgExecLegacyContent.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecLegacyContentProtoMsg): MsgExecLegacyContent { + return MsgExecLegacyContent.decode(message.value); + }, + toProto(message: MsgExecLegacyContent): Uint8Array { + return MsgExecLegacyContent.encode(message).finish(); + }, + toProtoMsg(message: MsgExecLegacyContent): MsgExecLegacyContentProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent", + value: MsgExecLegacyContent.encode(message).finish() + }; } }; function createBaseMsgExecLegacyContentResponse(): MsgExecLegacyContentResponse { return {}; } export const MsgExecLegacyContentResponse = { + typeUrl: "/cosmos.gov.v1.MsgExecLegacyContentResponse", encode(_: MsgExecLegacyContentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -396,6 +509,34 @@ export const MsgExecLegacyContentResponse = { toSDK(_: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgExecLegacyContentResponseAmino): MsgExecLegacyContentResponse { + return {}; + }, + toAmino(_: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgExecLegacyContentResponseAminoMsg): MsgExecLegacyContentResponse { + return MsgExecLegacyContentResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseAminoMsg { + return { + type: "cosmos-sdk/v1/MsgExecLegacyContentResponse", + value: MsgExecLegacyContentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecLegacyContentResponseProtoMsg): MsgExecLegacyContentResponse { + return MsgExecLegacyContentResponse.decode(message.value); + }, + toProto(message: MsgExecLegacyContentResponse): Uint8Array { + return MsgExecLegacyContentResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExecLegacyContentResponse): MsgExecLegacyContentResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgExecLegacyContentResponse", + value: MsgExecLegacyContentResponse.encode(message).finish() + }; } }; function createBaseMsgVote(): MsgVote { @@ -407,6 +548,7 @@ function createBaseMsgVote(): MsgVote { }; } export const MsgVote = { + typeUrl: "/cosmos.gov.v1.MsgVote", encode(message: MsgVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -495,12 +637,50 @@ export const MsgVote = { message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); obj.metadata = message.metadata; return obj; + }, + fromAmino(object: MsgVoteAmino): MsgVote { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, + metadata: object.metadata + }; + }, + toAmino(message: MsgVote): MsgVoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + obj.option = message.option; + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { + return MsgVote.fromAmino(object.value); + }, + toAminoMsg(message: MsgVote): MsgVoteAminoMsg { + return { + type: "cosmos-sdk/v1/MsgVote", + value: MsgVote.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteProtoMsg): MsgVote { + return MsgVote.decode(message.value); + }, + toProto(message: MsgVote): Uint8Array { + return MsgVote.encode(message).finish(); + }, + toProtoMsg(message: MsgVote): MsgVoteProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgVote", + value: MsgVote.encode(message).finish() + }; } }; function createBaseMsgVoteResponse(): MsgVoteResponse { return {}; } export const MsgVoteResponse = { + typeUrl: "/cosmos.gov.v1.MsgVoteResponse", encode(_: MsgVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -538,6 +718,34 @@ export const MsgVoteResponse = { toSDK(_: MsgVoteResponse): MsgVoteResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgVoteResponseAmino): MsgVoteResponse { + return {}; + }, + toAmino(_: MsgVoteResponse): MsgVoteResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgVoteResponseAminoMsg): MsgVoteResponse { + return MsgVoteResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteResponse): MsgVoteResponseAminoMsg { + return { + type: "cosmos-sdk/v1/MsgVoteResponse", + value: MsgVoteResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteResponseProtoMsg): MsgVoteResponse { + return MsgVoteResponse.decode(message.value); + }, + toProto(message: MsgVoteResponse): Uint8Array { + return MsgVoteResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteResponse): MsgVoteResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgVoteResponse", + value: MsgVoteResponse.encode(message).finish() + }; } }; function createBaseMsgVoteWeighted(): MsgVoteWeighted { @@ -549,6 +757,7 @@ function createBaseMsgVoteWeighted(): MsgVoteWeighted { }; } export const MsgVoteWeighted = { + typeUrl: "/cosmos.gov.v1.MsgVoteWeighted", encode(message: MsgVoteWeighted, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -645,12 +854,54 @@ export const MsgVoteWeighted = { } obj.metadata = message.metadata; return obj; + }, + fromAmino(object: MsgVoteWeightedAmino): MsgVoteWeighted { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [], + metadata: object.metadata + }; + }, + toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + if (message.options) { + obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { + return MsgVoteWeighted.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteWeighted): MsgVoteWeightedAminoMsg { + return { + type: "cosmos-sdk/v1/MsgVoteWeighted", + value: MsgVoteWeighted.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteWeightedProtoMsg): MsgVoteWeighted { + return MsgVoteWeighted.decode(message.value); + }, + toProto(message: MsgVoteWeighted): Uint8Array { + return MsgVoteWeighted.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteWeighted): MsgVoteWeightedProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgVoteWeighted", + value: MsgVoteWeighted.encode(message).finish() + }; } }; function createBaseMsgVoteWeightedResponse(): MsgVoteWeightedResponse { return {}; } export const MsgVoteWeightedResponse = { + typeUrl: "/cosmos.gov.v1.MsgVoteWeightedResponse", encode(_: MsgVoteWeightedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -688,6 +939,34 @@ export const MsgVoteWeightedResponse = { toSDK(_: MsgVoteWeightedResponse): MsgVoteWeightedResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgVoteWeightedResponseAmino): MsgVoteWeightedResponse { + return {}; + }, + toAmino(_: MsgVoteWeightedResponse): MsgVoteWeightedResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgVoteWeightedResponseAminoMsg): MsgVoteWeightedResponse { + return MsgVoteWeightedResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseAminoMsg { + return { + type: "cosmos-sdk/v1/MsgVoteWeightedResponse", + value: MsgVoteWeightedResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteWeightedResponseProtoMsg): MsgVoteWeightedResponse { + return MsgVoteWeightedResponse.decode(message.value); + }, + toProto(message: MsgVoteWeightedResponse): Uint8Array { + return MsgVoteWeightedResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgVoteWeightedResponse", + value: MsgVoteWeightedResponse.encode(message).finish() + }; } }; function createBaseMsgDeposit(): MsgDeposit { @@ -698,6 +977,7 @@ function createBaseMsgDeposit(): MsgDeposit { }; } export const MsgDeposit = { + typeUrl: "/cosmos.gov.v1.MsgDeposit", encode(message: MsgDeposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -782,12 +1062,52 @@ export const MsgDeposit = { obj.amount = []; } return obj; + }, + fromAmino(object: MsgDepositAmino): MsgDeposit { + return { + proposalId: BigInt(object.proposal_id), + depositor: object.depositor, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgDeposit): MsgDepositAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: MsgDepositAminoMsg): MsgDeposit { + return MsgDeposit.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeposit): MsgDepositAminoMsg { + return { + type: "cosmos-sdk/v1/MsgDeposit", + value: MsgDeposit.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositProtoMsg): MsgDeposit { + return MsgDeposit.decode(message.value); + }, + toProto(message: MsgDeposit): Uint8Array { + return MsgDeposit.encode(message).finish(); + }, + toProtoMsg(message: MsgDeposit): MsgDepositProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgDeposit", + value: MsgDeposit.encode(message).finish() + }; } }; function createBaseMsgDepositResponse(): MsgDepositResponse { return {}; } export const MsgDepositResponse = { + typeUrl: "/cosmos.gov.v1.MsgDepositResponse", encode(_: MsgDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -825,5 +1145,33 @@ export const MsgDepositResponse = { toSDK(_: MsgDepositResponse): MsgDepositResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDepositResponseAmino): MsgDepositResponse { + return {}; + }, + toAmino(_: MsgDepositResponse): MsgDepositResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDepositResponseAminoMsg): MsgDepositResponse { + return MsgDepositResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDepositResponse): MsgDepositResponseAminoMsg { + return { + type: "cosmos-sdk/v1/MsgDepositResponse", + value: MsgDepositResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositResponseProtoMsg): MsgDepositResponse { + return MsgDepositResponse.decode(message.value); + }, + toProto(message: MsgDepositResponse): Uint8Array { + return MsgDepositResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDepositResponse): MsgDepositResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1.MsgDepositResponse", + value: MsgDepositResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts index 5e3160476f..6462d5deab 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/genesis.ts @@ -41,6 +41,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.gov.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.startingProposalId !== BigInt(0)) { writer.uint32(8).uint64(message.startingProposalId); @@ -189,5 +190,60 @@ export const GenesisState = { message.votingParams !== undefined && (obj.voting_params = message.votingParams ? VotingParams.toSDK(message.votingParams) : undefined); message.tallyParams !== undefined && (obj.tally_params = message.tallyParams ? TallyParams.toSDK(message.tallyParams) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + startingProposalId: BigInt(object.starting_proposal_id), + deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromAmino(e)) : [], + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], + proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], + depositParams: object?.deposit_params ? DepositParams.fromAmino(object.deposit_params) : undefined, + votingParams: object?.voting_params ? VotingParams.fromAmino(object.voting_params) : undefined, + tallyParams: object?.tally_params ? TallyParams.fromAmino(object.tally_params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.starting_proposal_id = message.startingProposalId ? message.startingProposalId.toString() : undefined; + if (message.deposits) { + obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); + } else { + obj.deposits = []; + } + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + if (message.proposals) { + obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); + } else { + obj.proposals = []; + } + obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; + obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; + obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts index 8f65375964..3b2d050f68 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/gov.ts @@ -313,6 +313,7 @@ function createBaseWeightedVoteOption(): WeightedVoteOption { }; } export const WeightedVoteOption = { + typeUrl: "/cosmos.gov.v1beta1.WeightedVoteOption", encode(message: WeightedVoteOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.option !== 0) { writer.uint32(8).int32(message.option); @@ -377,6 +378,39 @@ export const WeightedVoteOption = { message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); obj.weight = message.weight; return obj; + }, + fromAmino(object: WeightedVoteOptionAmino): WeightedVoteOption { + return { + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, + weight: object.weight + }; + }, + toAmino(message: WeightedVoteOption): WeightedVoteOptionAmino { + const obj: any = {}; + obj.option = message.option; + obj.weight = message.weight; + return obj; + }, + fromAminoMsg(object: WeightedVoteOptionAminoMsg): WeightedVoteOption { + return WeightedVoteOption.fromAmino(object.value); + }, + toAminoMsg(message: WeightedVoteOption): WeightedVoteOptionAminoMsg { + return { + type: "cosmos-sdk/WeightedVoteOption", + value: WeightedVoteOption.toAmino(message) + }; + }, + fromProtoMsg(message: WeightedVoteOptionProtoMsg): WeightedVoteOption { + return WeightedVoteOption.decode(message.value); + }, + toProto(message: WeightedVoteOption): Uint8Array { + return WeightedVoteOption.encode(message).finish(); + }, + toProtoMsg(message: WeightedVoteOption): WeightedVoteOptionProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.WeightedVoteOption", + value: WeightedVoteOption.encode(message).finish() + }; } }; function createBaseTextProposal(): TextProposal { @@ -386,6 +420,7 @@ function createBaseTextProposal(): TextProposal { }; } export const TextProposal = { + typeUrl: "/cosmos.gov.v1beta1.TextProposal", encode(message: TextProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -450,6 +485,39 @@ export const TextProposal = { obj.title = message.title; obj.description = message.description; return obj; + }, + fromAmino(object: TextProposalAmino): TextProposal { + return { + title: object.title, + description: object.description + }; + }, + toAmino(message: TextProposal): TextProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: TextProposalAminoMsg): TextProposal { + return TextProposal.fromAmino(object.value); + }, + toAminoMsg(message: TextProposal): TextProposalAminoMsg { + return { + type: "cosmos-sdk/TextProposal", + value: TextProposal.toAmino(message) + }; + }, + fromProtoMsg(message: TextProposalProtoMsg): TextProposal { + return TextProposal.decode(message.value); + }, + toProto(message: TextProposal): Uint8Array { + return TextProposal.encode(message).finish(); + }, + toProtoMsg(message: TextProposal): TextProposalProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.TextProposal", + value: TextProposal.encode(message).finish() + }; } }; function createBaseDeposit(): Deposit { @@ -460,6 +528,7 @@ function createBaseDeposit(): Deposit { }; } export const Deposit = { + typeUrl: "/cosmos.gov.v1beta1.Deposit", encode(message: Deposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -544,6 +613,45 @@ export const Deposit = { obj.amount = []; } return obj; + }, + fromAmino(object: DepositAmino): Deposit { + return { + proposalId: BigInt(object.proposal_id), + depositor: object.depositor, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Deposit): DepositAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: DepositAminoMsg): Deposit { + return Deposit.fromAmino(object.value); + }, + toAminoMsg(message: Deposit): DepositAminoMsg { + return { + type: "cosmos-sdk/Deposit", + value: Deposit.toAmino(message) + }; + }, + fromProtoMsg(message: DepositProtoMsg): Deposit { + return Deposit.decode(message.value); + }, + toProto(message: Deposit): Uint8Array { + return Deposit.encode(message).finish(); + }, + toProtoMsg(message: Deposit): DepositProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.Deposit", + value: Deposit.encode(message).finish() + }; } }; function createBaseProposal(): Proposal { @@ -560,6 +668,7 @@ function createBaseProposal(): Proposal { }; } export const Proposal = { + typeUrl: "/cosmos.gov.v1beta1.Proposal", encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -716,6 +825,57 @@ export const Proposal = { message.votingStartTime !== undefined && (obj.voting_start_time = message.votingStartTime ?? undefined); message.votingEndTime !== undefined && (obj.voting_end_time = message.votingEndTime ?? undefined); return obj; + }, + fromAmino(object: ProposalAmino): Proposal { + return { + proposalId: BigInt(object.proposal_id), + content: object?.content ? Any.fromAmino(object.content) : undefined, + status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, + finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined, + submitTime: object.submit_time, + depositEndTime: object.deposit_end_time, + totalDeposit: Array.isArray(object?.total_deposit) ? object.total_deposit.map((e: any) => Coin.fromAmino(e)) : [], + votingStartTime: object.voting_start_time, + votingEndTime: object.voting_end_time + }; + }, + toAmino(message: Proposal): ProposalAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.content = message.content ? Any.toAmino(message.content) : undefined; + obj.status = message.status; + obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; + obj.submit_time = message.submitTime; + obj.deposit_end_time = message.depositEndTime; + if (message.totalDeposit) { + obj.total_deposit = message.totalDeposit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total_deposit = []; + } + obj.voting_start_time = message.votingStartTime; + obj.voting_end_time = message.votingEndTime; + return obj; + }, + fromAminoMsg(object: ProposalAminoMsg): Proposal { + return Proposal.fromAmino(object.value); + }, + toAminoMsg(message: Proposal): ProposalAminoMsg { + return { + type: "cosmos-sdk/Proposal", + value: Proposal.toAmino(message) + }; + }, + fromProtoMsg(message: ProposalProtoMsg): Proposal { + return Proposal.decode(message.value); + }, + toProto(message: Proposal): Uint8Array { + return Proposal.encode(message).finish(); + }, + toProtoMsg(message: Proposal): ProposalProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.Proposal", + value: Proposal.encode(message).finish() + }; } }; function createBaseTallyResult(): TallyResult { @@ -727,6 +887,7 @@ function createBaseTallyResult(): TallyResult { }; } export const TallyResult = { + typeUrl: "/cosmos.gov.v1beta1.TallyResult", encode(message: TallyResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.yes !== "") { writer.uint32(10).string(message.yes); @@ -815,6 +976,43 @@ export const TallyResult = { obj.no = message.no; obj.no_with_veto = message.noWithVeto; return obj; + }, + fromAmino(object: TallyResultAmino): TallyResult { + return { + yes: object.yes, + abstain: object.abstain, + no: object.no, + noWithVeto: object.no_with_veto + }; + }, + toAmino(message: TallyResult): TallyResultAmino { + const obj: any = {}; + obj.yes = message.yes; + obj.abstain = message.abstain; + obj.no = message.no; + obj.no_with_veto = message.noWithVeto; + return obj; + }, + fromAminoMsg(object: TallyResultAminoMsg): TallyResult { + return TallyResult.fromAmino(object.value); + }, + toAminoMsg(message: TallyResult): TallyResultAminoMsg { + return { + type: "cosmos-sdk/TallyResult", + value: TallyResult.toAmino(message) + }; + }, + fromProtoMsg(message: TallyResultProtoMsg): TallyResult { + return TallyResult.decode(message.value); + }, + toProto(message: TallyResult): Uint8Array { + return TallyResult.encode(message).finish(); + }, + toProtoMsg(message: TallyResult): TallyResultProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.TallyResult", + value: TallyResult.encode(message).finish() + }; } }; function createBaseVote(): Vote { @@ -826,6 +1024,7 @@ function createBaseVote(): Vote { }; } export const Vote = { + typeUrl: "/cosmos.gov.v1beta1.Vote", encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -922,6 +1121,47 @@ export const Vote = { obj.options = []; } return obj; + }, + fromAmino(object: VoteAmino): Vote { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, + options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [] + }; + }, + toAmino(message: Vote): VoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + obj.option = message.option; + if (message.options) { + obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); + } else { + obj.options = []; + } + return obj; + }, + fromAminoMsg(object: VoteAminoMsg): Vote { + return Vote.fromAmino(object.value); + }, + toAminoMsg(message: Vote): VoteAminoMsg { + return { + type: "cosmos-sdk/Vote", + value: Vote.toAmino(message) + }; + }, + fromProtoMsg(message: VoteProtoMsg): Vote { + return Vote.decode(message.value); + }, + toProto(message: Vote): Uint8Array { + return Vote.encode(message).finish(); + }, + toProtoMsg(message: Vote): VoteProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.Vote", + value: Vote.encode(message).finish() + }; } }; function createBaseDepositParams(): DepositParams { @@ -931,6 +1171,7 @@ function createBaseDepositParams(): DepositParams { }; } export const DepositParams = { + typeUrl: "/cosmos.gov.v1beta1.DepositParams", encode(message: DepositParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.minDeposit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1003,6 +1244,43 @@ export const DepositParams = { } message.maxDepositPeriod !== undefined && (obj.max_deposit_period = message.maxDepositPeriod ? Duration.toSDK(message.maxDepositPeriod) : undefined); return obj; + }, + fromAmino(object: DepositParamsAmino): DepositParams { + return { + minDeposit: Array.isArray(object?.min_deposit) ? object.min_deposit.map((e: any) => Coin.fromAmino(e)) : [], + maxDepositPeriod: object?.max_deposit_period ? Duration.fromAmino(object.max_deposit_period) : undefined + }; + }, + toAmino(message: DepositParams): DepositParamsAmino { + const obj: any = {}; + if (message.minDeposit) { + obj.min_deposit = message.minDeposit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.min_deposit = []; + } + obj.max_deposit_period = message.maxDepositPeriod ? Duration.toAmino(message.maxDepositPeriod) : undefined; + return obj; + }, + fromAminoMsg(object: DepositParamsAminoMsg): DepositParams { + return DepositParams.fromAmino(object.value); + }, + toAminoMsg(message: DepositParams): DepositParamsAminoMsg { + return { + type: "cosmos-sdk/DepositParams", + value: DepositParams.toAmino(message) + }; + }, + fromProtoMsg(message: DepositParamsProtoMsg): DepositParams { + return DepositParams.decode(message.value); + }, + toProto(message: DepositParams): Uint8Array { + return DepositParams.encode(message).finish(); + }, + toProtoMsg(message: DepositParams): DepositParamsProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.DepositParams", + value: DepositParams.encode(message).finish() + }; } }; function createBaseVotingParams(): VotingParams { @@ -1011,6 +1289,7 @@ function createBaseVotingParams(): VotingParams { }; } export const VotingParams = { + typeUrl: "/cosmos.gov.v1beta1.VotingParams", encode(message: VotingParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingPeriod !== undefined) { Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim(); @@ -1063,6 +1342,37 @@ export const VotingParams = { const obj: any = {}; message.votingPeriod !== undefined && (obj.voting_period = message.votingPeriod ? Duration.toSDK(message.votingPeriod) : undefined); return obj; + }, + fromAmino(object: VotingParamsAmino): VotingParams { + return { + votingPeriod: object?.voting_period ? Duration.fromAmino(object.voting_period) : undefined + }; + }, + toAmino(message: VotingParams): VotingParamsAmino { + const obj: any = {}; + obj.voting_period = message.votingPeriod ? Duration.toAmino(message.votingPeriod) : undefined; + return obj; + }, + fromAminoMsg(object: VotingParamsAminoMsg): VotingParams { + return VotingParams.fromAmino(object.value); + }, + toAminoMsg(message: VotingParams): VotingParamsAminoMsg { + return { + type: "cosmos-sdk/VotingParams", + value: VotingParams.toAmino(message) + }; + }, + fromProtoMsg(message: VotingParamsProtoMsg): VotingParams { + return VotingParams.decode(message.value); + }, + toProto(message: VotingParams): Uint8Array { + return VotingParams.encode(message).finish(); + }, + toProtoMsg(message: VotingParams): VotingParamsProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.VotingParams", + value: VotingParams.encode(message).finish() + }; } }; function createBaseTallyParams(): TallyParams { @@ -1073,6 +1383,7 @@ function createBaseTallyParams(): TallyParams { }; } export const TallyParams = { + typeUrl: "/cosmos.gov.v1beta1.TallyParams", encode(message: TallyParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quorum.length !== 0) { writer.uint32(10).bytes(message.quorum); @@ -1149,5 +1460,40 @@ export const TallyParams = { obj.threshold = message.threshold; obj.veto_threshold = message.vetoThreshold; return obj; + }, + fromAmino(object: TallyParamsAmino): TallyParams { + return { + quorum: object.quorum, + threshold: object.threshold, + vetoThreshold: object.veto_threshold + }; + }, + toAmino(message: TallyParams): TallyParamsAmino { + const obj: any = {}; + obj.quorum = message.quorum; + obj.threshold = message.threshold; + obj.veto_threshold = message.vetoThreshold; + return obj; + }, + fromAminoMsg(object: TallyParamsAminoMsg): TallyParams { + return TallyParams.fromAmino(object.value); + }, + toAminoMsg(message: TallyParams): TallyParamsAminoMsg { + return { + type: "cosmos-sdk/TallyParams", + value: TallyParams.toAmino(message) + }; + }, + fromProtoMsg(message: TallyParamsProtoMsg): TallyParams { + return TallyParams.decode(message.value); + }, + toProto(message: TallyParams): Uint8Array { + return TallyParams.encode(message).finish(); + }, + toProtoMsg(message: TallyParams): TallyParamsProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.TallyParams", + value: TallyParams.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts index 2bb9446bf7..c397400869 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/query.ts @@ -195,6 +195,7 @@ function createBaseQueryProposalRequest(): QueryProposalRequest { }; } export const QueryProposalRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest", encode(message: QueryProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -247,6 +248,37 @@ export const QueryProposalRequest = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: QueryProposalRequestAmino): QueryProposalRequest { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { + return QueryProposalRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalRequest): QueryProposalRequestAminoMsg { + return { + type: "cosmos-sdk/QueryProposalRequest", + value: QueryProposalRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalRequestProtoMsg): QueryProposalRequest { + return QueryProposalRequest.decode(message.value); + }, + toProto(message: QueryProposalRequest): Uint8Array { + return QueryProposalRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalRequest): QueryProposalRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest", + value: QueryProposalRequest.encode(message).finish() + }; } }; function createBaseQueryProposalResponse(): QueryProposalResponse { @@ -255,6 +287,7 @@ function createBaseQueryProposalResponse(): QueryProposalResponse { }; } export const QueryProposalResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalResponse", encode(message: QueryProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposal !== undefined) { Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim(); @@ -307,6 +340,37 @@ export const QueryProposalResponse = { const obj: any = {}; message.proposal !== undefined && (obj.proposal = message.proposal ? Proposal.toSDK(message.proposal) : undefined); return obj; + }, + fromAmino(object: QueryProposalResponseAmino): QueryProposalResponse { + return { + proposal: object?.proposal ? Proposal.fromAmino(object.proposal) : undefined + }; + }, + toAmino(message: QueryProposalResponse): QueryProposalResponseAmino { + const obj: any = {}; + obj.proposal = message.proposal ? Proposal.toAmino(message.proposal) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalResponseAminoMsg): QueryProposalResponse { + return QueryProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalResponse): QueryProposalResponseAminoMsg { + return { + type: "cosmos-sdk/QueryProposalResponse", + value: QueryProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalResponseProtoMsg): QueryProposalResponse { + return QueryProposalResponse.decode(message.value); + }, + toProto(message: QueryProposalResponse): Uint8Array { + return QueryProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalResponse): QueryProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalResponse", + value: QueryProposalResponse.encode(message).finish() + }; } }; function createBaseQueryProposalsRequest(): QueryProposalsRequest { @@ -318,6 +382,7 @@ function createBaseQueryProposalsRequest(): QueryProposalsRequest { }; } export const QueryProposalsRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalsRequest", encode(message: QueryProposalsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalStatus !== 0) { writer.uint32(8).int32(message.proposalStatus); @@ -406,6 +471,43 @@ export const QueryProposalsRequest = { obj.depositor = message.depositor; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProposalsRequestAmino): QueryProposalsRequest { + return { + proposalStatus: isSet(object.proposal_status) ? proposalStatusFromJSON(object.proposal_status) : -1, + voter: object.voter, + depositor: object.depositor, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProposalsRequest): QueryProposalsRequestAmino { + const obj: any = {}; + obj.proposal_status = message.proposalStatus; + obj.voter = message.voter; + obj.depositor = message.depositor; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalsRequestAminoMsg): QueryProposalsRequest { + return QueryProposalsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalsRequest): QueryProposalsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryProposalsRequest", + value: QueryProposalsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalsRequestProtoMsg): QueryProposalsRequest { + return QueryProposalsRequest.decode(message.value); + }, + toProto(message: QueryProposalsRequest): Uint8Array { + return QueryProposalsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalsRequest): QueryProposalsRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalsRequest", + value: QueryProposalsRequest.encode(message).finish() + }; } }; function createBaseQueryProposalsResponse(): QueryProposalsResponse { @@ -415,6 +517,7 @@ function createBaseQueryProposalsResponse(): QueryProposalsResponse { }; } export const QueryProposalsResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalsResponse", encode(message: QueryProposalsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proposals) { Proposal.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -487,6 +590,43 @@ export const QueryProposalsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProposalsResponseAmino): QueryProposalsResponse { + return { + proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProposalsResponse): QueryProposalsResponseAmino { + const obj: any = {}; + if (message.proposals) { + obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); + } else { + obj.proposals = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalsResponseAminoMsg): QueryProposalsResponse { + return QueryProposalsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalsResponse): QueryProposalsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryProposalsResponse", + value: QueryProposalsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalsResponseProtoMsg): QueryProposalsResponse { + return QueryProposalsResponse.decode(message.value); + }, + toProto(message: QueryProposalsResponse): Uint8Array { + return QueryProposalsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalsResponse): QueryProposalsResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryProposalsResponse", + value: QueryProposalsResponse.encode(message).finish() + }; } }; function createBaseQueryVoteRequest(): QueryVoteRequest { @@ -496,6 +636,7 @@ function createBaseQueryVoteRequest(): QueryVoteRequest { }; } export const QueryVoteRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryVoteRequest", encode(message: QueryVoteRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -560,6 +701,39 @@ export const QueryVoteRequest = { obj.proposal_id = message.proposalId; obj.voter = message.voter; return obj; + }, + fromAmino(object: QueryVoteRequestAmino): QueryVoteRequest { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter + }; + }, + toAmino(message: QueryVoteRequest): QueryVoteRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + return obj; + }, + fromAminoMsg(object: QueryVoteRequestAminoMsg): QueryVoteRequest { + return QueryVoteRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVoteRequest): QueryVoteRequestAminoMsg { + return { + type: "cosmos-sdk/QueryVoteRequest", + value: QueryVoteRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVoteRequestProtoMsg): QueryVoteRequest { + return QueryVoteRequest.decode(message.value); + }, + toProto(message: QueryVoteRequest): Uint8Array { + return QueryVoteRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVoteRequest): QueryVoteRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryVoteRequest", + value: QueryVoteRequest.encode(message).finish() + }; } }; function createBaseQueryVoteResponse(): QueryVoteResponse { @@ -568,6 +742,7 @@ function createBaseQueryVoteResponse(): QueryVoteResponse { }; } export const QueryVoteResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryVoteResponse", encode(message: QueryVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.vote !== undefined) { Vote.encode(message.vote, writer.uint32(10).fork()).ldelim(); @@ -620,6 +795,37 @@ export const QueryVoteResponse = { const obj: any = {}; message.vote !== undefined && (obj.vote = message.vote ? Vote.toSDK(message.vote) : undefined); return obj; + }, + fromAmino(object: QueryVoteResponseAmino): QueryVoteResponse { + return { + vote: object?.vote ? Vote.fromAmino(object.vote) : undefined + }; + }, + toAmino(message: QueryVoteResponse): QueryVoteResponseAmino { + const obj: any = {}; + obj.vote = message.vote ? Vote.toAmino(message.vote) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVoteResponseAminoMsg): QueryVoteResponse { + return QueryVoteResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVoteResponse): QueryVoteResponseAminoMsg { + return { + type: "cosmos-sdk/QueryVoteResponse", + value: QueryVoteResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVoteResponseProtoMsg): QueryVoteResponse { + return QueryVoteResponse.decode(message.value); + }, + toProto(message: QueryVoteResponse): Uint8Array { + return QueryVoteResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVoteResponse): QueryVoteResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryVoteResponse", + value: QueryVoteResponse.encode(message).finish() + }; } }; function createBaseQueryVotesRequest(): QueryVotesRequest { @@ -629,6 +835,7 @@ function createBaseQueryVotesRequest(): QueryVotesRequest { }; } export const QueryVotesRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryVotesRequest", encode(message: QueryVotesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -693,6 +900,39 @@ export const QueryVotesRequest = { obj.proposal_id = message.proposalId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesRequestAmino): QueryVotesRequest { + return { + proposalId: BigInt(object.proposal_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesRequest): QueryVotesRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesRequestAminoMsg): QueryVotesRequest { + return QueryVotesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesRequest): QueryVotesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryVotesRequest", + value: QueryVotesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesRequestProtoMsg): QueryVotesRequest { + return QueryVotesRequest.decode(message.value); + }, + toProto(message: QueryVotesRequest): Uint8Array { + return QueryVotesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesRequest): QueryVotesRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryVotesRequest", + value: QueryVotesRequest.encode(message).finish() + }; } }; function createBaseQueryVotesResponse(): QueryVotesResponse { @@ -702,6 +942,7 @@ function createBaseQueryVotesResponse(): QueryVotesResponse { }; } export const QueryVotesResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryVotesResponse", encode(message: QueryVotesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -774,6 +1015,43 @@ export const QueryVotesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesResponseAmino): QueryVotesResponse { + return { + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesResponse): QueryVotesResponseAmino { + const obj: any = {}; + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesResponseAminoMsg): QueryVotesResponse { + return QueryVotesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesResponse): QueryVotesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryVotesResponse", + value: QueryVotesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesResponseProtoMsg): QueryVotesResponse { + return QueryVotesResponse.decode(message.value); + }, + toProto(message: QueryVotesResponse): Uint8Array { + return QueryVotesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesResponse): QueryVotesResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryVotesResponse", + value: QueryVotesResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { @@ -782,6 +1060,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { }; } export const QueryParamsRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryParamsRequest", encode(message: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.paramsType !== "") { writer.uint32(10).string(message.paramsType); @@ -834,6 +1113,37 @@ export const QueryParamsRequest = { const obj: any = {}; obj.params_type = message.paramsType; return obj; + }, + fromAmino(object: QueryParamsRequestAmino): QueryParamsRequest { + return { + paramsType: object.params_type + }; + }, + toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + obj.params_type = message.paramsType; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -844,6 +1154,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingParams !== undefined) { VotingParams.encode(message.votingParams, writer.uint32(10).fork()).ldelim(); @@ -920,6 +1231,41 @@ export const QueryParamsResponse = { message.depositParams !== undefined && (obj.deposit_params = message.depositParams ? DepositParams.toSDK(message.depositParams) : undefined); message.tallyParams !== undefined && (obj.tally_params = message.tallyParams ? TallyParams.toSDK(message.tallyParams) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + votingParams: object?.voting_params ? VotingParams.fromAmino(object.voting_params) : undefined, + depositParams: object?.deposit_params ? DepositParams.fromAmino(object.deposit_params) : undefined, + tallyParams: object?.tally_params ? TallyParams.fromAmino(object.tally_params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.voting_params = message.votingParams ? VotingParams.toAmino(message.votingParams) : undefined; + obj.deposit_params = message.depositParams ? DepositParams.toAmino(message.depositParams) : undefined; + obj.tally_params = message.tallyParams ? TallyParams.toAmino(message.tallyParams) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryDepositRequest(): QueryDepositRequest { @@ -929,6 +1275,7 @@ function createBaseQueryDepositRequest(): QueryDepositRequest { }; } export const QueryDepositRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositRequest", encode(message: QueryDepositRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -993,6 +1340,39 @@ export const QueryDepositRequest = { obj.proposal_id = message.proposalId; obj.depositor = message.depositor; return obj; + }, + fromAmino(object: QueryDepositRequestAmino): QueryDepositRequest { + return { + proposalId: BigInt(object.proposal_id), + depositor: object.depositor + }; + }, + toAmino(message: QueryDepositRequest): QueryDepositRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor; + return obj; + }, + fromAminoMsg(object: QueryDepositRequestAminoMsg): QueryDepositRequest { + return QueryDepositRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositRequest): QueryDepositRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDepositRequest", + value: QueryDepositRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositRequestProtoMsg): QueryDepositRequest { + return QueryDepositRequest.decode(message.value); + }, + toProto(message: QueryDepositRequest): Uint8Array { + return QueryDepositRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositRequest): QueryDepositRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositRequest", + value: QueryDepositRequest.encode(message).finish() + }; } }; function createBaseQueryDepositResponse(): QueryDepositResponse { @@ -1001,6 +1381,7 @@ function createBaseQueryDepositResponse(): QueryDepositResponse { }; } export const QueryDepositResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositResponse", encode(message: QueryDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deposit !== undefined) { Deposit.encode(message.deposit, writer.uint32(10).fork()).ldelim(); @@ -1053,6 +1434,37 @@ export const QueryDepositResponse = { const obj: any = {}; message.deposit !== undefined && (obj.deposit = message.deposit ? Deposit.toSDK(message.deposit) : undefined); return obj; + }, + fromAmino(object: QueryDepositResponseAmino): QueryDepositResponse { + return { + deposit: object?.deposit ? Deposit.fromAmino(object.deposit) : undefined + }; + }, + toAmino(message: QueryDepositResponse): QueryDepositResponseAmino { + const obj: any = {}; + obj.deposit = message.deposit ? Deposit.toAmino(message.deposit) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDepositResponseAminoMsg): QueryDepositResponse { + return QueryDepositResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositResponse): QueryDepositResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDepositResponse", + value: QueryDepositResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositResponseProtoMsg): QueryDepositResponse { + return QueryDepositResponse.decode(message.value); + }, + toProto(message: QueryDepositResponse): Uint8Array { + return QueryDepositResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositResponse): QueryDepositResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositResponse", + value: QueryDepositResponse.encode(message).finish() + }; } }; function createBaseQueryDepositsRequest(): QueryDepositsRequest { @@ -1062,6 +1474,7 @@ function createBaseQueryDepositsRequest(): QueryDepositsRequest { }; } export const QueryDepositsRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositsRequest", encode(message: QueryDepositsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1126,6 +1539,39 @@ export const QueryDepositsRequest = { obj.proposal_id = message.proposalId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDepositsRequestAmino): QueryDepositsRequest { + return { + proposalId: BigInt(object.proposal_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDepositsRequest): QueryDepositsRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDepositsRequestAminoMsg): QueryDepositsRequest { + return QueryDepositsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositsRequest): QueryDepositsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDepositsRequest", + value: QueryDepositsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositsRequestProtoMsg): QueryDepositsRequest { + return QueryDepositsRequest.decode(message.value); + }, + toProto(message: QueryDepositsRequest): Uint8Array { + return QueryDepositsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositsRequest): QueryDepositsRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositsRequest", + value: QueryDepositsRequest.encode(message).finish() + }; } }; function createBaseQueryDepositsResponse(): QueryDepositsResponse { @@ -1135,6 +1581,7 @@ function createBaseQueryDepositsResponse(): QueryDepositsResponse { }; } export const QueryDepositsResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositsResponse", encode(message: QueryDepositsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deposits) { Deposit.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1207,6 +1654,43 @@ export const QueryDepositsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDepositsResponseAmino): QueryDepositsResponse { + return { + deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDepositsResponse): QueryDepositsResponseAmino { + const obj: any = {}; + if (message.deposits) { + obj.deposits = message.deposits.map(e => e ? Deposit.toAmino(e) : undefined); + } else { + obj.deposits = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDepositsResponseAminoMsg): QueryDepositsResponse { + return QueryDepositsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDepositsResponse): QueryDepositsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDepositsResponse", + value: QueryDepositsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDepositsResponseProtoMsg): QueryDepositsResponse { + return QueryDepositsResponse.decode(message.value); + }, + toProto(message: QueryDepositsResponse): Uint8Array { + return QueryDepositsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDepositsResponse): QueryDepositsResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryDepositsResponse", + value: QueryDepositsResponse.encode(message).finish() + }; } }; function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { @@ -1215,6 +1699,7 @@ function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { }; } export const QueryTallyResultRequest = { + typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest", encode(message: QueryTallyResultRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1267,6 +1752,37 @@ export const QueryTallyResultRequest = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: QueryTallyResultRequestAmino): QueryTallyResultRequest { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { + return QueryTallyResultRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestAminoMsg { + return { + type: "cosmos-sdk/QueryTallyResultRequest", + value: QueryTallyResultRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTallyResultRequestProtoMsg): QueryTallyResultRequest { + return QueryTallyResultRequest.decode(message.value); + }, + toProto(message: QueryTallyResultRequest): Uint8Array { + return QueryTallyResultRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest", + value: QueryTallyResultRequest.encode(message).finish() + }; } }; function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { @@ -1275,6 +1791,7 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { }; } export const QueryTallyResultResponse = { + typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultResponse", encode(message: QueryTallyResultResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tally !== undefined) { TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim(); @@ -1327,5 +1844,36 @@ export const QueryTallyResultResponse = { const obj: any = {}; message.tally !== undefined && (obj.tally = message.tally ? TallyResult.toSDK(message.tally) : undefined); return obj; + }, + fromAmino(object: QueryTallyResultResponseAmino): QueryTallyResultResponse { + return { + tally: object?.tally ? TallyResult.fromAmino(object.tally) : undefined + }; + }, + toAmino(message: QueryTallyResultResponse): QueryTallyResultResponseAmino { + const obj: any = {}; + obj.tally = message.tally ? TallyResult.toAmino(message.tally) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTallyResultResponseAminoMsg): QueryTallyResultResponse { + return QueryTallyResultResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseAminoMsg { + return { + type: "cosmos-sdk/QueryTallyResultResponse", + value: QueryTallyResultResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTallyResultResponseProtoMsg): QueryTallyResultResponse { + return QueryTallyResultResponse.decode(message.value); + }, + toProto(message: QueryTallyResultResponse): Uint8Array { + return QueryTallyResultResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultResponse", + value: QueryTallyResultResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts index 2563d706ea..643e413157 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/gov/v1beta1/tx.ts @@ -102,6 +102,7 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal { }; } export const MsgSubmitProposal = { + typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal", encode(message: MsgSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.content !== undefined) { Any.encode(message.content, writer.uint32(10).fork()).ldelim(); @@ -186,6 +187,45 @@ export const MsgSubmitProposal = { } obj.proposer = message.proposer; return obj; + }, + fromAmino(object: MsgSubmitProposalAmino): MsgSubmitProposal { + return { + content: object?.content ? Any.fromAmino(object.content) : undefined, + initialDeposit: Array.isArray(object?.initial_deposit) ? object.initial_deposit.map((e: any) => Coin.fromAmino(e)) : [], + proposer: object.proposer + }; + }, + toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { + const obj: any = {}; + obj.content = message.content ? Any.toAmino(message.content) : undefined; + if (message.initialDeposit) { + obj.initial_deposit = message.initialDeposit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.initial_deposit = []; + } + obj.proposer = message.proposer; + return obj; + }, + fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { + return MsgSubmitProposal.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitProposal", + value: MsgSubmitProposal.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal { + return MsgSubmitProposal.decode(message.value); + }, + toProto(message: MsgSubmitProposal): Uint8Array { + return MsgSubmitProposal.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal", + value: MsgSubmitProposal.encode(message).finish() + }; } }; function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { @@ -194,6 +234,7 @@ function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { }; } export const MsgSubmitProposalResponse = { + typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse", encode(message: MsgSubmitProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -246,6 +287,37 @@ export const MsgSubmitProposalResponse = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: MsgSubmitProposalResponseAmino): MsgSubmitProposalResponse { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { + return MsgSubmitProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitProposalResponse", + value: MsgSubmitProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg): MsgSubmitProposalResponse { + return MsgSubmitProposalResponse.decode(message.value); + }, + toProto(message: MsgSubmitProposalResponse): Uint8Array { + return MsgSubmitProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse", + value: MsgSubmitProposalResponse.encode(message).finish() + }; } }; function createBaseMsgVote(): MsgVote { @@ -256,6 +328,7 @@ function createBaseMsgVote(): MsgVote { }; } export const MsgVote = { + typeUrl: "/cosmos.gov.v1beta1.MsgVote", encode(message: MsgVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -332,12 +405,48 @@ export const MsgVote = { obj.voter = message.voter; message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); return obj; + }, + fromAmino(object: MsgVoteAmino): MsgVote { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1 + }; + }, + toAmino(message: MsgVote): MsgVoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + obj.option = message.option; + return obj; + }, + fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { + return MsgVote.fromAmino(object.value); + }, + toAminoMsg(message: MsgVote): MsgVoteAminoMsg { + return { + type: "cosmos-sdk/MsgVote", + value: MsgVote.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteProtoMsg): MsgVote { + return MsgVote.decode(message.value); + }, + toProto(message: MsgVote): Uint8Array { + return MsgVote.encode(message).finish(); + }, + toProtoMsg(message: MsgVote): MsgVoteProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgVote", + value: MsgVote.encode(message).finish() + }; } }; function createBaseMsgVoteResponse(): MsgVoteResponse { return {}; } export const MsgVoteResponse = { + typeUrl: "/cosmos.gov.v1beta1.MsgVoteResponse", encode(_: MsgVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -375,6 +484,34 @@ export const MsgVoteResponse = { toSDK(_: MsgVoteResponse): MsgVoteResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgVoteResponseAmino): MsgVoteResponse { + return {}; + }, + toAmino(_: MsgVoteResponse): MsgVoteResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgVoteResponseAminoMsg): MsgVoteResponse { + return MsgVoteResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteResponse): MsgVoteResponseAminoMsg { + return { + type: "cosmos-sdk/MsgVoteResponse", + value: MsgVoteResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteResponseProtoMsg): MsgVoteResponse { + return MsgVoteResponse.decode(message.value); + }, + toProto(message: MsgVoteResponse): Uint8Array { + return MsgVoteResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteResponse): MsgVoteResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgVoteResponse", + value: MsgVoteResponse.encode(message).finish() + }; } }; function createBaseMsgVoteWeighted(): MsgVoteWeighted { @@ -385,6 +522,7 @@ function createBaseMsgVoteWeighted(): MsgVoteWeighted { }; } export const MsgVoteWeighted = { + typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeighted", encode(message: MsgVoteWeighted, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -469,12 +607,52 @@ export const MsgVoteWeighted = { obj.options = []; } return obj; + }, + fromAmino(object: MsgVoteWeightedAmino): MsgVoteWeighted { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgVoteWeighted): MsgVoteWeightedAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + if (message.options) { + obj.options = message.options.map(e => e ? WeightedVoteOption.toAmino(e) : undefined); + } else { + obj.options = []; + } + return obj; + }, + fromAminoMsg(object: MsgVoteWeightedAminoMsg): MsgVoteWeighted { + return MsgVoteWeighted.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteWeighted): MsgVoteWeightedAminoMsg { + return { + type: "cosmos-sdk/MsgVoteWeighted", + value: MsgVoteWeighted.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteWeightedProtoMsg): MsgVoteWeighted { + return MsgVoteWeighted.decode(message.value); + }, + toProto(message: MsgVoteWeighted): Uint8Array { + return MsgVoteWeighted.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteWeighted): MsgVoteWeightedProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeighted", + value: MsgVoteWeighted.encode(message).finish() + }; } }; function createBaseMsgVoteWeightedResponse(): MsgVoteWeightedResponse { return {}; } export const MsgVoteWeightedResponse = { + typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeightedResponse", encode(_: MsgVoteWeightedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -512,6 +690,34 @@ export const MsgVoteWeightedResponse = { toSDK(_: MsgVoteWeightedResponse): MsgVoteWeightedResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgVoteWeightedResponseAmino): MsgVoteWeightedResponse { + return {}; + }, + toAmino(_: MsgVoteWeightedResponse): MsgVoteWeightedResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgVoteWeightedResponseAminoMsg): MsgVoteWeightedResponse { + return MsgVoteWeightedResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseAminoMsg { + return { + type: "cosmos-sdk/MsgVoteWeightedResponse", + value: MsgVoteWeightedResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteWeightedResponseProtoMsg): MsgVoteWeightedResponse { + return MsgVoteWeightedResponse.decode(message.value); + }, + toProto(message: MsgVoteWeightedResponse): Uint8Array { + return MsgVoteWeightedResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteWeightedResponse): MsgVoteWeightedResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeightedResponse", + value: MsgVoteWeightedResponse.encode(message).finish() + }; } }; function createBaseMsgDeposit(): MsgDeposit { @@ -522,6 +728,7 @@ function createBaseMsgDeposit(): MsgDeposit { }; } export const MsgDeposit = { + typeUrl: "/cosmos.gov.v1beta1.MsgDeposit", encode(message: MsgDeposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -606,12 +813,52 @@ export const MsgDeposit = { obj.amount = []; } return obj; + }, + fromAmino(object: MsgDepositAmino): MsgDeposit { + return { + proposalId: BigInt(object.proposal_id), + depositor: object.depositor, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgDeposit): MsgDepositAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.depositor = message.depositor; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: MsgDepositAminoMsg): MsgDeposit { + return MsgDeposit.fromAmino(object.value); + }, + toAminoMsg(message: MsgDeposit): MsgDepositAminoMsg { + return { + type: "cosmos-sdk/MsgDeposit", + value: MsgDeposit.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositProtoMsg): MsgDeposit { + return MsgDeposit.decode(message.value); + }, + toProto(message: MsgDeposit): Uint8Array { + return MsgDeposit.encode(message).finish(); + }, + toProtoMsg(message: MsgDeposit): MsgDepositProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgDeposit", + value: MsgDeposit.encode(message).finish() + }; } }; function createBaseMsgDepositResponse(): MsgDepositResponse { return {}; } export const MsgDepositResponse = { + typeUrl: "/cosmos.gov.v1beta1.MsgDepositResponse", encode(_: MsgDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -649,5 +896,33 @@ export const MsgDepositResponse = { toSDK(_: MsgDepositResponse): MsgDepositResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDepositResponseAmino): MsgDepositResponse { + return {}; + }, + toAmino(_: MsgDepositResponse): MsgDepositResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDepositResponseAminoMsg): MsgDepositResponse { + return MsgDepositResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDepositResponse): MsgDepositResponseAminoMsg { + return { + type: "cosmos-sdk/MsgDepositResponse", + value: MsgDepositResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDepositResponseProtoMsg): MsgDepositResponse { + return MsgDepositResponse.decode(message.value); + }, + toProto(message: MsgDepositResponse): Uint8Array { + return MsgDepositResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDepositResponse): MsgDepositResponseProtoMsg { + return { + typeUrl: "/cosmos.gov.v1beta1.MsgDepositResponse", + value: MsgDepositResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts index d7da5ab741..535b779956 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/events.ts @@ -95,6 +95,7 @@ function createBaseEventCreateGroup(): EventCreateGroup { }; } export const EventCreateGroup = { + typeUrl: "/cosmos.group.v1.EventCreateGroup", encode(message: EventCreateGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -147,6 +148,37 @@ export const EventCreateGroup = { const obj: any = {}; obj.group_id = message.groupId; return obj; + }, + fromAmino(object: EventCreateGroupAmino): EventCreateGroup { + return { + groupId: BigInt(object.group_id) + }; + }, + toAmino(message: EventCreateGroup): EventCreateGroupAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EventCreateGroupAminoMsg): EventCreateGroup { + return EventCreateGroup.fromAmino(object.value); + }, + toAminoMsg(message: EventCreateGroup): EventCreateGroupAminoMsg { + return { + type: "cosmos-sdk/EventCreateGroup", + value: EventCreateGroup.toAmino(message) + }; + }, + fromProtoMsg(message: EventCreateGroupProtoMsg): EventCreateGroup { + return EventCreateGroup.decode(message.value); + }, + toProto(message: EventCreateGroup): Uint8Array { + return EventCreateGroup.encode(message).finish(); + }, + toProtoMsg(message: EventCreateGroup): EventCreateGroupProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventCreateGroup", + value: EventCreateGroup.encode(message).finish() + }; } }; function createBaseEventUpdateGroup(): EventUpdateGroup { @@ -155,6 +187,7 @@ function createBaseEventUpdateGroup(): EventUpdateGroup { }; } export const EventUpdateGroup = { + typeUrl: "/cosmos.group.v1.EventUpdateGroup", encode(message: EventUpdateGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -207,6 +240,37 @@ export const EventUpdateGroup = { const obj: any = {}; obj.group_id = message.groupId; return obj; + }, + fromAmino(object: EventUpdateGroupAmino): EventUpdateGroup { + return { + groupId: BigInt(object.group_id) + }; + }, + toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EventUpdateGroupAminoMsg): EventUpdateGroup { + return EventUpdateGroup.fromAmino(object.value); + }, + toAminoMsg(message: EventUpdateGroup): EventUpdateGroupAminoMsg { + return { + type: "cosmos-sdk/EventUpdateGroup", + value: EventUpdateGroup.toAmino(message) + }; + }, + fromProtoMsg(message: EventUpdateGroupProtoMsg): EventUpdateGroup { + return EventUpdateGroup.decode(message.value); + }, + toProto(message: EventUpdateGroup): Uint8Array { + return EventUpdateGroup.encode(message).finish(); + }, + toProtoMsg(message: EventUpdateGroup): EventUpdateGroupProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventUpdateGroup", + value: EventUpdateGroup.encode(message).finish() + }; } }; function createBaseEventCreateGroupPolicy(): EventCreateGroupPolicy { @@ -215,6 +279,7 @@ function createBaseEventCreateGroupPolicy(): EventCreateGroupPolicy { }; } export const EventCreateGroupPolicy = { + typeUrl: "/cosmos.group.v1.EventCreateGroupPolicy", encode(message: EventCreateGroupPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -267,6 +332,37 @@ export const EventCreateGroupPolicy = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: EventCreateGroupPolicyAmino): EventCreateGroupPolicy { + return { + address: object.address + }; + }, + toAmino(message: EventCreateGroupPolicy): EventCreateGroupPolicyAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: EventCreateGroupPolicyAminoMsg): EventCreateGroupPolicy { + return EventCreateGroupPolicy.fromAmino(object.value); + }, + toAminoMsg(message: EventCreateGroupPolicy): EventCreateGroupPolicyAminoMsg { + return { + type: "cosmos-sdk/EventCreateGroupPolicy", + value: EventCreateGroupPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: EventCreateGroupPolicyProtoMsg): EventCreateGroupPolicy { + return EventCreateGroupPolicy.decode(message.value); + }, + toProto(message: EventCreateGroupPolicy): Uint8Array { + return EventCreateGroupPolicy.encode(message).finish(); + }, + toProtoMsg(message: EventCreateGroupPolicy): EventCreateGroupPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventCreateGroupPolicy", + value: EventCreateGroupPolicy.encode(message).finish() + }; } }; function createBaseEventUpdateGroupPolicy(): EventUpdateGroupPolicy { @@ -275,6 +371,7 @@ function createBaseEventUpdateGroupPolicy(): EventUpdateGroupPolicy { }; } export const EventUpdateGroupPolicy = { + typeUrl: "/cosmos.group.v1.EventUpdateGroupPolicy", encode(message: EventUpdateGroupPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -327,6 +424,37 @@ export const EventUpdateGroupPolicy = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: EventUpdateGroupPolicyAmino): EventUpdateGroupPolicy { + return { + address: object.address + }; + }, + toAmino(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: EventUpdateGroupPolicyAminoMsg): EventUpdateGroupPolicy { + return EventUpdateGroupPolicy.fromAmino(object.value); + }, + toAminoMsg(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyAminoMsg { + return { + type: "cosmos-sdk/EventUpdateGroupPolicy", + value: EventUpdateGroupPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: EventUpdateGroupPolicyProtoMsg): EventUpdateGroupPolicy { + return EventUpdateGroupPolicy.decode(message.value); + }, + toProto(message: EventUpdateGroupPolicy): Uint8Array { + return EventUpdateGroupPolicy.encode(message).finish(); + }, + toProtoMsg(message: EventUpdateGroupPolicy): EventUpdateGroupPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventUpdateGroupPolicy", + value: EventUpdateGroupPolicy.encode(message).finish() + }; } }; function createBaseEventSubmitProposal(): EventSubmitProposal { @@ -335,6 +463,7 @@ function createBaseEventSubmitProposal(): EventSubmitProposal { }; } export const EventSubmitProposal = { + typeUrl: "/cosmos.group.v1.EventSubmitProposal", encode(message: EventSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -387,6 +516,37 @@ export const EventSubmitProposal = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: EventSubmitProposalAmino): EventSubmitProposal { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EventSubmitProposalAminoMsg): EventSubmitProposal { + return EventSubmitProposal.fromAmino(object.value); + }, + toAminoMsg(message: EventSubmitProposal): EventSubmitProposalAminoMsg { + return { + type: "cosmos-sdk/EventSubmitProposal", + value: EventSubmitProposal.toAmino(message) + }; + }, + fromProtoMsg(message: EventSubmitProposalProtoMsg): EventSubmitProposal { + return EventSubmitProposal.decode(message.value); + }, + toProto(message: EventSubmitProposal): Uint8Array { + return EventSubmitProposal.encode(message).finish(); + }, + toProtoMsg(message: EventSubmitProposal): EventSubmitProposalProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventSubmitProposal", + value: EventSubmitProposal.encode(message).finish() + }; } }; function createBaseEventWithdrawProposal(): EventWithdrawProposal { @@ -395,6 +555,7 @@ function createBaseEventWithdrawProposal(): EventWithdrawProposal { }; } export const EventWithdrawProposal = { + typeUrl: "/cosmos.group.v1.EventWithdrawProposal", encode(message: EventWithdrawProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -447,6 +608,37 @@ export const EventWithdrawProposal = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: EventWithdrawProposalAmino): EventWithdrawProposal { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EventWithdrawProposalAminoMsg): EventWithdrawProposal { + return EventWithdrawProposal.fromAmino(object.value); + }, + toAminoMsg(message: EventWithdrawProposal): EventWithdrawProposalAminoMsg { + return { + type: "cosmos-sdk/EventWithdrawProposal", + value: EventWithdrawProposal.toAmino(message) + }; + }, + fromProtoMsg(message: EventWithdrawProposalProtoMsg): EventWithdrawProposal { + return EventWithdrawProposal.decode(message.value); + }, + toProto(message: EventWithdrawProposal): Uint8Array { + return EventWithdrawProposal.encode(message).finish(); + }, + toProtoMsg(message: EventWithdrawProposal): EventWithdrawProposalProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventWithdrawProposal", + value: EventWithdrawProposal.encode(message).finish() + }; } }; function createBaseEventVote(): EventVote { @@ -455,6 +647,7 @@ function createBaseEventVote(): EventVote { }; } export const EventVote = { + typeUrl: "/cosmos.group.v1.EventVote", encode(message: EventVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -507,6 +700,37 @@ export const EventVote = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: EventVoteAmino): EventVote { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: EventVote): EventVoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EventVoteAminoMsg): EventVote { + return EventVote.fromAmino(object.value); + }, + toAminoMsg(message: EventVote): EventVoteAminoMsg { + return { + type: "cosmos-sdk/EventVote", + value: EventVote.toAmino(message) + }; + }, + fromProtoMsg(message: EventVoteProtoMsg): EventVote { + return EventVote.decode(message.value); + }, + toProto(message: EventVote): Uint8Array { + return EventVote.encode(message).finish(); + }, + toProtoMsg(message: EventVote): EventVoteProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventVote", + value: EventVote.encode(message).finish() + }; } }; function createBaseEventExec(): EventExec { @@ -516,6 +740,7 @@ function createBaseEventExec(): EventExec { }; } export const EventExec = { + typeUrl: "/cosmos.group.v1.EventExec", encode(message: EventExec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -580,6 +805,39 @@ export const EventExec = { obj.proposal_id = message.proposalId; message.result !== undefined && (obj.result = proposalExecutorResultToJSON(message.result)); return obj; + }, + fromAmino(object: EventExecAmino): EventExec { + return { + proposalId: BigInt(object.proposal_id), + result: isSet(object.result) ? proposalExecutorResultFromJSON(object.result) : -1 + }; + }, + toAmino(message: EventExec): EventExecAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.result = message.result; + return obj; + }, + fromAminoMsg(object: EventExecAminoMsg): EventExec { + return EventExec.fromAmino(object.value); + }, + toAminoMsg(message: EventExec): EventExecAminoMsg { + return { + type: "cosmos-sdk/EventExec", + value: EventExec.toAmino(message) + }; + }, + fromProtoMsg(message: EventExecProtoMsg): EventExec { + return EventExec.decode(message.value); + }, + toProto(message: EventExec): Uint8Array { + return EventExec.encode(message).finish(); + }, + toProtoMsg(message: EventExec): EventExecProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventExec", + value: EventExec.encode(message).finish() + }; } }; function createBaseEventLeaveGroup(): EventLeaveGroup { @@ -589,6 +847,7 @@ function createBaseEventLeaveGroup(): EventLeaveGroup { }; } export const EventLeaveGroup = { + typeUrl: "/cosmos.group.v1.EventLeaveGroup", encode(message: EventLeaveGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -653,5 +912,38 @@ export const EventLeaveGroup = { obj.group_id = message.groupId; obj.address = message.address; return obj; + }, + fromAmino(object: EventLeaveGroupAmino): EventLeaveGroup { + return { + groupId: BigInt(object.group_id), + address: object.address + }; + }, + toAmino(message: EventLeaveGroup): EventLeaveGroupAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: EventLeaveGroupAminoMsg): EventLeaveGroup { + return EventLeaveGroup.fromAmino(object.value); + }, + toAminoMsg(message: EventLeaveGroup): EventLeaveGroupAminoMsg { + return { + type: "cosmos-sdk/EventLeaveGroup", + value: EventLeaveGroup.toAmino(message) + }; + }, + fromProtoMsg(message: EventLeaveGroupProtoMsg): EventLeaveGroup { + return EventLeaveGroup.decode(message.value); + }, + toProto(message: EventLeaveGroup): Uint8Array { + return EventLeaveGroup.encode(message).finish(); + }, + toProtoMsg(message: EventLeaveGroup): EventLeaveGroupProtoMsg { + return { + typeUrl: "/cosmos.group.v1.EventLeaveGroup", + value: EventLeaveGroup.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts index 7c5381dcb3..1ba992182d 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/genesis.ts @@ -54,6 +54,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.group.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupSeq !== BigInt(0)) { writer.uint32(8).uint64(message.groupSeq); @@ -230,5 +231,70 @@ export const GenesisState = { obj.votes = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + groupSeq: BigInt(object.group_seq), + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromAmino(e)) : [], + groupMembers: Array.isArray(object?.group_members) ? object.group_members.map((e: any) => GroupMember.fromAmino(e)) : [], + groupPolicySeq: BigInt(object.group_policy_seq), + groupPolicies: Array.isArray(object?.group_policies) ? object.group_policies.map((e: any) => GroupPolicyInfo.fromAmino(e)) : [], + proposalSeq: BigInt(object.proposal_seq), + proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.group_seq = message.groupSeq ? message.groupSeq.toString() : undefined; + if (message.groups) { + obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); + } else { + obj.groups = []; + } + if (message.groupMembers) { + obj.group_members = message.groupMembers.map(e => e ? GroupMember.toAmino(e) : undefined); + } else { + obj.group_members = []; + } + obj.group_policy_seq = message.groupPolicySeq ? message.groupPolicySeq.toString() : undefined; + if (message.groupPolicies) { + obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); + } else { + obj.group_policies = []; + } + obj.proposal_seq = message.proposalSeq ? message.proposalSeq.toString() : undefined; + if (message.proposals) { + obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); + } else { + obj.proposals = []; + } + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.group.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts index f73b0f582e..36fc4f2b1e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/query.ts @@ -294,6 +294,7 @@ function createBaseQueryGroupInfoRequest(): QueryGroupInfoRequest { }; } export const QueryGroupInfoRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest", encode(message: QueryGroupInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -346,6 +347,37 @@ export const QueryGroupInfoRequest = { const obj: any = {}; obj.group_id = message.groupId; return obj; + }, + fromAmino(object: QueryGroupInfoRequestAmino): QueryGroupInfoRequest { + return { + groupId: BigInt(object.group_id) + }; + }, + toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupInfoRequestAminoMsg): QueryGroupInfoRequest { + return QueryGroupInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupInfoRequest): QueryGroupInfoRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupInfoRequest", + value: QueryGroupInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupInfoRequestProtoMsg): QueryGroupInfoRequest { + return QueryGroupInfoRequest.decode(message.value); + }, + toProto(message: QueryGroupInfoRequest): Uint8Array { + return QueryGroupInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupInfoRequest): QueryGroupInfoRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest", + value: QueryGroupInfoRequest.encode(message).finish() + }; } }; function createBaseQueryGroupInfoResponse(): QueryGroupInfoResponse { @@ -354,6 +386,7 @@ function createBaseQueryGroupInfoResponse(): QueryGroupInfoResponse { }; } export const QueryGroupInfoResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupInfoResponse", encode(message: QueryGroupInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.info !== undefined) { GroupInfo.encode(message.info, writer.uint32(10).fork()).ldelim(); @@ -406,6 +439,37 @@ export const QueryGroupInfoResponse = { const obj: any = {}; message.info !== undefined && (obj.info = message.info ? GroupInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: QueryGroupInfoResponseAmino): QueryGroupInfoResponse { + return { + info: object?.info ? GroupInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: QueryGroupInfoResponse): QueryGroupInfoResponseAmino { + const obj: any = {}; + obj.info = message.info ? GroupInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupInfoResponseAminoMsg): QueryGroupInfoResponse { + return QueryGroupInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupInfoResponse): QueryGroupInfoResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupInfoResponse", + value: QueryGroupInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupInfoResponseProtoMsg): QueryGroupInfoResponse { + return QueryGroupInfoResponse.decode(message.value); + }, + toProto(message: QueryGroupInfoResponse): Uint8Array { + return QueryGroupInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupInfoResponse): QueryGroupInfoResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupInfoResponse", + value: QueryGroupInfoResponse.encode(message).finish() + }; } }; function createBaseQueryGroupPolicyInfoRequest(): QueryGroupPolicyInfoRequest { @@ -414,6 +478,7 @@ function createBaseQueryGroupPolicyInfoRequest(): QueryGroupPolicyInfoRequest { }; } export const QueryGroupPolicyInfoRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoRequest", encode(message: QueryGroupPolicyInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -466,6 +531,37 @@ export const QueryGroupPolicyInfoRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryGroupPolicyInfoRequestAmino): QueryGroupPolicyInfoRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryGroupPolicyInfoRequestAminoMsg): QueryGroupPolicyInfoRequest { + return QueryGroupPolicyInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupPolicyInfoRequest", + value: QueryGroupPolicyInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupPolicyInfoRequestProtoMsg): QueryGroupPolicyInfoRequest { + return QueryGroupPolicyInfoRequest.decode(message.value); + }, + toProto(message: QueryGroupPolicyInfoRequest): Uint8Array { + return QueryGroupPolicyInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupPolicyInfoRequest): QueryGroupPolicyInfoRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoRequest", + value: QueryGroupPolicyInfoRequest.encode(message).finish() + }; } }; function createBaseQueryGroupPolicyInfoResponse(): QueryGroupPolicyInfoResponse { @@ -474,6 +570,7 @@ function createBaseQueryGroupPolicyInfoResponse(): QueryGroupPolicyInfoResponse }; } export const QueryGroupPolicyInfoResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoResponse", encode(message: QueryGroupPolicyInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.info !== undefined) { GroupPolicyInfo.encode(message.info, writer.uint32(10).fork()).ldelim(); @@ -526,6 +623,37 @@ export const QueryGroupPolicyInfoResponse = { const obj: any = {}; message.info !== undefined && (obj.info = message.info ? GroupPolicyInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: QueryGroupPolicyInfoResponseAmino): QueryGroupPolicyInfoResponse { + return { + info: object?.info ? GroupPolicyInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: QueryGroupPolicyInfoResponse): QueryGroupPolicyInfoResponseAmino { + const obj: any = {}; + obj.info = message.info ? GroupPolicyInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupPolicyInfoResponseAminoMsg): QueryGroupPolicyInfoResponse { + return QueryGroupPolicyInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupPolicyInfoResponse): QueryGroupPolicyInfoResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupPolicyInfoResponse", + value: QueryGroupPolicyInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupPolicyInfoResponseProtoMsg): QueryGroupPolicyInfoResponse { + return QueryGroupPolicyInfoResponse.decode(message.value); + }, + toProto(message: QueryGroupPolicyInfoResponse): Uint8Array { + return QueryGroupPolicyInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupPolicyInfoResponse): QueryGroupPolicyInfoResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoResponse", + value: QueryGroupPolicyInfoResponse.encode(message).finish() + }; } }; function createBaseQueryGroupMembersRequest(): QueryGroupMembersRequest { @@ -535,6 +663,7 @@ function createBaseQueryGroupMembersRequest(): QueryGroupMembersRequest { }; } export const QueryGroupMembersRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupMembersRequest", encode(message: QueryGroupMembersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -599,6 +728,39 @@ export const QueryGroupMembersRequest = { obj.group_id = message.groupId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupMembersRequestAmino): QueryGroupMembersRequest { + return { + groupId: BigInt(object.group_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupMembersRequest): QueryGroupMembersRequestAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupMembersRequestAminoMsg): QueryGroupMembersRequest { + return QueryGroupMembersRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupMembersRequest): QueryGroupMembersRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupMembersRequest", + value: QueryGroupMembersRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupMembersRequestProtoMsg): QueryGroupMembersRequest { + return QueryGroupMembersRequest.decode(message.value); + }, + toProto(message: QueryGroupMembersRequest): Uint8Array { + return QueryGroupMembersRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupMembersRequest): QueryGroupMembersRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupMembersRequest", + value: QueryGroupMembersRequest.encode(message).finish() + }; } }; function createBaseQueryGroupMembersResponse(): QueryGroupMembersResponse { @@ -608,6 +770,7 @@ function createBaseQueryGroupMembersResponse(): QueryGroupMembersResponse { }; } export const QueryGroupMembersResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupMembersResponse", encode(message: QueryGroupMembersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.members) { GroupMember.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -680,6 +843,43 @@ export const QueryGroupMembersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupMembersResponseAmino): QueryGroupMembersResponse { + return { + members: Array.isArray(object?.members) ? object.members.map((e: any) => GroupMember.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupMembersResponse): QueryGroupMembersResponseAmino { + const obj: any = {}; + if (message.members) { + obj.members = message.members.map(e => e ? GroupMember.toAmino(e) : undefined); + } else { + obj.members = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupMembersResponseAminoMsg): QueryGroupMembersResponse { + return QueryGroupMembersResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupMembersResponse): QueryGroupMembersResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupMembersResponse", + value: QueryGroupMembersResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupMembersResponseProtoMsg): QueryGroupMembersResponse { + return QueryGroupMembersResponse.decode(message.value); + }, + toProto(message: QueryGroupMembersResponse): Uint8Array { + return QueryGroupMembersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupMembersResponse): QueryGroupMembersResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupMembersResponse", + value: QueryGroupMembersResponse.encode(message).finish() + }; } }; function createBaseQueryGroupsByAdminRequest(): QueryGroupsByAdminRequest { @@ -689,6 +889,7 @@ function createBaseQueryGroupsByAdminRequest(): QueryGroupsByAdminRequest { }; } export const QueryGroupsByAdminRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupsByAdminRequest", encode(message: QueryGroupsByAdminRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -753,6 +954,39 @@ export const QueryGroupsByAdminRequest = { obj.admin = message.admin; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupsByAdminRequestAmino): QueryGroupsByAdminRequest { + return { + admin: object.admin, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupsByAdminRequestAminoMsg): QueryGroupsByAdminRequest { + return QueryGroupsByAdminRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupsByAdminRequest", + value: QueryGroupsByAdminRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupsByAdminRequestProtoMsg): QueryGroupsByAdminRequest { + return QueryGroupsByAdminRequest.decode(message.value); + }, + toProto(message: QueryGroupsByAdminRequest): Uint8Array { + return QueryGroupsByAdminRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupsByAdminRequest): QueryGroupsByAdminRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupsByAdminRequest", + value: QueryGroupsByAdminRequest.encode(message).finish() + }; } }; function createBaseQueryGroupsByAdminResponse(): QueryGroupsByAdminResponse { @@ -762,6 +996,7 @@ function createBaseQueryGroupsByAdminResponse(): QueryGroupsByAdminResponse { }; } export const QueryGroupsByAdminResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupsByAdminResponse", encode(message: QueryGroupsByAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groups) { GroupInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -834,6 +1069,43 @@ export const QueryGroupsByAdminResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupsByAdminResponseAmino): QueryGroupsByAdminResponse { + return { + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupsByAdminResponse): QueryGroupsByAdminResponseAmino { + const obj: any = {}; + if (message.groups) { + obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupsByAdminResponseAminoMsg): QueryGroupsByAdminResponse { + return QueryGroupsByAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupsByAdminResponse): QueryGroupsByAdminResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupsByAdminResponse", + value: QueryGroupsByAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupsByAdminResponseProtoMsg): QueryGroupsByAdminResponse { + return QueryGroupsByAdminResponse.decode(message.value); + }, + toProto(message: QueryGroupsByAdminResponse): Uint8Array { + return QueryGroupsByAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupsByAdminResponse): QueryGroupsByAdminResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupsByAdminResponse", + value: QueryGroupsByAdminResponse.encode(message).finish() + }; } }; function createBaseQueryGroupPoliciesByGroupRequest(): QueryGroupPoliciesByGroupRequest { @@ -843,6 +1115,7 @@ function createBaseQueryGroupPoliciesByGroupRequest(): QueryGroupPoliciesByGroup }; } export const QueryGroupPoliciesByGroupRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupRequest", encode(message: QueryGroupPoliciesByGroupRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -907,6 +1180,39 @@ export const QueryGroupPoliciesByGroupRequest = { obj.group_id = message.groupId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupPoliciesByGroupRequestAmino): QueryGroupPoliciesByGroupRequest { + return { + groupId: BigInt(object.group_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupPoliciesByGroupRequestAminoMsg): QueryGroupPoliciesByGroupRequest { + return QueryGroupPoliciesByGroupRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupPoliciesByGroupRequest", + value: QueryGroupPoliciesByGroupRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupPoliciesByGroupRequestProtoMsg): QueryGroupPoliciesByGroupRequest { + return QueryGroupPoliciesByGroupRequest.decode(message.value); + }, + toProto(message: QueryGroupPoliciesByGroupRequest): Uint8Array { + return QueryGroupPoliciesByGroupRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupPoliciesByGroupRequest): QueryGroupPoliciesByGroupRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupRequest", + value: QueryGroupPoliciesByGroupRequest.encode(message).finish() + }; } }; function createBaseQueryGroupPoliciesByGroupResponse(): QueryGroupPoliciesByGroupResponse { @@ -916,6 +1222,7 @@ function createBaseQueryGroupPoliciesByGroupResponse(): QueryGroupPoliciesByGrou }; } export const QueryGroupPoliciesByGroupResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupResponse", encode(message: QueryGroupPoliciesByGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groupPolicies) { GroupPolicyInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -988,6 +1295,43 @@ export const QueryGroupPoliciesByGroupResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupPoliciesByGroupResponseAmino): QueryGroupPoliciesByGroupResponse { + return { + groupPolicies: Array.isArray(object?.group_policies) ? object.group_policies.map((e: any) => GroupPolicyInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupPoliciesByGroupResponse): QueryGroupPoliciesByGroupResponseAmino { + const obj: any = {}; + if (message.groupPolicies) { + obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); + } else { + obj.group_policies = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupPoliciesByGroupResponseAminoMsg): QueryGroupPoliciesByGroupResponse { + return QueryGroupPoliciesByGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupPoliciesByGroupResponse): QueryGroupPoliciesByGroupResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupPoliciesByGroupResponse", + value: QueryGroupPoliciesByGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupPoliciesByGroupResponseProtoMsg): QueryGroupPoliciesByGroupResponse { + return QueryGroupPoliciesByGroupResponse.decode(message.value); + }, + toProto(message: QueryGroupPoliciesByGroupResponse): Uint8Array { + return QueryGroupPoliciesByGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupPoliciesByGroupResponse): QueryGroupPoliciesByGroupResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupResponse", + value: QueryGroupPoliciesByGroupResponse.encode(message).finish() + }; } }; function createBaseQueryGroupPoliciesByAdminRequest(): QueryGroupPoliciesByAdminRequest { @@ -997,6 +1341,7 @@ function createBaseQueryGroupPoliciesByAdminRequest(): QueryGroupPoliciesByAdmin }; } export const QueryGroupPoliciesByAdminRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminRequest", encode(message: QueryGroupPoliciesByAdminRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -1061,6 +1406,39 @@ export const QueryGroupPoliciesByAdminRequest = { obj.admin = message.admin; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupPoliciesByAdminRequestAmino): QueryGroupPoliciesByAdminRequest { + return { + admin: object.admin, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupPoliciesByAdminRequestAminoMsg): QueryGroupPoliciesByAdminRequest { + return QueryGroupPoliciesByAdminRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupPoliciesByAdminRequest", + value: QueryGroupPoliciesByAdminRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupPoliciesByAdminRequestProtoMsg): QueryGroupPoliciesByAdminRequest { + return QueryGroupPoliciesByAdminRequest.decode(message.value); + }, + toProto(message: QueryGroupPoliciesByAdminRequest): Uint8Array { + return QueryGroupPoliciesByAdminRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupPoliciesByAdminRequest): QueryGroupPoliciesByAdminRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminRequest", + value: QueryGroupPoliciesByAdminRequest.encode(message).finish() + }; } }; function createBaseQueryGroupPoliciesByAdminResponse(): QueryGroupPoliciesByAdminResponse { @@ -1070,6 +1448,7 @@ function createBaseQueryGroupPoliciesByAdminResponse(): QueryGroupPoliciesByAdmi }; } export const QueryGroupPoliciesByAdminResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminResponse", encode(message: QueryGroupPoliciesByAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groupPolicies) { GroupPolicyInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1142,6 +1521,43 @@ export const QueryGroupPoliciesByAdminResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupPoliciesByAdminResponseAmino): QueryGroupPoliciesByAdminResponse { + return { + groupPolicies: Array.isArray(object?.group_policies) ? object.group_policies.map((e: any) => GroupPolicyInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupPoliciesByAdminResponse): QueryGroupPoliciesByAdminResponseAmino { + const obj: any = {}; + if (message.groupPolicies) { + obj.group_policies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toAmino(e) : undefined); + } else { + obj.group_policies = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupPoliciesByAdminResponseAminoMsg): QueryGroupPoliciesByAdminResponse { + return QueryGroupPoliciesByAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupPoliciesByAdminResponse): QueryGroupPoliciesByAdminResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupPoliciesByAdminResponse", + value: QueryGroupPoliciesByAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupPoliciesByAdminResponseProtoMsg): QueryGroupPoliciesByAdminResponse { + return QueryGroupPoliciesByAdminResponse.decode(message.value); + }, + toProto(message: QueryGroupPoliciesByAdminResponse): Uint8Array { + return QueryGroupPoliciesByAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupPoliciesByAdminResponse): QueryGroupPoliciesByAdminResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminResponse", + value: QueryGroupPoliciesByAdminResponse.encode(message).finish() + }; } }; function createBaseQueryProposalRequest(): QueryProposalRequest { @@ -1150,6 +1566,7 @@ function createBaseQueryProposalRequest(): QueryProposalRequest { }; } export const QueryProposalRequest = { + typeUrl: "/cosmos.group.v1.QueryProposalRequest", encode(message: QueryProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1202,6 +1619,37 @@ export const QueryProposalRequest = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: QueryProposalRequestAmino): QueryProposalRequest { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalRequestAminoMsg): QueryProposalRequest { + return QueryProposalRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalRequest): QueryProposalRequestAminoMsg { + return { + type: "cosmos-sdk/QueryProposalRequest", + value: QueryProposalRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalRequestProtoMsg): QueryProposalRequest { + return QueryProposalRequest.decode(message.value); + }, + toProto(message: QueryProposalRequest): Uint8Array { + return QueryProposalRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalRequest): QueryProposalRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryProposalRequest", + value: QueryProposalRequest.encode(message).finish() + }; } }; function createBaseQueryProposalResponse(): QueryProposalResponse { @@ -1210,6 +1658,7 @@ function createBaseQueryProposalResponse(): QueryProposalResponse { }; } export const QueryProposalResponse = { + typeUrl: "/cosmos.group.v1.QueryProposalResponse", encode(message: QueryProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposal !== undefined) { Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim(); @@ -1262,6 +1711,37 @@ export const QueryProposalResponse = { const obj: any = {}; message.proposal !== undefined && (obj.proposal = message.proposal ? Proposal.toSDK(message.proposal) : undefined); return obj; + }, + fromAmino(object: QueryProposalResponseAmino): QueryProposalResponse { + return { + proposal: object?.proposal ? Proposal.fromAmino(object.proposal) : undefined + }; + }, + toAmino(message: QueryProposalResponse): QueryProposalResponseAmino { + const obj: any = {}; + obj.proposal = message.proposal ? Proposal.toAmino(message.proposal) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalResponseAminoMsg): QueryProposalResponse { + return QueryProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalResponse): QueryProposalResponseAminoMsg { + return { + type: "cosmos-sdk/QueryProposalResponse", + value: QueryProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalResponseProtoMsg): QueryProposalResponse { + return QueryProposalResponse.decode(message.value); + }, + toProto(message: QueryProposalResponse): Uint8Array { + return QueryProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalResponse): QueryProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryProposalResponse", + value: QueryProposalResponse.encode(message).finish() + }; } }; function createBaseQueryProposalsByGroupPolicyRequest(): QueryProposalsByGroupPolicyRequest { @@ -1271,6 +1751,7 @@ function createBaseQueryProposalsByGroupPolicyRequest(): QueryProposalsByGroupPo }; } export const QueryProposalsByGroupPolicyRequest = { + typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyRequest", encode(message: QueryProposalsByGroupPolicyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1335,6 +1816,39 @@ export const QueryProposalsByGroupPolicyRequest = { obj.address = message.address; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProposalsByGroupPolicyRequestAmino): QueryProposalsByGroupPolicyRequest { + return { + address: object.address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalsByGroupPolicyRequestAminoMsg): QueryProposalsByGroupPolicyRequest { + return QueryProposalsByGroupPolicyRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestAminoMsg { + return { + type: "cosmos-sdk/QueryProposalsByGroupPolicyRequest", + value: QueryProposalsByGroupPolicyRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalsByGroupPolicyRequestProtoMsg): QueryProposalsByGroupPolicyRequest { + return QueryProposalsByGroupPolicyRequest.decode(message.value); + }, + toProto(message: QueryProposalsByGroupPolicyRequest): Uint8Array { + return QueryProposalsByGroupPolicyRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalsByGroupPolicyRequest): QueryProposalsByGroupPolicyRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyRequest", + value: QueryProposalsByGroupPolicyRequest.encode(message).finish() + }; } }; function createBaseQueryProposalsByGroupPolicyResponse(): QueryProposalsByGroupPolicyResponse { @@ -1344,6 +1858,7 @@ function createBaseQueryProposalsByGroupPolicyResponse(): QueryProposalsByGroupP }; } export const QueryProposalsByGroupPolicyResponse = { + typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyResponse", encode(message: QueryProposalsByGroupPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proposals) { Proposal.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1416,6 +1931,43 @@ export const QueryProposalsByGroupPolicyResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryProposalsByGroupPolicyResponseAmino): QueryProposalsByGroupPolicyResponse { + return { + proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryProposalsByGroupPolicyResponse): QueryProposalsByGroupPolicyResponseAmino { + const obj: any = {}; + if (message.proposals) { + obj.proposals = message.proposals.map(e => e ? Proposal.toAmino(e) : undefined); + } else { + obj.proposals = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryProposalsByGroupPolicyResponseAminoMsg): QueryProposalsByGroupPolicyResponse { + return QueryProposalsByGroupPolicyResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryProposalsByGroupPolicyResponse): QueryProposalsByGroupPolicyResponseAminoMsg { + return { + type: "cosmos-sdk/QueryProposalsByGroupPolicyResponse", + value: QueryProposalsByGroupPolicyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryProposalsByGroupPolicyResponseProtoMsg): QueryProposalsByGroupPolicyResponse { + return QueryProposalsByGroupPolicyResponse.decode(message.value); + }, + toProto(message: QueryProposalsByGroupPolicyResponse): Uint8Array { + return QueryProposalsByGroupPolicyResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryProposalsByGroupPolicyResponse): QueryProposalsByGroupPolicyResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyResponse", + value: QueryProposalsByGroupPolicyResponse.encode(message).finish() + }; } }; function createBaseQueryVoteByProposalVoterRequest(): QueryVoteByProposalVoterRequest { @@ -1425,6 +1977,7 @@ function createBaseQueryVoteByProposalVoterRequest(): QueryVoteByProposalVoterRe }; } export const QueryVoteByProposalVoterRequest = { + typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterRequest", encode(message: QueryVoteByProposalVoterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1489,6 +2042,39 @@ export const QueryVoteByProposalVoterRequest = { obj.proposal_id = message.proposalId; obj.voter = message.voter; return obj; + }, + fromAmino(object: QueryVoteByProposalVoterRequestAmino): QueryVoteByProposalVoterRequest { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter + }; + }, + toAmino(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + return obj; + }, + fromAminoMsg(object: QueryVoteByProposalVoterRequestAminoMsg): QueryVoteByProposalVoterRequest { + return QueryVoteByProposalVoterRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestAminoMsg { + return { + type: "cosmos-sdk/QueryVoteByProposalVoterRequest", + value: QueryVoteByProposalVoterRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVoteByProposalVoterRequestProtoMsg): QueryVoteByProposalVoterRequest { + return QueryVoteByProposalVoterRequest.decode(message.value); + }, + toProto(message: QueryVoteByProposalVoterRequest): Uint8Array { + return QueryVoteByProposalVoterRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVoteByProposalVoterRequest): QueryVoteByProposalVoterRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterRequest", + value: QueryVoteByProposalVoterRequest.encode(message).finish() + }; } }; function createBaseQueryVoteByProposalVoterResponse(): QueryVoteByProposalVoterResponse { @@ -1497,6 +2083,7 @@ function createBaseQueryVoteByProposalVoterResponse(): QueryVoteByProposalVoterR }; } export const QueryVoteByProposalVoterResponse = { + typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterResponse", encode(message: QueryVoteByProposalVoterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.vote !== undefined) { Vote.encode(message.vote, writer.uint32(10).fork()).ldelim(); @@ -1549,6 +2136,37 @@ export const QueryVoteByProposalVoterResponse = { const obj: any = {}; message.vote !== undefined && (obj.vote = message.vote ? Vote.toSDK(message.vote) : undefined); return obj; + }, + fromAmino(object: QueryVoteByProposalVoterResponseAmino): QueryVoteByProposalVoterResponse { + return { + vote: object?.vote ? Vote.fromAmino(object.vote) : undefined + }; + }, + toAmino(message: QueryVoteByProposalVoterResponse): QueryVoteByProposalVoterResponseAmino { + const obj: any = {}; + obj.vote = message.vote ? Vote.toAmino(message.vote) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVoteByProposalVoterResponseAminoMsg): QueryVoteByProposalVoterResponse { + return QueryVoteByProposalVoterResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVoteByProposalVoterResponse): QueryVoteByProposalVoterResponseAminoMsg { + return { + type: "cosmos-sdk/QueryVoteByProposalVoterResponse", + value: QueryVoteByProposalVoterResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVoteByProposalVoterResponseProtoMsg): QueryVoteByProposalVoterResponse { + return QueryVoteByProposalVoterResponse.decode(message.value); + }, + toProto(message: QueryVoteByProposalVoterResponse): Uint8Array { + return QueryVoteByProposalVoterResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVoteByProposalVoterResponse): QueryVoteByProposalVoterResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterResponse", + value: QueryVoteByProposalVoterResponse.encode(message).finish() + }; } }; function createBaseQueryVotesByProposalRequest(): QueryVotesByProposalRequest { @@ -1558,6 +2176,7 @@ function createBaseQueryVotesByProposalRequest(): QueryVotesByProposalRequest { }; } export const QueryVotesByProposalRequest = { + typeUrl: "/cosmos.group.v1.QueryVotesByProposalRequest", encode(message: QueryVotesByProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1622,6 +2241,39 @@ export const QueryVotesByProposalRequest = { obj.proposal_id = message.proposalId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesByProposalRequestAmino): QueryVotesByProposalRequest { + return { + proposalId: BigInt(object.proposal_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesByProposalRequestAminoMsg): QueryVotesByProposalRequest { + return QueryVotesByProposalRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestAminoMsg { + return { + type: "cosmos-sdk/QueryVotesByProposalRequest", + value: QueryVotesByProposalRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesByProposalRequestProtoMsg): QueryVotesByProposalRequest { + return QueryVotesByProposalRequest.decode(message.value); + }, + toProto(message: QueryVotesByProposalRequest): Uint8Array { + return QueryVotesByProposalRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesByProposalRequest): QueryVotesByProposalRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryVotesByProposalRequest", + value: QueryVotesByProposalRequest.encode(message).finish() + }; } }; function createBaseQueryVotesByProposalResponse(): QueryVotesByProposalResponse { @@ -1631,6 +2283,7 @@ function createBaseQueryVotesByProposalResponse(): QueryVotesByProposalResponse }; } export const QueryVotesByProposalResponse = { + typeUrl: "/cosmos.group.v1.QueryVotesByProposalResponse", encode(message: QueryVotesByProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1703,6 +2356,43 @@ export const QueryVotesByProposalResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesByProposalResponseAmino): QueryVotesByProposalResponse { + return { + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesByProposalResponse): QueryVotesByProposalResponseAmino { + const obj: any = {}; + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesByProposalResponseAminoMsg): QueryVotesByProposalResponse { + return QueryVotesByProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesByProposalResponse): QueryVotesByProposalResponseAminoMsg { + return { + type: "cosmos-sdk/QueryVotesByProposalResponse", + value: QueryVotesByProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesByProposalResponseProtoMsg): QueryVotesByProposalResponse { + return QueryVotesByProposalResponse.decode(message.value); + }, + toProto(message: QueryVotesByProposalResponse): Uint8Array { + return QueryVotesByProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesByProposalResponse): QueryVotesByProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryVotesByProposalResponse", + value: QueryVotesByProposalResponse.encode(message).finish() + }; } }; function createBaseQueryVotesByVoterRequest(): QueryVotesByVoterRequest { @@ -1712,6 +2402,7 @@ function createBaseQueryVotesByVoterRequest(): QueryVotesByVoterRequest { }; } export const QueryVotesByVoterRequest = { + typeUrl: "/cosmos.group.v1.QueryVotesByVoterRequest", encode(message: QueryVotesByVoterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.voter !== "") { writer.uint32(10).string(message.voter); @@ -1776,6 +2467,39 @@ export const QueryVotesByVoterRequest = { obj.voter = message.voter; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesByVoterRequestAmino): QueryVotesByVoterRequest { + return { + voter: object.voter, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAmino { + const obj: any = {}; + obj.voter = message.voter; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesByVoterRequestAminoMsg): QueryVotesByVoterRequest { + return QueryVotesByVoterRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestAminoMsg { + return { + type: "cosmos-sdk/QueryVotesByVoterRequest", + value: QueryVotesByVoterRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesByVoterRequestProtoMsg): QueryVotesByVoterRequest { + return QueryVotesByVoterRequest.decode(message.value); + }, + toProto(message: QueryVotesByVoterRequest): Uint8Array { + return QueryVotesByVoterRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesByVoterRequest): QueryVotesByVoterRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryVotesByVoterRequest", + value: QueryVotesByVoterRequest.encode(message).finish() + }; } }; function createBaseQueryVotesByVoterResponse(): QueryVotesByVoterResponse { @@ -1785,6 +2509,7 @@ function createBaseQueryVotesByVoterResponse(): QueryVotesByVoterResponse { }; } export const QueryVotesByVoterResponse = { + typeUrl: "/cosmos.group.v1.QueryVotesByVoterResponse", encode(message: QueryVotesByVoterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1857,6 +2582,43 @@ export const QueryVotesByVoterResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryVotesByVoterResponseAmino): QueryVotesByVoterResponse { + return { + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryVotesByVoterResponse): QueryVotesByVoterResponseAmino { + const obj: any = {}; + if (message.votes) { + obj.votes = message.votes.map(e => e ? Vote.toAmino(e) : undefined); + } else { + obj.votes = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryVotesByVoterResponseAminoMsg): QueryVotesByVoterResponse { + return QueryVotesByVoterResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryVotesByVoterResponse): QueryVotesByVoterResponseAminoMsg { + return { + type: "cosmos-sdk/QueryVotesByVoterResponse", + value: QueryVotesByVoterResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryVotesByVoterResponseProtoMsg): QueryVotesByVoterResponse { + return QueryVotesByVoterResponse.decode(message.value); + }, + toProto(message: QueryVotesByVoterResponse): Uint8Array { + return QueryVotesByVoterResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryVotesByVoterResponse): QueryVotesByVoterResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryVotesByVoterResponse", + value: QueryVotesByVoterResponse.encode(message).finish() + }; } }; function createBaseQueryGroupsByMemberRequest(): QueryGroupsByMemberRequest { @@ -1866,6 +2628,7 @@ function createBaseQueryGroupsByMemberRequest(): QueryGroupsByMemberRequest { }; } export const QueryGroupsByMemberRequest = { + typeUrl: "/cosmos.group.v1.QueryGroupsByMemberRequest", encode(message: QueryGroupsByMemberRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1930,6 +2693,39 @@ export const QueryGroupsByMemberRequest = { obj.address = message.address; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupsByMemberRequestAmino): QueryGroupsByMemberRequest { + return { + address: object.address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupsByMemberRequestAminoMsg): QueryGroupsByMemberRequest { + return QueryGroupsByMemberRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestAminoMsg { + return { + type: "cosmos-sdk/QueryGroupsByMemberRequest", + value: QueryGroupsByMemberRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupsByMemberRequestProtoMsg): QueryGroupsByMemberRequest { + return QueryGroupsByMemberRequest.decode(message.value); + }, + toProto(message: QueryGroupsByMemberRequest): Uint8Array { + return QueryGroupsByMemberRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupsByMemberRequest): QueryGroupsByMemberRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupsByMemberRequest", + value: QueryGroupsByMemberRequest.encode(message).finish() + }; } }; function createBaseQueryGroupsByMemberResponse(): QueryGroupsByMemberResponse { @@ -1939,6 +2735,7 @@ function createBaseQueryGroupsByMemberResponse(): QueryGroupsByMemberResponse { }; } export const QueryGroupsByMemberResponse = { + typeUrl: "/cosmos.group.v1.QueryGroupsByMemberResponse", encode(message: QueryGroupsByMemberResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groups) { GroupInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2011,6 +2808,43 @@ export const QueryGroupsByMemberResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGroupsByMemberResponseAmino): QueryGroupsByMemberResponse { + return { + groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGroupsByMemberResponse): QueryGroupsByMemberResponseAmino { + const obj: any = {}; + if (message.groups) { + obj.groups = message.groups.map(e => e ? GroupInfo.toAmino(e) : undefined); + } else { + obj.groups = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGroupsByMemberResponseAminoMsg): QueryGroupsByMemberResponse { + return QueryGroupsByMemberResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGroupsByMemberResponse): QueryGroupsByMemberResponseAminoMsg { + return { + type: "cosmos-sdk/QueryGroupsByMemberResponse", + value: QueryGroupsByMemberResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGroupsByMemberResponseProtoMsg): QueryGroupsByMemberResponse { + return QueryGroupsByMemberResponse.decode(message.value); + }, + toProto(message: QueryGroupsByMemberResponse): Uint8Array { + return QueryGroupsByMemberResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGroupsByMemberResponse): QueryGroupsByMemberResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryGroupsByMemberResponse", + value: QueryGroupsByMemberResponse.encode(message).finish() + }; } }; function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { @@ -2019,6 +2853,7 @@ function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { }; } export const QueryTallyResultRequest = { + typeUrl: "/cosmos.group.v1.QueryTallyResultRequest", encode(message: QueryTallyResultRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -2071,6 +2906,37 @@ export const QueryTallyResultRequest = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: QueryTallyResultRequestAmino): QueryTallyResultRequest { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryTallyResultRequestAminoMsg): QueryTallyResultRequest { + return QueryTallyResultRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestAminoMsg { + return { + type: "cosmos-sdk/QueryTallyResultRequest", + value: QueryTallyResultRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTallyResultRequestProtoMsg): QueryTallyResultRequest { + return QueryTallyResultRequest.decode(message.value); + }, + toProto(message: QueryTallyResultRequest): Uint8Array { + return QueryTallyResultRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTallyResultRequest): QueryTallyResultRequestProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryTallyResultRequest", + value: QueryTallyResultRequest.encode(message).finish() + }; } }; function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { @@ -2079,6 +2945,7 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { }; } export const QueryTallyResultResponse = { + typeUrl: "/cosmos.group.v1.QueryTallyResultResponse", encode(message: QueryTallyResultResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tally !== undefined) { TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim(); @@ -2131,5 +2998,36 @@ export const QueryTallyResultResponse = { const obj: any = {}; message.tally !== undefined && (obj.tally = message.tally ? TallyResult.toSDK(message.tally) : undefined); return obj; + }, + fromAmino(object: QueryTallyResultResponseAmino): QueryTallyResultResponse { + return { + tally: object?.tally ? TallyResult.fromAmino(object.tally) : undefined + }; + }, + toAmino(message: QueryTallyResultResponse): QueryTallyResultResponseAmino { + const obj: any = {}; + obj.tally = message.tally ? TallyResult.toAmino(message.tally) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTallyResultResponseAminoMsg): QueryTallyResultResponse { + return QueryTallyResultResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseAminoMsg { + return { + type: "cosmos-sdk/QueryTallyResultResponse", + value: QueryTallyResultResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTallyResultResponseProtoMsg): QueryTallyResultResponse { + return QueryTallyResultResponse.decode(message.value); + }, + toProto(message: QueryTallyResultResponse): Uint8Array { + return QueryTallyResultResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTallyResultResponse): QueryTallyResultResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.QueryTallyResultResponse", + value: QueryTallyResultResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts index de4ef26c77..b5fa9c55c5 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/tx.ts @@ -370,6 +370,7 @@ function createBaseMsgCreateGroup(): MsgCreateGroup { }; } export const MsgCreateGroup = { + typeUrl: "/cosmos.group.v1.MsgCreateGroup", encode(message: MsgCreateGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -454,6 +455,45 @@ export const MsgCreateGroup = { } obj.metadata = message.metadata; return obj; + }, + fromAmino(object: MsgCreateGroupAmino): MsgCreateGroup { + return { + admin: object.admin, + members: Array.isArray(object?.members) ? object.members.map((e: any) => Member.fromAmino(e)) : [], + metadata: object.metadata + }; + }, + toAmino(message: MsgCreateGroup): MsgCreateGroupAmino { + const obj: any = {}; + obj.admin = message.admin; + if (message.members) { + obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); + } else { + obj.members = []; + } + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: MsgCreateGroupAminoMsg): MsgCreateGroup { + return MsgCreateGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGroup): MsgCreateGroupAminoMsg { + return { + type: "cosmos-sdk/MsgCreateGroup", + value: MsgCreateGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGroupProtoMsg): MsgCreateGroup { + return MsgCreateGroup.decode(message.value); + }, + toProto(message: MsgCreateGroup): Uint8Array { + return MsgCreateGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGroup): MsgCreateGroupProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgCreateGroup", + value: MsgCreateGroup.encode(message).finish() + }; } }; function createBaseMsgCreateGroupResponse(): MsgCreateGroupResponse { @@ -462,6 +502,7 @@ function createBaseMsgCreateGroupResponse(): MsgCreateGroupResponse { }; } export const MsgCreateGroupResponse = { + typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse", encode(message: MsgCreateGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -514,6 +555,37 @@ export const MsgCreateGroupResponse = { const obj: any = {}; obj.group_id = message.groupId; return obj; + }, + fromAmino(object: MsgCreateGroupResponseAmino): MsgCreateGroupResponse { + return { + groupId: BigInt(object.group_id) + }; + }, + toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateGroupResponseAminoMsg): MsgCreateGroupResponse { + return MsgCreateGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGroupResponse): MsgCreateGroupResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreateGroupResponse", + value: MsgCreateGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGroupResponseProtoMsg): MsgCreateGroupResponse { + return MsgCreateGroupResponse.decode(message.value); + }, + toProto(message: MsgCreateGroupResponse): Uint8Array { + return MsgCreateGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGroupResponse): MsgCreateGroupResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse", + value: MsgCreateGroupResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupMembers(): MsgUpdateGroupMembers { @@ -524,6 +596,7 @@ function createBaseMsgUpdateGroupMembers(): MsgUpdateGroupMembers { }; } export const MsgUpdateGroupMembers = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembers", encode(message: MsgUpdateGroupMembers, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -608,12 +681,52 @@ export const MsgUpdateGroupMembers = { obj.member_updates = []; } return obj; + }, + fromAmino(object: MsgUpdateGroupMembersAmino): MsgUpdateGroupMembers { + return { + admin: object.admin, + groupId: BigInt(object.group_id), + memberUpdates: Array.isArray(object?.member_updates) ? object.member_updates.map((e: any) => Member.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + if (message.memberUpdates) { + obj.member_updates = message.memberUpdates.map(e => e ? Member.toAmino(e) : undefined); + } else { + obj.member_updates = []; + } + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupMembersAminoMsg): MsgUpdateGroupMembers { + return MsgUpdateGroupMembers.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupMembers", + value: MsgUpdateGroupMembers.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupMembersProtoMsg): MsgUpdateGroupMembers { + return MsgUpdateGroupMembers.decode(message.value); + }, + toProto(message: MsgUpdateGroupMembers): Uint8Array { + return MsgUpdateGroupMembers.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupMembers): MsgUpdateGroupMembersProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembers", + value: MsgUpdateGroupMembers.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupMembersResponse(): MsgUpdateGroupMembersResponse { return {}; } export const MsgUpdateGroupMembersResponse = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembersResponse", encode(_: MsgUpdateGroupMembersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -651,6 +764,34 @@ export const MsgUpdateGroupMembersResponse = { toSDK(_: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateGroupMembersResponseAmino): MsgUpdateGroupMembersResponse { + return {}; + }, + toAmino(_: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupMembersResponseAminoMsg): MsgUpdateGroupMembersResponse { + return MsgUpdateGroupMembersResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupMembersResponse", + value: MsgUpdateGroupMembersResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupMembersResponseProtoMsg): MsgUpdateGroupMembersResponse { + return MsgUpdateGroupMembersResponse.decode(message.value); + }, + toProto(message: MsgUpdateGroupMembersResponse): Uint8Array { + return MsgUpdateGroupMembersResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupMembersResponse): MsgUpdateGroupMembersResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembersResponse", + value: MsgUpdateGroupMembersResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupAdmin(): MsgUpdateGroupAdmin { @@ -661,6 +802,7 @@ function createBaseMsgUpdateGroupAdmin(): MsgUpdateGroupAdmin { }; } export const MsgUpdateGroupAdmin = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdmin", encode(message: MsgUpdateGroupAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -737,12 +879,48 @@ export const MsgUpdateGroupAdmin = { obj.group_id = message.groupId; obj.new_admin = message.newAdmin; return obj; + }, + fromAmino(object: MsgUpdateGroupAdminAmino): MsgUpdateGroupAdmin { + return { + admin: object.admin, + groupId: BigInt(object.group_id), + newAdmin: object.new_admin + }; + }, + toAmino(message: MsgUpdateGroupAdmin): MsgUpdateGroupAdminAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.new_admin = message.newAdmin; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupAdminAminoMsg): MsgUpdateGroupAdmin { + return MsgUpdateGroupAdmin.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupAdmin): MsgUpdateGroupAdminAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupAdmin", + value: MsgUpdateGroupAdmin.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupAdminProtoMsg): MsgUpdateGroupAdmin { + return MsgUpdateGroupAdmin.decode(message.value); + }, + toProto(message: MsgUpdateGroupAdmin): Uint8Array { + return MsgUpdateGroupAdmin.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupAdmin): MsgUpdateGroupAdminProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdmin", + value: MsgUpdateGroupAdmin.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupAdminResponse(): MsgUpdateGroupAdminResponse { return {}; } export const MsgUpdateGroupAdminResponse = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdminResponse", encode(_: MsgUpdateGroupAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -780,6 +958,34 @@ export const MsgUpdateGroupAdminResponse = { toSDK(_: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateGroupAdminResponseAmino): MsgUpdateGroupAdminResponse { + return {}; + }, + toAmino(_: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupAdminResponseAminoMsg): MsgUpdateGroupAdminResponse { + return MsgUpdateGroupAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupAdminResponse", + value: MsgUpdateGroupAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupAdminResponseProtoMsg): MsgUpdateGroupAdminResponse { + return MsgUpdateGroupAdminResponse.decode(message.value); + }, + toProto(message: MsgUpdateGroupAdminResponse): Uint8Array { + return MsgUpdateGroupAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupAdminResponse): MsgUpdateGroupAdminResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdminResponse", + value: MsgUpdateGroupAdminResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupMetadata(): MsgUpdateGroupMetadata { @@ -790,6 +996,7 @@ function createBaseMsgUpdateGroupMetadata(): MsgUpdateGroupMetadata { }; } export const MsgUpdateGroupMetadata = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadata", encode(message: MsgUpdateGroupMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -866,12 +1073,48 @@ export const MsgUpdateGroupMetadata = { obj.group_id = message.groupId; obj.metadata = message.metadata; return obj; + }, + fromAmino(object: MsgUpdateGroupMetadataAmino): MsgUpdateGroupMetadata { + return { + admin: object.admin, + groupId: BigInt(object.group_id), + metadata: object.metadata + }; + }, + toAmino(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupMetadataAminoMsg): MsgUpdateGroupMetadata { + return MsgUpdateGroupMetadata.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupMetadata", + value: MsgUpdateGroupMetadata.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupMetadataProtoMsg): MsgUpdateGroupMetadata { + return MsgUpdateGroupMetadata.decode(message.value); + }, + toProto(message: MsgUpdateGroupMetadata): Uint8Array { + return MsgUpdateGroupMetadata.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupMetadata): MsgUpdateGroupMetadataProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadata", + value: MsgUpdateGroupMetadata.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupMetadataResponse(): MsgUpdateGroupMetadataResponse { return {}; } export const MsgUpdateGroupMetadataResponse = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadataResponse", encode(_: MsgUpdateGroupMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -909,6 +1152,34 @@ export const MsgUpdateGroupMetadataResponse = { toSDK(_: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateGroupMetadataResponseAmino): MsgUpdateGroupMetadataResponse { + return {}; + }, + toAmino(_: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupMetadataResponseAminoMsg): MsgUpdateGroupMetadataResponse { + return MsgUpdateGroupMetadataResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupMetadataResponse", + value: MsgUpdateGroupMetadataResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupMetadataResponseProtoMsg): MsgUpdateGroupMetadataResponse { + return MsgUpdateGroupMetadataResponse.decode(message.value); + }, + toProto(message: MsgUpdateGroupMetadataResponse): Uint8Array { + return MsgUpdateGroupMetadataResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupMetadataResponse): MsgUpdateGroupMetadataResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadataResponse", + value: MsgUpdateGroupMetadataResponse.encode(message).finish() + }; } }; function createBaseMsgCreateGroupPolicy(): MsgCreateGroupPolicy { @@ -920,6 +1191,7 @@ function createBaseMsgCreateGroupPolicy(): MsgCreateGroupPolicy { }; } export const MsgCreateGroupPolicy = { + typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy", encode(message: MsgCreateGroupPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -1008,6 +1280,43 @@ export const MsgCreateGroupPolicy = { obj.metadata = message.metadata; message.decisionPolicy !== undefined && (obj.decision_policy = message.decisionPolicy ? Any.toSDK(message.decisionPolicy) : undefined); return obj; + }, + fromAmino(object: MsgCreateGroupPolicyAmino): MsgCreateGroupPolicy { + return { + admin: object.admin, + groupId: BigInt(object.group_id), + metadata: object.metadata, + decisionPolicy: object?.decision_policy ? Any.fromAmino(object.decision_policy) : undefined + }; + }, + toAmino(message: MsgCreateGroupPolicy): MsgCreateGroupPolicyAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.metadata = message.metadata; + obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateGroupPolicyAminoMsg): MsgCreateGroupPolicy { + return MsgCreateGroupPolicy.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGroupPolicy): MsgCreateGroupPolicyAminoMsg { + return { + type: "cosmos-sdk/MsgCreateGroupPolicy", + value: MsgCreateGroupPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGroupPolicyProtoMsg): MsgCreateGroupPolicy { + return MsgCreateGroupPolicy.decode(message.value); + }, + toProto(message: MsgCreateGroupPolicy): Uint8Array { + return MsgCreateGroupPolicy.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGroupPolicy): MsgCreateGroupPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy", + value: MsgCreateGroupPolicy.encode(message).finish() + }; } }; function createBaseMsgCreateGroupPolicyResponse(): MsgCreateGroupPolicyResponse { @@ -1016,6 +1325,7 @@ function createBaseMsgCreateGroupPolicyResponse(): MsgCreateGroupPolicyResponse }; } export const MsgCreateGroupPolicyResponse = { + typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicyResponse", encode(message: MsgCreateGroupPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1068,6 +1378,37 @@ export const MsgCreateGroupPolicyResponse = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: MsgCreateGroupPolicyResponseAmino): MsgCreateGroupPolicyResponse { + return { + address: object.address + }; + }, + toAmino(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: MsgCreateGroupPolicyResponseAminoMsg): MsgCreateGroupPolicyResponse { + return MsgCreateGroupPolicyResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreateGroupPolicyResponse", + value: MsgCreateGroupPolicyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGroupPolicyResponseProtoMsg): MsgCreateGroupPolicyResponse { + return MsgCreateGroupPolicyResponse.decode(message.value); + }, + toProto(message: MsgCreateGroupPolicyResponse): Uint8Array { + return MsgCreateGroupPolicyResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGroupPolicyResponse): MsgCreateGroupPolicyResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicyResponse", + value: MsgCreateGroupPolicyResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupPolicyAdmin(): MsgUpdateGroupPolicyAdmin { @@ -1078,6 +1419,7 @@ function createBaseMsgUpdateGroupPolicyAdmin(): MsgUpdateGroupPolicyAdmin { }; } export const MsgUpdateGroupPolicyAdmin = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdmin", encode(message: MsgUpdateGroupPolicyAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -1154,6 +1496,41 @@ export const MsgUpdateGroupPolicyAdmin = { obj.address = message.address; obj.new_admin = message.newAdmin; return obj; + }, + fromAmino(object: MsgUpdateGroupPolicyAdminAmino): MsgUpdateGroupPolicyAdmin { + return { + admin: object.admin, + address: object.address, + newAdmin: object.new_admin + }; + }, + toAmino(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.address = message.address; + obj.new_admin = message.newAdmin; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupPolicyAdminAminoMsg): MsgUpdateGroupPolicyAdmin { + return MsgUpdateGroupPolicyAdmin.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupPolicyAdmin", + value: MsgUpdateGroupPolicyAdmin.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupPolicyAdminProtoMsg): MsgUpdateGroupPolicyAdmin { + return MsgUpdateGroupPolicyAdmin.decode(message.value); + }, + toProto(message: MsgUpdateGroupPolicyAdmin): Uint8Array { + return MsgUpdateGroupPolicyAdmin.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupPolicyAdmin): MsgUpdateGroupPolicyAdminProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdmin", + value: MsgUpdateGroupPolicyAdmin.encode(message).finish() + }; } }; function createBaseMsgCreateGroupWithPolicy(): MsgCreateGroupWithPolicy { @@ -1167,6 +1544,7 @@ function createBaseMsgCreateGroupWithPolicy(): MsgCreateGroupWithPolicy { }; } export const MsgCreateGroupWithPolicy = { + typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy", encode(message: MsgCreateGroupWithPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -1287,6 +1665,51 @@ export const MsgCreateGroupWithPolicy = { obj.group_policy_as_admin = message.groupPolicyAsAdmin; message.decisionPolicy !== undefined && (obj.decision_policy = message.decisionPolicy ? Any.toSDK(message.decisionPolicy) : undefined); return obj; + }, + fromAmino(object: MsgCreateGroupWithPolicyAmino): MsgCreateGroupWithPolicy { + return { + admin: object.admin, + members: Array.isArray(object?.members) ? object.members.map((e: any) => Member.fromAmino(e)) : [], + groupMetadata: object.group_metadata, + groupPolicyMetadata: object.group_policy_metadata, + groupPolicyAsAdmin: object.group_policy_as_admin, + decisionPolicy: object?.decision_policy ? Any.fromAmino(object.decision_policy) : undefined + }; + }, + toAmino(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAmino { + const obj: any = {}; + obj.admin = message.admin; + if (message.members) { + obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); + } else { + obj.members = []; + } + obj.group_metadata = message.groupMetadata; + obj.group_policy_metadata = message.groupPolicyMetadata; + obj.group_policy_as_admin = message.groupPolicyAsAdmin; + obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateGroupWithPolicyAminoMsg): MsgCreateGroupWithPolicy { + return MsgCreateGroupWithPolicy.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyAminoMsg { + return { + type: "cosmos-sdk/MsgCreateGroupWithPolicy", + value: MsgCreateGroupWithPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGroupWithPolicyProtoMsg): MsgCreateGroupWithPolicy { + return MsgCreateGroupWithPolicy.decode(message.value); + }, + toProto(message: MsgCreateGroupWithPolicy): Uint8Array { + return MsgCreateGroupWithPolicy.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGroupWithPolicy): MsgCreateGroupWithPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy", + value: MsgCreateGroupWithPolicy.encode(message).finish() + }; } }; function createBaseMsgCreateGroupWithPolicyResponse(): MsgCreateGroupWithPolicyResponse { @@ -1296,6 +1719,7 @@ function createBaseMsgCreateGroupWithPolicyResponse(): MsgCreateGroupWithPolicyR }; } export const MsgCreateGroupWithPolicyResponse = { + typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicyResponse", encode(message: MsgCreateGroupWithPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -1360,12 +1784,46 @@ export const MsgCreateGroupWithPolicyResponse = { obj.group_id = message.groupId; obj.group_policy_address = message.groupPolicyAddress; return obj; + }, + fromAmino(object: MsgCreateGroupWithPolicyResponseAmino): MsgCreateGroupWithPolicyResponse { + return { + groupId: BigInt(object.group_id), + groupPolicyAddress: object.group_policy_address + }; + }, + toAmino(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.group_policy_address = message.groupPolicyAddress; + return obj; + }, + fromAminoMsg(object: MsgCreateGroupWithPolicyResponseAminoMsg): MsgCreateGroupWithPolicyResponse { + return MsgCreateGroupWithPolicyResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreateGroupWithPolicyResponse", + value: MsgCreateGroupWithPolicyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGroupWithPolicyResponseProtoMsg): MsgCreateGroupWithPolicyResponse { + return MsgCreateGroupWithPolicyResponse.decode(message.value); + }, + toProto(message: MsgCreateGroupWithPolicyResponse): Uint8Array { + return MsgCreateGroupWithPolicyResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGroupWithPolicyResponse): MsgCreateGroupWithPolicyResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicyResponse", + value: MsgCreateGroupWithPolicyResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupPolicyAdminResponse(): MsgUpdateGroupPolicyAdminResponse { return {}; } export const MsgUpdateGroupPolicyAdminResponse = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdminResponse", encode(_: MsgUpdateGroupPolicyAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1403,6 +1861,34 @@ export const MsgUpdateGroupPolicyAdminResponse = { toSDK(_: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateGroupPolicyAdminResponseAmino): MsgUpdateGroupPolicyAdminResponse { + return {}; + }, + toAmino(_: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupPolicyAdminResponseAminoMsg): MsgUpdateGroupPolicyAdminResponse { + return MsgUpdateGroupPolicyAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupPolicyAdminResponse", + value: MsgUpdateGroupPolicyAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupPolicyAdminResponseProtoMsg): MsgUpdateGroupPolicyAdminResponse { + return MsgUpdateGroupPolicyAdminResponse.decode(message.value); + }, + toProto(message: MsgUpdateGroupPolicyAdminResponse): Uint8Array { + return MsgUpdateGroupPolicyAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupPolicyAdminResponse): MsgUpdateGroupPolicyAdminResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdminResponse", + value: MsgUpdateGroupPolicyAdminResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupPolicyDecisionPolicy(): MsgUpdateGroupPolicyDecisionPolicy { @@ -1413,6 +1899,7 @@ function createBaseMsgUpdateGroupPolicyDecisionPolicy(): MsgUpdateGroupPolicyDec }; } export const MsgUpdateGroupPolicyDecisionPolicy = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy", encode(message: MsgUpdateGroupPolicyDecisionPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -1489,12 +1976,48 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { obj.address = message.address; message.decisionPolicy !== undefined && (obj.decision_policy = message.decisionPolicy ? Any.toSDK(message.decisionPolicy) : undefined); return obj; + }, + fromAmino(object: MsgUpdateGroupPolicyDecisionPolicyAmino): MsgUpdateGroupPolicyDecisionPolicy { + return { + admin: object.admin, + address: object.address, + decisionPolicy: object?.decision_policy ? Any.fromAmino(object.decision_policy) : undefined + }; + }, + toAmino(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.address = message.address; + obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupPolicyDecisionPolicyAminoMsg): MsgUpdateGroupPolicyDecisionPolicy { + return MsgUpdateGroupPolicyDecisionPolicy.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicy", + value: MsgUpdateGroupPolicyDecisionPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicyProtoMsg): MsgUpdateGroupPolicyDecisionPolicy { + return MsgUpdateGroupPolicyDecisionPolicy.decode(message.value); + }, + toProto(message: MsgUpdateGroupPolicyDecisionPolicy): Uint8Array { + return MsgUpdateGroupPolicyDecisionPolicy.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicy): MsgUpdateGroupPolicyDecisionPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy", + value: MsgUpdateGroupPolicyDecisionPolicy.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupPolicyDecisionPolicyResponse(): MsgUpdateGroupPolicyDecisionPolicyResponse { return {}; } export const MsgUpdateGroupPolicyDecisionPolicyResponse = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicyResponse", encode(_: MsgUpdateGroupPolicyDecisionPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1532,6 +2055,34 @@ export const MsgUpdateGroupPolicyDecisionPolicyResponse = { toSDK(_: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateGroupPolicyDecisionPolicyResponseAmino): MsgUpdateGroupPolicyDecisionPolicyResponse { + return {}; + }, + toAmino(_: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupPolicyDecisionPolicyResponseAminoMsg): MsgUpdateGroupPolicyDecisionPolicyResponse { + return MsgUpdateGroupPolicyDecisionPolicyResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicyResponse", + value: MsgUpdateGroupPolicyDecisionPolicyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicyResponseProtoMsg): MsgUpdateGroupPolicyDecisionPolicyResponse { + return MsgUpdateGroupPolicyDecisionPolicyResponse.decode(message.value); + }, + toProto(message: MsgUpdateGroupPolicyDecisionPolicyResponse): Uint8Array { + return MsgUpdateGroupPolicyDecisionPolicyResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupPolicyDecisionPolicyResponse): MsgUpdateGroupPolicyDecisionPolicyResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicyResponse", + value: MsgUpdateGroupPolicyDecisionPolicyResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupPolicyMetadata(): MsgUpdateGroupPolicyMetadata { @@ -1542,6 +2093,7 @@ function createBaseMsgUpdateGroupPolicyMetadata(): MsgUpdateGroupPolicyMetadata }; } export const MsgUpdateGroupPolicyMetadata = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadata", encode(message: MsgUpdateGroupPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -1618,12 +2170,48 @@ export const MsgUpdateGroupPolicyMetadata = { obj.address = message.address; obj.metadata = message.metadata; return obj; + }, + fromAmino(object: MsgUpdateGroupPolicyMetadataAmino): MsgUpdateGroupPolicyMetadata { + return { + admin: object.admin, + address: object.address, + metadata: object.metadata + }; + }, + toAmino(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.address = message.address; + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupPolicyMetadataAminoMsg): MsgUpdateGroupPolicyMetadata { + return MsgUpdateGroupPolicyMetadata.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupPolicyMetadata", + value: MsgUpdateGroupPolicyMetadata.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupPolicyMetadataProtoMsg): MsgUpdateGroupPolicyMetadata { + return MsgUpdateGroupPolicyMetadata.decode(message.value); + }, + toProto(message: MsgUpdateGroupPolicyMetadata): Uint8Array { + return MsgUpdateGroupPolicyMetadata.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupPolicyMetadata): MsgUpdateGroupPolicyMetadataProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadata", + value: MsgUpdateGroupPolicyMetadata.encode(message).finish() + }; } }; function createBaseMsgUpdateGroupPolicyMetadataResponse(): MsgUpdateGroupPolicyMetadataResponse { return {}; } export const MsgUpdateGroupPolicyMetadataResponse = { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadataResponse", encode(_: MsgUpdateGroupPolicyMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1661,6 +2249,34 @@ export const MsgUpdateGroupPolicyMetadataResponse = { toSDK(_: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateGroupPolicyMetadataResponseAmino): MsgUpdateGroupPolicyMetadataResponse { + return {}; + }, + toAmino(_: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateGroupPolicyMetadataResponseAminoMsg): MsgUpdateGroupPolicyMetadataResponse { + return MsgUpdateGroupPolicyMetadataResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateGroupPolicyMetadataResponse", + value: MsgUpdateGroupPolicyMetadataResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateGroupPolicyMetadataResponseProtoMsg): MsgUpdateGroupPolicyMetadataResponse { + return MsgUpdateGroupPolicyMetadataResponse.decode(message.value); + }, + toProto(message: MsgUpdateGroupPolicyMetadataResponse): Uint8Array { + return MsgUpdateGroupPolicyMetadataResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateGroupPolicyMetadataResponse): MsgUpdateGroupPolicyMetadataResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadataResponse", + value: MsgUpdateGroupPolicyMetadataResponse.encode(message).finish() + }; } }; function createBaseMsgSubmitProposal(): MsgSubmitProposal { @@ -1673,6 +2289,7 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal { }; } export const MsgSubmitProposal = { + typeUrl: "/cosmos.group.v1.MsgSubmitProposal", encode(message: MsgSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1789,6 +2406,53 @@ export const MsgSubmitProposal = { } message.exec !== undefined && (obj.exec = execToJSON(message.exec)); return obj; + }, + fromAmino(object: MsgSubmitProposalAmino): MsgSubmitProposal { + return { + address: object.address, + proposers: Array.isArray(object?.proposers) ? object.proposers.map((e: any) => e) : [], + metadata: object.metadata, + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [], + exec: isSet(object.exec) ? execFromJSON(object.exec) : -1 + }; + }, + toAmino(message: MsgSubmitProposal): MsgSubmitProposalAmino { + const obj: any = {}; + obj.address = message.address; + if (message.proposers) { + obj.proposers = message.proposers.map(e => e); + } else { + obj.proposers = []; + } + obj.metadata = message.metadata; + if (message.messages) { + obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.messages = []; + } + obj.exec = message.exec; + return obj; + }, + fromAminoMsg(object: MsgSubmitProposalAminoMsg): MsgSubmitProposal { + return MsgSubmitProposal.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitProposal): MsgSubmitProposalAminoMsg { + return { + type: "cosmos-sdk/group/MsgSubmitProposal", + value: MsgSubmitProposal.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitProposalProtoMsg): MsgSubmitProposal { + return MsgSubmitProposal.decode(message.value); + }, + toProto(message: MsgSubmitProposal): Uint8Array { + return MsgSubmitProposal.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitProposal): MsgSubmitProposalProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgSubmitProposal", + value: MsgSubmitProposal.encode(message).finish() + }; } }; function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { @@ -1797,6 +2461,7 @@ function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { }; } export const MsgSubmitProposalResponse = { + typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse", encode(message: MsgSubmitProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1849,6 +2514,37 @@ export const MsgSubmitProposalResponse = { const obj: any = {}; obj.proposal_id = message.proposalId; return obj; + }, + fromAmino(object: MsgSubmitProposalResponseAmino): MsgSubmitProposalResponse { + return { + proposalId: BigInt(object.proposal_id) + }; + }, + toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSubmitProposalResponseAminoMsg): MsgSubmitProposalResponse { + return MsgSubmitProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitProposalResponse", + value: MsgSubmitProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitProposalResponseProtoMsg): MsgSubmitProposalResponse { + return MsgSubmitProposalResponse.decode(message.value); + }, + toProto(message: MsgSubmitProposalResponse): Uint8Array { + return MsgSubmitProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse", + value: MsgSubmitProposalResponse.encode(message).finish() + }; } }; function createBaseMsgWithdrawProposal(): MsgWithdrawProposal { @@ -1858,6 +2554,7 @@ function createBaseMsgWithdrawProposal(): MsgWithdrawProposal { }; } export const MsgWithdrawProposal = { + typeUrl: "/cosmos.group.v1.MsgWithdrawProposal", encode(message: MsgWithdrawProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1922,12 +2619,46 @@ export const MsgWithdrawProposal = { obj.proposal_id = message.proposalId; obj.address = message.address; return obj; + }, + fromAmino(object: MsgWithdrawProposalAmino): MsgWithdrawProposal { + return { + proposalId: BigInt(object.proposal_id), + address: object.address + }; + }, + toAmino(message: MsgWithdrawProposal): MsgWithdrawProposalAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: MsgWithdrawProposalAminoMsg): MsgWithdrawProposal { + return MsgWithdrawProposal.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawProposal): MsgWithdrawProposalAminoMsg { + return { + type: "cosmos-sdk/group/MsgWithdrawProposal", + value: MsgWithdrawProposal.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawProposalProtoMsg): MsgWithdrawProposal { + return MsgWithdrawProposal.decode(message.value); + }, + toProto(message: MsgWithdrawProposal): Uint8Array { + return MsgWithdrawProposal.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawProposal): MsgWithdrawProposalProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgWithdrawProposal", + value: MsgWithdrawProposal.encode(message).finish() + }; } }; function createBaseMsgWithdrawProposalResponse(): MsgWithdrawProposalResponse { return {}; } export const MsgWithdrawProposalResponse = { + typeUrl: "/cosmos.group.v1.MsgWithdrawProposalResponse", encode(_: MsgWithdrawProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1965,6 +2696,34 @@ export const MsgWithdrawProposalResponse = { toSDK(_: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgWithdrawProposalResponseAmino): MsgWithdrawProposalResponse { + return {}; + }, + toAmino(_: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgWithdrawProposalResponseAminoMsg): MsgWithdrawProposalResponse { + return MsgWithdrawProposalResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseAminoMsg { + return { + type: "cosmos-sdk/MsgWithdrawProposalResponse", + value: MsgWithdrawProposalResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawProposalResponseProtoMsg): MsgWithdrawProposalResponse { + return MsgWithdrawProposalResponse.decode(message.value); + }, + toProto(message: MsgWithdrawProposalResponse): Uint8Array { + return MsgWithdrawProposalResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawProposalResponse): MsgWithdrawProposalResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgWithdrawProposalResponse", + value: MsgWithdrawProposalResponse.encode(message).finish() + }; } }; function createBaseMsgVote(): MsgVote { @@ -1977,6 +2736,7 @@ function createBaseMsgVote(): MsgVote { }; } export const MsgVote = { + typeUrl: "/cosmos.group.v1.MsgVote", encode(message: MsgVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -2077,12 +2837,52 @@ export const MsgVote = { obj.metadata = message.metadata; message.exec !== undefined && (obj.exec = execToJSON(message.exec)); return obj; + }, + fromAmino(object: MsgVoteAmino): MsgVote { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, + metadata: object.metadata, + exec: isSet(object.exec) ? execFromJSON(object.exec) : -1 + }; + }, + toAmino(message: MsgVote): MsgVoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + obj.option = message.option; + obj.metadata = message.metadata; + obj.exec = message.exec; + return obj; + }, + fromAminoMsg(object: MsgVoteAminoMsg): MsgVote { + return MsgVote.fromAmino(object.value); + }, + toAminoMsg(message: MsgVote): MsgVoteAminoMsg { + return { + type: "cosmos-sdk/group/MsgVote", + value: MsgVote.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteProtoMsg): MsgVote { + return MsgVote.decode(message.value); + }, + toProto(message: MsgVote): Uint8Array { + return MsgVote.encode(message).finish(); + }, + toProtoMsg(message: MsgVote): MsgVoteProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgVote", + value: MsgVote.encode(message).finish() + }; } }; function createBaseMsgVoteResponse(): MsgVoteResponse { return {}; } export const MsgVoteResponse = { + typeUrl: "/cosmos.group.v1.MsgVoteResponse", encode(_: MsgVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2120,6 +2920,34 @@ export const MsgVoteResponse = { toSDK(_: MsgVoteResponse): MsgVoteResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgVoteResponseAmino): MsgVoteResponse { + return {}; + }, + toAmino(_: MsgVoteResponse): MsgVoteResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgVoteResponseAminoMsg): MsgVoteResponse { + return MsgVoteResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgVoteResponse): MsgVoteResponseAminoMsg { + return { + type: "cosmos-sdk/MsgVoteResponse", + value: MsgVoteResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgVoteResponseProtoMsg): MsgVoteResponse { + return MsgVoteResponse.decode(message.value); + }, + toProto(message: MsgVoteResponse): Uint8Array { + return MsgVoteResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgVoteResponse): MsgVoteResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgVoteResponse", + value: MsgVoteResponse.encode(message).finish() + }; } }; function createBaseMsgExec(): MsgExec { @@ -2129,6 +2957,7 @@ function createBaseMsgExec(): MsgExec { }; } export const MsgExec = { + typeUrl: "/cosmos.group.v1.MsgExec", encode(message: MsgExec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -2193,12 +3022,46 @@ export const MsgExec = { obj.proposal_id = message.proposalId; obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgExecAmino): MsgExec { + return { + proposalId: BigInt(object.proposal_id), + signer: object.signer + }; + }, + toAmino(message: MsgExec): MsgExecAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgExecAminoMsg): MsgExec { + return MsgExec.fromAmino(object.value); + }, + toAminoMsg(message: MsgExec): MsgExecAminoMsg { + return { + type: "cosmos-sdk/group/MsgExec", + value: MsgExec.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecProtoMsg): MsgExec { + return MsgExec.decode(message.value); + }, + toProto(message: MsgExec): Uint8Array { + return MsgExec.encode(message).finish(); + }, + toProtoMsg(message: MsgExec): MsgExecProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgExec", + value: MsgExec.encode(message).finish() + }; } }; function createBaseMsgExecResponse(): MsgExecResponse { return {}; } export const MsgExecResponse = { + typeUrl: "/cosmos.group.v1.MsgExecResponse", encode(_: MsgExecResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2236,6 +3099,34 @@ export const MsgExecResponse = { toSDK(_: MsgExecResponse): MsgExecResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgExecResponseAmino): MsgExecResponse { + return {}; + }, + toAmino(_: MsgExecResponse): MsgExecResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgExecResponseAminoMsg): MsgExecResponse { + return MsgExecResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExecResponse): MsgExecResponseAminoMsg { + return { + type: "cosmos-sdk/MsgExecResponse", + value: MsgExecResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecResponseProtoMsg): MsgExecResponse { + return MsgExecResponse.decode(message.value); + }, + toProto(message: MsgExecResponse): Uint8Array { + return MsgExecResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExecResponse): MsgExecResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgExecResponse", + value: MsgExecResponse.encode(message).finish() + }; } }; function createBaseMsgLeaveGroup(): MsgLeaveGroup { @@ -2245,6 +3136,7 @@ function createBaseMsgLeaveGroup(): MsgLeaveGroup { }; } export const MsgLeaveGroup = { + typeUrl: "/cosmos.group.v1.MsgLeaveGroup", encode(message: MsgLeaveGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -2309,12 +3201,46 @@ export const MsgLeaveGroup = { obj.address = message.address; obj.group_id = message.groupId; return obj; + }, + fromAmino(object: MsgLeaveGroupAmino): MsgLeaveGroup { + return { + address: object.address, + groupId: BigInt(object.group_id) + }; + }, + toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { + const obj: any = {}; + obj.address = message.address; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgLeaveGroupAminoMsg): MsgLeaveGroup { + return MsgLeaveGroup.fromAmino(object.value); + }, + toAminoMsg(message: MsgLeaveGroup): MsgLeaveGroupAminoMsg { + return { + type: "cosmos-sdk/group/MsgLeaveGroup", + value: MsgLeaveGroup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgLeaveGroupProtoMsg): MsgLeaveGroup { + return MsgLeaveGroup.decode(message.value); + }, + toProto(message: MsgLeaveGroup): Uint8Array { + return MsgLeaveGroup.encode(message).finish(); + }, + toProtoMsg(message: MsgLeaveGroup): MsgLeaveGroupProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgLeaveGroup", + value: MsgLeaveGroup.encode(message).finish() + }; } }; function createBaseMsgLeaveGroupResponse(): MsgLeaveGroupResponse { return {}; } export const MsgLeaveGroupResponse = { + typeUrl: "/cosmos.group.v1.MsgLeaveGroupResponse", encode(_: MsgLeaveGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2352,5 +3278,33 @@ export const MsgLeaveGroupResponse = { toSDK(_: MsgLeaveGroupResponse): MsgLeaveGroupResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgLeaveGroupResponseAmino): MsgLeaveGroupResponse { + return {}; + }, + toAmino(_: MsgLeaveGroupResponse): MsgLeaveGroupResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgLeaveGroupResponseAminoMsg): MsgLeaveGroupResponse { + return MsgLeaveGroupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgLeaveGroupResponse): MsgLeaveGroupResponseAminoMsg { + return { + type: "cosmos-sdk/MsgLeaveGroupResponse", + value: MsgLeaveGroupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgLeaveGroupResponseProtoMsg): MsgLeaveGroupResponse { + return MsgLeaveGroupResponse.decode(message.value); + }, + toProto(message: MsgLeaveGroupResponse): Uint8Array { + return MsgLeaveGroupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgLeaveGroupResponse): MsgLeaveGroupResponseProtoMsg { + return { + typeUrl: "/cosmos.group.v1.MsgLeaveGroupResponse", + value: MsgLeaveGroupResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts index d87c786b34..c61d72a5ab 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/group/v1/types.ts @@ -491,6 +491,7 @@ function createBaseMember(): Member { }; } export const Member = { + typeUrl: "/cosmos.group.v1.Member", encode(message: Member, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -579,6 +580,43 @@ export const Member = { obj.metadata = message.metadata; message.addedAt !== undefined && (obj.added_at = message.addedAt ?? undefined); return obj; + }, + fromAmino(object: MemberAmino): Member { + return { + address: object.address, + weight: object.weight, + metadata: object.metadata, + addedAt: object.added_at + }; + }, + toAmino(message: Member): MemberAmino { + const obj: any = {}; + obj.address = message.address; + obj.weight = message.weight; + obj.metadata = message.metadata; + obj.added_at = message.addedAt; + return obj; + }, + fromAminoMsg(object: MemberAminoMsg): Member { + return Member.fromAmino(object.value); + }, + toAminoMsg(message: Member): MemberAminoMsg { + return { + type: "cosmos-sdk/Member", + value: Member.toAmino(message) + }; + }, + fromProtoMsg(message: MemberProtoMsg): Member { + return Member.decode(message.value); + }, + toProto(message: Member): Uint8Array { + return Member.encode(message).finish(); + }, + toProtoMsg(message: Member): MemberProtoMsg { + return { + typeUrl: "/cosmos.group.v1.Member", + value: Member.encode(message).finish() + }; } }; function createBaseMembers(): Members { @@ -587,6 +625,7 @@ function createBaseMembers(): Members { }; } export const Members = { + typeUrl: "/cosmos.group.v1.Members", encode(message: Members, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.members) { Member.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -647,6 +686,41 @@ export const Members = { obj.members = []; } return obj; + }, + fromAmino(object: MembersAmino): Members { + return { + members: Array.isArray(object?.members) ? object.members.map((e: any) => Member.fromAmino(e)) : [] + }; + }, + toAmino(message: Members): MembersAmino { + const obj: any = {}; + if (message.members) { + obj.members = message.members.map(e => e ? Member.toAmino(e) : undefined); + } else { + obj.members = []; + } + return obj; + }, + fromAminoMsg(object: MembersAminoMsg): Members { + return Members.fromAmino(object.value); + }, + toAminoMsg(message: Members): MembersAminoMsg { + return { + type: "cosmos-sdk/Members", + value: Members.toAmino(message) + }; + }, + fromProtoMsg(message: MembersProtoMsg): Members { + return Members.decode(message.value); + }, + toProto(message: Members): Uint8Array { + return Members.encode(message).finish(); + }, + toProtoMsg(message: Members): MembersProtoMsg { + return { + typeUrl: "/cosmos.group.v1.Members", + value: Members.encode(message).finish() + }; } }; function createBaseThresholdDecisionPolicy(): ThresholdDecisionPolicy { @@ -656,6 +730,7 @@ function createBaseThresholdDecisionPolicy(): ThresholdDecisionPolicy { }; } export const ThresholdDecisionPolicy = { + typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy", encode(message: ThresholdDecisionPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.threshold !== "") { writer.uint32(10).string(message.threshold); @@ -720,6 +795,39 @@ export const ThresholdDecisionPolicy = { obj.threshold = message.threshold; message.windows !== undefined && (obj.windows = message.windows ? DecisionPolicyWindows.toSDK(message.windows) : undefined); return obj; + }, + fromAmino(object: ThresholdDecisionPolicyAmino): ThresholdDecisionPolicy { + return { + threshold: object.threshold, + windows: object?.windows ? DecisionPolicyWindows.fromAmino(object.windows) : undefined + }; + }, + toAmino(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAmino { + const obj: any = {}; + obj.threshold = message.threshold; + obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; + return obj; + }, + fromAminoMsg(object: ThresholdDecisionPolicyAminoMsg): ThresholdDecisionPolicy { + return ThresholdDecisionPolicy.fromAmino(object.value); + }, + toAminoMsg(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyAminoMsg { + return { + type: "cosmos-sdk/ThresholdDecisionPolicy", + value: ThresholdDecisionPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: ThresholdDecisionPolicyProtoMsg): ThresholdDecisionPolicy { + return ThresholdDecisionPolicy.decode(message.value); + }, + toProto(message: ThresholdDecisionPolicy): Uint8Array { + return ThresholdDecisionPolicy.encode(message).finish(); + }, + toProtoMsg(message: ThresholdDecisionPolicy): ThresholdDecisionPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy", + value: ThresholdDecisionPolicy.encode(message).finish() + }; } }; function createBasePercentageDecisionPolicy(): PercentageDecisionPolicy { @@ -729,6 +837,7 @@ function createBasePercentageDecisionPolicy(): PercentageDecisionPolicy { }; } export const PercentageDecisionPolicy = { + typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy", encode(message: PercentageDecisionPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.percentage !== "") { writer.uint32(10).string(message.percentage); @@ -793,6 +902,39 @@ export const PercentageDecisionPolicy = { obj.percentage = message.percentage; message.windows !== undefined && (obj.windows = message.windows ? DecisionPolicyWindows.toSDK(message.windows) : undefined); return obj; + }, + fromAmino(object: PercentageDecisionPolicyAmino): PercentageDecisionPolicy { + return { + percentage: object.percentage, + windows: object?.windows ? DecisionPolicyWindows.fromAmino(object.windows) : undefined + }; + }, + toAmino(message: PercentageDecisionPolicy): PercentageDecisionPolicyAmino { + const obj: any = {}; + obj.percentage = message.percentage; + obj.windows = message.windows ? DecisionPolicyWindows.toAmino(message.windows) : undefined; + return obj; + }, + fromAminoMsg(object: PercentageDecisionPolicyAminoMsg): PercentageDecisionPolicy { + return PercentageDecisionPolicy.fromAmino(object.value); + }, + toAminoMsg(message: PercentageDecisionPolicy): PercentageDecisionPolicyAminoMsg { + return { + type: "cosmos-sdk/PercentageDecisionPolicy", + value: PercentageDecisionPolicy.toAmino(message) + }; + }, + fromProtoMsg(message: PercentageDecisionPolicyProtoMsg): PercentageDecisionPolicy { + return PercentageDecisionPolicy.decode(message.value); + }, + toProto(message: PercentageDecisionPolicy): Uint8Array { + return PercentageDecisionPolicy.encode(message).finish(); + }, + toProtoMsg(message: PercentageDecisionPolicy): PercentageDecisionPolicyProtoMsg { + return { + typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy", + value: PercentageDecisionPolicy.encode(message).finish() + }; } }; function createBaseDecisionPolicyWindows(): DecisionPolicyWindows { @@ -802,6 +944,7 @@ function createBaseDecisionPolicyWindows(): DecisionPolicyWindows { }; } export const DecisionPolicyWindows = { + typeUrl: "/cosmos.group.v1.DecisionPolicyWindows", encode(message: DecisionPolicyWindows, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingPeriod !== undefined) { Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim(); @@ -866,6 +1009,39 @@ export const DecisionPolicyWindows = { message.votingPeriod !== undefined && (obj.voting_period = message.votingPeriod ? Duration.toSDK(message.votingPeriod) : undefined); message.minExecutionPeriod !== undefined && (obj.min_execution_period = message.minExecutionPeriod ? Duration.toSDK(message.minExecutionPeriod) : undefined); return obj; + }, + fromAmino(object: DecisionPolicyWindowsAmino): DecisionPolicyWindows { + return { + votingPeriod: object?.voting_period ? Duration.fromAmino(object.voting_period) : undefined, + minExecutionPeriod: object?.min_execution_period ? Duration.fromAmino(object.min_execution_period) : undefined + }; + }, + toAmino(message: DecisionPolicyWindows): DecisionPolicyWindowsAmino { + const obj: any = {}; + obj.voting_period = message.votingPeriod ? Duration.toAmino(message.votingPeriod) : undefined; + obj.min_execution_period = message.minExecutionPeriod ? Duration.toAmino(message.minExecutionPeriod) : undefined; + return obj; + }, + fromAminoMsg(object: DecisionPolicyWindowsAminoMsg): DecisionPolicyWindows { + return DecisionPolicyWindows.fromAmino(object.value); + }, + toAminoMsg(message: DecisionPolicyWindows): DecisionPolicyWindowsAminoMsg { + return { + type: "cosmos-sdk/DecisionPolicyWindows", + value: DecisionPolicyWindows.toAmino(message) + }; + }, + fromProtoMsg(message: DecisionPolicyWindowsProtoMsg): DecisionPolicyWindows { + return DecisionPolicyWindows.decode(message.value); + }, + toProto(message: DecisionPolicyWindows): Uint8Array { + return DecisionPolicyWindows.encode(message).finish(); + }, + toProtoMsg(message: DecisionPolicyWindows): DecisionPolicyWindowsProtoMsg { + return { + typeUrl: "/cosmos.group.v1.DecisionPolicyWindows", + value: DecisionPolicyWindows.encode(message).finish() + }; } }; function createBaseGroupInfo(): GroupInfo { @@ -879,6 +1055,7 @@ function createBaseGroupInfo(): GroupInfo { }; } export const GroupInfo = { + typeUrl: "/cosmos.group.v1.GroupInfo", encode(message: GroupInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); @@ -991,6 +1168,47 @@ export const GroupInfo = { obj.total_weight = message.totalWeight; message.createdAt !== undefined && (obj.created_at = message.createdAt ?? undefined); return obj; + }, + fromAmino(object: GroupInfoAmino): GroupInfo { + return { + id: BigInt(object.id), + admin: object.admin, + metadata: object.metadata, + version: BigInt(object.version), + totalWeight: object.total_weight, + createdAt: object.created_at + }; + }, + toAmino(message: GroupInfo): GroupInfoAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + obj.admin = message.admin; + obj.metadata = message.metadata; + obj.version = message.version ? message.version.toString() : undefined; + obj.total_weight = message.totalWeight; + obj.created_at = message.createdAt; + return obj; + }, + fromAminoMsg(object: GroupInfoAminoMsg): GroupInfo { + return GroupInfo.fromAmino(object.value); + }, + toAminoMsg(message: GroupInfo): GroupInfoAminoMsg { + return { + type: "cosmos-sdk/GroupInfo", + value: GroupInfo.toAmino(message) + }; + }, + fromProtoMsg(message: GroupInfoProtoMsg): GroupInfo { + return GroupInfo.decode(message.value); + }, + toProto(message: GroupInfo): Uint8Array { + return GroupInfo.encode(message).finish(); + }, + toProtoMsg(message: GroupInfo): GroupInfoProtoMsg { + return { + typeUrl: "/cosmos.group.v1.GroupInfo", + value: GroupInfo.encode(message).finish() + }; } }; function createBaseGroupMember(): GroupMember { @@ -1000,6 +1218,7 @@ function createBaseGroupMember(): GroupMember { }; } export const GroupMember = { + typeUrl: "/cosmos.group.v1.GroupMember", encode(message: GroupMember, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); @@ -1064,6 +1283,39 @@ export const GroupMember = { obj.group_id = message.groupId; message.member !== undefined && (obj.member = message.member ? Member.toSDK(message.member) : undefined); return obj; + }, + fromAmino(object: GroupMemberAmino): GroupMember { + return { + groupId: BigInt(object.group_id), + member: object?.member ? Member.fromAmino(object.member) : undefined + }; + }, + toAmino(message: GroupMember): GroupMemberAmino { + const obj: any = {}; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.member = message.member ? Member.toAmino(message.member) : undefined; + return obj; + }, + fromAminoMsg(object: GroupMemberAminoMsg): GroupMember { + return GroupMember.fromAmino(object.value); + }, + toAminoMsg(message: GroupMember): GroupMemberAminoMsg { + return { + type: "cosmos-sdk/GroupMember", + value: GroupMember.toAmino(message) + }; + }, + fromProtoMsg(message: GroupMemberProtoMsg): GroupMember { + return GroupMember.decode(message.value); + }, + toProto(message: GroupMember): Uint8Array { + return GroupMember.encode(message).finish(); + }, + toProtoMsg(message: GroupMember): GroupMemberProtoMsg { + return { + typeUrl: "/cosmos.group.v1.GroupMember", + value: GroupMember.encode(message).finish() + }; } }; function createBaseGroupPolicyInfo(): GroupPolicyInfo { @@ -1078,6 +1330,7 @@ function createBaseGroupPolicyInfo(): GroupPolicyInfo { }; } export const GroupPolicyInfo = { + typeUrl: "/cosmos.group.v1.GroupPolicyInfo", encode(message: GroupPolicyInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1202,6 +1455,49 @@ export const GroupPolicyInfo = { message.decisionPolicy !== undefined && (obj.decision_policy = message.decisionPolicy ? Any.toSDK(message.decisionPolicy) : undefined); message.createdAt !== undefined && (obj.created_at = message.createdAt ?? undefined); return obj; + }, + fromAmino(object: GroupPolicyInfoAmino): GroupPolicyInfo { + return { + address: object.address, + groupId: BigInt(object.group_id), + admin: object.admin, + metadata: object.metadata, + version: BigInt(object.version), + decisionPolicy: object?.decision_policy ? Any.fromAmino(object.decision_policy) : undefined, + createdAt: object.created_at + }; + }, + toAmino(message: GroupPolicyInfo): GroupPolicyInfoAmino { + const obj: any = {}; + obj.address = message.address; + obj.group_id = message.groupId ? message.groupId.toString() : undefined; + obj.admin = message.admin; + obj.metadata = message.metadata; + obj.version = message.version ? message.version.toString() : undefined; + obj.decision_policy = message.decisionPolicy ? Any.toAmino(message.decisionPolicy) : undefined; + obj.created_at = message.createdAt; + return obj; + }, + fromAminoMsg(object: GroupPolicyInfoAminoMsg): GroupPolicyInfo { + return GroupPolicyInfo.fromAmino(object.value); + }, + toAminoMsg(message: GroupPolicyInfo): GroupPolicyInfoAminoMsg { + return { + type: "cosmos-sdk/GroupPolicyInfo", + value: GroupPolicyInfo.toAmino(message) + }; + }, + fromProtoMsg(message: GroupPolicyInfoProtoMsg): GroupPolicyInfo { + return GroupPolicyInfo.decode(message.value); + }, + toProto(message: GroupPolicyInfo): Uint8Array { + return GroupPolicyInfo.encode(message).finish(); + }, + toProtoMsg(message: GroupPolicyInfo): GroupPolicyInfoProtoMsg { + return { + typeUrl: "/cosmos.group.v1.GroupPolicyInfo", + value: GroupPolicyInfo.encode(message).finish() + }; } }; function createBaseProposal(): Proposal { @@ -1222,6 +1518,7 @@ function createBaseProposal(): Proposal { }; } export const Proposal = { + typeUrl: "/cosmos.group.v1.Proposal", encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); @@ -1434,6 +1731,69 @@ export const Proposal = { obj.messages = []; } return obj; + }, + fromAmino(object: ProposalAmino): Proposal { + return { + id: BigInt(object.id), + address: object.address, + metadata: object.metadata, + proposers: Array.isArray(object?.proposers) ? object.proposers.map((e: any) => e) : [], + submitTime: object.submit_time, + groupVersion: BigInt(object.group_version), + groupPolicyVersion: BigInt(object.group_policy_version), + status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, + result: isSet(object.result) ? proposalResultFromJSON(object.result) : -1, + finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined, + votingPeriodEnd: object.voting_period_end, + executorResult: isSet(object.executor_result) ? proposalExecutorResultFromJSON(object.executor_result) : -1, + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: Proposal): ProposalAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + obj.address = message.address; + obj.metadata = message.metadata; + if (message.proposers) { + obj.proposers = message.proposers.map(e => e); + } else { + obj.proposers = []; + } + obj.submit_time = message.submitTime; + obj.group_version = message.groupVersion ? message.groupVersion.toString() : undefined; + obj.group_policy_version = message.groupPolicyVersion ? message.groupPolicyVersion.toString() : undefined; + obj.status = message.status; + obj.result = message.result; + obj.final_tally_result = message.finalTallyResult ? TallyResult.toAmino(message.finalTallyResult) : undefined; + obj.voting_period_end = message.votingPeriodEnd; + obj.executor_result = message.executorResult; + if (message.messages) { + obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.messages = []; + } + return obj; + }, + fromAminoMsg(object: ProposalAminoMsg): Proposal { + return Proposal.fromAmino(object.value); + }, + toAminoMsg(message: Proposal): ProposalAminoMsg { + return { + type: "cosmos-sdk/Proposal", + value: Proposal.toAmino(message) + }; + }, + fromProtoMsg(message: ProposalProtoMsg): Proposal { + return Proposal.decode(message.value); + }, + toProto(message: Proposal): Uint8Array { + return Proposal.encode(message).finish(); + }, + toProtoMsg(message: Proposal): ProposalProtoMsg { + return { + typeUrl: "/cosmos.group.v1.Proposal", + value: Proposal.encode(message).finish() + }; } }; function createBaseTallyResult(): TallyResult { @@ -1445,6 +1805,7 @@ function createBaseTallyResult(): TallyResult { }; } export const TallyResult = { + typeUrl: "/cosmos.group.v1.TallyResult", encode(message: TallyResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.yesCount !== "") { writer.uint32(10).string(message.yesCount); @@ -1533,6 +1894,43 @@ export const TallyResult = { obj.no_count = message.noCount; obj.no_with_veto_count = message.noWithVetoCount; return obj; + }, + fromAmino(object: TallyResultAmino): TallyResult { + return { + yesCount: object.yes_count, + abstainCount: object.abstain_count, + noCount: object.no_count, + noWithVetoCount: object.no_with_veto_count + }; + }, + toAmino(message: TallyResult): TallyResultAmino { + const obj: any = {}; + obj.yes_count = message.yesCount; + obj.abstain_count = message.abstainCount; + obj.no_count = message.noCount; + obj.no_with_veto_count = message.noWithVetoCount; + return obj; + }, + fromAminoMsg(object: TallyResultAminoMsg): TallyResult { + return TallyResult.fromAmino(object.value); + }, + toAminoMsg(message: TallyResult): TallyResultAminoMsg { + return { + type: "cosmos-sdk/TallyResult", + value: TallyResult.toAmino(message) + }; + }, + fromProtoMsg(message: TallyResultProtoMsg): TallyResult { + return TallyResult.decode(message.value); + }, + toProto(message: TallyResult): Uint8Array { + return TallyResult.encode(message).finish(); + }, + toProtoMsg(message: TallyResult): TallyResultProtoMsg { + return { + typeUrl: "/cosmos.group.v1.TallyResult", + value: TallyResult.encode(message).finish() + }; } }; function createBaseVote(): Vote { @@ -1545,6 +1943,7 @@ function createBaseVote(): Vote { }; } export const Vote = { + typeUrl: "/cosmos.group.v1.Vote", encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); @@ -1645,5 +2044,44 @@ export const Vote = { obj.metadata = message.metadata; message.submitTime !== undefined && (obj.submit_time = message.submitTime ?? undefined); return obj; + }, + fromAmino(object: VoteAmino): Vote { + return { + proposalId: BigInt(object.proposal_id), + voter: object.voter, + option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, + metadata: object.metadata, + submitTime: object.submit_time + }; + }, + toAmino(message: Vote): VoteAmino { + const obj: any = {}; + obj.proposal_id = message.proposalId ? message.proposalId.toString() : undefined; + obj.voter = message.voter; + obj.option = message.option; + obj.metadata = message.metadata; + obj.submit_time = message.submitTime; + return obj; + }, + fromAminoMsg(object: VoteAminoMsg): Vote { + return Vote.fromAmino(object.value); + }, + toAminoMsg(message: Vote): VoteAminoMsg { + return { + type: "cosmos-sdk/Vote", + value: Vote.toAmino(message) + }; + }, + fromProtoMsg(message: VoteProtoMsg): Vote { + return Vote.decode(message.value); + }, + toProto(message: Vote): Uint8Array { + return Vote.encode(message).finish(); + }, + toProtoMsg(message: Vote): VoteProtoMsg { + return { + typeUrl: "/cosmos.group.v1.Vote", + value: Vote.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts b/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts index 66eb43b2da..720e512e95 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/ics23/v1/proofs.ts @@ -489,6 +489,7 @@ function createBaseExistenceProof(): ExistenceProof { }; } export const ExistenceProof = { + typeUrl: "/cosmos.ics23.v1.ExistenceProof", encode(message: ExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -585,6 +586,47 @@ export const ExistenceProof = { obj.path = []; } return obj; + }, + fromAmino(object: ExistenceProofAmino): ExistenceProof { + return { + key: object.key, + value: object.value, + leaf: object?.leaf ? LeafOp.fromAmino(object.leaf) : undefined, + path: Array.isArray(object?.path) ? object.path.map((e: any) => InnerOp.fromAmino(e)) : [] + }; + }, + toAmino(message: ExistenceProof): ExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + obj.leaf = message.leaf ? LeafOp.toAmino(message.leaf) : undefined; + if (message.path) { + obj.path = message.path.map(e => e ? InnerOp.toAmino(e) : undefined); + } else { + obj.path = []; + } + return obj; + }, + fromAminoMsg(object: ExistenceProofAminoMsg): ExistenceProof { + return ExistenceProof.fromAmino(object.value); + }, + toAminoMsg(message: ExistenceProof): ExistenceProofAminoMsg { + return { + type: "cosmos-sdk/ExistenceProof", + value: ExistenceProof.toAmino(message) + }; + }, + fromProtoMsg(message: ExistenceProofProtoMsg): ExistenceProof { + return ExistenceProof.decode(message.value); + }, + toProto(message: ExistenceProof): Uint8Array { + return ExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: ExistenceProof): ExistenceProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.ExistenceProof", + value: ExistenceProof.encode(message).finish() + }; } }; function createBaseNonExistenceProof(): NonExistenceProof { @@ -595,6 +637,7 @@ function createBaseNonExistenceProof(): NonExistenceProof { }; } export const NonExistenceProof = { + typeUrl: "/cosmos.ics23.v1.NonExistenceProof", encode(message: NonExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -671,6 +714,41 @@ export const NonExistenceProof = { message.left !== undefined && (obj.left = message.left ? ExistenceProof.toSDK(message.left) : undefined); message.right !== undefined && (obj.right = message.right ? ExistenceProof.toSDK(message.right) : undefined); return obj; + }, + fromAmino(object: NonExistenceProofAmino): NonExistenceProof { + return { + key: object.key, + left: object?.left ? ExistenceProof.fromAmino(object.left) : undefined, + right: object?.right ? ExistenceProof.fromAmino(object.right) : undefined + }; + }, + toAmino(message: NonExistenceProof): NonExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.left = message.left ? ExistenceProof.toAmino(message.left) : undefined; + obj.right = message.right ? ExistenceProof.toAmino(message.right) : undefined; + return obj; + }, + fromAminoMsg(object: NonExistenceProofAminoMsg): NonExistenceProof { + return NonExistenceProof.fromAmino(object.value); + }, + toAminoMsg(message: NonExistenceProof): NonExistenceProofAminoMsg { + return { + type: "cosmos-sdk/NonExistenceProof", + value: NonExistenceProof.toAmino(message) + }; + }, + fromProtoMsg(message: NonExistenceProofProtoMsg): NonExistenceProof { + return NonExistenceProof.decode(message.value); + }, + toProto(message: NonExistenceProof): Uint8Array { + return NonExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: NonExistenceProof): NonExistenceProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.NonExistenceProof", + value: NonExistenceProof.encode(message).finish() + }; } }; function createBaseCommitmentProof(): CommitmentProof { @@ -682,6 +760,7 @@ function createBaseCommitmentProof(): CommitmentProof { }; } export const CommitmentProof = { + typeUrl: "/cosmos.ics23.v1.CommitmentProof", encode(message: CommitmentProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); @@ -770,6 +849,43 @@ export const CommitmentProof = { message.batch !== undefined && (obj.batch = message.batch ? BatchProof.toSDK(message.batch) : undefined); message.compressed !== undefined && (obj.compressed = message.compressed ? CompressedBatchProof.toSDK(message.compressed) : undefined); return obj; + }, + fromAmino(object: CommitmentProofAmino): CommitmentProof { + return { + exist: object?.exist ? ExistenceProof.fromAmino(object.exist) : undefined, + nonexist: object?.nonexist ? NonExistenceProof.fromAmino(object.nonexist) : undefined, + batch: object?.batch ? BatchProof.fromAmino(object.batch) : undefined, + compressed: object?.compressed ? CompressedBatchProof.fromAmino(object.compressed) : undefined + }; + }, + toAmino(message: CommitmentProof): CommitmentProofAmino { + const obj: any = {}; + obj.exist = message.exist ? ExistenceProof.toAmino(message.exist) : undefined; + obj.nonexist = message.nonexist ? NonExistenceProof.toAmino(message.nonexist) : undefined; + obj.batch = message.batch ? BatchProof.toAmino(message.batch) : undefined; + obj.compressed = message.compressed ? CompressedBatchProof.toAmino(message.compressed) : undefined; + return obj; + }, + fromAminoMsg(object: CommitmentProofAminoMsg): CommitmentProof { + return CommitmentProof.fromAmino(object.value); + }, + toAminoMsg(message: CommitmentProof): CommitmentProofAminoMsg { + return { + type: "cosmos-sdk/CommitmentProof", + value: CommitmentProof.toAmino(message) + }; + }, + fromProtoMsg(message: CommitmentProofProtoMsg): CommitmentProof { + return CommitmentProof.decode(message.value); + }, + toProto(message: CommitmentProof): Uint8Array { + return CommitmentProof.encode(message).finish(); + }, + toProtoMsg(message: CommitmentProof): CommitmentProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.CommitmentProof", + value: CommitmentProof.encode(message).finish() + }; } }; function createBaseLeafOp(): LeafOp { @@ -782,6 +898,7 @@ function createBaseLeafOp(): LeafOp { }; } export const LeafOp = { + typeUrl: "/cosmos.ics23.v1.LeafOp", encode(message: LeafOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== 0) { writer.uint32(8).int32(message.hash); @@ -882,6 +999,45 @@ export const LeafOp = { message.length !== undefined && (obj.length = lengthOpToJSON(message.length)); obj.prefix = message.prefix; return obj; + }, + fromAmino(object: LeafOpAmino): LeafOp { + return { + hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1, + prehashKey: isSet(object.prehash_key) ? hashOpFromJSON(object.prehash_key) : -1, + prehashValue: isSet(object.prehash_value) ? hashOpFromJSON(object.prehash_value) : -1, + length: isSet(object.length) ? lengthOpFromJSON(object.length) : -1, + prefix: object.prefix + }; + }, + toAmino(message: LeafOp): LeafOpAmino { + const obj: any = {}; + obj.hash = message.hash; + obj.prehash_key = message.prehashKey; + obj.prehash_value = message.prehashValue; + obj.length = message.length; + obj.prefix = message.prefix; + return obj; + }, + fromAminoMsg(object: LeafOpAminoMsg): LeafOp { + return LeafOp.fromAmino(object.value); + }, + toAminoMsg(message: LeafOp): LeafOpAminoMsg { + return { + type: "cosmos-sdk/LeafOp", + value: LeafOp.toAmino(message) + }; + }, + fromProtoMsg(message: LeafOpProtoMsg): LeafOp { + return LeafOp.decode(message.value); + }, + toProto(message: LeafOp): Uint8Array { + return LeafOp.encode(message).finish(); + }, + toProtoMsg(message: LeafOp): LeafOpProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.LeafOp", + value: LeafOp.encode(message).finish() + }; } }; function createBaseInnerOp(): InnerOp { @@ -892,6 +1048,7 @@ function createBaseInnerOp(): InnerOp { }; } export const InnerOp = { + typeUrl: "/cosmos.ics23.v1.InnerOp", encode(message: InnerOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== 0) { writer.uint32(8).int32(message.hash); @@ -968,6 +1125,41 @@ export const InnerOp = { obj.prefix = message.prefix; obj.suffix = message.suffix; return obj; + }, + fromAmino(object: InnerOpAmino): InnerOp { + return { + hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1, + prefix: object.prefix, + suffix: object.suffix + }; + }, + toAmino(message: InnerOp): InnerOpAmino { + const obj: any = {}; + obj.hash = message.hash; + obj.prefix = message.prefix; + obj.suffix = message.suffix; + return obj; + }, + fromAminoMsg(object: InnerOpAminoMsg): InnerOp { + return InnerOp.fromAmino(object.value); + }, + toAminoMsg(message: InnerOp): InnerOpAminoMsg { + return { + type: "cosmos-sdk/InnerOp", + value: InnerOp.toAmino(message) + }; + }, + fromProtoMsg(message: InnerOpProtoMsg): InnerOp { + return InnerOp.decode(message.value); + }, + toProto(message: InnerOp): Uint8Array { + return InnerOp.encode(message).finish(); + }, + toProtoMsg(message: InnerOp): InnerOpProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.InnerOp", + value: InnerOp.encode(message).finish() + }; } }; function createBaseProofSpec(): ProofSpec { @@ -979,6 +1171,7 @@ function createBaseProofSpec(): ProofSpec { }; } export const ProofSpec = { + typeUrl: "/cosmos.ics23.v1.ProofSpec", encode(message: ProofSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leafSpec !== undefined) { LeafOp.encode(message.leafSpec, writer.uint32(10).fork()).ldelim(); @@ -1067,6 +1260,43 @@ export const ProofSpec = { obj.max_depth = message.maxDepth; obj.min_depth = message.minDepth; return obj; + }, + fromAmino(object: ProofSpecAmino): ProofSpec { + return { + leafSpec: object?.leaf_spec ? LeafOp.fromAmino(object.leaf_spec) : undefined, + innerSpec: object?.inner_spec ? InnerSpec.fromAmino(object.inner_spec) : undefined, + maxDepth: object.max_depth, + minDepth: object.min_depth + }; + }, + toAmino(message: ProofSpec): ProofSpecAmino { + const obj: any = {}; + obj.leaf_spec = message.leafSpec ? LeafOp.toAmino(message.leafSpec) : undefined; + obj.inner_spec = message.innerSpec ? InnerSpec.toAmino(message.innerSpec) : undefined; + obj.max_depth = message.maxDepth; + obj.min_depth = message.minDepth; + return obj; + }, + fromAminoMsg(object: ProofSpecAminoMsg): ProofSpec { + return ProofSpec.fromAmino(object.value); + }, + toAminoMsg(message: ProofSpec): ProofSpecAminoMsg { + return { + type: "cosmos-sdk/ProofSpec", + value: ProofSpec.toAmino(message) + }; + }, + fromProtoMsg(message: ProofSpecProtoMsg): ProofSpec { + return ProofSpec.decode(message.value); + }, + toProto(message: ProofSpec): Uint8Array { + return ProofSpec.encode(message).finish(); + }, + toProtoMsg(message: ProofSpec): ProofSpecProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.ProofSpec", + value: ProofSpec.encode(message).finish() + }; } }; function createBaseInnerSpec(): InnerSpec { @@ -1080,6 +1310,7 @@ function createBaseInnerSpec(): InnerSpec { }; } export const InnerSpec = { + typeUrl: "/cosmos.ics23.v1.InnerSpec", encode(message: InnerSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.childOrder) { @@ -1209,6 +1440,51 @@ export const InnerSpec = { obj.empty_child = message.emptyChild; message.hash !== undefined && (obj.hash = hashOpToJSON(message.hash)); return obj; + }, + fromAmino(object: InnerSpecAmino): InnerSpec { + return { + childOrder: Array.isArray(object?.child_order) ? object.child_order.map((e: any) => e) : [], + childSize: object.child_size, + minPrefixLength: object.min_prefix_length, + maxPrefixLength: object.max_prefix_length, + emptyChild: object.empty_child, + hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1 + }; + }, + toAmino(message: InnerSpec): InnerSpecAmino { + const obj: any = {}; + if (message.childOrder) { + obj.child_order = message.childOrder.map(e => e); + } else { + obj.child_order = []; + } + obj.child_size = message.childSize; + obj.min_prefix_length = message.minPrefixLength; + obj.max_prefix_length = message.maxPrefixLength; + obj.empty_child = message.emptyChild; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: InnerSpecAminoMsg): InnerSpec { + return InnerSpec.fromAmino(object.value); + }, + toAminoMsg(message: InnerSpec): InnerSpecAminoMsg { + return { + type: "cosmos-sdk/InnerSpec", + value: InnerSpec.toAmino(message) + }; + }, + fromProtoMsg(message: InnerSpecProtoMsg): InnerSpec { + return InnerSpec.decode(message.value); + }, + toProto(message: InnerSpec): Uint8Array { + return InnerSpec.encode(message).finish(); + }, + toProtoMsg(message: InnerSpec): InnerSpecProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.InnerSpec", + value: InnerSpec.encode(message).finish() + }; } }; function createBaseBatchProof(): BatchProof { @@ -1217,6 +1493,7 @@ function createBaseBatchProof(): BatchProof { }; } export const BatchProof = { + typeUrl: "/cosmos.ics23.v1.BatchProof", encode(message: BatchProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { BatchEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1277,6 +1554,41 @@ export const BatchProof = { obj.entries = []; } return obj; + }, + fromAmino(object: BatchProofAmino): BatchProof { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => BatchEntry.fromAmino(e)) : [] + }; + }, + toAmino(message: BatchProof): BatchProofAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? BatchEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: BatchProofAminoMsg): BatchProof { + return BatchProof.fromAmino(object.value); + }, + toAminoMsg(message: BatchProof): BatchProofAminoMsg { + return { + type: "cosmos-sdk/BatchProof", + value: BatchProof.toAmino(message) + }; + }, + fromProtoMsg(message: BatchProofProtoMsg): BatchProof { + return BatchProof.decode(message.value); + }, + toProto(message: BatchProof): Uint8Array { + return BatchProof.encode(message).finish(); + }, + toProtoMsg(message: BatchProof): BatchProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.BatchProof", + value: BatchProof.encode(message).finish() + }; } }; function createBaseBatchEntry(): BatchEntry { @@ -1286,6 +1598,7 @@ function createBaseBatchEntry(): BatchEntry { }; } export const BatchEntry = { + typeUrl: "/cosmos.ics23.v1.BatchEntry", encode(message: BatchEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); @@ -1350,6 +1663,39 @@ export const BatchEntry = { message.exist !== undefined && (obj.exist = message.exist ? ExistenceProof.toSDK(message.exist) : undefined); message.nonexist !== undefined && (obj.nonexist = message.nonexist ? NonExistenceProof.toSDK(message.nonexist) : undefined); return obj; + }, + fromAmino(object: BatchEntryAmino): BatchEntry { + return { + exist: object?.exist ? ExistenceProof.fromAmino(object.exist) : undefined, + nonexist: object?.nonexist ? NonExistenceProof.fromAmino(object.nonexist) : undefined + }; + }, + toAmino(message: BatchEntry): BatchEntryAmino { + const obj: any = {}; + obj.exist = message.exist ? ExistenceProof.toAmino(message.exist) : undefined; + obj.nonexist = message.nonexist ? NonExistenceProof.toAmino(message.nonexist) : undefined; + return obj; + }, + fromAminoMsg(object: BatchEntryAminoMsg): BatchEntry { + return BatchEntry.fromAmino(object.value); + }, + toAminoMsg(message: BatchEntry): BatchEntryAminoMsg { + return { + type: "cosmos-sdk/BatchEntry", + value: BatchEntry.toAmino(message) + }; + }, + fromProtoMsg(message: BatchEntryProtoMsg): BatchEntry { + return BatchEntry.decode(message.value); + }, + toProto(message: BatchEntry): Uint8Array { + return BatchEntry.encode(message).finish(); + }, + toProtoMsg(message: BatchEntry): BatchEntryProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.BatchEntry", + value: BatchEntry.encode(message).finish() + }; } }; function createBaseCompressedBatchProof(): CompressedBatchProof { @@ -1359,6 +1705,7 @@ function createBaseCompressedBatchProof(): CompressedBatchProof { }; } export const CompressedBatchProof = { + typeUrl: "/cosmos.ics23.v1.CompressedBatchProof", encode(message: CompressedBatchProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { CompressedBatchEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1439,6 +1786,47 @@ export const CompressedBatchProof = { obj.lookup_inners = []; } return obj; + }, + fromAmino(object: CompressedBatchProofAmino): CompressedBatchProof { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => CompressedBatchEntry.fromAmino(e)) : [], + lookupInners: Array.isArray(object?.lookup_inners) ? object.lookup_inners.map((e: any) => InnerOp.fromAmino(e)) : [] + }; + }, + toAmino(message: CompressedBatchProof): CompressedBatchProofAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? CompressedBatchEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + if (message.lookupInners) { + obj.lookup_inners = message.lookupInners.map(e => e ? InnerOp.toAmino(e) : undefined); + } else { + obj.lookup_inners = []; + } + return obj; + }, + fromAminoMsg(object: CompressedBatchProofAminoMsg): CompressedBatchProof { + return CompressedBatchProof.fromAmino(object.value); + }, + toAminoMsg(message: CompressedBatchProof): CompressedBatchProofAminoMsg { + return { + type: "cosmos-sdk/CompressedBatchProof", + value: CompressedBatchProof.toAmino(message) + }; + }, + fromProtoMsg(message: CompressedBatchProofProtoMsg): CompressedBatchProof { + return CompressedBatchProof.decode(message.value); + }, + toProto(message: CompressedBatchProof): Uint8Array { + return CompressedBatchProof.encode(message).finish(); + }, + toProtoMsg(message: CompressedBatchProof): CompressedBatchProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.CompressedBatchProof", + value: CompressedBatchProof.encode(message).finish() + }; } }; function createBaseCompressedBatchEntry(): CompressedBatchEntry { @@ -1448,6 +1836,7 @@ function createBaseCompressedBatchEntry(): CompressedBatchEntry { }; } export const CompressedBatchEntry = { + typeUrl: "/cosmos.ics23.v1.CompressedBatchEntry", encode(message: CompressedBatchEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { CompressedExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); @@ -1512,6 +1901,39 @@ export const CompressedBatchEntry = { message.exist !== undefined && (obj.exist = message.exist ? CompressedExistenceProof.toSDK(message.exist) : undefined); message.nonexist !== undefined && (obj.nonexist = message.nonexist ? CompressedNonExistenceProof.toSDK(message.nonexist) : undefined); return obj; + }, + fromAmino(object: CompressedBatchEntryAmino): CompressedBatchEntry { + return { + exist: object?.exist ? CompressedExistenceProof.fromAmino(object.exist) : undefined, + nonexist: object?.nonexist ? CompressedNonExistenceProof.fromAmino(object.nonexist) : undefined + }; + }, + toAmino(message: CompressedBatchEntry): CompressedBatchEntryAmino { + const obj: any = {}; + obj.exist = message.exist ? CompressedExistenceProof.toAmino(message.exist) : undefined; + obj.nonexist = message.nonexist ? CompressedNonExistenceProof.toAmino(message.nonexist) : undefined; + return obj; + }, + fromAminoMsg(object: CompressedBatchEntryAminoMsg): CompressedBatchEntry { + return CompressedBatchEntry.fromAmino(object.value); + }, + toAminoMsg(message: CompressedBatchEntry): CompressedBatchEntryAminoMsg { + return { + type: "cosmos-sdk/CompressedBatchEntry", + value: CompressedBatchEntry.toAmino(message) + }; + }, + fromProtoMsg(message: CompressedBatchEntryProtoMsg): CompressedBatchEntry { + return CompressedBatchEntry.decode(message.value); + }, + toProto(message: CompressedBatchEntry): Uint8Array { + return CompressedBatchEntry.encode(message).finish(); + }, + toProtoMsg(message: CompressedBatchEntry): CompressedBatchEntryProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.CompressedBatchEntry", + value: CompressedBatchEntry.encode(message).finish() + }; } }; function createBaseCompressedExistenceProof(): CompressedExistenceProof { @@ -1523,6 +1945,7 @@ function createBaseCompressedExistenceProof(): CompressedExistenceProof { }; } export const CompressedExistenceProof = { + typeUrl: "/cosmos.ics23.v1.CompressedExistenceProof", encode(message: CompressedExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -1628,6 +2051,47 @@ export const CompressedExistenceProof = { obj.path = []; } return obj; + }, + fromAmino(object: CompressedExistenceProofAmino): CompressedExistenceProof { + return { + key: object.key, + value: object.value, + leaf: object?.leaf ? LeafOp.fromAmino(object.leaf) : undefined, + path: Array.isArray(object?.path) ? object.path.map((e: any) => e) : [] + }; + }, + toAmino(message: CompressedExistenceProof): CompressedExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + obj.leaf = message.leaf ? LeafOp.toAmino(message.leaf) : undefined; + if (message.path) { + obj.path = message.path.map(e => e); + } else { + obj.path = []; + } + return obj; + }, + fromAminoMsg(object: CompressedExistenceProofAminoMsg): CompressedExistenceProof { + return CompressedExistenceProof.fromAmino(object.value); + }, + toAminoMsg(message: CompressedExistenceProof): CompressedExistenceProofAminoMsg { + return { + type: "cosmos-sdk/CompressedExistenceProof", + value: CompressedExistenceProof.toAmino(message) + }; + }, + fromProtoMsg(message: CompressedExistenceProofProtoMsg): CompressedExistenceProof { + return CompressedExistenceProof.decode(message.value); + }, + toProto(message: CompressedExistenceProof): Uint8Array { + return CompressedExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: CompressedExistenceProof): CompressedExistenceProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.CompressedExistenceProof", + value: CompressedExistenceProof.encode(message).finish() + }; } }; function createBaseCompressedNonExistenceProof(): CompressedNonExistenceProof { @@ -1638,6 +2102,7 @@ function createBaseCompressedNonExistenceProof(): CompressedNonExistenceProof { }; } export const CompressedNonExistenceProof = { + typeUrl: "/cosmos.ics23.v1.CompressedNonExistenceProof", encode(message: CompressedNonExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -1714,5 +2179,40 @@ export const CompressedNonExistenceProof = { message.left !== undefined && (obj.left = message.left ? CompressedExistenceProof.toSDK(message.left) : undefined); message.right !== undefined && (obj.right = message.right ? CompressedExistenceProof.toSDK(message.right) : undefined); return obj; + }, + fromAmino(object: CompressedNonExistenceProofAmino): CompressedNonExistenceProof { + return { + key: object.key, + left: object?.left ? CompressedExistenceProof.fromAmino(object.left) : undefined, + right: object?.right ? CompressedExistenceProof.fromAmino(object.right) : undefined + }; + }, + toAmino(message: CompressedNonExistenceProof): CompressedNonExistenceProofAmino { + const obj: any = {}; + obj.key = message.key; + obj.left = message.left ? CompressedExistenceProof.toAmino(message.left) : undefined; + obj.right = message.right ? CompressedExistenceProof.toAmino(message.right) : undefined; + return obj; + }, + fromAminoMsg(object: CompressedNonExistenceProofAminoMsg): CompressedNonExistenceProof { + return CompressedNonExistenceProof.fromAmino(object.value); + }, + toAminoMsg(message: CompressedNonExistenceProof): CompressedNonExistenceProofAminoMsg { + return { + type: "cosmos-sdk/CompressedNonExistenceProof", + value: CompressedNonExistenceProof.toAmino(message) + }; + }, + fromProtoMsg(message: CompressedNonExistenceProofProtoMsg): CompressedNonExistenceProof { + return CompressedNonExistenceProof.decode(message.value); + }, + toProto(message: CompressedNonExistenceProof): Uint8Array { + return CompressedNonExistenceProof.encode(message).finish(); + }, + toProtoMsg(message: CompressedNonExistenceProof): CompressedNonExistenceProofProtoMsg { + return { + typeUrl: "/cosmos.ics23.v1.CompressedNonExistenceProof", + value: CompressedNonExistenceProof.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/genesis.ts index 85d8a5d696..9c1c60344d 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/genesis.ts @@ -21,6 +21,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.mint.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.minter !== undefined) { Minter.encode(message.minter, writer.uint32(10).fork()).ldelim(); @@ -85,5 +86,38 @@ export const GenesisState = { message.minter !== undefined && (obj.minter = message.minter ? Minter.toSDK(message.minter) : undefined); message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + minter: object?.minter ? Minter.fromAmino(object.minter) : undefined, + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.minter = message.minter ? Minter.toAmino(message.minter) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts index 82ecf0c61e..6611caa320 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/mint.ts @@ -45,6 +45,7 @@ function createBaseMinter(): Minter { }; } export const Minter = { + typeUrl: "/cosmos.mint.v1beta1.Minter", encode(message: Minter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflation !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.inflation, 18).atomics); @@ -109,6 +110,39 @@ export const Minter = { obj.inflation = message.inflation; obj.annual_provisions = message.annualProvisions; return obj; + }, + fromAmino(object: MinterAmino): Minter { + return { + inflation: object.inflation, + annualProvisions: object.annual_provisions + }; + }, + toAmino(message: Minter): MinterAmino { + const obj: any = {}; + obj.inflation = message.inflation; + obj.annual_provisions = message.annualProvisions; + return obj; + }, + fromAminoMsg(object: MinterAminoMsg): Minter { + return Minter.fromAmino(object.value); + }, + toAminoMsg(message: Minter): MinterAminoMsg { + return { + type: "cosmos-sdk/Minter", + value: Minter.toAmino(message) + }; + }, + fromProtoMsg(message: MinterProtoMsg): Minter { + return Minter.decode(message.value); + }, + toProto(message: Minter): Uint8Array { + return Minter.encode(message).finish(); + }, + toProtoMsg(message: Minter): MinterProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.Minter", + value: Minter.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -122,6 +156,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmos.mint.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mintDenom !== "") { writer.uint32(10).string(message.mintDenom); @@ -234,5 +269,46 @@ export const Params = { obj.goal_bonded = message.goalBonded; obj.blocks_per_year = message.blocksPerYear; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + mintDenom: object.mint_denom, + inflationRateChange: object.inflation_rate_change, + inflationMax: object.inflation_max, + inflationMin: object.inflation_min, + goalBonded: object.goal_bonded, + blocksPerYear: BigInt(object.blocks_per_year) + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.mint_denom = message.mintDenom; + obj.inflation_rate_change = message.inflationRateChange; + obj.inflation_max = message.inflationMax; + obj.inflation_min = message.inflationMin; + obj.goal_bonded = message.goalBonded; + obj.blocks_per_year = message.blocksPerYear ? message.blocksPerYear.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/query.ts index 8f0474b015..306a3ea6a6 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/mint/v1beta1/query.ts @@ -63,6 +63,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/cosmos.mint.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -100,6 +101,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -108,6 +137,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.mint.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -160,12 +190,44 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryInflationRequest(): QueryInflationRequest { return {}; } export const QueryInflationRequest = { + typeUrl: "/cosmos.mint.v1beta1.QueryInflationRequest", encode(_: QueryInflationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -203,6 +265,34 @@ export const QueryInflationRequest = { toSDK(_: QueryInflationRequest): QueryInflationRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryInflationRequestAmino): QueryInflationRequest { + return {}; + }, + toAmino(_: QueryInflationRequest): QueryInflationRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryInflationRequestAminoMsg): QueryInflationRequest { + return QueryInflationRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryInflationRequest): QueryInflationRequestAminoMsg { + return { + type: "cosmos-sdk/QueryInflationRequest", + value: QueryInflationRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryInflationRequestProtoMsg): QueryInflationRequest { + return QueryInflationRequest.decode(message.value); + }, + toProto(message: QueryInflationRequest): Uint8Array { + return QueryInflationRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryInflationRequest): QueryInflationRequestProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.QueryInflationRequest", + value: QueryInflationRequest.encode(message).finish() + }; } }; function createBaseQueryInflationResponse(): QueryInflationResponse { @@ -211,6 +301,7 @@ function createBaseQueryInflationResponse(): QueryInflationResponse { }; } export const QueryInflationResponse = { + typeUrl: "/cosmos.mint.v1beta1.QueryInflationResponse", encode(message: QueryInflationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflation.length !== 0) { writer.uint32(10).bytes(message.inflation); @@ -263,12 +354,44 @@ export const QueryInflationResponse = { const obj: any = {}; obj.inflation = message.inflation; return obj; + }, + fromAmino(object: QueryInflationResponseAmino): QueryInflationResponse { + return { + inflation: object.inflation + }; + }, + toAmino(message: QueryInflationResponse): QueryInflationResponseAmino { + const obj: any = {}; + obj.inflation = message.inflation; + return obj; + }, + fromAminoMsg(object: QueryInflationResponseAminoMsg): QueryInflationResponse { + return QueryInflationResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryInflationResponse): QueryInflationResponseAminoMsg { + return { + type: "cosmos-sdk/QueryInflationResponse", + value: QueryInflationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryInflationResponseProtoMsg): QueryInflationResponse { + return QueryInflationResponse.decode(message.value); + }, + toProto(message: QueryInflationResponse): Uint8Array { + return QueryInflationResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryInflationResponse): QueryInflationResponseProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.QueryInflationResponse", + value: QueryInflationResponse.encode(message).finish() + }; } }; function createBaseQueryAnnualProvisionsRequest(): QueryAnnualProvisionsRequest { return {}; } export const QueryAnnualProvisionsRequest = { + typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsRequest", encode(_: QueryAnnualProvisionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -306,6 +429,34 @@ export const QueryAnnualProvisionsRequest = { toSDK(_: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryAnnualProvisionsRequestAmino): QueryAnnualProvisionsRequest { + return {}; + }, + toAmino(_: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryAnnualProvisionsRequestAminoMsg): QueryAnnualProvisionsRequest { + return QueryAnnualProvisionsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAnnualProvisionsRequest", + value: QueryAnnualProvisionsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAnnualProvisionsRequestProtoMsg): QueryAnnualProvisionsRequest { + return QueryAnnualProvisionsRequest.decode(message.value); + }, + toProto(message: QueryAnnualProvisionsRequest): Uint8Array { + return QueryAnnualProvisionsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAnnualProvisionsRequest): QueryAnnualProvisionsRequestProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsRequest", + value: QueryAnnualProvisionsRequest.encode(message).finish() + }; } }; function createBaseQueryAnnualProvisionsResponse(): QueryAnnualProvisionsResponse { @@ -314,6 +465,7 @@ function createBaseQueryAnnualProvisionsResponse(): QueryAnnualProvisionsRespons }; } export const QueryAnnualProvisionsResponse = { + typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsResponse", encode(message: QueryAnnualProvisionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.annualProvisions.length !== 0) { writer.uint32(10).bytes(message.annualProvisions); @@ -366,5 +518,36 @@ export const QueryAnnualProvisionsResponse = { const obj: any = {}; obj.annual_provisions = message.annualProvisions; return obj; + }, + fromAmino(object: QueryAnnualProvisionsResponseAmino): QueryAnnualProvisionsResponse { + return { + annualProvisions: object.annual_provisions + }; + }, + toAmino(message: QueryAnnualProvisionsResponse): QueryAnnualProvisionsResponseAmino { + const obj: any = {}; + obj.annual_provisions = message.annualProvisions; + return obj; + }, + fromAminoMsg(object: QueryAnnualProvisionsResponseAminoMsg): QueryAnnualProvisionsResponse { + return QueryAnnualProvisionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAnnualProvisionsResponse): QueryAnnualProvisionsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAnnualProvisionsResponse", + value: QueryAnnualProvisionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAnnualProvisionsResponseProtoMsg): QueryAnnualProvisionsResponse { + return QueryAnnualProvisionsResponse.decode(message.value); + }, + toProto(message: QueryAnnualProvisionsResponse): Uint8Array { + return QueryAnnualProvisionsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAnnualProvisionsResponse): QueryAnnualProvisionsResponseProtoMsg { + return { + typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsResponse", + value: QueryAnnualProvisionsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts index 87f7181f81..ac79db83f9 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/event.ts @@ -48,6 +48,7 @@ function createBaseEventSend(): EventSend { }; } export const EventSend = { + typeUrl: "/cosmos.nft.v1beta1.EventSend", encode(message: EventSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -136,6 +137,43 @@ export const EventSend = { obj.sender = message.sender; obj.receiver = message.receiver; return obj; + }, + fromAmino(object: EventSendAmino): EventSend { + return { + classId: object.class_id, + id: object.id, + sender: object.sender, + receiver: object.receiver + }; + }, + toAmino(message: EventSend): EventSendAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + obj.sender = message.sender; + obj.receiver = message.receiver; + return obj; + }, + fromAminoMsg(object: EventSendAminoMsg): EventSend { + return EventSend.fromAmino(object.value); + }, + toAminoMsg(message: EventSend): EventSendAminoMsg { + return { + type: "cosmos-sdk/EventSend", + value: EventSend.toAmino(message) + }; + }, + fromProtoMsg(message: EventSendProtoMsg): EventSend { + return EventSend.decode(message.value); + }, + toProto(message: EventSend): Uint8Array { + return EventSend.encode(message).finish(); + }, + toProtoMsg(message: EventSend): EventSendProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.EventSend", + value: EventSend.encode(message).finish() + }; } }; function createBaseEventMint(): EventMint { @@ -146,6 +184,7 @@ function createBaseEventMint(): EventMint { }; } export const EventMint = { + typeUrl: "/cosmos.nft.v1beta1.EventMint", encode(message: EventMint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -222,6 +261,41 @@ export const EventMint = { obj.id = message.id; obj.owner = message.owner; return obj; + }, + fromAmino(object: EventMintAmino): EventMint { + return { + classId: object.class_id, + id: object.id, + owner: object.owner + }; + }, + toAmino(message: EventMint): EventMintAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: EventMintAminoMsg): EventMint { + return EventMint.fromAmino(object.value); + }, + toAminoMsg(message: EventMint): EventMintAminoMsg { + return { + type: "cosmos-sdk/EventMint", + value: EventMint.toAmino(message) + }; + }, + fromProtoMsg(message: EventMintProtoMsg): EventMint { + return EventMint.decode(message.value); + }, + toProto(message: EventMint): Uint8Array { + return EventMint.encode(message).finish(); + }, + toProtoMsg(message: EventMint): EventMintProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.EventMint", + value: EventMint.encode(message).finish() + }; } }; function createBaseEventBurn(): EventBurn { @@ -232,6 +306,7 @@ function createBaseEventBurn(): EventBurn { }; } export const EventBurn = { + typeUrl: "/cosmos.nft.v1beta1.EventBurn", encode(message: EventBurn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -308,5 +383,40 @@ export const EventBurn = { obj.id = message.id; obj.owner = message.owner; return obj; + }, + fromAmino(object: EventBurnAmino): EventBurn { + return { + classId: object.class_id, + id: object.id, + owner: object.owner + }; + }, + toAmino(message: EventBurn): EventBurnAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: EventBurnAminoMsg): EventBurn { + return EventBurn.fromAmino(object.value); + }, + toAminoMsg(message: EventBurn): EventBurnAminoMsg { + return { + type: "cosmos-sdk/EventBurn", + value: EventBurn.toAmino(message) + }; + }, + fromProtoMsg(message: EventBurnProtoMsg): EventBurn { + return EventBurn.decode(message.value); + }, + toProto(message: EventBurn): Uint8Array { + return EventBurn.encode(message).finish(); + }, + toProtoMsg(message: EventBurn): EventBurnProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.EventBurn", + value: EventBurn.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts index 741ffdc9f1..5a4f9e3de3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/genesis.ts @@ -32,6 +32,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.nft.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.classes) { Class.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -112,6 +113,47 @@ export const GenesisState = { obj.entries = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + classes: Array.isArray(object?.classes) ? object.classes.map((e: any) => Class.fromAmino(e)) : [], + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => Entry.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.classes) { + obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); + } else { + obj.classes = []; + } + if (message.entries) { + obj.entries = message.entries.map(e => e ? Entry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseEntry(): Entry { @@ -121,6 +163,7 @@ function createBaseEntry(): Entry { }; } export const Entry = { + typeUrl: "/cosmos.nft.v1beta1.Entry", encode(message: Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -193,5 +236,42 @@ export const Entry = { obj.nfts = []; } return obj; + }, + fromAmino(object: EntryAmino): Entry { + return { + owner: object.owner, + nfts: Array.isArray(object?.nfts) ? object.nfts.map((e: any) => NFT.fromAmino(e)) : [] + }; + }, + toAmino(message: Entry): EntryAmino { + const obj: any = {}; + obj.owner = message.owner; + if (message.nfts) { + obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); + } else { + obj.nfts = []; + } + return obj; + }, + fromAminoMsg(object: EntryAminoMsg): Entry { + return Entry.fromAmino(object.value); + }, + toAminoMsg(message: Entry): EntryAminoMsg { + return { + type: "cosmos-sdk/Entry", + value: Entry.toAmino(message) + }; + }, + fromProtoMsg(message: EntryProtoMsg): Entry { + return Entry.decode(message.value); + }, + toProto(message: Entry): Uint8Array { + return Entry.encode(message).finish(); + }, + toProtoMsg(message: Entry): EntryProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.Entry", + value: Entry.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts index 8b7581bdc5..b56ead1c7f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/nft.ts @@ -62,6 +62,7 @@ function createBaseClass(): Class { }; } export const Class = { + typeUrl: "/cosmos.nft.v1beta1.Class", encode(message: Class, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -186,6 +187,49 @@ export const Class = { obj.uri_hash = message.uriHash; message.data !== undefined && (obj.data = message.data ? Any.toSDK(message.data) : undefined); return obj; + }, + fromAmino(object: ClassAmino): Class { + return { + id: object.id, + name: object.name, + symbol: object.symbol, + description: object.description, + uri: object.uri, + uriHash: object.uri_hash, + data: object?.data ? Any.fromAmino(object.data) : undefined + }; + }, + toAmino(message: Class): ClassAmino { + const obj: any = {}; + obj.id = message.id; + obj.name = message.name; + obj.symbol = message.symbol; + obj.description = message.description; + obj.uri = message.uri; + obj.uri_hash = message.uriHash; + obj.data = message.data ? Any.toAmino(message.data) : undefined; + return obj; + }, + fromAminoMsg(object: ClassAminoMsg): Class { + return Class.fromAmino(object.value); + }, + toAminoMsg(message: Class): ClassAminoMsg { + return { + type: "cosmos-sdk/Class", + value: Class.toAmino(message) + }; + }, + fromProtoMsg(message: ClassProtoMsg): Class { + return Class.decode(message.value); + }, + toProto(message: Class): Uint8Array { + return Class.encode(message).finish(); + }, + toProtoMsg(message: Class): ClassProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.Class", + value: Class.encode(message).finish() + }; } }; function createBaseNFT(): NFT { @@ -198,6 +242,7 @@ function createBaseNFT(): NFT { }; } export const NFT = { + typeUrl: "/cosmos.nft.v1beta1.NFT", encode(message: NFT, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -298,5 +343,44 @@ export const NFT = { obj.uri_hash = message.uriHash; message.data !== undefined && (obj.data = message.data ? Any.toSDK(message.data) : undefined); return obj; + }, + fromAmino(object: NFTAmino): NFT { + return { + classId: object.class_id, + id: object.id, + uri: object.uri, + uriHash: object.uri_hash, + data: object?.data ? Any.fromAmino(object.data) : undefined + }; + }, + toAmino(message: NFT): NFTAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + obj.uri = message.uri; + obj.uri_hash = message.uriHash; + obj.data = message.data ? Any.toAmino(message.data) : undefined; + return obj; + }, + fromAminoMsg(object: NFTAminoMsg): NFT { + return NFT.fromAmino(object.value); + }, + toAminoMsg(message: NFT): NFTAminoMsg { + return { + type: "cosmos-sdk/NFT", + value: NFT.toAmino(message) + }; + }, + fromProtoMsg(message: NFTProtoMsg): NFT { + return NFT.decode(message.value); + }, + toProto(message: NFT): Uint8Array { + return NFT.encode(message).finish(); + }, + toProtoMsg(message: NFT): NFTProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.NFT", + value: NFT.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts index 655c875073..72a2d046a5 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/query.ts @@ -137,6 +137,7 @@ function createBaseQueryBalanceRequest(): QueryBalanceRequest { }; } export const QueryBalanceRequest = { + typeUrl: "/cosmos.nft.v1beta1.QueryBalanceRequest", encode(message: QueryBalanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -201,6 +202,39 @@ export const QueryBalanceRequest = { obj.class_id = message.classId; obj.owner = message.owner; return obj; + }, + fromAmino(object: QueryBalanceRequestAmino): QueryBalanceRequest { + return { + classId: object.class_id, + owner: object.owner + }; + }, + toAmino(message: QueryBalanceRequest): QueryBalanceRequestAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: QueryBalanceRequestAminoMsg): QueryBalanceRequest { + return QueryBalanceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryBalanceRequest): QueryBalanceRequestAminoMsg { + return { + type: "cosmos-sdk/QueryBalanceRequest", + value: QueryBalanceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBalanceRequestProtoMsg): QueryBalanceRequest { + return QueryBalanceRequest.decode(message.value); + }, + toProto(message: QueryBalanceRequest): Uint8Array { + return QueryBalanceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBalanceRequest): QueryBalanceRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryBalanceRequest", + value: QueryBalanceRequest.encode(message).finish() + }; } }; function createBaseQueryBalanceResponse(): QueryBalanceResponse { @@ -209,6 +243,7 @@ function createBaseQueryBalanceResponse(): QueryBalanceResponse { }; } export const QueryBalanceResponse = { + typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse", encode(message: QueryBalanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.amount !== BigInt(0)) { writer.uint32(8).uint64(message.amount); @@ -261,6 +296,37 @@ export const QueryBalanceResponse = { const obj: any = {}; obj.amount = message.amount; return obj; + }, + fromAmino(object: QueryBalanceResponseAmino): QueryBalanceResponse { + return { + amount: BigInt(object.amount) + }; + }, + toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { + const obj: any = {}; + obj.amount = message.amount ? message.amount.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryBalanceResponseAminoMsg): QueryBalanceResponse { + return QueryBalanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryBalanceResponse): QueryBalanceResponseAminoMsg { + return { + type: "cosmos-sdk/QueryBalanceResponse", + value: QueryBalanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBalanceResponseProtoMsg): QueryBalanceResponse { + return QueryBalanceResponse.decode(message.value); + }, + toProto(message: QueryBalanceResponse): Uint8Array { + return QueryBalanceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBalanceResponse): QueryBalanceResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse", + value: QueryBalanceResponse.encode(message).finish() + }; } }; function createBaseQueryOwnerRequest(): QueryOwnerRequest { @@ -270,6 +336,7 @@ function createBaseQueryOwnerRequest(): QueryOwnerRequest { }; } export const QueryOwnerRequest = { + typeUrl: "/cosmos.nft.v1beta1.QueryOwnerRequest", encode(message: QueryOwnerRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -334,6 +401,39 @@ export const QueryOwnerRequest = { obj.class_id = message.classId; obj.id = message.id; return obj; + }, + fromAmino(object: QueryOwnerRequestAmino): QueryOwnerRequest { + return { + classId: object.class_id, + id: object.id + }; + }, + toAmino(message: QueryOwnerRequest): QueryOwnerRequestAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + return obj; + }, + fromAminoMsg(object: QueryOwnerRequestAminoMsg): QueryOwnerRequest { + return QueryOwnerRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryOwnerRequest): QueryOwnerRequestAminoMsg { + return { + type: "cosmos-sdk/QueryOwnerRequest", + value: QueryOwnerRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryOwnerRequestProtoMsg): QueryOwnerRequest { + return QueryOwnerRequest.decode(message.value); + }, + toProto(message: QueryOwnerRequest): Uint8Array { + return QueryOwnerRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryOwnerRequest): QueryOwnerRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryOwnerRequest", + value: QueryOwnerRequest.encode(message).finish() + }; } }; function createBaseQueryOwnerResponse(): QueryOwnerResponse { @@ -342,6 +442,7 @@ function createBaseQueryOwnerResponse(): QueryOwnerResponse { }; } export const QueryOwnerResponse = { + typeUrl: "/cosmos.nft.v1beta1.QueryOwnerResponse", encode(message: QueryOwnerResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -394,6 +495,37 @@ export const QueryOwnerResponse = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: QueryOwnerResponseAmino): QueryOwnerResponse { + return { + owner: object.owner + }; + }, + toAmino(message: QueryOwnerResponse): QueryOwnerResponseAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: QueryOwnerResponseAminoMsg): QueryOwnerResponse { + return QueryOwnerResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryOwnerResponse): QueryOwnerResponseAminoMsg { + return { + type: "cosmos-sdk/QueryOwnerResponse", + value: QueryOwnerResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryOwnerResponseProtoMsg): QueryOwnerResponse { + return QueryOwnerResponse.decode(message.value); + }, + toProto(message: QueryOwnerResponse): Uint8Array { + return QueryOwnerResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryOwnerResponse): QueryOwnerResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryOwnerResponse", + value: QueryOwnerResponse.encode(message).finish() + }; } }; function createBaseQuerySupplyRequest(): QuerySupplyRequest { @@ -402,6 +534,7 @@ function createBaseQuerySupplyRequest(): QuerySupplyRequest { }; } export const QuerySupplyRequest = { + typeUrl: "/cosmos.nft.v1beta1.QuerySupplyRequest", encode(message: QuerySupplyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -454,6 +587,37 @@ export const QuerySupplyRequest = { const obj: any = {}; obj.class_id = message.classId; return obj; + }, + fromAmino(object: QuerySupplyRequestAmino): QuerySupplyRequest { + return { + classId: object.class_id + }; + }, + toAmino(message: QuerySupplyRequest): QuerySupplyRequestAmino { + const obj: any = {}; + obj.class_id = message.classId; + return obj; + }, + fromAminoMsg(object: QuerySupplyRequestAminoMsg): QuerySupplyRequest { + return QuerySupplyRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySupplyRequest): QuerySupplyRequestAminoMsg { + return { + type: "cosmos-sdk/QuerySupplyRequest", + value: QuerySupplyRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySupplyRequestProtoMsg): QuerySupplyRequest { + return QuerySupplyRequest.decode(message.value); + }, + toProto(message: QuerySupplyRequest): Uint8Array { + return QuerySupplyRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySupplyRequest): QuerySupplyRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QuerySupplyRequest", + value: QuerySupplyRequest.encode(message).finish() + }; } }; function createBaseQuerySupplyResponse(): QuerySupplyResponse { @@ -462,6 +626,7 @@ function createBaseQuerySupplyResponse(): QuerySupplyResponse { }; } export const QuerySupplyResponse = { + typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse", encode(message: QuerySupplyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.amount !== BigInt(0)) { writer.uint32(8).uint64(message.amount); @@ -514,6 +679,37 @@ export const QuerySupplyResponse = { const obj: any = {}; obj.amount = message.amount; return obj; + }, + fromAmino(object: QuerySupplyResponseAmino): QuerySupplyResponse { + return { + amount: BigInt(object.amount) + }; + }, + toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { + const obj: any = {}; + obj.amount = message.amount ? message.amount.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QuerySupplyResponseAminoMsg): QuerySupplyResponse { + return QuerySupplyResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySupplyResponse): QuerySupplyResponseAminoMsg { + return { + type: "cosmos-sdk/QuerySupplyResponse", + value: QuerySupplyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySupplyResponseProtoMsg): QuerySupplyResponse { + return QuerySupplyResponse.decode(message.value); + }, + toProto(message: QuerySupplyResponse): Uint8Array { + return QuerySupplyResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySupplyResponse): QuerySupplyResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse", + value: QuerySupplyResponse.encode(message).finish() + }; } }; function createBaseQueryNFTsRequest(): QueryNFTsRequest { @@ -524,6 +720,7 @@ function createBaseQueryNFTsRequest(): QueryNFTsRequest { }; } export const QueryNFTsRequest = { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTsRequest", encode(message: QueryNFTsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -600,6 +797,41 @@ export const QueryNFTsRequest = { obj.owner = message.owner; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryNFTsRequestAmino): QueryNFTsRequest { + return { + classId: object.class_id, + owner: object.owner, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryNFTsRequest): QueryNFTsRequestAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.owner = message.owner; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryNFTsRequestAminoMsg): QueryNFTsRequest { + return QueryNFTsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryNFTsRequest): QueryNFTsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryNFTsRequest", + value: QueryNFTsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNFTsRequestProtoMsg): QueryNFTsRequest { + return QueryNFTsRequest.decode(message.value); + }, + toProto(message: QueryNFTsRequest): Uint8Array { + return QueryNFTsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryNFTsRequest): QueryNFTsRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTsRequest", + value: QueryNFTsRequest.encode(message).finish() + }; } }; function createBaseQueryNFTsResponse(): QueryNFTsResponse { @@ -609,6 +841,7 @@ function createBaseQueryNFTsResponse(): QueryNFTsResponse { }; } export const QueryNFTsResponse = { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTsResponse", encode(message: QueryNFTsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.nfts) { NFT.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -681,6 +914,43 @@ export const QueryNFTsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryNFTsResponseAmino): QueryNFTsResponse { + return { + nfts: Array.isArray(object?.nfts) ? object.nfts.map((e: any) => NFT.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryNFTsResponse): QueryNFTsResponseAmino { + const obj: any = {}; + if (message.nfts) { + obj.nfts = message.nfts.map(e => e ? NFT.toAmino(e) : undefined); + } else { + obj.nfts = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryNFTsResponseAminoMsg): QueryNFTsResponse { + return QueryNFTsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryNFTsResponse): QueryNFTsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryNFTsResponse", + value: QueryNFTsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNFTsResponseProtoMsg): QueryNFTsResponse { + return QueryNFTsResponse.decode(message.value); + }, + toProto(message: QueryNFTsResponse): Uint8Array { + return QueryNFTsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryNFTsResponse): QueryNFTsResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTsResponse", + value: QueryNFTsResponse.encode(message).finish() + }; } }; function createBaseQueryNFTRequest(): QueryNFTRequest { @@ -690,6 +960,7 @@ function createBaseQueryNFTRequest(): QueryNFTRequest { }; } export const QueryNFTRequest = { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTRequest", encode(message: QueryNFTRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -754,6 +1025,39 @@ export const QueryNFTRequest = { obj.class_id = message.classId; obj.id = message.id; return obj; + }, + fromAmino(object: QueryNFTRequestAmino): QueryNFTRequest { + return { + classId: object.class_id, + id: object.id + }; + }, + toAmino(message: QueryNFTRequest): QueryNFTRequestAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + return obj; + }, + fromAminoMsg(object: QueryNFTRequestAminoMsg): QueryNFTRequest { + return QueryNFTRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryNFTRequest): QueryNFTRequestAminoMsg { + return { + type: "cosmos-sdk/QueryNFTRequest", + value: QueryNFTRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNFTRequestProtoMsg): QueryNFTRequest { + return QueryNFTRequest.decode(message.value); + }, + toProto(message: QueryNFTRequest): Uint8Array { + return QueryNFTRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryNFTRequest): QueryNFTRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTRequest", + value: QueryNFTRequest.encode(message).finish() + }; } }; function createBaseQueryNFTResponse(): QueryNFTResponse { @@ -762,6 +1066,7 @@ function createBaseQueryNFTResponse(): QueryNFTResponse { }; } export const QueryNFTResponse = { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTResponse", encode(message: QueryNFTResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nft !== undefined) { NFT.encode(message.nft, writer.uint32(10).fork()).ldelim(); @@ -814,6 +1119,37 @@ export const QueryNFTResponse = { const obj: any = {}; message.nft !== undefined && (obj.nft = message.nft ? NFT.toSDK(message.nft) : undefined); return obj; + }, + fromAmino(object: QueryNFTResponseAmino): QueryNFTResponse { + return { + nft: object?.nft ? NFT.fromAmino(object.nft) : undefined + }; + }, + toAmino(message: QueryNFTResponse): QueryNFTResponseAmino { + const obj: any = {}; + obj.nft = message.nft ? NFT.toAmino(message.nft) : undefined; + return obj; + }, + fromAminoMsg(object: QueryNFTResponseAminoMsg): QueryNFTResponse { + return QueryNFTResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryNFTResponse): QueryNFTResponseAminoMsg { + return { + type: "cosmos-sdk/QueryNFTResponse", + value: QueryNFTResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNFTResponseProtoMsg): QueryNFTResponse { + return QueryNFTResponse.decode(message.value); + }, + toProto(message: QueryNFTResponse): Uint8Array { + return QueryNFTResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryNFTResponse): QueryNFTResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryNFTResponse", + value: QueryNFTResponse.encode(message).finish() + }; } }; function createBaseQueryClassRequest(): QueryClassRequest { @@ -822,6 +1158,7 @@ function createBaseQueryClassRequest(): QueryClassRequest { }; } export const QueryClassRequest = { + typeUrl: "/cosmos.nft.v1beta1.QueryClassRequest", encode(message: QueryClassRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -874,6 +1211,37 @@ export const QueryClassRequest = { const obj: any = {}; obj.class_id = message.classId; return obj; + }, + fromAmino(object: QueryClassRequestAmino): QueryClassRequest { + return { + classId: object.class_id + }; + }, + toAmino(message: QueryClassRequest): QueryClassRequestAmino { + const obj: any = {}; + obj.class_id = message.classId; + return obj; + }, + fromAminoMsg(object: QueryClassRequestAminoMsg): QueryClassRequest { + return QueryClassRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClassRequest): QueryClassRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClassRequest", + value: QueryClassRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClassRequestProtoMsg): QueryClassRequest { + return QueryClassRequest.decode(message.value); + }, + toProto(message: QueryClassRequest): Uint8Array { + return QueryClassRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClassRequest): QueryClassRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryClassRequest", + value: QueryClassRequest.encode(message).finish() + }; } }; function createBaseQueryClassResponse(): QueryClassResponse { @@ -882,6 +1250,7 @@ function createBaseQueryClassResponse(): QueryClassResponse { }; } export const QueryClassResponse = { + typeUrl: "/cosmos.nft.v1beta1.QueryClassResponse", encode(message: QueryClassResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.class !== undefined) { Class.encode(message.class, writer.uint32(10).fork()).ldelim(); @@ -934,6 +1303,37 @@ export const QueryClassResponse = { const obj: any = {}; message.class !== undefined && (obj.class = message.class ? Class.toSDK(message.class) : undefined); return obj; + }, + fromAmino(object: QueryClassResponseAmino): QueryClassResponse { + return { + class: object?.class ? Class.fromAmino(object.class) : undefined + }; + }, + toAmino(message: QueryClassResponse): QueryClassResponseAmino { + const obj: any = {}; + obj.class = message.class ? Class.toAmino(message.class) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClassResponseAminoMsg): QueryClassResponse { + return QueryClassResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClassResponse): QueryClassResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClassResponse", + value: QueryClassResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClassResponseProtoMsg): QueryClassResponse { + return QueryClassResponse.decode(message.value); + }, + toProto(message: QueryClassResponse): Uint8Array { + return QueryClassResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClassResponse): QueryClassResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryClassResponse", + value: QueryClassResponse.encode(message).finish() + }; } }; function createBaseQueryClassesRequest(): QueryClassesRequest { @@ -942,6 +1342,7 @@ function createBaseQueryClassesRequest(): QueryClassesRequest { }; } export const QueryClassesRequest = { + typeUrl: "/cosmos.nft.v1beta1.QueryClassesRequest", encode(message: QueryClassesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -994,6 +1395,37 @@ export const QueryClassesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryClassesRequestAmino): QueryClassesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryClassesRequest): QueryClassesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClassesRequestAminoMsg): QueryClassesRequest { + return QueryClassesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClassesRequest): QueryClassesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClassesRequest", + value: QueryClassesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClassesRequestProtoMsg): QueryClassesRequest { + return QueryClassesRequest.decode(message.value); + }, + toProto(message: QueryClassesRequest): Uint8Array { + return QueryClassesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClassesRequest): QueryClassesRequestProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryClassesRequest", + value: QueryClassesRequest.encode(message).finish() + }; } }; function createBaseQueryClassesResponse(): QueryClassesResponse { @@ -1003,6 +1435,7 @@ function createBaseQueryClassesResponse(): QueryClassesResponse { }; } export const QueryClassesResponse = { + typeUrl: "/cosmos.nft.v1beta1.QueryClassesResponse", encode(message: QueryClassesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.classes) { Class.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1075,5 +1508,42 @@ export const QueryClassesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryClassesResponseAmino): QueryClassesResponse { + return { + classes: Array.isArray(object?.classes) ? object.classes.map((e: any) => Class.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryClassesResponse): QueryClassesResponseAmino { + const obj: any = {}; + if (message.classes) { + obj.classes = message.classes.map(e => e ? Class.toAmino(e) : undefined); + } else { + obj.classes = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClassesResponseAminoMsg): QueryClassesResponse { + return QueryClassesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClassesResponse): QueryClassesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClassesResponse", + value: QueryClassesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClassesResponseProtoMsg): QueryClassesResponse { + return QueryClassesResponse.decode(message.value); + }, + toProto(message: QueryClassesResponse): Uint8Array { + return QueryClassesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClassesResponse): QueryClassesResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.QueryClassesResponse", + value: QueryClassesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts index b1d8bb1041..89ae370971 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/nft/v1beta1/tx.ts @@ -32,6 +32,7 @@ function createBaseMsgSend(): MsgSend { }; } export const MsgSend = { + typeUrl: "/cosmos.nft.v1beta1.MsgSend", encode(message: MsgSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); @@ -120,12 +121,50 @@ export const MsgSend = { obj.sender = message.sender; obj.receiver = message.receiver; return obj; + }, + fromAmino(object: MsgSendAmino): MsgSend { + return { + classId: object.class_id, + id: object.id, + sender: object.sender, + receiver: object.receiver + }; + }, + toAmino(message: MsgSend): MsgSendAmino { + const obj: any = {}; + obj.class_id = message.classId; + obj.id = message.id; + obj.sender = message.sender; + obj.receiver = message.receiver; + return obj; + }, + fromAminoMsg(object: MsgSendAminoMsg): MsgSend { + return MsgSend.fromAmino(object.value); + }, + toAminoMsg(message: MsgSend): MsgSendAminoMsg { + return { + type: "cosmos-sdk/MsgNFTSend", + value: MsgSend.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSendProtoMsg): MsgSend { + return MsgSend.decode(message.value); + }, + toProto(message: MsgSend): Uint8Array { + return MsgSend.encode(message).finish(); + }, + toProtoMsg(message: MsgSend): MsgSendProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.MsgSend", + value: MsgSend.encode(message).finish() + }; } }; function createBaseMsgSendResponse(): MsgSendResponse { return {}; } export const MsgSendResponse = { + typeUrl: "/cosmos.nft.v1beta1.MsgSendResponse", encode(_: MsgSendResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -163,5 +202,33 @@ export const MsgSendResponse = { toSDK(_: MsgSendResponse): MsgSendResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSendResponseAmino): MsgSendResponse { + return {}; + }, + toAmino(_: MsgSendResponse): MsgSendResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSendResponseAminoMsg): MsgSendResponse { + return MsgSendResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSendResponse): MsgSendResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSendResponse", + value: MsgSendResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSendResponseProtoMsg): MsgSendResponse { + return MsgSendResponse.decode(message.value); + }, + toProto(message: MsgSendResponse): Uint8Array { + return MsgSendResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSendResponse): MsgSendResponseProtoMsg { + return { + typeUrl: "/cosmos.nft.v1beta1.MsgSendResponse", + value: MsgSendResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/orm/module/v1alpha1/module.ts b/__fixtures__/v-next/outputosmojs/cosmos/orm/module/v1alpha1/module.ts index 8c5d57e3de..6f377a3299 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/orm/module/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/orm/module/v1alpha1/module.ts @@ -17,6 +17,7 @@ function createBaseModule(): Module { return {}; } export const Module = { + typeUrl: "/cosmos.orm.module.v1alpha1.Module", encode(_: Module, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -54,5 +55,33 @@ export const Module = { toSDK(_: Module): ModuleSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ModuleAmino): Module { + return {}; + }, + toAmino(_: Module): ModuleAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ModuleAminoMsg): Module { + return Module.fromAmino(object.value); + }, + toAminoMsg(message: Module): ModuleAminoMsg { + return { + type: "cosmos-sdk/Module", + value: Module.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleProtoMsg): Module { + return Module.decode(message.value); + }, + toProto(message: Module): Uint8Array { + return Module.encode(message).finish(); + }, + toProtoMsg(message: Module): ModuleProtoMsg { + return { + typeUrl: "/cosmos.orm.module.v1alpha1.Module", + value: Module.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts index 3f0b879b3d..21b6949094 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1/orm.ts @@ -117,6 +117,7 @@ function createBaseTableDescriptor(): TableDescriptor { }; } export const TableDescriptor = { + typeUrl: "/cosmos.orm.v1.TableDescriptor", encode(message: TableDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.primaryKey !== undefined) { PrimaryKeyDescriptor.encode(message.primaryKey, writer.uint32(10).fork()).ldelim(); @@ -201,6 +202,45 @@ export const TableDescriptor = { } obj.id = message.id; return obj; + }, + fromAmino(object: TableDescriptorAmino): TableDescriptor { + return { + primaryKey: object?.primary_key ? PrimaryKeyDescriptor.fromAmino(object.primary_key) : undefined, + index: Array.isArray(object?.index) ? object.index.map((e: any) => SecondaryIndexDescriptor.fromAmino(e)) : [], + id: object.id + }; + }, + toAmino(message: TableDescriptor): TableDescriptorAmino { + const obj: any = {}; + obj.primary_key = message.primaryKey ? PrimaryKeyDescriptor.toAmino(message.primaryKey) : undefined; + if (message.index) { + obj.index = message.index.map(e => e ? SecondaryIndexDescriptor.toAmino(e) : undefined); + } else { + obj.index = []; + } + obj.id = message.id; + return obj; + }, + fromAminoMsg(object: TableDescriptorAminoMsg): TableDescriptor { + return TableDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: TableDescriptor): TableDescriptorAminoMsg { + return { + type: "cosmos-sdk/TableDescriptor", + value: TableDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: TableDescriptorProtoMsg): TableDescriptor { + return TableDescriptor.decode(message.value); + }, + toProto(message: TableDescriptor): Uint8Array { + return TableDescriptor.encode(message).finish(); + }, + toProtoMsg(message: TableDescriptor): TableDescriptorProtoMsg { + return { + typeUrl: "/cosmos.orm.v1.TableDescriptor", + value: TableDescriptor.encode(message).finish() + }; } }; function createBasePrimaryKeyDescriptor(): PrimaryKeyDescriptor { @@ -210,6 +250,7 @@ function createBasePrimaryKeyDescriptor(): PrimaryKeyDescriptor { }; } export const PrimaryKeyDescriptor = { + typeUrl: "/cosmos.orm.v1.PrimaryKeyDescriptor", encode(message: PrimaryKeyDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fields !== "") { writer.uint32(10).string(message.fields); @@ -274,6 +315,39 @@ export const PrimaryKeyDescriptor = { obj.fields = message.fields; obj.auto_increment = message.autoIncrement; return obj; + }, + fromAmino(object: PrimaryKeyDescriptorAmino): PrimaryKeyDescriptor { + return { + fields: object.fields, + autoIncrement: object.auto_increment + }; + }, + toAmino(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAmino { + const obj: any = {}; + obj.fields = message.fields; + obj.auto_increment = message.autoIncrement; + return obj; + }, + fromAminoMsg(object: PrimaryKeyDescriptorAminoMsg): PrimaryKeyDescriptor { + return PrimaryKeyDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorAminoMsg { + return { + type: "cosmos-sdk/PrimaryKeyDescriptor", + value: PrimaryKeyDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: PrimaryKeyDescriptorProtoMsg): PrimaryKeyDescriptor { + return PrimaryKeyDescriptor.decode(message.value); + }, + toProto(message: PrimaryKeyDescriptor): Uint8Array { + return PrimaryKeyDescriptor.encode(message).finish(); + }, + toProtoMsg(message: PrimaryKeyDescriptor): PrimaryKeyDescriptorProtoMsg { + return { + typeUrl: "/cosmos.orm.v1.PrimaryKeyDescriptor", + value: PrimaryKeyDescriptor.encode(message).finish() + }; } }; function createBaseSecondaryIndexDescriptor(): SecondaryIndexDescriptor { @@ -284,6 +358,7 @@ function createBaseSecondaryIndexDescriptor(): SecondaryIndexDescriptor { }; } export const SecondaryIndexDescriptor = { + typeUrl: "/cosmos.orm.v1.SecondaryIndexDescriptor", encode(message: SecondaryIndexDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fields !== "") { writer.uint32(10).string(message.fields); @@ -360,6 +435,41 @@ export const SecondaryIndexDescriptor = { obj.id = message.id; obj.unique = message.unique; return obj; + }, + fromAmino(object: SecondaryIndexDescriptorAmino): SecondaryIndexDescriptor { + return { + fields: object.fields, + id: object.id, + unique: object.unique + }; + }, + toAmino(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAmino { + const obj: any = {}; + obj.fields = message.fields; + obj.id = message.id; + obj.unique = message.unique; + return obj; + }, + fromAminoMsg(object: SecondaryIndexDescriptorAminoMsg): SecondaryIndexDescriptor { + return SecondaryIndexDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorAminoMsg { + return { + type: "cosmos-sdk/SecondaryIndexDescriptor", + value: SecondaryIndexDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: SecondaryIndexDescriptorProtoMsg): SecondaryIndexDescriptor { + return SecondaryIndexDescriptor.decode(message.value); + }, + toProto(message: SecondaryIndexDescriptor): Uint8Array { + return SecondaryIndexDescriptor.encode(message).finish(); + }, + toProtoMsg(message: SecondaryIndexDescriptor): SecondaryIndexDescriptorProtoMsg { + return { + typeUrl: "/cosmos.orm.v1.SecondaryIndexDescriptor", + value: SecondaryIndexDescriptor.encode(message).finish() + }; } }; function createBaseSingletonDescriptor(): SingletonDescriptor { @@ -368,6 +478,7 @@ function createBaseSingletonDescriptor(): SingletonDescriptor { }; } export const SingletonDescriptor = { + typeUrl: "/cosmos.orm.v1.SingletonDescriptor", encode(message: SingletonDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).uint32(message.id); @@ -420,5 +531,36 @@ export const SingletonDescriptor = { const obj: any = {}; obj.id = message.id; return obj; + }, + fromAmino(object: SingletonDescriptorAmino): SingletonDescriptor { + return { + id: object.id + }; + }, + toAmino(message: SingletonDescriptor): SingletonDescriptorAmino { + const obj: any = {}; + obj.id = message.id; + return obj; + }, + fromAminoMsg(object: SingletonDescriptorAminoMsg): SingletonDescriptor { + return SingletonDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: SingletonDescriptor): SingletonDescriptorAminoMsg { + return { + type: "cosmos-sdk/SingletonDescriptor", + value: SingletonDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: SingletonDescriptorProtoMsg): SingletonDescriptor { + return SingletonDescriptor.decode(message.value); + }, + toProto(message: SingletonDescriptor): Uint8Array { + return SingletonDescriptor.encode(message).finish(); + }, + toProtoMsg(message: SingletonDescriptor): SingletonDescriptorProtoMsg { + return { + typeUrl: "/cosmos.orm.v1.SingletonDescriptor", + value: SingletonDescriptor.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts index d12f9e52d3..e17265d000 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/orm/v1alpha1/schema.ts @@ -132,6 +132,7 @@ function createBaseModuleSchemaDescriptor(): ModuleSchemaDescriptor { }; } export const ModuleSchemaDescriptor = { + typeUrl: "/cosmos.orm.v1alpha1.ModuleSchemaDescriptor", encode(message: ModuleSchemaDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.schemaFile) { ModuleSchemaDescriptor_FileEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -204,6 +205,43 @@ export const ModuleSchemaDescriptor = { } obj.prefix = message.prefix; return obj; + }, + fromAmino(object: ModuleSchemaDescriptorAmino): ModuleSchemaDescriptor { + return { + schemaFile: Array.isArray(object?.schema_file) ? object.schema_file.map((e: any) => ModuleSchemaDescriptor_FileEntry.fromAmino(e)) : [], + prefix: object.prefix + }; + }, + toAmino(message: ModuleSchemaDescriptor): ModuleSchemaDescriptorAmino { + const obj: any = {}; + if (message.schemaFile) { + obj.schema_file = message.schemaFile.map(e => e ? ModuleSchemaDescriptor_FileEntry.toAmino(e) : undefined); + } else { + obj.schema_file = []; + } + obj.prefix = message.prefix; + return obj; + }, + fromAminoMsg(object: ModuleSchemaDescriptorAminoMsg): ModuleSchemaDescriptor { + return ModuleSchemaDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: ModuleSchemaDescriptor): ModuleSchemaDescriptorAminoMsg { + return { + type: "cosmos-sdk/ModuleSchemaDescriptor", + value: ModuleSchemaDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleSchemaDescriptorProtoMsg): ModuleSchemaDescriptor { + return ModuleSchemaDescriptor.decode(message.value); + }, + toProto(message: ModuleSchemaDescriptor): Uint8Array { + return ModuleSchemaDescriptor.encode(message).finish(); + }, + toProtoMsg(message: ModuleSchemaDescriptor): ModuleSchemaDescriptorProtoMsg { + return { + typeUrl: "/cosmos.orm.v1alpha1.ModuleSchemaDescriptor", + value: ModuleSchemaDescriptor.encode(message).finish() + }; } }; function createBaseModuleSchemaDescriptor_FileEntry(): ModuleSchemaDescriptor_FileEntry { @@ -214,6 +252,7 @@ function createBaseModuleSchemaDescriptor_FileEntry(): ModuleSchemaDescriptor_Fi }; } export const ModuleSchemaDescriptor_FileEntry = { + typeUrl: "/cosmos.orm.v1alpha1.FileEntry", encode(message: ModuleSchemaDescriptor_FileEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).uint32(message.id); @@ -290,5 +329,40 @@ export const ModuleSchemaDescriptor_FileEntry = { obj.proto_file_name = message.protoFileName; message.storageType !== undefined && (obj.storage_type = storageTypeToJSON(message.storageType)); return obj; + }, + fromAmino(object: ModuleSchemaDescriptor_FileEntryAmino): ModuleSchemaDescriptor_FileEntry { + return { + id: object.id, + protoFileName: object.proto_file_name, + storageType: isSet(object.storage_type) ? storageTypeFromJSON(object.storage_type) : -1 + }; + }, + toAmino(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAmino { + const obj: any = {}; + obj.id = message.id; + obj.proto_file_name = message.protoFileName; + obj.storage_type = message.storageType; + return obj; + }, + fromAminoMsg(object: ModuleSchemaDescriptor_FileEntryAminoMsg): ModuleSchemaDescriptor_FileEntry { + return ModuleSchemaDescriptor_FileEntry.fromAmino(object.value); + }, + toAminoMsg(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryAminoMsg { + return { + type: "cosmos-sdk/FileEntry", + value: ModuleSchemaDescriptor_FileEntry.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleSchemaDescriptor_FileEntryProtoMsg): ModuleSchemaDescriptor_FileEntry { + return ModuleSchemaDescriptor_FileEntry.decode(message.value); + }, + toProto(message: ModuleSchemaDescriptor_FileEntry): Uint8Array { + return ModuleSchemaDescriptor_FileEntry.encode(message).finish(); + }, + toProtoMsg(message: ModuleSchemaDescriptor_FileEntry): ModuleSchemaDescriptor_FileEntryProtoMsg { + return { + typeUrl: "/cosmos.orm.v1alpha1.FileEntry", + value: ModuleSchemaDescriptor_FileEntry.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts index df4713c917..a4fd3e6f26 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/params.ts @@ -39,6 +39,7 @@ function createBaseParameterChangeProposal(): ParameterChangeProposal { }; } export const ParameterChangeProposal = { + typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal", encode(message: ParameterChangeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -123,6 +124,45 @@ export const ParameterChangeProposal = { obj.changes = []; } return obj; + }, + fromAmino(object: ParameterChangeProposalAmino): ParameterChangeProposal { + return { + title: object.title, + description: object.description, + changes: Array.isArray(object?.changes) ? object.changes.map((e: any) => ParamChange.fromAmino(e)) : [] + }; + }, + toAmino(message: ParameterChangeProposal): ParameterChangeProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.changes) { + obj.changes = message.changes.map(e => e ? ParamChange.toAmino(e) : undefined); + } else { + obj.changes = []; + } + return obj; + }, + fromAminoMsg(object: ParameterChangeProposalAminoMsg): ParameterChangeProposal { + return ParameterChangeProposal.fromAmino(object.value); + }, + toAminoMsg(message: ParameterChangeProposal): ParameterChangeProposalAminoMsg { + return { + type: "cosmos-sdk/ParameterChangeProposal", + value: ParameterChangeProposal.toAmino(message) + }; + }, + fromProtoMsg(message: ParameterChangeProposalProtoMsg): ParameterChangeProposal { + return ParameterChangeProposal.decode(message.value); + }, + toProto(message: ParameterChangeProposal): Uint8Array { + return ParameterChangeProposal.encode(message).finish(); + }, + toProtoMsg(message: ParameterChangeProposal): ParameterChangeProposalProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal", + value: ParameterChangeProposal.encode(message).finish() + }; } }; function createBaseParamChange(): ParamChange { @@ -133,6 +173,7 @@ function createBaseParamChange(): ParamChange { }; } export const ParamChange = { + typeUrl: "/cosmos.params.v1beta1.ParamChange", encode(message: ParamChange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subspace !== "") { writer.uint32(10).string(message.subspace); @@ -209,5 +250,40 @@ export const ParamChange = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: ParamChangeAmino): ParamChange { + return { + subspace: object.subspace, + key: object.key, + value: object.value + }; + }, + toAmino(message: ParamChange): ParamChangeAmino { + const obj: any = {}; + obj.subspace = message.subspace; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: ParamChangeAminoMsg): ParamChange { + return ParamChange.fromAmino(object.value); + }, + toAminoMsg(message: ParamChange): ParamChangeAminoMsg { + return { + type: "cosmos-sdk/ParamChange", + value: ParamChange.toAmino(message) + }; + }, + fromProtoMsg(message: ParamChangeProtoMsg): ParamChange { + return ParamChange.decode(message.value); + }, + toProto(message: ParamChange): Uint8Array { + return ParamChange.encode(message).finish(); + }, + toProtoMsg(message: ParamChange): ParamChangeProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.ParamChange", + value: ParamChange.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts index ab17110009..03946a3569 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/params/v1beta1/query.ts @@ -70,6 +70,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { }; } export const QueryParamsRequest = { + typeUrl: "/cosmos.params.v1beta1.QueryParamsRequest", encode(message: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subspace !== "") { writer.uint32(10).string(message.subspace); @@ -134,6 +135,39 @@ export const QueryParamsRequest = { obj.subspace = message.subspace; obj.key = message.key; return obj; + }, + fromAmino(object: QueryParamsRequestAmino): QueryParamsRequest { + return { + subspace: object.subspace, + key: object.key + }; + }, + toAmino(message: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + obj.subspace = message.subspace; + obj.key = message.key; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -142,6 +176,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.params.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.param !== undefined) { ParamChange.encode(message.param, writer.uint32(10).fork()).ldelim(); @@ -194,12 +229,44 @@ export const QueryParamsResponse = { const obj: any = {}; message.param !== undefined && (obj.param = message.param ? ParamChange.toSDK(message.param) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + param: object?.param ? ParamChange.fromAmino(object.param) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.param = message.param ? ParamChange.toAmino(message.param) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQuerySubspacesRequest(): QuerySubspacesRequest { return {}; } export const QuerySubspacesRequest = { + typeUrl: "/cosmos.params.v1beta1.QuerySubspacesRequest", encode(_: QuerySubspacesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -237,6 +304,34 @@ export const QuerySubspacesRequest = { toSDK(_: QuerySubspacesRequest): QuerySubspacesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QuerySubspacesRequestAmino): QuerySubspacesRequest { + return {}; + }, + toAmino(_: QuerySubspacesRequest): QuerySubspacesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QuerySubspacesRequestAminoMsg): QuerySubspacesRequest { + return QuerySubspacesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySubspacesRequest): QuerySubspacesRequestAminoMsg { + return { + type: "cosmos-sdk/QuerySubspacesRequest", + value: QuerySubspacesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySubspacesRequestProtoMsg): QuerySubspacesRequest { + return QuerySubspacesRequest.decode(message.value); + }, + toProto(message: QuerySubspacesRequest): Uint8Array { + return QuerySubspacesRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySubspacesRequest): QuerySubspacesRequestProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.QuerySubspacesRequest", + value: QuerySubspacesRequest.encode(message).finish() + }; } }; function createBaseQuerySubspacesResponse(): QuerySubspacesResponse { @@ -245,6 +340,7 @@ function createBaseQuerySubspacesResponse(): QuerySubspacesResponse { }; } export const QuerySubspacesResponse = { + typeUrl: "/cosmos.params.v1beta1.QuerySubspacesResponse", encode(message: QuerySubspacesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.subspaces) { Subspace.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -305,6 +401,41 @@ export const QuerySubspacesResponse = { obj.subspaces = []; } return obj; + }, + fromAmino(object: QuerySubspacesResponseAmino): QuerySubspacesResponse { + return { + subspaces: Array.isArray(object?.subspaces) ? object.subspaces.map((e: any) => Subspace.fromAmino(e)) : [] + }; + }, + toAmino(message: QuerySubspacesResponse): QuerySubspacesResponseAmino { + const obj: any = {}; + if (message.subspaces) { + obj.subspaces = message.subspaces.map(e => e ? Subspace.toAmino(e) : undefined); + } else { + obj.subspaces = []; + } + return obj; + }, + fromAminoMsg(object: QuerySubspacesResponseAminoMsg): QuerySubspacesResponse { + return QuerySubspacesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySubspacesResponse): QuerySubspacesResponseAminoMsg { + return { + type: "cosmos-sdk/QuerySubspacesResponse", + value: QuerySubspacesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySubspacesResponseProtoMsg): QuerySubspacesResponse { + return QuerySubspacesResponse.decode(message.value); + }, + toProto(message: QuerySubspacesResponse): Uint8Array { + return QuerySubspacesResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySubspacesResponse): QuerySubspacesResponseProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.QuerySubspacesResponse", + value: QuerySubspacesResponse.encode(message).finish() + }; } }; function createBaseSubspace(): Subspace { @@ -314,6 +445,7 @@ function createBaseSubspace(): Subspace { }; } export const Subspace = { + typeUrl: "/cosmos.params.v1beta1.Subspace", encode(message: Subspace, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subspace !== "") { writer.uint32(10).string(message.subspace); @@ -386,5 +518,42 @@ export const Subspace = { obj.keys = []; } return obj; + }, + fromAmino(object: SubspaceAmino): Subspace { + return { + subspace: object.subspace, + keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => e) : [] + }; + }, + toAmino(message: Subspace): SubspaceAmino { + const obj: any = {}; + obj.subspace = message.subspace; + if (message.keys) { + obj.keys = message.keys.map(e => e); + } else { + obj.keys = []; + } + return obj; + }, + fromAminoMsg(object: SubspaceAminoMsg): Subspace { + return Subspace.fromAmino(object.value); + }, + toAminoMsg(message: Subspace): SubspaceAminoMsg { + return { + type: "cosmos-sdk/Subspace", + value: Subspace.toAmino(message) + }; + }, + fromProtoMsg(message: SubspaceProtoMsg): Subspace { + return Subspace.decode(message.value); + }, + toProto(message: Subspace): Uint8Array { + return Subspace.encode(message).finish(); + }, + toProtoMsg(message: Subspace): SubspaceProtoMsg { + return { + typeUrl: "/cosmos.params.v1beta1.Subspace", + value: Subspace.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts index 0483928f98..6d3347c5e7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/genesis.ts @@ -73,6 +73,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.slashing.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -165,6 +166,49 @@ export const GenesisState = { obj.missed_blocks = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + signingInfos: Array.isArray(object?.signing_infos) ? object.signing_infos.map((e: any) => SigningInfo.fromAmino(e)) : [], + missedBlocks: Array.isArray(object?.missed_blocks) ? object.missed_blocks.map((e: any) => ValidatorMissedBlocks.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.signingInfos) { + obj.signing_infos = message.signingInfos.map(e => e ? SigningInfo.toAmino(e) : undefined); + } else { + obj.signing_infos = []; + } + if (message.missedBlocks) { + obj.missed_blocks = message.missedBlocks.map(e => e ? ValidatorMissedBlocks.toAmino(e) : undefined); + } else { + obj.missed_blocks = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseSigningInfo(): SigningInfo { @@ -174,6 +218,7 @@ function createBaseSigningInfo(): SigningInfo { }; } export const SigningInfo = { + typeUrl: "/cosmos.slashing.v1beta1.SigningInfo", encode(message: SigningInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -238,6 +283,39 @@ export const SigningInfo = { obj.address = message.address; message.validatorSigningInfo !== undefined && (obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toSDK(message.validatorSigningInfo) : undefined); return obj; + }, + fromAmino(object: SigningInfoAmino): SigningInfo { + return { + address: object.address, + validatorSigningInfo: object?.validator_signing_info ? ValidatorSigningInfo.fromAmino(object.validator_signing_info) : undefined + }; + }, + toAmino(message: SigningInfo): SigningInfoAmino { + const obj: any = {}; + obj.address = message.address; + obj.validator_signing_info = message.validatorSigningInfo ? ValidatorSigningInfo.toAmino(message.validatorSigningInfo) : undefined; + return obj; + }, + fromAminoMsg(object: SigningInfoAminoMsg): SigningInfo { + return SigningInfo.fromAmino(object.value); + }, + toAminoMsg(message: SigningInfo): SigningInfoAminoMsg { + return { + type: "cosmos-sdk/SigningInfo", + value: SigningInfo.toAmino(message) + }; + }, + fromProtoMsg(message: SigningInfoProtoMsg): SigningInfo { + return SigningInfo.decode(message.value); + }, + toProto(message: SigningInfo): Uint8Array { + return SigningInfo.encode(message).finish(); + }, + toProtoMsg(message: SigningInfo): SigningInfoProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.SigningInfo", + value: SigningInfo.encode(message).finish() + }; } }; function createBaseValidatorMissedBlocks(): ValidatorMissedBlocks { @@ -247,6 +325,7 @@ function createBaseValidatorMissedBlocks(): ValidatorMissedBlocks { }; } export const ValidatorMissedBlocks = { + typeUrl: "/cosmos.slashing.v1beta1.ValidatorMissedBlocks", encode(message: ValidatorMissedBlocks, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -319,6 +398,43 @@ export const ValidatorMissedBlocks = { obj.missed_blocks = []; } return obj; + }, + fromAmino(object: ValidatorMissedBlocksAmino): ValidatorMissedBlocks { + return { + address: object.address, + missedBlocks: Array.isArray(object?.missed_blocks) ? object.missed_blocks.map((e: any) => MissedBlock.fromAmino(e)) : [] + }; + }, + toAmino(message: ValidatorMissedBlocks): ValidatorMissedBlocksAmino { + const obj: any = {}; + obj.address = message.address; + if (message.missedBlocks) { + obj.missed_blocks = message.missedBlocks.map(e => e ? MissedBlock.toAmino(e) : undefined); + } else { + obj.missed_blocks = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorMissedBlocksAminoMsg): ValidatorMissedBlocks { + return ValidatorMissedBlocks.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorMissedBlocks): ValidatorMissedBlocksAminoMsg { + return { + type: "cosmos-sdk/ValidatorMissedBlocks", + value: ValidatorMissedBlocks.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorMissedBlocksProtoMsg): ValidatorMissedBlocks { + return ValidatorMissedBlocks.decode(message.value); + }, + toProto(message: ValidatorMissedBlocks): Uint8Array { + return ValidatorMissedBlocks.encode(message).finish(); + }, + toProtoMsg(message: ValidatorMissedBlocks): ValidatorMissedBlocksProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.ValidatorMissedBlocks", + value: ValidatorMissedBlocks.encode(message).finish() + }; } }; function createBaseMissedBlock(): MissedBlock { @@ -328,6 +444,7 @@ function createBaseMissedBlock(): MissedBlock { }; } export const MissedBlock = { + typeUrl: "/cosmos.slashing.v1beta1.MissedBlock", encode(message: MissedBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== BigInt(0)) { writer.uint32(8).int64(message.index); @@ -392,5 +509,38 @@ export const MissedBlock = { obj.index = message.index; obj.missed = message.missed; return obj; + }, + fromAmino(object: MissedBlockAmino): MissedBlock { + return { + index: BigInt(object.index), + missed: object.missed + }; + }, + toAmino(message: MissedBlock): MissedBlockAmino { + const obj: any = {}; + obj.index = message.index ? message.index.toString() : undefined; + obj.missed = message.missed; + return obj; + }, + fromAminoMsg(object: MissedBlockAminoMsg): MissedBlock { + return MissedBlock.fromAmino(object.value); + }, + toAminoMsg(message: MissedBlock): MissedBlockAminoMsg { + return { + type: "cosmos-sdk/MissedBlock", + value: MissedBlock.toAmino(message) + }; + }, + fromProtoMsg(message: MissedBlockProtoMsg): MissedBlock { + return MissedBlock.decode(message.value); + }, + toProto(message: MissedBlock): Uint8Array { + return MissedBlock.encode(message).finish(); + }, + toProtoMsg(message: MissedBlock): MissedBlockProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.MissedBlock", + value: MissedBlock.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts index 30aca4b9fc..f9fa71e31b 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/query.ts @@ -80,6 +80,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/cosmos.slashing.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -117,6 +118,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -125,6 +154,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.slashing.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -177,6 +207,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQuerySigningInfoRequest(): QuerySigningInfoRequest { @@ -185,6 +246,7 @@ function createBaseQuerySigningInfoRequest(): QuerySigningInfoRequest { }; } export const QuerySigningInfoRequest = { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoRequest", encode(message: QuerySigningInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.consAddress !== "") { writer.uint32(10).string(message.consAddress); @@ -237,6 +299,37 @@ export const QuerySigningInfoRequest = { const obj: any = {}; obj.cons_address = message.consAddress; return obj; + }, + fromAmino(object: QuerySigningInfoRequestAmino): QuerySigningInfoRequest { + return { + consAddress: object.cons_address + }; + }, + toAmino(message: QuerySigningInfoRequest): QuerySigningInfoRequestAmino { + const obj: any = {}; + obj.cons_address = message.consAddress; + return obj; + }, + fromAminoMsg(object: QuerySigningInfoRequestAminoMsg): QuerySigningInfoRequest { + return QuerySigningInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySigningInfoRequest): QuerySigningInfoRequestAminoMsg { + return { + type: "cosmos-sdk/QuerySigningInfoRequest", + value: QuerySigningInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySigningInfoRequestProtoMsg): QuerySigningInfoRequest { + return QuerySigningInfoRequest.decode(message.value); + }, + toProto(message: QuerySigningInfoRequest): Uint8Array { + return QuerySigningInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySigningInfoRequest): QuerySigningInfoRequestProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoRequest", + value: QuerySigningInfoRequest.encode(message).finish() + }; } }; function createBaseQuerySigningInfoResponse(): QuerySigningInfoResponse { @@ -245,6 +338,7 @@ function createBaseQuerySigningInfoResponse(): QuerySigningInfoResponse { }; } export const QuerySigningInfoResponse = { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoResponse", encode(message: QuerySigningInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.valSigningInfo !== undefined) { ValidatorSigningInfo.encode(message.valSigningInfo, writer.uint32(10).fork()).ldelim(); @@ -297,6 +391,37 @@ export const QuerySigningInfoResponse = { const obj: any = {}; message.valSigningInfo !== undefined && (obj.val_signing_info = message.valSigningInfo ? ValidatorSigningInfo.toSDK(message.valSigningInfo) : undefined); return obj; + }, + fromAmino(object: QuerySigningInfoResponseAmino): QuerySigningInfoResponse { + return { + valSigningInfo: object?.val_signing_info ? ValidatorSigningInfo.fromAmino(object.val_signing_info) : undefined + }; + }, + toAmino(message: QuerySigningInfoResponse): QuerySigningInfoResponseAmino { + const obj: any = {}; + obj.val_signing_info = message.valSigningInfo ? ValidatorSigningInfo.toAmino(message.valSigningInfo) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySigningInfoResponseAminoMsg): QuerySigningInfoResponse { + return QuerySigningInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySigningInfoResponse): QuerySigningInfoResponseAminoMsg { + return { + type: "cosmos-sdk/QuerySigningInfoResponse", + value: QuerySigningInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySigningInfoResponseProtoMsg): QuerySigningInfoResponse { + return QuerySigningInfoResponse.decode(message.value); + }, + toProto(message: QuerySigningInfoResponse): Uint8Array { + return QuerySigningInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySigningInfoResponse): QuerySigningInfoResponseProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoResponse", + value: QuerySigningInfoResponse.encode(message).finish() + }; } }; function createBaseQuerySigningInfosRequest(): QuerySigningInfosRequest { @@ -305,6 +430,7 @@ function createBaseQuerySigningInfosRequest(): QuerySigningInfosRequest { }; } export const QuerySigningInfosRequest = { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosRequest", encode(message: QuerySigningInfosRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -357,6 +483,37 @@ export const QuerySigningInfosRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QuerySigningInfosRequestAmino): QuerySigningInfosRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QuerySigningInfosRequest): QuerySigningInfosRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySigningInfosRequestAminoMsg): QuerySigningInfosRequest { + return QuerySigningInfosRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySigningInfosRequest): QuerySigningInfosRequestAminoMsg { + return { + type: "cosmos-sdk/QuerySigningInfosRequest", + value: QuerySigningInfosRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySigningInfosRequestProtoMsg): QuerySigningInfosRequest { + return QuerySigningInfosRequest.decode(message.value); + }, + toProto(message: QuerySigningInfosRequest): Uint8Array { + return QuerySigningInfosRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySigningInfosRequest): QuerySigningInfosRequestProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosRequest", + value: QuerySigningInfosRequest.encode(message).finish() + }; } }; function createBaseQuerySigningInfosResponse(): QuerySigningInfosResponse { @@ -366,6 +523,7 @@ function createBaseQuerySigningInfosResponse(): QuerySigningInfosResponse { }; } export const QuerySigningInfosResponse = { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosResponse", encode(message: QuerySigningInfosResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.info) { ValidatorSigningInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -438,5 +596,42 @@ export const QuerySigningInfosResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QuerySigningInfosResponseAmino): QuerySigningInfosResponse { + return { + info: Array.isArray(object?.info) ? object.info.map((e: any) => ValidatorSigningInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QuerySigningInfosResponse): QuerySigningInfosResponseAmino { + const obj: any = {}; + if (message.info) { + obj.info = message.info.map(e => e ? ValidatorSigningInfo.toAmino(e) : undefined); + } else { + obj.info = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySigningInfosResponseAminoMsg): QuerySigningInfosResponse { + return QuerySigningInfosResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySigningInfosResponse): QuerySigningInfosResponseAminoMsg { + return { + type: "cosmos-sdk/QuerySigningInfosResponse", + value: QuerySigningInfosResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySigningInfosResponseProtoMsg): QuerySigningInfosResponse { + return QuerySigningInfosResponse.decode(message.value); + }, + toProto(message: QuerySigningInfosResponse): Uint8Array { + return QuerySigningInfosResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySigningInfosResponse): QuerySigningInfosResponseProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosResponse", + value: QuerySigningInfosResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts index 941208886f..fcc91d0a38 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/slashing.ts @@ -69,6 +69,7 @@ function createBaseValidatorSigningInfo(): ValidatorSigningInfo { }; } export const ValidatorSigningInfo = { + typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo", encode(message: ValidatorSigningInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -181,6 +182,47 @@ export const ValidatorSigningInfo = { obj.tombstoned = message.tombstoned; obj.missed_blocks_counter = message.missedBlocksCounter; return obj; + }, + fromAmino(object: ValidatorSigningInfoAmino): ValidatorSigningInfo { + return { + address: object.address, + startHeight: BigInt(object.start_height), + indexOffset: BigInt(object.index_offset), + jailedUntil: object.jailed_until, + tombstoned: object.tombstoned, + missedBlocksCounter: BigInt(object.missed_blocks_counter) + }; + }, + toAmino(message: ValidatorSigningInfo): ValidatorSigningInfoAmino { + const obj: any = {}; + obj.address = message.address; + obj.start_height = message.startHeight ? message.startHeight.toString() : undefined; + obj.index_offset = message.indexOffset ? message.indexOffset.toString() : undefined; + obj.jailed_until = message.jailedUntil; + obj.tombstoned = message.tombstoned; + obj.missed_blocks_counter = message.missedBlocksCounter ? message.missedBlocksCounter.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorSigningInfoAminoMsg): ValidatorSigningInfo { + return ValidatorSigningInfo.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorSigningInfo): ValidatorSigningInfoAminoMsg { + return { + type: "cosmos-sdk/ValidatorSigningInfo", + value: ValidatorSigningInfo.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorSigningInfoProtoMsg): ValidatorSigningInfo { + return ValidatorSigningInfo.decode(message.value); + }, + toProto(message: ValidatorSigningInfo): Uint8Array { + return ValidatorSigningInfo.encode(message).finish(); + }, + toProtoMsg(message: ValidatorSigningInfo): ValidatorSigningInfoProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo", + value: ValidatorSigningInfo.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -193,6 +235,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmos.slashing.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedBlocksWindow !== BigInt(0)) { writer.uint32(8).int64(message.signedBlocksWindow); @@ -293,5 +336,44 @@ export const Params = { obj.slash_fraction_double_sign = message.slashFractionDoubleSign; obj.slash_fraction_downtime = message.slashFractionDowntime; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + signedBlocksWindow: BigInt(object.signed_blocks_window), + minSignedPerWindow: object.min_signed_per_window, + downtimeJailDuration: object?.downtime_jail_duration ? Duration.fromAmino(object.downtime_jail_duration) : undefined, + slashFractionDoubleSign: object.slash_fraction_double_sign, + slashFractionDowntime: object.slash_fraction_downtime + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.signed_blocks_window = message.signedBlocksWindow ? message.signedBlocksWindow.toString() : undefined; + obj.min_signed_per_window = message.minSignedPerWindow; + obj.downtime_jail_duration = message.downtimeJailDuration ? Duration.toAmino(message.downtimeJailDuration) : undefined; + obj.slash_fraction_double_sign = message.slashFractionDoubleSign; + obj.slash_fraction_downtime = message.slashFractionDowntime; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts index 661ec424a4..aeb2a5d75b 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/slashing/v1beta1/tx.ts @@ -19,6 +19,7 @@ function createBaseMsgUnjail(): MsgUnjail { }; } export const MsgUnjail = { + typeUrl: "/cosmos.slashing.v1beta1.MsgUnjail", encode(message: MsgUnjail, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); @@ -71,12 +72,44 @@ export const MsgUnjail = { const obj: any = {}; obj.validator_addr = message.validatorAddr; return obj; + }, + fromAmino(object: MsgUnjailAmino): MsgUnjail { + return { + validatorAddr: object.validator_addr + }; + }, + toAmino(message: MsgUnjail): MsgUnjailAmino { + const obj: any = {}; + obj.validator_addr = message.validatorAddr; + return obj; + }, + fromAminoMsg(object: MsgUnjailAminoMsg): MsgUnjail { + return MsgUnjail.fromAmino(object.value); + }, + toAminoMsg(message: MsgUnjail): MsgUnjailAminoMsg { + return { + type: "cosmos-sdk/MsgUnjail", + value: MsgUnjail.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUnjailProtoMsg): MsgUnjail { + return MsgUnjail.decode(message.value); + }, + toProto(message: MsgUnjail): Uint8Array { + return MsgUnjail.encode(message).finish(); + }, + toProtoMsg(message: MsgUnjail): MsgUnjailProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.MsgUnjail", + value: MsgUnjail.encode(message).finish() + }; } }; function createBaseMsgUnjailResponse(): MsgUnjailResponse { return {}; } export const MsgUnjailResponse = { + typeUrl: "/cosmos.slashing.v1beta1.MsgUnjailResponse", encode(_: MsgUnjailResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -114,5 +147,33 @@ export const MsgUnjailResponse = { toSDK(_: MsgUnjailResponse): MsgUnjailResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUnjailResponseAmino): MsgUnjailResponse { + return {}; + }, + toAmino(_: MsgUnjailResponse): MsgUnjailResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUnjailResponseAminoMsg): MsgUnjailResponse { + return MsgUnjailResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUnjailResponse): MsgUnjailResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUnjailResponse", + value: MsgUnjailResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUnjailResponseProtoMsg): MsgUnjailResponse { + return MsgUnjailResponse.decode(message.value); + }, + toProto(message: MsgUnjailResponse): Uint8Array { + return MsgUnjailResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUnjailResponse): MsgUnjailResponseProtoMsg { + return { + typeUrl: "/cosmos.slashing.v1beta1.MsgUnjailResponse", + value: MsgUnjailResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts index c91f2de14d..7c253d7423 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/authz.ts @@ -103,6 +103,7 @@ function createBaseStakeAuthorization(): StakeAuthorization { }; } export const StakeAuthorization = { + typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization", encode(message: StakeAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxTokens !== undefined) { Coin.encode(message.maxTokens, writer.uint32(10).fork()).ldelim(); @@ -191,6 +192,43 @@ export const StakeAuthorization = { message.denyList !== undefined && (obj.deny_list = message.denyList ? StakeAuthorization_Validators.toSDK(message.denyList) : undefined); message.authorizationType !== undefined && (obj.authorization_type = authorizationTypeToJSON(message.authorizationType)); return obj; + }, + fromAmino(object: StakeAuthorizationAmino): StakeAuthorization { + return { + maxTokens: object?.max_tokens ? Coin.fromAmino(object.max_tokens) : undefined, + allowList: object?.allow_list ? StakeAuthorization_Validators.fromAmino(object.allow_list) : undefined, + denyList: object?.deny_list ? StakeAuthorization_Validators.fromAmino(object.deny_list) : undefined, + authorizationType: isSet(object.authorization_type) ? authorizationTypeFromJSON(object.authorization_type) : -1 + }; + }, + toAmino(message: StakeAuthorization): StakeAuthorizationAmino { + const obj: any = {}; + obj.max_tokens = message.maxTokens ? Coin.toAmino(message.maxTokens) : undefined; + obj.allow_list = message.allowList ? StakeAuthorization_Validators.toAmino(message.allowList) : undefined; + obj.deny_list = message.denyList ? StakeAuthorization_Validators.toAmino(message.denyList) : undefined; + obj.authorization_type = message.authorizationType; + return obj; + }, + fromAminoMsg(object: StakeAuthorizationAminoMsg): StakeAuthorization { + return StakeAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: StakeAuthorization): StakeAuthorizationAminoMsg { + return { + type: "cosmos-sdk/StakeAuthorization", + value: StakeAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: StakeAuthorizationProtoMsg): StakeAuthorization { + return StakeAuthorization.decode(message.value); + }, + toProto(message: StakeAuthorization): Uint8Array { + return StakeAuthorization.encode(message).finish(); + }, + toProtoMsg(message: StakeAuthorization): StakeAuthorizationProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization", + value: StakeAuthorization.encode(message).finish() + }; } }; function createBaseStakeAuthorization_Validators(): StakeAuthorization_Validators { @@ -199,6 +237,7 @@ function createBaseStakeAuthorization_Validators(): StakeAuthorization_Validator }; } export const StakeAuthorization_Validators = { + typeUrl: "/cosmos.staking.v1beta1.Validators", encode(message: StakeAuthorization_Validators, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.address) { writer.uint32(10).string(v!); @@ -259,5 +298,40 @@ export const StakeAuthorization_Validators = { obj.address = []; } return obj; + }, + fromAmino(object: StakeAuthorization_ValidatorsAmino): StakeAuthorization_Validators { + return { + address: Array.isArray(object?.address) ? object.address.map((e: any) => e) : [] + }; + }, + toAmino(message: StakeAuthorization_Validators): StakeAuthorization_ValidatorsAmino { + const obj: any = {}; + if (message.address) { + obj.address = message.address.map(e => e); + } else { + obj.address = []; + } + return obj; + }, + fromAminoMsg(object: StakeAuthorization_ValidatorsAminoMsg): StakeAuthorization_Validators { + return StakeAuthorization_Validators.fromAmino(object.value); + }, + toAminoMsg(message: StakeAuthorization_Validators): StakeAuthorization_ValidatorsAminoMsg { + return { + type: "cosmos-sdk/Validators", + value: StakeAuthorization_Validators.toAmino(message) + }; + }, + fromProtoMsg(message: StakeAuthorization_ValidatorsProtoMsg): StakeAuthorization_Validators { + return StakeAuthorization_Validators.decode(message.value); + }, + toProto(message: StakeAuthorization_Validators): Uint8Array { + return StakeAuthorization_Validators.encode(message).finish(); + }, + toProtoMsg(message: StakeAuthorization_Validators): StakeAuthorization_ValidatorsProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Validators", + value: StakeAuthorization_Validators.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts index 39ba20fd7e..c6702ae78d 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/genesis.ts @@ -62,6 +62,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmos.staking.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -238,6 +239,71 @@ export const GenesisState = { } obj.exported = message.exported; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + lastTotalPower: object.last_total_power, + lastValidatorPowers: Array.isArray(object?.last_validator_powers) ? object.last_validator_powers.map((e: any) => LastValidatorPower.fromAmino(e)) : [], + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], + delegations: Array.isArray(object?.delegations) ? object.delegations.map((e: any) => Delegation.fromAmino(e)) : [], + unbondingDelegations: Array.isArray(object?.unbonding_delegations) ? object.unbonding_delegations.map((e: any) => UnbondingDelegation.fromAmino(e)) : [], + redelegations: Array.isArray(object?.redelegations) ? object.redelegations.map((e: any) => Redelegation.fromAmino(e)) : [], + exported: object.exported + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.last_total_power = message.lastTotalPower; + if (message.lastValidatorPowers) { + obj.last_validator_powers = message.lastValidatorPowers.map(e => e ? LastValidatorPower.toAmino(e) : undefined); + } else { + obj.last_validator_powers = []; + } + if (message.validators) { + obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.validators = []; + } + if (message.delegations) { + obj.delegations = message.delegations.map(e => e ? Delegation.toAmino(e) : undefined); + } else { + obj.delegations = []; + } + if (message.unbondingDelegations) { + obj.unbonding_delegations = message.unbondingDelegations.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); + } else { + obj.unbonding_delegations = []; + } + if (message.redelegations) { + obj.redelegations = message.redelegations.map(e => e ? Redelegation.toAmino(e) : undefined); + } else { + obj.redelegations = []; + } + obj.exported = message.exported; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseLastValidatorPower(): LastValidatorPower { @@ -247,6 +313,7 @@ function createBaseLastValidatorPower(): LastValidatorPower { }; } export const LastValidatorPower = { + typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower", encode(message: LastValidatorPower, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -311,5 +378,38 @@ export const LastValidatorPower = { obj.address = message.address; obj.power = message.power; return obj; + }, + fromAmino(object: LastValidatorPowerAmino): LastValidatorPower { + return { + address: object.address, + power: BigInt(object.power) + }; + }, + toAmino(message: LastValidatorPower): LastValidatorPowerAmino { + const obj: any = {}; + obj.address = message.address; + obj.power = message.power ? message.power.toString() : undefined; + return obj; + }, + fromAminoMsg(object: LastValidatorPowerAminoMsg): LastValidatorPower { + return LastValidatorPower.fromAmino(object.value); + }, + toAminoMsg(message: LastValidatorPower): LastValidatorPowerAminoMsg { + return { + type: "cosmos-sdk/LastValidatorPower", + value: LastValidatorPower.toAmino(message) + }; + }, + fromProtoMsg(message: LastValidatorPowerProtoMsg): LastValidatorPower { + return LastValidatorPower.decode(message.value); + }, + toProto(message: LastValidatorPower): Uint8Array { + return LastValidatorPower.encode(message).finish(); + }, + toProtoMsg(message: LastValidatorPower): LastValidatorPowerProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower", + value: LastValidatorPower.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts index 6520a0d5c2..6164486c09 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/query.ts @@ -413,6 +413,7 @@ function createBaseQueryValidatorsRequest(): QueryValidatorsRequest { }; } export const QueryValidatorsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsRequest", encode(message: QueryValidatorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.status !== "") { writer.uint32(10).string(message.status); @@ -477,6 +478,39 @@ export const QueryValidatorsRequest = { obj.status = message.status; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorsRequestAmino): QueryValidatorsRequest { + return { + status: object.status, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorsRequest): QueryValidatorsRequestAmino { + const obj: any = {}; + obj.status = message.status; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorsRequestAminoMsg): QueryValidatorsRequest { + return QueryValidatorsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorsRequest): QueryValidatorsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorsRequest", + value: QueryValidatorsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorsRequestProtoMsg): QueryValidatorsRequest { + return QueryValidatorsRequest.decode(message.value); + }, + toProto(message: QueryValidatorsRequest): Uint8Array { + return QueryValidatorsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorsRequest): QueryValidatorsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsRequest", + value: QueryValidatorsRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorsResponse(): QueryValidatorsResponse { @@ -486,6 +520,7 @@ function createBaseQueryValidatorsResponse(): QueryValidatorsResponse { }; } export const QueryValidatorsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsResponse", encode(message: QueryValidatorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { Validator.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -558,6 +593,43 @@ export const QueryValidatorsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorsResponseAmino): QueryValidatorsResponse { + return { + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorsResponse): QueryValidatorsResponseAmino { + const obj: any = {}; + if (message.validators) { + obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorsResponseAminoMsg): QueryValidatorsResponse { + return QueryValidatorsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorsResponse): QueryValidatorsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorsResponse", + value: QueryValidatorsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorsResponseProtoMsg): QueryValidatorsResponse { + return QueryValidatorsResponse.decode(message.value); + }, + toProto(message: QueryValidatorsResponse): Uint8Array { + return QueryValidatorsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorsResponse): QueryValidatorsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsResponse", + value: QueryValidatorsResponse.encode(message).finish() + }; } }; function createBaseQueryValidatorRequest(): QueryValidatorRequest { @@ -566,6 +638,7 @@ function createBaseQueryValidatorRequest(): QueryValidatorRequest { }; } export const QueryValidatorRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorRequest", encode(message: QueryValidatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); @@ -618,6 +691,37 @@ export const QueryValidatorRequest = { const obj: any = {}; obj.validator_addr = message.validatorAddr; return obj; + }, + fromAmino(object: QueryValidatorRequestAmino): QueryValidatorRequest { + return { + validatorAddr: object.validator_addr + }; + }, + toAmino(message: QueryValidatorRequest): QueryValidatorRequestAmino { + const obj: any = {}; + obj.validator_addr = message.validatorAddr; + return obj; + }, + fromAminoMsg(object: QueryValidatorRequestAminoMsg): QueryValidatorRequest { + return QueryValidatorRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorRequest): QueryValidatorRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorRequest", + value: QueryValidatorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorRequestProtoMsg): QueryValidatorRequest { + return QueryValidatorRequest.decode(message.value); + }, + toProto(message: QueryValidatorRequest): Uint8Array { + return QueryValidatorRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorRequest): QueryValidatorRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorRequest", + value: QueryValidatorRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorResponse(): QueryValidatorResponse { @@ -626,6 +730,7 @@ function createBaseQueryValidatorResponse(): QueryValidatorResponse { }; } export const QueryValidatorResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorResponse", encode(message: QueryValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validator !== undefined) { Validator.encode(message.validator, writer.uint32(10).fork()).ldelim(); @@ -678,6 +783,37 @@ export const QueryValidatorResponse = { const obj: any = {}; message.validator !== undefined && (obj.validator = message.validator ? Validator.toSDK(message.validator) : undefined); return obj; + }, + fromAmino(object: QueryValidatorResponseAmino): QueryValidatorResponse { + return { + validator: object?.validator ? Validator.fromAmino(object.validator) : undefined + }; + }, + toAmino(message: QueryValidatorResponse): QueryValidatorResponseAmino { + const obj: any = {}; + obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorResponseAminoMsg): QueryValidatorResponse { + return QueryValidatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorResponse): QueryValidatorResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorResponse", + value: QueryValidatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorResponseProtoMsg): QueryValidatorResponse { + return QueryValidatorResponse.decode(message.value); + }, + toProto(message: QueryValidatorResponse): Uint8Array { + return QueryValidatorResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorResponse): QueryValidatorResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorResponse", + value: QueryValidatorResponse.encode(message).finish() + }; } }; function createBaseQueryValidatorDelegationsRequest(): QueryValidatorDelegationsRequest { @@ -687,6 +823,7 @@ function createBaseQueryValidatorDelegationsRequest(): QueryValidatorDelegations }; } export const QueryValidatorDelegationsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsRequest", encode(message: QueryValidatorDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); @@ -751,6 +888,39 @@ export const QueryValidatorDelegationsRequest = { obj.validator_addr = message.validatorAddr; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorDelegationsRequestAmino): QueryValidatorDelegationsRequest { + return { + validatorAddr: object.validator_addr, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAmino { + const obj: any = {}; + obj.validator_addr = message.validatorAddr; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorDelegationsRequestAminoMsg): QueryValidatorDelegationsRequest { + return QueryValidatorDelegationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorDelegationsRequest", + value: QueryValidatorDelegationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorDelegationsRequestProtoMsg): QueryValidatorDelegationsRequest { + return QueryValidatorDelegationsRequest.decode(message.value); + }, + toProto(message: QueryValidatorDelegationsRequest): Uint8Array { + return QueryValidatorDelegationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorDelegationsRequest): QueryValidatorDelegationsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsRequest", + value: QueryValidatorDelegationsRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorDelegationsResponse(): QueryValidatorDelegationsResponse { @@ -760,6 +930,7 @@ function createBaseQueryValidatorDelegationsResponse(): QueryValidatorDelegation }; } export const QueryValidatorDelegationsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsResponse", encode(message: QueryValidatorDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.delegationResponses) { DelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -832,6 +1003,43 @@ export const QueryValidatorDelegationsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorDelegationsResponseAmino): QueryValidatorDelegationsResponse { + return { + delegationResponses: Array.isArray(object?.delegation_responses) ? object.delegation_responses.map((e: any) => DelegationResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorDelegationsResponse): QueryValidatorDelegationsResponseAmino { + const obj: any = {}; + if (message.delegationResponses) { + obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); + } else { + obj.delegation_responses = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorDelegationsResponseAminoMsg): QueryValidatorDelegationsResponse { + return QueryValidatorDelegationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorDelegationsResponse): QueryValidatorDelegationsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorDelegationsResponse", + value: QueryValidatorDelegationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorDelegationsResponseProtoMsg): QueryValidatorDelegationsResponse { + return QueryValidatorDelegationsResponse.decode(message.value); + }, + toProto(message: QueryValidatorDelegationsResponse): Uint8Array { + return QueryValidatorDelegationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorDelegationsResponse): QueryValidatorDelegationsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsResponse", + value: QueryValidatorDelegationsResponse.encode(message).finish() + }; } }; function createBaseQueryValidatorUnbondingDelegationsRequest(): QueryValidatorUnbondingDelegationsRequest { @@ -841,6 +1049,7 @@ function createBaseQueryValidatorUnbondingDelegationsRequest(): QueryValidatorUn }; } export const QueryValidatorUnbondingDelegationsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsRequest", encode(message: QueryValidatorUnbondingDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); @@ -905,6 +1114,39 @@ export const QueryValidatorUnbondingDelegationsRequest = { obj.validator_addr = message.validatorAddr; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorUnbondingDelegationsRequestAmino): QueryValidatorUnbondingDelegationsRequest { + return { + validatorAddr: object.validator_addr, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAmino { + const obj: any = {}; + obj.validator_addr = message.validatorAddr; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorUnbondingDelegationsRequestAminoMsg): QueryValidatorUnbondingDelegationsRequest { + return QueryValidatorUnbondingDelegationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorUnbondingDelegationsRequest", + value: QueryValidatorUnbondingDelegationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorUnbondingDelegationsRequestProtoMsg): QueryValidatorUnbondingDelegationsRequest { + return QueryValidatorUnbondingDelegationsRequest.decode(message.value); + }, + toProto(message: QueryValidatorUnbondingDelegationsRequest): Uint8Array { + return QueryValidatorUnbondingDelegationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorUnbondingDelegationsRequest): QueryValidatorUnbondingDelegationsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsRequest", + value: QueryValidatorUnbondingDelegationsRequest.encode(message).finish() + }; } }; function createBaseQueryValidatorUnbondingDelegationsResponse(): QueryValidatorUnbondingDelegationsResponse { @@ -914,6 +1156,7 @@ function createBaseQueryValidatorUnbondingDelegationsResponse(): QueryValidatorU }; } export const QueryValidatorUnbondingDelegationsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsResponse", encode(message: QueryValidatorUnbondingDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unbondingResponses) { UnbondingDelegation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -986,6 +1229,43 @@ export const QueryValidatorUnbondingDelegationsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryValidatorUnbondingDelegationsResponseAmino): QueryValidatorUnbondingDelegationsResponse { + return { + unbondingResponses: Array.isArray(object?.unbonding_responses) ? object.unbonding_responses.map((e: any) => UnbondingDelegation.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryValidatorUnbondingDelegationsResponse): QueryValidatorUnbondingDelegationsResponseAmino { + const obj: any = {}; + if (message.unbondingResponses) { + obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); + } else { + obj.unbonding_responses = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryValidatorUnbondingDelegationsResponseAminoMsg): QueryValidatorUnbondingDelegationsResponse { + return QueryValidatorUnbondingDelegationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryValidatorUnbondingDelegationsResponse): QueryValidatorUnbondingDelegationsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryValidatorUnbondingDelegationsResponse", + value: QueryValidatorUnbondingDelegationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryValidatorUnbondingDelegationsResponseProtoMsg): QueryValidatorUnbondingDelegationsResponse { + return QueryValidatorUnbondingDelegationsResponse.decode(message.value); + }, + toProto(message: QueryValidatorUnbondingDelegationsResponse): Uint8Array { + return QueryValidatorUnbondingDelegationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryValidatorUnbondingDelegationsResponse): QueryValidatorUnbondingDelegationsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsResponse", + value: QueryValidatorUnbondingDelegationsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegationRequest(): QueryDelegationRequest { @@ -995,6 +1275,7 @@ function createBaseQueryDelegationRequest(): QueryDelegationRequest { }; } export const QueryDelegationRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegationRequest", encode(message: QueryDelegationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1059,6 +1340,39 @@ export const QueryDelegationRequest = { obj.delegator_addr = message.delegatorAddr; obj.validator_addr = message.validatorAddr; return obj; + }, + fromAmino(object: QueryDelegationRequestAmino): QueryDelegationRequest { + return { + delegatorAddr: object.delegator_addr, + validatorAddr: object.validator_addr + }; + }, + toAmino(message: QueryDelegationRequest): QueryDelegationRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.validator_addr = message.validatorAddr; + return obj; + }, + fromAminoMsg(object: QueryDelegationRequestAminoMsg): QueryDelegationRequest { + return QueryDelegationRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegationRequest): QueryDelegationRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegationRequest", + value: QueryDelegationRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegationRequestProtoMsg): QueryDelegationRequest { + return QueryDelegationRequest.decode(message.value); + }, + toProto(message: QueryDelegationRequest): Uint8Array { + return QueryDelegationRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegationRequest): QueryDelegationRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegationRequest", + value: QueryDelegationRequest.encode(message).finish() + }; } }; function createBaseQueryDelegationResponse(): QueryDelegationResponse { @@ -1067,6 +1381,7 @@ function createBaseQueryDelegationResponse(): QueryDelegationResponse { }; } export const QueryDelegationResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegationResponse", encode(message: QueryDelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegationResponse !== undefined) { DelegationResponse.encode(message.delegationResponse, writer.uint32(10).fork()).ldelim(); @@ -1119,6 +1434,37 @@ export const QueryDelegationResponse = { const obj: any = {}; message.delegationResponse !== undefined && (obj.delegation_response = message.delegationResponse ? DelegationResponse.toSDK(message.delegationResponse) : undefined); return obj; + }, + fromAmino(object: QueryDelegationResponseAmino): QueryDelegationResponse { + return { + delegationResponse: object?.delegation_response ? DelegationResponse.fromAmino(object.delegation_response) : undefined + }; + }, + toAmino(message: QueryDelegationResponse): QueryDelegationResponseAmino { + const obj: any = {}; + obj.delegation_response = message.delegationResponse ? DelegationResponse.toAmino(message.delegationResponse) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegationResponseAminoMsg): QueryDelegationResponse { + return QueryDelegationResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegationResponse): QueryDelegationResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegationResponse", + value: QueryDelegationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegationResponseProtoMsg): QueryDelegationResponse { + return QueryDelegationResponse.decode(message.value); + }, + toProto(message: QueryDelegationResponse): Uint8Array { + return QueryDelegationResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegationResponse): QueryDelegationResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegationResponse", + value: QueryDelegationResponse.encode(message).finish() + }; } }; function createBaseQueryUnbondingDelegationRequest(): QueryUnbondingDelegationRequest { @@ -1128,6 +1474,7 @@ function createBaseQueryUnbondingDelegationRequest(): QueryUnbondingDelegationRe }; } export const QueryUnbondingDelegationRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationRequest", encode(message: QueryUnbondingDelegationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1192,6 +1539,39 @@ export const QueryUnbondingDelegationRequest = { obj.delegator_addr = message.delegatorAddr; obj.validator_addr = message.validatorAddr; return obj; + }, + fromAmino(object: QueryUnbondingDelegationRequestAmino): QueryUnbondingDelegationRequest { + return { + delegatorAddr: object.delegator_addr, + validatorAddr: object.validator_addr + }; + }, + toAmino(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.validator_addr = message.validatorAddr; + return obj; + }, + fromAminoMsg(object: QueryUnbondingDelegationRequestAminoMsg): QueryUnbondingDelegationRequest { + return QueryUnbondingDelegationRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestAminoMsg { + return { + type: "cosmos-sdk/QueryUnbondingDelegationRequest", + value: QueryUnbondingDelegationRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnbondingDelegationRequestProtoMsg): QueryUnbondingDelegationRequest { + return QueryUnbondingDelegationRequest.decode(message.value); + }, + toProto(message: QueryUnbondingDelegationRequest): Uint8Array { + return QueryUnbondingDelegationRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUnbondingDelegationRequest): QueryUnbondingDelegationRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationRequest", + value: QueryUnbondingDelegationRequest.encode(message).finish() + }; } }; function createBaseQueryUnbondingDelegationResponse(): QueryUnbondingDelegationResponse { @@ -1200,6 +1580,7 @@ function createBaseQueryUnbondingDelegationResponse(): QueryUnbondingDelegationR }; } export const QueryUnbondingDelegationResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationResponse", encode(message: QueryUnbondingDelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.unbond !== undefined) { UnbondingDelegation.encode(message.unbond, writer.uint32(10).fork()).ldelim(); @@ -1252,6 +1633,37 @@ export const QueryUnbondingDelegationResponse = { const obj: any = {}; message.unbond !== undefined && (obj.unbond = message.unbond ? UnbondingDelegation.toSDK(message.unbond) : undefined); return obj; + }, + fromAmino(object: QueryUnbondingDelegationResponseAmino): QueryUnbondingDelegationResponse { + return { + unbond: object?.unbond ? UnbondingDelegation.fromAmino(object.unbond) : undefined + }; + }, + toAmino(message: QueryUnbondingDelegationResponse): QueryUnbondingDelegationResponseAmino { + const obj: any = {}; + obj.unbond = message.unbond ? UnbondingDelegation.toAmino(message.unbond) : undefined; + return obj; + }, + fromAminoMsg(object: QueryUnbondingDelegationResponseAminoMsg): QueryUnbondingDelegationResponse { + return QueryUnbondingDelegationResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnbondingDelegationResponse): QueryUnbondingDelegationResponseAminoMsg { + return { + type: "cosmos-sdk/QueryUnbondingDelegationResponse", + value: QueryUnbondingDelegationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnbondingDelegationResponseProtoMsg): QueryUnbondingDelegationResponse { + return QueryUnbondingDelegationResponse.decode(message.value); + }, + toProto(message: QueryUnbondingDelegationResponse): Uint8Array { + return QueryUnbondingDelegationResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUnbondingDelegationResponse): QueryUnbondingDelegationResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationResponse", + value: QueryUnbondingDelegationResponse.encode(message).finish() + }; } }; function createBaseQueryDelegatorDelegationsRequest(): QueryDelegatorDelegationsRequest { @@ -1261,6 +1673,7 @@ function createBaseQueryDelegatorDelegationsRequest(): QueryDelegatorDelegations }; } export const QueryDelegatorDelegationsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsRequest", encode(message: QueryDelegatorDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1325,6 +1738,39 @@ export const QueryDelegatorDelegationsRequest = { obj.delegator_addr = message.delegatorAddr; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorDelegationsRequestAmino): QueryDelegatorDelegationsRequest { + return { + delegatorAddr: object.delegator_addr, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorDelegationsRequestAminoMsg): QueryDelegatorDelegationsRequest { + return QueryDelegatorDelegationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorDelegationsRequest", + value: QueryDelegatorDelegationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorDelegationsRequestProtoMsg): QueryDelegatorDelegationsRequest { + return QueryDelegatorDelegationsRequest.decode(message.value); + }, + toProto(message: QueryDelegatorDelegationsRequest): Uint8Array { + return QueryDelegatorDelegationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorDelegationsRequest): QueryDelegatorDelegationsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsRequest", + value: QueryDelegatorDelegationsRequest.encode(message).finish() + }; } }; function createBaseQueryDelegatorDelegationsResponse(): QueryDelegatorDelegationsResponse { @@ -1334,6 +1780,7 @@ function createBaseQueryDelegatorDelegationsResponse(): QueryDelegatorDelegation }; } export const QueryDelegatorDelegationsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsResponse", encode(message: QueryDelegatorDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.delegationResponses) { DelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1406,6 +1853,43 @@ export const QueryDelegatorDelegationsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorDelegationsResponseAmino): QueryDelegatorDelegationsResponse { + return { + delegationResponses: Array.isArray(object?.delegation_responses) ? object.delegation_responses.map((e: any) => DelegationResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDelegatorDelegationsResponse): QueryDelegatorDelegationsResponseAmino { + const obj: any = {}; + if (message.delegationResponses) { + obj.delegation_responses = message.delegationResponses.map(e => e ? DelegationResponse.toAmino(e) : undefined); + } else { + obj.delegation_responses = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorDelegationsResponseAminoMsg): QueryDelegatorDelegationsResponse { + return QueryDelegatorDelegationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorDelegationsResponse): QueryDelegatorDelegationsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorDelegationsResponse", + value: QueryDelegatorDelegationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorDelegationsResponseProtoMsg): QueryDelegatorDelegationsResponse { + return QueryDelegatorDelegationsResponse.decode(message.value); + }, + toProto(message: QueryDelegatorDelegationsResponse): Uint8Array { + return QueryDelegatorDelegationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorDelegationsResponse): QueryDelegatorDelegationsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsResponse", + value: QueryDelegatorDelegationsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegatorUnbondingDelegationsRequest(): QueryDelegatorUnbondingDelegationsRequest { @@ -1415,6 +1899,7 @@ function createBaseQueryDelegatorUnbondingDelegationsRequest(): QueryDelegatorUn }; } export const QueryDelegatorUnbondingDelegationsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsRequest", encode(message: QueryDelegatorUnbondingDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1479,6 +1964,39 @@ export const QueryDelegatorUnbondingDelegationsRequest = { obj.delegator_addr = message.delegatorAddr; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorUnbondingDelegationsRequestAmino): QueryDelegatorUnbondingDelegationsRequest { + return { + delegatorAddr: object.delegator_addr, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorUnbondingDelegationsRequestAminoMsg): QueryDelegatorUnbondingDelegationsRequest { + return QueryDelegatorUnbondingDelegationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorUnbondingDelegationsRequest", + value: QueryDelegatorUnbondingDelegationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorUnbondingDelegationsRequestProtoMsg): QueryDelegatorUnbondingDelegationsRequest { + return QueryDelegatorUnbondingDelegationsRequest.decode(message.value); + }, + toProto(message: QueryDelegatorUnbondingDelegationsRequest): Uint8Array { + return QueryDelegatorUnbondingDelegationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorUnbondingDelegationsRequest): QueryDelegatorUnbondingDelegationsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsRequest", + value: QueryDelegatorUnbondingDelegationsRequest.encode(message).finish() + }; } }; function createBaseQueryDelegatorUnbondingDelegationsResponse(): QueryDelegatorUnbondingDelegationsResponse { @@ -1488,6 +2006,7 @@ function createBaseQueryDelegatorUnbondingDelegationsResponse(): QueryDelegatorU }; } export const QueryDelegatorUnbondingDelegationsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsResponse", encode(message: QueryDelegatorUnbondingDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unbondingResponses) { UnbondingDelegation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1560,6 +2079,43 @@ export const QueryDelegatorUnbondingDelegationsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorUnbondingDelegationsResponseAmino): QueryDelegatorUnbondingDelegationsResponse { + return { + unbondingResponses: Array.isArray(object?.unbonding_responses) ? object.unbonding_responses.map((e: any) => UnbondingDelegation.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDelegatorUnbondingDelegationsResponse): QueryDelegatorUnbondingDelegationsResponseAmino { + const obj: any = {}; + if (message.unbondingResponses) { + obj.unbonding_responses = message.unbondingResponses.map(e => e ? UnbondingDelegation.toAmino(e) : undefined); + } else { + obj.unbonding_responses = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorUnbondingDelegationsResponseAminoMsg): QueryDelegatorUnbondingDelegationsResponse { + return QueryDelegatorUnbondingDelegationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorUnbondingDelegationsResponse): QueryDelegatorUnbondingDelegationsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorUnbondingDelegationsResponse", + value: QueryDelegatorUnbondingDelegationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorUnbondingDelegationsResponseProtoMsg): QueryDelegatorUnbondingDelegationsResponse { + return QueryDelegatorUnbondingDelegationsResponse.decode(message.value); + }, + toProto(message: QueryDelegatorUnbondingDelegationsResponse): Uint8Array { + return QueryDelegatorUnbondingDelegationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorUnbondingDelegationsResponse): QueryDelegatorUnbondingDelegationsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsResponse", + value: QueryDelegatorUnbondingDelegationsResponse.encode(message).finish() + }; } }; function createBaseQueryRedelegationsRequest(): QueryRedelegationsRequest { @@ -1571,6 +2127,7 @@ function createBaseQueryRedelegationsRequest(): QueryRedelegationsRequest { }; } export const QueryRedelegationsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsRequest", encode(message: QueryRedelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1659,6 +2216,43 @@ export const QueryRedelegationsRequest = { obj.dst_validator_addr = message.dstValidatorAddr; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryRedelegationsRequestAmino): QueryRedelegationsRequest { + return { + delegatorAddr: object.delegator_addr, + srcValidatorAddr: object.src_validator_addr, + dstValidatorAddr: object.dst_validator_addr, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryRedelegationsRequest): QueryRedelegationsRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.src_validator_addr = message.srcValidatorAddr; + obj.dst_validator_addr = message.dstValidatorAddr; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryRedelegationsRequestAminoMsg): QueryRedelegationsRequest { + return QueryRedelegationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryRedelegationsRequest): QueryRedelegationsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryRedelegationsRequest", + value: QueryRedelegationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryRedelegationsRequestProtoMsg): QueryRedelegationsRequest { + return QueryRedelegationsRequest.decode(message.value); + }, + toProto(message: QueryRedelegationsRequest): Uint8Array { + return QueryRedelegationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryRedelegationsRequest): QueryRedelegationsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsRequest", + value: QueryRedelegationsRequest.encode(message).finish() + }; } }; function createBaseQueryRedelegationsResponse(): QueryRedelegationsResponse { @@ -1668,6 +2262,7 @@ function createBaseQueryRedelegationsResponse(): QueryRedelegationsResponse { }; } export const QueryRedelegationsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsResponse", encode(message: QueryRedelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.redelegationResponses) { RedelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1740,6 +2335,43 @@ export const QueryRedelegationsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryRedelegationsResponseAmino): QueryRedelegationsResponse { + return { + redelegationResponses: Array.isArray(object?.redelegation_responses) ? object.redelegation_responses.map((e: any) => RedelegationResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryRedelegationsResponse): QueryRedelegationsResponseAmino { + const obj: any = {}; + if (message.redelegationResponses) { + obj.redelegation_responses = message.redelegationResponses.map(e => e ? RedelegationResponse.toAmino(e) : undefined); + } else { + obj.redelegation_responses = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryRedelegationsResponseAminoMsg): QueryRedelegationsResponse { + return QueryRedelegationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryRedelegationsResponse): QueryRedelegationsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryRedelegationsResponse", + value: QueryRedelegationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryRedelegationsResponseProtoMsg): QueryRedelegationsResponse { + return QueryRedelegationsResponse.decode(message.value); + }, + toProto(message: QueryRedelegationsResponse): Uint8Array { + return QueryRedelegationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryRedelegationsResponse): QueryRedelegationsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsResponse", + value: QueryRedelegationsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRequest { @@ -1749,6 +2381,7 @@ function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRe }; } export const QueryDelegatorValidatorsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsRequest", encode(message: QueryDelegatorValidatorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1813,6 +2446,39 @@ export const QueryDelegatorValidatorsRequest = { obj.delegator_addr = message.delegatorAddr; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorValidatorsRequestAmino): QueryDelegatorValidatorsRequest { + return { + delegatorAddr: object.delegator_addr, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorValidatorsRequestAminoMsg): QueryDelegatorValidatorsRequest { + return QueryDelegatorValidatorsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorValidatorsRequest", + value: QueryDelegatorValidatorsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorValidatorsRequestProtoMsg): QueryDelegatorValidatorsRequest { + return QueryDelegatorValidatorsRequest.decode(message.value); + }, + toProto(message: QueryDelegatorValidatorsRequest): Uint8Array { + return QueryDelegatorValidatorsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorValidatorsRequest): QueryDelegatorValidatorsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsRequest", + value: QueryDelegatorValidatorsRequest.encode(message).finish() + }; } }; function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsResponse { @@ -1822,6 +2488,7 @@ function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsR }; } export const QueryDelegatorValidatorsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsResponse", encode(message: QueryDelegatorValidatorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { Validator.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1894,6 +2561,43 @@ export const QueryDelegatorValidatorsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorValidatorsResponseAmino): QueryDelegatorValidatorsResponse { + return { + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseAmino { + const obj: any = {}; + if (message.validators) { + obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorValidatorsResponseAminoMsg): QueryDelegatorValidatorsResponse { + return QueryDelegatorValidatorsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorValidatorsResponse", + value: QueryDelegatorValidatorsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorValidatorsResponseProtoMsg): QueryDelegatorValidatorsResponse { + return QueryDelegatorValidatorsResponse.decode(message.value); + }, + toProto(message: QueryDelegatorValidatorsResponse): Uint8Array { + return QueryDelegatorValidatorsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorValidatorsResponse): QueryDelegatorValidatorsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsResponse", + value: QueryDelegatorValidatorsResponse.encode(message).finish() + }; } }; function createBaseQueryDelegatorValidatorRequest(): QueryDelegatorValidatorRequest { @@ -1903,6 +2607,7 @@ function createBaseQueryDelegatorValidatorRequest(): QueryDelegatorValidatorRequ }; } export const QueryDelegatorValidatorRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorRequest", encode(message: QueryDelegatorValidatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); @@ -1967,6 +2672,39 @@ export const QueryDelegatorValidatorRequest = { obj.delegator_addr = message.delegatorAddr; obj.validator_addr = message.validatorAddr; return obj; + }, + fromAmino(object: QueryDelegatorValidatorRequestAmino): QueryDelegatorValidatorRequest { + return { + delegatorAddr: object.delegator_addr, + validatorAddr: object.validator_addr + }; + }, + toAmino(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAmino { + const obj: any = {}; + obj.delegator_addr = message.delegatorAddr; + obj.validator_addr = message.validatorAddr; + return obj; + }, + fromAminoMsg(object: QueryDelegatorValidatorRequestAminoMsg): QueryDelegatorValidatorRequest { + return QueryDelegatorValidatorRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorValidatorRequest", + value: QueryDelegatorValidatorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorValidatorRequestProtoMsg): QueryDelegatorValidatorRequest { + return QueryDelegatorValidatorRequest.decode(message.value); + }, + toProto(message: QueryDelegatorValidatorRequest): Uint8Array { + return QueryDelegatorValidatorRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorValidatorRequest): QueryDelegatorValidatorRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorRequest", + value: QueryDelegatorValidatorRequest.encode(message).finish() + }; } }; function createBaseQueryDelegatorValidatorResponse(): QueryDelegatorValidatorResponse { @@ -1975,6 +2713,7 @@ function createBaseQueryDelegatorValidatorResponse(): QueryDelegatorValidatorRes }; } export const QueryDelegatorValidatorResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorResponse", encode(message: QueryDelegatorValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validator !== undefined) { Validator.encode(message.validator, writer.uint32(10).fork()).ldelim(); @@ -2027,6 +2766,37 @@ export const QueryDelegatorValidatorResponse = { const obj: any = {}; message.validator !== undefined && (obj.validator = message.validator ? Validator.toSDK(message.validator) : undefined); return obj; + }, + fromAmino(object: QueryDelegatorValidatorResponseAmino): QueryDelegatorValidatorResponse { + return { + validator: object?.validator ? Validator.fromAmino(object.validator) : undefined + }; + }, + toAmino(message: QueryDelegatorValidatorResponse): QueryDelegatorValidatorResponseAmino { + const obj: any = {}; + obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDelegatorValidatorResponseAminoMsg): QueryDelegatorValidatorResponse { + return QueryDelegatorValidatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDelegatorValidatorResponse): QueryDelegatorValidatorResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDelegatorValidatorResponse", + value: QueryDelegatorValidatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDelegatorValidatorResponseProtoMsg): QueryDelegatorValidatorResponse { + return QueryDelegatorValidatorResponse.decode(message.value); + }, + toProto(message: QueryDelegatorValidatorResponse): Uint8Array { + return QueryDelegatorValidatorResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDelegatorValidatorResponse): QueryDelegatorValidatorResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorResponse", + value: QueryDelegatorValidatorResponse.encode(message).finish() + }; } }; function createBaseQueryHistoricalInfoRequest(): QueryHistoricalInfoRequest { @@ -2035,6 +2805,7 @@ function createBaseQueryHistoricalInfoRequest(): QueryHistoricalInfoRequest { }; } export const QueryHistoricalInfoRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest", encode(message: QueryHistoricalInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -2087,6 +2858,37 @@ export const QueryHistoricalInfoRequest = { const obj: any = {}; obj.height = message.height; return obj; + }, + fromAmino(object: QueryHistoricalInfoRequestAmino): QueryHistoricalInfoRequest { + return { + height: BigInt(object.height) + }; + }, + toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryHistoricalInfoRequestAminoMsg): QueryHistoricalInfoRequest { + return QueryHistoricalInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAminoMsg { + return { + type: "cosmos-sdk/QueryHistoricalInfoRequest", + value: QueryHistoricalInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryHistoricalInfoRequestProtoMsg): QueryHistoricalInfoRequest { + return QueryHistoricalInfoRequest.decode(message.value); + }, + toProto(message: QueryHistoricalInfoRequest): Uint8Array { + return QueryHistoricalInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest", + value: QueryHistoricalInfoRequest.encode(message).finish() + }; } }; function createBaseQueryHistoricalInfoResponse(): QueryHistoricalInfoResponse { @@ -2095,6 +2897,7 @@ function createBaseQueryHistoricalInfoResponse(): QueryHistoricalInfoResponse { }; } export const QueryHistoricalInfoResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoResponse", encode(message: QueryHistoricalInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hist !== undefined) { HistoricalInfo.encode(message.hist, writer.uint32(10).fork()).ldelim(); @@ -2147,12 +2950,44 @@ export const QueryHistoricalInfoResponse = { const obj: any = {}; message.hist !== undefined && (obj.hist = message.hist ? HistoricalInfo.toSDK(message.hist) : undefined); return obj; + }, + fromAmino(object: QueryHistoricalInfoResponseAmino): QueryHistoricalInfoResponse { + return { + hist: object?.hist ? HistoricalInfo.fromAmino(object.hist) : undefined + }; + }, + toAmino(message: QueryHistoricalInfoResponse): QueryHistoricalInfoResponseAmino { + const obj: any = {}; + obj.hist = message.hist ? HistoricalInfo.toAmino(message.hist) : undefined; + return obj; + }, + fromAminoMsg(object: QueryHistoricalInfoResponseAminoMsg): QueryHistoricalInfoResponse { + return QueryHistoricalInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryHistoricalInfoResponse): QueryHistoricalInfoResponseAminoMsg { + return { + type: "cosmos-sdk/QueryHistoricalInfoResponse", + value: QueryHistoricalInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryHistoricalInfoResponseProtoMsg): QueryHistoricalInfoResponse { + return QueryHistoricalInfoResponse.decode(message.value); + }, + toProto(message: QueryHistoricalInfoResponse): Uint8Array { + return QueryHistoricalInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryHistoricalInfoResponse): QueryHistoricalInfoResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoResponse", + value: QueryHistoricalInfoResponse.encode(message).finish() + }; } }; function createBaseQueryPoolRequest(): QueryPoolRequest { return {}; } export const QueryPoolRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryPoolRequest", encode(_: QueryPoolRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2190,6 +3025,34 @@ export const QueryPoolRequest = { toSDK(_: QueryPoolRequest): QueryPoolRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryPoolRequestAmino): QueryPoolRequest { + return {}; + }, + toAmino(_: QueryPoolRequest): QueryPoolRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { + return QueryPoolRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolRequest): QueryPoolRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPoolRequest", + value: QueryPoolRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolRequestProtoMsg): QueryPoolRequest { + return QueryPoolRequest.decode(message.value); + }, + toProto(message: QueryPoolRequest): Uint8Array { + return QueryPoolRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolRequest): QueryPoolRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryPoolRequest", + value: QueryPoolRequest.encode(message).finish() + }; } }; function createBaseQueryPoolResponse(): QueryPoolResponse { @@ -2198,6 +3061,7 @@ function createBaseQueryPoolResponse(): QueryPoolResponse { }; } export const QueryPoolResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryPoolResponse", encode(message: QueryPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pool !== undefined) { Pool.encode(message.pool, writer.uint32(10).fork()).ldelim(); @@ -2250,12 +3114,44 @@ export const QueryPoolResponse = { const obj: any = {}; message.pool !== undefined && (obj.pool = message.pool ? Pool.toSDK(message.pool) : undefined); return obj; + }, + fromAmino(object: QueryPoolResponseAmino): QueryPoolResponse { + return { + pool: object?.pool ? Pool.fromAmino(object.pool) : undefined + }; + }, + toAmino(message: QueryPoolResponse): QueryPoolResponseAmino { + const obj: any = {}; + obj.pool = message.pool ? Pool.toAmino(message.pool) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolResponseAminoMsg): QueryPoolResponse { + return QueryPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolResponse): QueryPoolResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPoolResponse", + value: QueryPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolResponseProtoMsg): QueryPoolResponse { + return QueryPoolResponse.decode(message.value); + }, + toProto(message: QueryPoolResponse): Uint8Array { + return QueryPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolResponse): QueryPoolResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryPoolResponse", + value: QueryPoolResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/cosmos.staking.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2293,6 +3189,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -2301,6 +3225,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/cosmos.staking.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -2353,5 +3278,36 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts index 7fe1965eb8..770b7ff5a7 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/staking.ts @@ -6,6 +6,7 @@ import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; import { Decimal } from "@cosmjs/math"; +import { encodePubkey, decodePubkey } from "@cosmjs/proto-signing"; export const protobufPackage = "cosmos.staking.v1beta1"; /** BondStatus is the status of a validator. */ export enum BondStatus { @@ -453,6 +454,7 @@ function createBaseHistoricalInfo(): HistoricalInfo { }; } export const HistoricalInfo = { + typeUrl: "/cosmos.staking.v1beta1.HistoricalInfo", encode(message: HistoricalInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.header !== undefined) { Header.encode(message.header, writer.uint32(10).fork()).ldelim(); @@ -525,6 +527,43 @@ export const HistoricalInfo = { obj.valset = []; } return obj; + }, + fromAmino(object: HistoricalInfoAmino): HistoricalInfo { + return { + header: object?.header ? Header.fromAmino(object.header) : undefined, + valset: Array.isArray(object?.valset) ? object.valset.map((e: any) => Validator.fromAmino(e)) : [] + }; + }, + toAmino(message: HistoricalInfo): HistoricalInfoAmino { + const obj: any = {}; + obj.header = message.header ? Header.toAmino(message.header) : undefined; + if (message.valset) { + obj.valset = message.valset.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.valset = []; + } + return obj; + }, + fromAminoMsg(object: HistoricalInfoAminoMsg): HistoricalInfo { + return HistoricalInfo.fromAmino(object.value); + }, + toAminoMsg(message: HistoricalInfo): HistoricalInfoAminoMsg { + return { + type: "cosmos-sdk/HistoricalInfo", + value: HistoricalInfo.toAmino(message) + }; + }, + fromProtoMsg(message: HistoricalInfoProtoMsg): HistoricalInfo { + return HistoricalInfo.decode(message.value); + }, + toProto(message: HistoricalInfo): Uint8Array { + return HistoricalInfo.encode(message).finish(); + }, + toProtoMsg(message: HistoricalInfo): HistoricalInfoProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.HistoricalInfo", + value: HistoricalInfo.encode(message).finish() + }; } }; function createBaseCommissionRates(): CommissionRates { @@ -535,6 +574,7 @@ function createBaseCommissionRates(): CommissionRates { }; } export const CommissionRates = { + typeUrl: "/cosmos.staking.v1beta1.CommissionRates", encode(message: CommissionRates, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rate !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.rate, 18).atomics); @@ -611,6 +651,41 @@ export const CommissionRates = { obj.max_rate = message.maxRate; obj.max_change_rate = message.maxChangeRate; return obj; + }, + fromAmino(object: CommissionRatesAmino): CommissionRates { + return { + rate: object.rate, + maxRate: object.max_rate, + maxChangeRate: object.max_change_rate + }; + }, + toAmino(message: CommissionRates): CommissionRatesAmino { + const obj: any = {}; + obj.rate = message.rate; + obj.max_rate = message.maxRate; + obj.max_change_rate = message.maxChangeRate; + return obj; + }, + fromAminoMsg(object: CommissionRatesAminoMsg): CommissionRates { + return CommissionRates.fromAmino(object.value); + }, + toAminoMsg(message: CommissionRates): CommissionRatesAminoMsg { + return { + type: "cosmos-sdk/CommissionRates", + value: CommissionRates.toAmino(message) + }; + }, + fromProtoMsg(message: CommissionRatesProtoMsg): CommissionRates { + return CommissionRates.decode(message.value); + }, + toProto(message: CommissionRates): Uint8Array { + return CommissionRates.encode(message).finish(); + }, + toProtoMsg(message: CommissionRates): CommissionRatesProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.CommissionRates", + value: CommissionRates.encode(message).finish() + }; } }; function createBaseCommission(): Commission { @@ -620,6 +695,7 @@ function createBaseCommission(): Commission { }; } export const Commission = { + typeUrl: "/cosmos.staking.v1beta1.Commission", encode(message: Commission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.commissionRates !== undefined) { CommissionRates.encode(message.commissionRates, writer.uint32(10).fork()).ldelim(); @@ -684,6 +760,39 @@ export const Commission = { message.commissionRates !== undefined && (obj.commission_rates = message.commissionRates ? CommissionRates.toSDK(message.commissionRates) : undefined); message.updateTime !== undefined && (obj.update_time = message.updateTime ?? undefined); return obj; + }, + fromAmino(object: CommissionAmino): Commission { + return { + commissionRates: object?.commission_rates ? CommissionRates.fromAmino(object.commission_rates) : undefined, + updateTime: object.update_time + }; + }, + toAmino(message: Commission): CommissionAmino { + const obj: any = {}; + obj.commission_rates = message.commissionRates ? CommissionRates.toAmino(message.commissionRates) : undefined; + obj.update_time = message.updateTime; + return obj; + }, + fromAminoMsg(object: CommissionAminoMsg): Commission { + return Commission.fromAmino(object.value); + }, + toAminoMsg(message: Commission): CommissionAminoMsg { + return { + type: "cosmos-sdk/Commission", + value: Commission.toAmino(message) + }; + }, + fromProtoMsg(message: CommissionProtoMsg): Commission { + return Commission.decode(message.value); + }, + toProto(message: Commission): Uint8Array { + return Commission.encode(message).finish(); + }, + toProtoMsg(message: Commission): CommissionProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Commission", + value: Commission.encode(message).finish() + }; } }; function createBaseDescription(): Description { @@ -696,6 +805,7 @@ function createBaseDescription(): Description { }; } export const Description = { + typeUrl: "/cosmos.staking.v1beta1.Description", encode(message: Description, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.moniker !== "") { writer.uint32(10).string(message.moniker); @@ -796,6 +906,45 @@ export const Description = { obj.security_contact = message.securityContact; obj.details = message.details; return obj; + }, + fromAmino(object: DescriptionAmino): Description { + return { + moniker: object.moniker, + identity: object.identity, + website: object.website, + securityContact: object.security_contact, + details: object.details + }; + }, + toAmino(message: Description): DescriptionAmino { + const obj: any = {}; + obj.moniker = message.moniker; + obj.identity = message.identity; + obj.website = message.website; + obj.security_contact = message.securityContact; + obj.details = message.details; + return obj; + }, + fromAminoMsg(object: DescriptionAminoMsg): Description { + return Description.fromAmino(object.value); + }, + toAminoMsg(message: Description): DescriptionAminoMsg { + return { + type: "cosmos-sdk/Description", + value: Description.toAmino(message) + }; + }, + fromProtoMsg(message: DescriptionProtoMsg): Description { + return Description.decode(message.value); + }, + toProto(message: Description): Uint8Array { + return Description.encode(message).finish(); + }, + toProtoMsg(message: Description): DescriptionProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Description", + value: Description.encode(message).finish() + }; } }; function createBaseValidator(): Validator { @@ -814,6 +963,7 @@ function createBaseValidator(): Validator { }; } export const Validator = { + typeUrl: "/cosmos.staking.v1beta1.Validator", encode(message: Validator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operatorAddress !== "") { writer.uint32(10).string(message.operatorAddress); @@ -986,6 +1136,57 @@ export const Validator = { message.commission !== undefined && (obj.commission = message.commission ? Commission.toSDK(message.commission) : undefined); obj.min_self_delegation = message.minSelfDelegation; return obj; + }, + fromAmino(object: ValidatorAmino): Validator { + return { + operatorAddress: object.operator_address, + consensusPubkey: object?.consensus_pubkey ? encodePubkey(object.consensus_pubkey) : undefined, + jailed: object.jailed, + status: isSet(object.status) ? bondStatusFromJSON(object.status) : -1, + tokens: object.tokens, + delegatorShares: object.delegator_shares, + description: object?.description ? Description.fromAmino(object.description) : undefined, + unbondingHeight: BigInt(object.unbonding_height), + unbondingTime: object.unbonding_time, + commission: object?.commission ? Commission.fromAmino(object.commission) : undefined, + minSelfDelegation: object.min_self_delegation + }; + }, + toAmino(message: Validator): ValidatorAmino { + const obj: any = {}; + obj.operator_address = message.operatorAddress; + obj.consensus_pubkey = message.consensusPubkey ? decodePubkey(message.consensusPubkey) : undefined; + obj.jailed = message.jailed; + obj.status = message.status; + obj.tokens = message.tokens; + obj.delegator_shares = message.delegatorShares; + obj.description = message.description ? Description.toAmino(message.description) : undefined; + obj.unbonding_height = message.unbondingHeight ? message.unbondingHeight.toString() : undefined; + obj.unbonding_time = message.unbondingTime; + obj.commission = message.commission ? Commission.toAmino(message.commission) : undefined; + obj.min_self_delegation = message.minSelfDelegation; + return obj; + }, + fromAminoMsg(object: ValidatorAminoMsg): Validator { + return Validator.fromAmino(object.value); + }, + toAminoMsg(message: Validator): ValidatorAminoMsg { + return { + type: "cosmos-sdk/Validator", + value: Validator.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorProtoMsg): Validator { + return Validator.decode(message.value); + }, + toProto(message: Validator): Uint8Array { + return Validator.encode(message).finish(); + }, + toProtoMsg(message: Validator): ValidatorProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Validator", + value: Validator.encode(message).finish() + }; } }; function createBaseValAddresses(): ValAddresses { @@ -994,6 +1195,7 @@ function createBaseValAddresses(): ValAddresses { }; } export const ValAddresses = { + typeUrl: "/cosmos.staking.v1beta1.ValAddresses", encode(message: ValAddresses, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.addresses) { writer.uint32(10).string(v!); @@ -1054,6 +1256,41 @@ export const ValAddresses = { obj.addresses = []; } return obj; + }, + fromAmino(object: ValAddressesAmino): ValAddresses { + return { + addresses: Array.isArray(object?.addresses) ? object.addresses.map((e: any) => e) : [] + }; + }, + toAmino(message: ValAddresses): ValAddressesAmino { + const obj: any = {}; + if (message.addresses) { + obj.addresses = message.addresses.map(e => e); + } else { + obj.addresses = []; + } + return obj; + }, + fromAminoMsg(object: ValAddressesAminoMsg): ValAddresses { + return ValAddresses.fromAmino(object.value); + }, + toAminoMsg(message: ValAddresses): ValAddressesAminoMsg { + return { + type: "cosmos-sdk/ValAddresses", + value: ValAddresses.toAmino(message) + }; + }, + fromProtoMsg(message: ValAddressesProtoMsg): ValAddresses { + return ValAddresses.decode(message.value); + }, + toProto(message: ValAddresses): Uint8Array { + return ValAddresses.encode(message).finish(); + }, + toProtoMsg(message: ValAddresses): ValAddressesProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.ValAddresses", + value: ValAddresses.encode(message).finish() + }; } }; function createBaseDVPair(): DVPair { @@ -1063,6 +1300,7 @@ function createBaseDVPair(): DVPair { }; } export const DVPair = { + typeUrl: "/cosmos.staking.v1beta1.DVPair", encode(message: DVPair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1127,6 +1365,39 @@ export const DVPair = { obj.delegator_address = message.delegatorAddress; obj.validator_address = message.validatorAddress; return obj; + }, + fromAmino(object: DVPairAmino): DVPair { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address + }; + }, + toAmino(message: DVPair): DVPairAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + return obj; + }, + fromAminoMsg(object: DVPairAminoMsg): DVPair { + return DVPair.fromAmino(object.value); + }, + toAminoMsg(message: DVPair): DVPairAminoMsg { + return { + type: "cosmos-sdk/DVPair", + value: DVPair.toAmino(message) + }; + }, + fromProtoMsg(message: DVPairProtoMsg): DVPair { + return DVPair.decode(message.value); + }, + toProto(message: DVPair): Uint8Array { + return DVPair.encode(message).finish(); + }, + toProtoMsg(message: DVPair): DVPairProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.DVPair", + value: DVPair.encode(message).finish() + }; } }; function createBaseDVPairs(): DVPairs { @@ -1135,6 +1406,7 @@ function createBaseDVPairs(): DVPairs { }; } export const DVPairs = { + typeUrl: "/cosmos.staking.v1beta1.DVPairs", encode(message: DVPairs, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pairs) { DVPair.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1195,6 +1467,41 @@ export const DVPairs = { obj.pairs = []; } return obj; + }, + fromAmino(object: DVPairsAmino): DVPairs { + return { + pairs: Array.isArray(object?.pairs) ? object.pairs.map((e: any) => DVPair.fromAmino(e)) : [] + }; + }, + toAmino(message: DVPairs): DVPairsAmino { + const obj: any = {}; + if (message.pairs) { + obj.pairs = message.pairs.map(e => e ? DVPair.toAmino(e) : undefined); + } else { + obj.pairs = []; + } + return obj; + }, + fromAminoMsg(object: DVPairsAminoMsg): DVPairs { + return DVPairs.fromAmino(object.value); + }, + toAminoMsg(message: DVPairs): DVPairsAminoMsg { + return { + type: "cosmos-sdk/DVPairs", + value: DVPairs.toAmino(message) + }; + }, + fromProtoMsg(message: DVPairsProtoMsg): DVPairs { + return DVPairs.decode(message.value); + }, + toProto(message: DVPairs): Uint8Array { + return DVPairs.encode(message).finish(); + }, + toProtoMsg(message: DVPairs): DVPairsProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.DVPairs", + value: DVPairs.encode(message).finish() + }; } }; function createBaseDVVTriplet(): DVVTriplet { @@ -1205,6 +1512,7 @@ function createBaseDVVTriplet(): DVVTriplet { }; } export const DVVTriplet = { + typeUrl: "/cosmos.staking.v1beta1.DVVTriplet", encode(message: DVVTriplet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1281,6 +1589,41 @@ export const DVVTriplet = { obj.validator_src_address = message.validatorSrcAddress; obj.validator_dst_address = message.validatorDstAddress; return obj; + }, + fromAmino(object: DVVTripletAmino): DVVTriplet { + return { + delegatorAddress: object.delegator_address, + validatorSrcAddress: object.validator_src_address, + validatorDstAddress: object.validator_dst_address + }; + }, + toAmino(message: DVVTriplet): DVVTripletAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress; + return obj; + }, + fromAminoMsg(object: DVVTripletAminoMsg): DVVTriplet { + return DVVTriplet.fromAmino(object.value); + }, + toAminoMsg(message: DVVTriplet): DVVTripletAminoMsg { + return { + type: "cosmos-sdk/DVVTriplet", + value: DVVTriplet.toAmino(message) + }; + }, + fromProtoMsg(message: DVVTripletProtoMsg): DVVTriplet { + return DVVTriplet.decode(message.value); + }, + toProto(message: DVVTriplet): Uint8Array { + return DVVTriplet.encode(message).finish(); + }, + toProtoMsg(message: DVVTriplet): DVVTripletProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.DVVTriplet", + value: DVVTriplet.encode(message).finish() + }; } }; function createBaseDVVTriplets(): DVVTriplets { @@ -1289,6 +1632,7 @@ function createBaseDVVTriplets(): DVVTriplets { }; } export const DVVTriplets = { + typeUrl: "/cosmos.staking.v1beta1.DVVTriplets", encode(message: DVVTriplets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.triplets) { DVVTriplet.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1349,6 +1693,41 @@ export const DVVTriplets = { obj.triplets = []; } return obj; + }, + fromAmino(object: DVVTripletsAmino): DVVTriplets { + return { + triplets: Array.isArray(object?.triplets) ? object.triplets.map((e: any) => DVVTriplet.fromAmino(e)) : [] + }; + }, + toAmino(message: DVVTriplets): DVVTripletsAmino { + const obj: any = {}; + if (message.triplets) { + obj.triplets = message.triplets.map(e => e ? DVVTriplet.toAmino(e) : undefined); + } else { + obj.triplets = []; + } + return obj; + }, + fromAminoMsg(object: DVVTripletsAminoMsg): DVVTriplets { + return DVVTriplets.fromAmino(object.value); + }, + toAminoMsg(message: DVVTriplets): DVVTripletsAminoMsg { + return { + type: "cosmos-sdk/DVVTriplets", + value: DVVTriplets.toAmino(message) + }; + }, + fromProtoMsg(message: DVVTripletsProtoMsg): DVVTriplets { + return DVVTriplets.decode(message.value); + }, + toProto(message: DVVTriplets): Uint8Array { + return DVVTriplets.encode(message).finish(); + }, + toProtoMsg(message: DVVTriplets): DVVTripletsProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.DVVTriplets", + value: DVVTriplets.encode(message).finish() + }; } }; function createBaseDelegation(): Delegation { @@ -1359,6 +1738,7 @@ function createBaseDelegation(): Delegation { }; } export const Delegation = { + typeUrl: "/cosmos.staking.v1beta1.Delegation", encode(message: Delegation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1435,6 +1815,41 @@ export const Delegation = { obj.validator_address = message.validatorAddress; obj.shares = message.shares; return obj; + }, + fromAmino(object: DelegationAmino): Delegation { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + shares: object.shares + }; + }, + toAmino(message: Delegation): DelegationAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.shares = message.shares; + return obj; + }, + fromAminoMsg(object: DelegationAminoMsg): Delegation { + return Delegation.fromAmino(object.value); + }, + toAminoMsg(message: Delegation): DelegationAminoMsg { + return { + type: "cosmos-sdk/Delegation", + value: Delegation.toAmino(message) + }; + }, + fromProtoMsg(message: DelegationProtoMsg): Delegation { + return Delegation.decode(message.value); + }, + toProto(message: Delegation): Uint8Array { + return Delegation.encode(message).finish(); + }, + toProtoMsg(message: Delegation): DelegationProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Delegation", + value: Delegation.encode(message).finish() + }; } }; function createBaseUnbondingDelegation(): UnbondingDelegation { @@ -1445,6 +1860,7 @@ function createBaseUnbondingDelegation(): UnbondingDelegation { }; } export const UnbondingDelegation = { + typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegation", encode(message: UnbondingDelegation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1529,6 +1945,45 @@ export const UnbondingDelegation = { obj.entries = []; } return obj; + }, + fromAmino(object: UnbondingDelegationAmino): UnbondingDelegation { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => UnbondingDelegationEntry.fromAmino(e)) : [] + }; + }, + toAmino(message: UnbondingDelegation): UnbondingDelegationAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + if (message.entries) { + obj.entries = message.entries.map(e => e ? UnbondingDelegationEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: UnbondingDelegationAminoMsg): UnbondingDelegation { + return UnbondingDelegation.fromAmino(object.value); + }, + toAminoMsg(message: UnbondingDelegation): UnbondingDelegationAminoMsg { + return { + type: "cosmos-sdk/UnbondingDelegation", + value: UnbondingDelegation.toAmino(message) + }; + }, + fromProtoMsg(message: UnbondingDelegationProtoMsg): UnbondingDelegation { + return UnbondingDelegation.decode(message.value); + }, + toProto(message: UnbondingDelegation): Uint8Array { + return UnbondingDelegation.encode(message).finish(); + }, + toProtoMsg(message: UnbondingDelegation): UnbondingDelegationProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegation", + value: UnbondingDelegation.encode(message).finish() + }; } }; function createBaseUnbondingDelegationEntry(): UnbondingDelegationEntry { @@ -1540,6 +1995,7 @@ function createBaseUnbondingDelegationEntry(): UnbondingDelegationEntry { }; } export const UnbondingDelegationEntry = { + typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegationEntry", encode(message: UnbondingDelegationEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.creationHeight !== BigInt(0)) { writer.uint32(8).int64(message.creationHeight); @@ -1628,6 +2084,43 @@ export const UnbondingDelegationEntry = { obj.initial_balance = message.initialBalance; obj.balance = message.balance; return obj; + }, + fromAmino(object: UnbondingDelegationEntryAmino): UnbondingDelegationEntry { + return { + creationHeight: BigInt(object.creation_height), + completionTime: object.completion_time, + initialBalance: object.initial_balance, + balance: object.balance + }; + }, + toAmino(message: UnbondingDelegationEntry): UnbondingDelegationEntryAmino { + const obj: any = {}; + obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.completion_time = message.completionTime; + obj.initial_balance = message.initialBalance; + obj.balance = message.balance; + return obj; + }, + fromAminoMsg(object: UnbondingDelegationEntryAminoMsg): UnbondingDelegationEntry { + return UnbondingDelegationEntry.fromAmino(object.value); + }, + toAminoMsg(message: UnbondingDelegationEntry): UnbondingDelegationEntryAminoMsg { + return { + type: "cosmos-sdk/UnbondingDelegationEntry", + value: UnbondingDelegationEntry.toAmino(message) + }; + }, + fromProtoMsg(message: UnbondingDelegationEntryProtoMsg): UnbondingDelegationEntry { + return UnbondingDelegationEntry.decode(message.value); + }, + toProto(message: UnbondingDelegationEntry): Uint8Array { + return UnbondingDelegationEntry.encode(message).finish(); + }, + toProtoMsg(message: UnbondingDelegationEntry): UnbondingDelegationEntryProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegationEntry", + value: UnbondingDelegationEntry.encode(message).finish() + }; } }; function createBaseRedelegationEntry(): RedelegationEntry { @@ -1639,6 +2132,7 @@ function createBaseRedelegationEntry(): RedelegationEntry { }; } export const RedelegationEntry = { + typeUrl: "/cosmos.staking.v1beta1.RedelegationEntry", encode(message: RedelegationEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.creationHeight !== BigInt(0)) { writer.uint32(8).int64(message.creationHeight); @@ -1727,6 +2221,43 @@ export const RedelegationEntry = { obj.initial_balance = message.initialBalance; obj.shares_dst = message.sharesDst; return obj; + }, + fromAmino(object: RedelegationEntryAmino): RedelegationEntry { + return { + creationHeight: BigInt(object.creation_height), + completionTime: object.completion_time, + initialBalance: object.initial_balance, + sharesDst: object.shares_dst + }; + }, + toAmino(message: RedelegationEntry): RedelegationEntryAmino { + const obj: any = {}; + obj.creation_height = message.creationHeight ? message.creationHeight.toString() : undefined; + obj.completion_time = message.completionTime; + obj.initial_balance = message.initialBalance; + obj.shares_dst = message.sharesDst; + return obj; + }, + fromAminoMsg(object: RedelegationEntryAminoMsg): RedelegationEntry { + return RedelegationEntry.fromAmino(object.value); + }, + toAminoMsg(message: RedelegationEntry): RedelegationEntryAminoMsg { + return { + type: "cosmos-sdk/RedelegationEntry", + value: RedelegationEntry.toAmino(message) + }; + }, + fromProtoMsg(message: RedelegationEntryProtoMsg): RedelegationEntry { + return RedelegationEntry.decode(message.value); + }, + toProto(message: RedelegationEntry): Uint8Array { + return RedelegationEntry.encode(message).finish(); + }, + toProtoMsg(message: RedelegationEntry): RedelegationEntryProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.RedelegationEntry", + value: RedelegationEntry.encode(message).finish() + }; } }; function createBaseRedelegation(): Redelegation { @@ -1738,6 +2269,7 @@ function createBaseRedelegation(): Redelegation { }; } export const Redelegation = { + typeUrl: "/cosmos.staking.v1beta1.Redelegation", encode(message: Redelegation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1834,6 +2366,47 @@ export const Redelegation = { obj.entries = []; } return obj; + }, + fromAmino(object: RedelegationAmino): Redelegation { + return { + delegatorAddress: object.delegator_address, + validatorSrcAddress: object.validator_src_address, + validatorDstAddress: object.validator_dst_address, + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => RedelegationEntry.fromAmino(e)) : [] + }; + }, + toAmino(message: Redelegation): RedelegationAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress; + if (message.entries) { + obj.entries = message.entries.map(e => e ? RedelegationEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: RedelegationAminoMsg): Redelegation { + return Redelegation.fromAmino(object.value); + }, + toAminoMsg(message: Redelegation): RedelegationAminoMsg { + return { + type: "cosmos-sdk/Redelegation", + value: Redelegation.toAmino(message) + }; + }, + fromProtoMsg(message: RedelegationProtoMsg): Redelegation { + return Redelegation.decode(message.value); + }, + toProto(message: Redelegation): Uint8Array { + return Redelegation.encode(message).finish(); + }, + toProtoMsg(message: Redelegation): RedelegationProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Redelegation", + value: Redelegation.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -1847,6 +2420,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmos.staking.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.unbondingTime !== undefined) { Duration.encode(message.unbondingTime, writer.uint32(10).fork()).ldelim(); @@ -1959,6 +2533,47 @@ export const Params = { obj.bond_denom = message.bondDenom; obj.min_commission_rate = message.minCommissionRate; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + unbondingTime: object?.unbonding_time ? Duration.fromAmino(object.unbonding_time) : undefined, + maxValidators: object.max_validators, + maxEntries: object.max_entries, + historicalEntries: object.historical_entries, + bondDenom: object.bond_denom, + minCommissionRate: object.min_commission_rate + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.unbonding_time = message.unbondingTime ? Duration.toAmino(message.unbondingTime) : undefined; + obj.max_validators = message.maxValidators; + obj.max_entries = message.maxEntries; + obj.historical_entries = message.historicalEntries; + obj.bond_denom = message.bondDenom; + obj.min_commission_rate = message.minCommissionRate; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseDelegationResponse(): DelegationResponse { @@ -1968,6 +2583,7 @@ function createBaseDelegationResponse(): DelegationResponse { }; } export const DelegationResponse = { + typeUrl: "/cosmos.staking.v1beta1.DelegationResponse", encode(message: DelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegation !== undefined) { Delegation.encode(message.delegation, writer.uint32(10).fork()).ldelim(); @@ -2032,6 +2648,39 @@ export const DelegationResponse = { message.delegation !== undefined && (obj.delegation = message.delegation ? Delegation.toSDK(message.delegation) : undefined); message.balance !== undefined && (obj.balance = message.balance ? Coin.toSDK(message.balance) : undefined); return obj; + }, + fromAmino(object: DelegationResponseAmino): DelegationResponse { + return { + delegation: object?.delegation ? Delegation.fromAmino(object.delegation) : undefined, + balance: object?.balance ? Coin.fromAmino(object.balance) : undefined + }; + }, + toAmino(message: DelegationResponse): DelegationResponseAmino { + const obj: any = {}; + obj.delegation = message.delegation ? Delegation.toAmino(message.delegation) : undefined; + obj.balance = message.balance ? Coin.toAmino(message.balance) : undefined; + return obj; + }, + fromAminoMsg(object: DelegationResponseAminoMsg): DelegationResponse { + return DelegationResponse.fromAmino(object.value); + }, + toAminoMsg(message: DelegationResponse): DelegationResponseAminoMsg { + return { + type: "cosmos-sdk/DelegationResponse", + value: DelegationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: DelegationResponseProtoMsg): DelegationResponse { + return DelegationResponse.decode(message.value); + }, + toProto(message: DelegationResponse): Uint8Array { + return DelegationResponse.encode(message).finish(); + }, + toProtoMsg(message: DelegationResponse): DelegationResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.DelegationResponse", + value: DelegationResponse.encode(message).finish() + }; } }; function createBaseRedelegationEntryResponse(): RedelegationEntryResponse { @@ -2041,6 +2690,7 @@ function createBaseRedelegationEntryResponse(): RedelegationEntryResponse { }; } export const RedelegationEntryResponse = { + typeUrl: "/cosmos.staking.v1beta1.RedelegationEntryResponse", encode(message: RedelegationEntryResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.redelegationEntry !== undefined) { RedelegationEntry.encode(message.redelegationEntry, writer.uint32(10).fork()).ldelim(); @@ -2105,6 +2755,39 @@ export const RedelegationEntryResponse = { message.redelegationEntry !== undefined && (obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toSDK(message.redelegationEntry) : undefined); obj.balance = message.balance; return obj; + }, + fromAmino(object: RedelegationEntryResponseAmino): RedelegationEntryResponse { + return { + redelegationEntry: object?.redelegation_entry ? RedelegationEntry.fromAmino(object.redelegation_entry) : undefined, + balance: object.balance + }; + }, + toAmino(message: RedelegationEntryResponse): RedelegationEntryResponseAmino { + const obj: any = {}; + obj.redelegation_entry = message.redelegationEntry ? RedelegationEntry.toAmino(message.redelegationEntry) : undefined; + obj.balance = message.balance; + return obj; + }, + fromAminoMsg(object: RedelegationEntryResponseAminoMsg): RedelegationEntryResponse { + return RedelegationEntryResponse.fromAmino(object.value); + }, + toAminoMsg(message: RedelegationEntryResponse): RedelegationEntryResponseAminoMsg { + return { + type: "cosmos-sdk/RedelegationEntryResponse", + value: RedelegationEntryResponse.toAmino(message) + }; + }, + fromProtoMsg(message: RedelegationEntryResponseProtoMsg): RedelegationEntryResponse { + return RedelegationEntryResponse.decode(message.value); + }, + toProto(message: RedelegationEntryResponse): Uint8Array { + return RedelegationEntryResponse.encode(message).finish(); + }, + toProtoMsg(message: RedelegationEntryResponse): RedelegationEntryResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.RedelegationEntryResponse", + value: RedelegationEntryResponse.encode(message).finish() + }; } }; function createBaseRedelegationResponse(): RedelegationResponse { @@ -2114,6 +2797,7 @@ function createBaseRedelegationResponse(): RedelegationResponse { }; } export const RedelegationResponse = { + typeUrl: "/cosmos.staking.v1beta1.RedelegationResponse", encode(message: RedelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.redelegation !== undefined) { Redelegation.encode(message.redelegation, writer.uint32(10).fork()).ldelim(); @@ -2186,6 +2870,43 @@ export const RedelegationResponse = { obj.entries = []; } return obj; + }, + fromAmino(object: RedelegationResponseAmino): RedelegationResponse { + return { + redelegation: object?.redelegation ? Redelegation.fromAmino(object.redelegation) : undefined, + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => RedelegationEntryResponse.fromAmino(e)) : [] + }; + }, + toAmino(message: RedelegationResponse): RedelegationResponseAmino { + const obj: any = {}; + obj.redelegation = message.redelegation ? Redelegation.toAmino(message.redelegation) : undefined; + if (message.entries) { + obj.entries = message.entries.map(e => e ? RedelegationEntryResponse.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: RedelegationResponseAminoMsg): RedelegationResponse { + return RedelegationResponse.fromAmino(object.value); + }, + toAminoMsg(message: RedelegationResponse): RedelegationResponseAminoMsg { + return { + type: "cosmos-sdk/RedelegationResponse", + value: RedelegationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: RedelegationResponseProtoMsg): RedelegationResponse { + return RedelegationResponse.decode(message.value); + }, + toProto(message: RedelegationResponse): Uint8Array { + return RedelegationResponse.encode(message).finish(); + }, + toProtoMsg(message: RedelegationResponse): RedelegationResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.RedelegationResponse", + value: RedelegationResponse.encode(message).finish() + }; } }; function createBasePool(): Pool { @@ -2195,6 +2916,7 @@ function createBasePool(): Pool { }; } export const Pool = { + typeUrl: "/cosmos.staking.v1beta1.Pool", encode(message: Pool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.notBondedTokens !== "") { writer.uint32(10).string(message.notBondedTokens); @@ -2259,5 +2981,38 @@ export const Pool = { obj.not_bonded_tokens = message.notBondedTokens; obj.bonded_tokens = message.bondedTokens; return obj; + }, + fromAmino(object: PoolAmino): Pool { + return { + notBondedTokens: object.not_bonded_tokens, + bondedTokens: object.bonded_tokens + }; + }, + toAmino(message: Pool): PoolAmino { + const obj: any = {}; + obj.not_bonded_tokens = message.notBondedTokens; + obj.bonded_tokens = message.bondedTokens; + return obj; + }, + fromAminoMsg(object: PoolAminoMsg): Pool { + return Pool.fromAmino(object.value); + }, + toAminoMsg(message: Pool): PoolAminoMsg { + return { + type: "cosmos-sdk/Pool", + value: Pool.toAmino(message) + }; + }, + fromProtoMsg(message: PoolProtoMsg): Pool { + return Pool.decode(message.value); + }, + toProto(message: Pool): Uint8Array { + return Pool.encode(message).finish(); + }, + toProtoMsg(message: Pool): PoolProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.Pool", + value: Pool.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts index b662efd300..a8c55b5258 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/staking/v1beta1/tx.ts @@ -4,6 +4,7 @@ import { Coin, CoinSDKType } from "../../base/v1beta1/coin"; import { Timestamp, TimestampSDKType } from "../../../google/protobuf/timestamp"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; +import { encodePubkey, decodePubkey } from "@cosmjs/proto-signing"; import { Decimal } from "@cosmjs/math"; export const protobufPackage = "cosmos.staking.v1beta1"; /** MsgCreateValidator defines a SDK message for creating a new validator. */ @@ -142,6 +143,7 @@ function createBaseMsgCreateValidator(): MsgCreateValidator { }; } export const MsgCreateValidator = { + typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator", encode(message: MsgCreateValidator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== undefined) { Description.encode(message.description, writer.uint32(10).fork()).ldelim(); @@ -266,12 +268,56 @@ export const MsgCreateValidator = { message.pubkey !== undefined && (obj.pubkey = message.pubkey ? Any.toSDK(message.pubkey) : undefined); message.value !== undefined && (obj.value = message.value ? Coin.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: MsgCreateValidatorAmino): MsgCreateValidator { + return { + description: object?.description ? Description.fromAmino(object.description) : undefined, + commission: object?.commission ? CommissionRates.fromAmino(object.commission) : undefined, + minSelfDelegation: object.min_self_delegation, + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + pubkey: object?.pubkey ? encodePubkey(object.pubkey) : undefined, + value: object?.value ? Coin.fromAmino(object.value) : undefined + }; + }, + toAmino(message: MsgCreateValidator): MsgCreateValidatorAmino { + const obj: any = {}; + obj.description = message.description ? Description.toAmino(message.description) : undefined; + obj.commission = message.commission ? CommissionRates.toAmino(message.commission) : undefined; + obj.min_self_delegation = message.minSelfDelegation; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.pubkey = message.pubkey ? decodePubkey(message.pubkey) : undefined; + obj.value = message.value ? Coin.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateValidatorAminoMsg): MsgCreateValidator { + return MsgCreateValidator.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateValidator): MsgCreateValidatorAminoMsg { + return { + type: "cosmos-sdk/MsgCreateValidator", + value: MsgCreateValidator.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateValidatorProtoMsg): MsgCreateValidator { + return MsgCreateValidator.decode(message.value); + }, + toProto(message: MsgCreateValidator): Uint8Array { + return MsgCreateValidator.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateValidator): MsgCreateValidatorProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator", + value: MsgCreateValidator.encode(message).finish() + }; } }; function createBaseMsgCreateValidatorResponse(): MsgCreateValidatorResponse { return {}; } export const MsgCreateValidatorResponse = { + typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidatorResponse", encode(_: MsgCreateValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -309,6 +355,34 @@ export const MsgCreateValidatorResponse = { toSDK(_: MsgCreateValidatorResponse): MsgCreateValidatorResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateValidatorResponseAmino): MsgCreateValidatorResponse { + return {}; + }, + toAmino(_: MsgCreateValidatorResponse): MsgCreateValidatorResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateValidatorResponseAminoMsg): MsgCreateValidatorResponse { + return MsgCreateValidatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateValidatorResponse): MsgCreateValidatorResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreateValidatorResponse", + value: MsgCreateValidatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateValidatorResponseProtoMsg): MsgCreateValidatorResponse { + return MsgCreateValidatorResponse.decode(message.value); + }, + toProto(message: MsgCreateValidatorResponse): Uint8Array { + return MsgCreateValidatorResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateValidatorResponse): MsgCreateValidatorResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidatorResponse", + value: MsgCreateValidatorResponse.encode(message).finish() + }; } }; function createBaseMsgEditValidator(): MsgEditValidator { @@ -320,6 +394,7 @@ function createBaseMsgEditValidator(): MsgEditValidator { }; } export const MsgEditValidator = { + typeUrl: "/cosmos.staking.v1beta1.MsgEditValidator", encode(message: MsgEditValidator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== undefined) { Description.encode(message.description, writer.uint32(10).fork()).ldelim(); @@ -408,12 +483,50 @@ export const MsgEditValidator = { obj.commission_rate = message.commissionRate; obj.min_self_delegation = message.minSelfDelegation; return obj; + }, + fromAmino(object: MsgEditValidatorAmino): MsgEditValidator { + return { + description: object?.description ? Description.fromAmino(object.description) : undefined, + validatorAddress: object.validator_address, + commissionRate: object.commission_rate, + minSelfDelegation: object.min_self_delegation + }; + }, + toAmino(message: MsgEditValidator): MsgEditValidatorAmino { + const obj: any = {}; + obj.description = message.description ? Description.toAmino(message.description) : undefined; + obj.validator_address = message.validatorAddress; + obj.commission_rate = message.commissionRate; + obj.min_self_delegation = message.minSelfDelegation; + return obj; + }, + fromAminoMsg(object: MsgEditValidatorAminoMsg): MsgEditValidator { + return MsgEditValidator.fromAmino(object.value); + }, + toAminoMsg(message: MsgEditValidator): MsgEditValidatorAminoMsg { + return { + type: "cosmos-sdk/MsgEditValidator", + value: MsgEditValidator.toAmino(message) + }; + }, + fromProtoMsg(message: MsgEditValidatorProtoMsg): MsgEditValidator { + return MsgEditValidator.decode(message.value); + }, + toProto(message: MsgEditValidator): Uint8Array { + return MsgEditValidator.encode(message).finish(); + }, + toProtoMsg(message: MsgEditValidator): MsgEditValidatorProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgEditValidator", + value: MsgEditValidator.encode(message).finish() + }; } }; function createBaseMsgEditValidatorResponse(): MsgEditValidatorResponse { return {}; } export const MsgEditValidatorResponse = { + typeUrl: "/cosmos.staking.v1beta1.MsgEditValidatorResponse", encode(_: MsgEditValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -451,6 +564,34 @@ export const MsgEditValidatorResponse = { toSDK(_: MsgEditValidatorResponse): MsgEditValidatorResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgEditValidatorResponseAmino): MsgEditValidatorResponse { + return {}; + }, + toAmino(_: MsgEditValidatorResponse): MsgEditValidatorResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgEditValidatorResponseAminoMsg): MsgEditValidatorResponse { + return MsgEditValidatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgEditValidatorResponse): MsgEditValidatorResponseAminoMsg { + return { + type: "cosmos-sdk/MsgEditValidatorResponse", + value: MsgEditValidatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgEditValidatorResponseProtoMsg): MsgEditValidatorResponse { + return MsgEditValidatorResponse.decode(message.value); + }, + toProto(message: MsgEditValidatorResponse): Uint8Array { + return MsgEditValidatorResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgEditValidatorResponse): MsgEditValidatorResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgEditValidatorResponse", + value: MsgEditValidatorResponse.encode(message).finish() + }; } }; function createBaseMsgDelegate(): MsgDelegate { @@ -461,6 +602,7 @@ function createBaseMsgDelegate(): MsgDelegate { }; } export const MsgDelegate = { + typeUrl: "/cosmos.staking.v1beta1.MsgDelegate", encode(message: MsgDelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -537,12 +679,48 @@ export const MsgDelegate = { obj.validator_address = message.validatorAddress; message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: MsgDelegateAmino): MsgDelegate { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: MsgDelegate): MsgDelegateAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: MsgDelegateAminoMsg): MsgDelegate { + return MsgDelegate.fromAmino(object.value); + }, + toAminoMsg(message: MsgDelegate): MsgDelegateAminoMsg { + return { + type: "cosmos-sdk/MsgDelegate", + value: MsgDelegate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDelegateProtoMsg): MsgDelegate { + return MsgDelegate.decode(message.value); + }, + toProto(message: MsgDelegate): Uint8Array { + return MsgDelegate.encode(message).finish(); + }, + toProtoMsg(message: MsgDelegate): MsgDelegateProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgDelegate", + value: MsgDelegate.encode(message).finish() + }; } }; function createBaseMsgDelegateResponse(): MsgDelegateResponse { return {}; } export const MsgDelegateResponse = { + typeUrl: "/cosmos.staking.v1beta1.MsgDelegateResponse", encode(_: MsgDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -580,6 +758,34 @@ export const MsgDelegateResponse = { toSDK(_: MsgDelegateResponse): MsgDelegateResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDelegateResponseAmino): MsgDelegateResponse { + return {}; + }, + toAmino(_: MsgDelegateResponse): MsgDelegateResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDelegateResponseAminoMsg): MsgDelegateResponse { + return MsgDelegateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDelegateResponse): MsgDelegateResponseAminoMsg { + return { + type: "cosmos-sdk/MsgDelegateResponse", + value: MsgDelegateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDelegateResponseProtoMsg): MsgDelegateResponse { + return MsgDelegateResponse.decode(message.value); + }, + toProto(message: MsgDelegateResponse): Uint8Array { + return MsgDelegateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDelegateResponse): MsgDelegateResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgDelegateResponse", + value: MsgDelegateResponse.encode(message).finish() + }; } }; function createBaseMsgBeginRedelegate(): MsgBeginRedelegate { @@ -591,6 +797,7 @@ function createBaseMsgBeginRedelegate(): MsgBeginRedelegate { }; } export const MsgBeginRedelegate = { + typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate", encode(message: MsgBeginRedelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -679,6 +886,43 @@ export const MsgBeginRedelegate = { obj.validator_dst_address = message.validatorDstAddress; message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: MsgBeginRedelegateAmino): MsgBeginRedelegate { + return { + delegatorAddress: object.delegator_address, + validatorSrcAddress: object.validator_src_address, + validatorDstAddress: object.validator_dst_address, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: MsgBeginRedelegate): MsgBeginRedelegateAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_src_address = message.validatorSrcAddress; + obj.validator_dst_address = message.validatorDstAddress; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: MsgBeginRedelegateAminoMsg): MsgBeginRedelegate { + return MsgBeginRedelegate.fromAmino(object.value); + }, + toAminoMsg(message: MsgBeginRedelegate): MsgBeginRedelegateAminoMsg { + return { + type: "cosmos-sdk/MsgBeginRedelegate", + value: MsgBeginRedelegate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBeginRedelegateProtoMsg): MsgBeginRedelegate { + return MsgBeginRedelegate.decode(message.value); + }, + toProto(message: MsgBeginRedelegate): Uint8Array { + return MsgBeginRedelegate.encode(message).finish(); + }, + toProtoMsg(message: MsgBeginRedelegate): MsgBeginRedelegateProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate", + value: MsgBeginRedelegate.encode(message).finish() + }; } }; function createBaseMsgBeginRedelegateResponse(): MsgBeginRedelegateResponse { @@ -687,6 +931,7 @@ function createBaseMsgBeginRedelegateResponse(): MsgBeginRedelegateResponse { }; } export const MsgBeginRedelegateResponse = { + typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegateResponse", encode(message: MsgBeginRedelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.completionTime !== undefined) { Timestamp.encode(toTimestamp(message.completionTime), writer.uint32(10).fork()).ldelim(); @@ -739,6 +984,37 @@ export const MsgBeginRedelegateResponse = { const obj: any = {}; message.completionTime !== undefined && (obj.completion_time = message.completionTime ?? undefined); return obj; + }, + fromAmino(object: MsgBeginRedelegateResponseAmino): MsgBeginRedelegateResponse { + return { + completionTime: object.completion_time + }; + }, + toAmino(message: MsgBeginRedelegateResponse): MsgBeginRedelegateResponseAmino { + const obj: any = {}; + obj.completion_time = message.completionTime; + return obj; + }, + fromAminoMsg(object: MsgBeginRedelegateResponseAminoMsg): MsgBeginRedelegateResponse { + return MsgBeginRedelegateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgBeginRedelegateResponse): MsgBeginRedelegateResponseAminoMsg { + return { + type: "cosmos-sdk/MsgBeginRedelegateResponse", + value: MsgBeginRedelegateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBeginRedelegateResponseProtoMsg): MsgBeginRedelegateResponse { + return MsgBeginRedelegateResponse.decode(message.value); + }, + toProto(message: MsgBeginRedelegateResponse): Uint8Array { + return MsgBeginRedelegateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgBeginRedelegateResponse): MsgBeginRedelegateResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegateResponse", + value: MsgBeginRedelegateResponse.encode(message).finish() + }; } }; function createBaseMsgUndelegate(): MsgUndelegate { @@ -749,6 +1025,7 @@ function createBaseMsgUndelegate(): MsgUndelegate { }; } export const MsgUndelegate = { + typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate", encode(message: MsgUndelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -825,6 +1102,41 @@ export const MsgUndelegate = { obj.validator_address = message.validatorAddress; message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: MsgUndelegateAmino): MsgUndelegate { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: MsgUndelegate): MsgUndelegateAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: MsgUndelegateAminoMsg): MsgUndelegate { + return MsgUndelegate.fromAmino(object.value); + }, + toAminoMsg(message: MsgUndelegate): MsgUndelegateAminoMsg { + return { + type: "cosmos-sdk/MsgUndelegate", + value: MsgUndelegate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUndelegateProtoMsg): MsgUndelegate { + return MsgUndelegate.decode(message.value); + }, + toProto(message: MsgUndelegate): Uint8Array { + return MsgUndelegate.encode(message).finish(); + }, + toProtoMsg(message: MsgUndelegate): MsgUndelegateProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate", + value: MsgUndelegate.encode(message).finish() + }; } }; function createBaseMsgUndelegateResponse(): MsgUndelegateResponse { @@ -833,6 +1145,7 @@ function createBaseMsgUndelegateResponse(): MsgUndelegateResponse { }; } export const MsgUndelegateResponse = { + typeUrl: "/cosmos.staking.v1beta1.MsgUndelegateResponse", encode(message: MsgUndelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.completionTime !== undefined) { Timestamp.encode(toTimestamp(message.completionTime), writer.uint32(10).fork()).ldelim(); @@ -885,5 +1198,36 @@ export const MsgUndelegateResponse = { const obj: any = {}; message.completionTime !== undefined && (obj.completion_time = message.completionTime ?? undefined); return obj; + }, + fromAmino(object: MsgUndelegateResponseAmino): MsgUndelegateResponse { + return { + completionTime: object.completion_time + }; + }, + toAmino(message: MsgUndelegateResponse): MsgUndelegateResponseAmino { + const obj: any = {}; + obj.completion_time = message.completionTime; + return obj; + }, + fromAminoMsg(object: MsgUndelegateResponseAminoMsg): MsgUndelegateResponse { + return MsgUndelegateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUndelegateResponse): MsgUndelegateResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUndelegateResponse", + value: MsgUndelegateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUndelegateResponseProtoMsg): MsgUndelegateResponse { + return MsgUndelegateResponse.decode(message.value); + }, + toProto(message: MsgUndelegateResponse): Uint8Array { + return MsgUndelegateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUndelegateResponse): MsgUndelegateResponseProtoMsg { + return { + typeUrl: "/cosmos.staking.v1beta1.MsgUndelegateResponse", + value: MsgUndelegateResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/v-next/outputosmojs/cosmos/tx/signing/v1beta1/signing.ts index fe512b2ed1..e78d240a1f 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/tx/signing/v1beta1/signing.ts @@ -166,6 +166,7 @@ function createBaseSignatureDescriptors(): SignatureDescriptors { }; } export const SignatureDescriptors = { + typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptors", encode(message: SignatureDescriptors, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signatures) { SignatureDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -226,6 +227,41 @@ export const SignatureDescriptors = { obj.signatures = []; } return obj; + }, + fromAmino(object: SignatureDescriptorsAmino): SignatureDescriptors { + return { + signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => SignatureDescriptor.fromAmino(e)) : [] + }; + }, + toAmino(message: SignatureDescriptors): SignatureDescriptorsAmino { + const obj: any = {}; + if (message.signatures) { + obj.signatures = message.signatures.map(e => e ? SignatureDescriptor.toAmino(e) : undefined); + } else { + obj.signatures = []; + } + return obj; + }, + fromAminoMsg(object: SignatureDescriptorsAminoMsg): SignatureDescriptors { + return SignatureDescriptors.fromAmino(object.value); + }, + toAminoMsg(message: SignatureDescriptors): SignatureDescriptorsAminoMsg { + return { + type: "cosmos-sdk/SignatureDescriptors", + value: SignatureDescriptors.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureDescriptorsProtoMsg): SignatureDescriptors { + return SignatureDescriptors.decode(message.value); + }, + toProto(message: SignatureDescriptors): Uint8Array { + return SignatureDescriptors.encode(message).finish(); + }, + toProtoMsg(message: SignatureDescriptors): SignatureDescriptorsProtoMsg { + return { + typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptors", + value: SignatureDescriptors.encode(message).finish() + }; } }; function createBaseSignatureDescriptor(): SignatureDescriptor { @@ -236,6 +272,7 @@ function createBaseSignatureDescriptor(): SignatureDescriptor { }; } export const SignatureDescriptor = { + typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor", encode(message: SignatureDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); @@ -312,6 +349,41 @@ export const SignatureDescriptor = { message.data !== undefined && (obj.data = message.data ? SignatureDescriptor_Data.toSDK(message.data) : undefined); obj.sequence = message.sequence; return obj; + }, + fromAmino(object: SignatureDescriptorAmino): SignatureDescriptor { + return { + publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, + data: object?.data ? SignatureDescriptor_Data.fromAmino(object.data) : undefined, + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: SignatureDescriptor): SignatureDescriptorAmino { + const obj: any = {}; + obj.public_key = message.publicKey ? Any.toAmino(message.publicKey) : undefined; + obj.data = message.data ? SignatureDescriptor_Data.toAmino(message.data) : undefined; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SignatureDescriptorAminoMsg): SignatureDescriptor { + return SignatureDescriptor.fromAmino(object.value); + }, + toAminoMsg(message: SignatureDescriptor): SignatureDescriptorAminoMsg { + return { + type: "cosmos-sdk/SignatureDescriptor", + value: SignatureDescriptor.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureDescriptorProtoMsg): SignatureDescriptor { + return SignatureDescriptor.decode(message.value); + }, + toProto(message: SignatureDescriptor): Uint8Array { + return SignatureDescriptor.encode(message).finish(); + }, + toProtoMsg(message: SignatureDescriptor): SignatureDescriptorProtoMsg { + return { + typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor", + value: SignatureDescriptor.encode(message).finish() + }; } }; function createBaseSignatureDescriptor_Data(): SignatureDescriptor_Data { @@ -321,6 +393,7 @@ function createBaseSignatureDescriptor_Data(): SignatureDescriptor_Data { }; } export const SignatureDescriptor_Data = { + typeUrl: "/cosmos.tx.signing.v1beta1.Data", encode(message: SignatureDescriptor_Data, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.single !== undefined) { SignatureDescriptor_Data_Single.encode(message.single, writer.uint32(10).fork()).ldelim(); @@ -385,6 +458,39 @@ export const SignatureDescriptor_Data = { message.single !== undefined && (obj.single = message.single ? SignatureDescriptor_Data_Single.toSDK(message.single) : undefined); message.multi !== undefined && (obj.multi = message.multi ? SignatureDescriptor_Data_Multi.toSDK(message.multi) : undefined); return obj; + }, + fromAmino(object: SignatureDescriptor_DataAmino): SignatureDescriptor_Data { + return { + single: object?.single ? SignatureDescriptor_Data_Single.fromAmino(object.single) : undefined, + multi: object?.multi ? SignatureDescriptor_Data_Multi.fromAmino(object.multi) : undefined + }; + }, + toAmino(message: SignatureDescriptor_Data): SignatureDescriptor_DataAmino { + const obj: any = {}; + obj.single = message.single ? SignatureDescriptor_Data_Single.toAmino(message.single) : undefined; + obj.multi = message.multi ? SignatureDescriptor_Data_Multi.toAmino(message.multi) : undefined; + return obj; + }, + fromAminoMsg(object: SignatureDescriptor_DataAminoMsg): SignatureDescriptor_Data { + return SignatureDescriptor_Data.fromAmino(object.value); + }, + toAminoMsg(message: SignatureDescriptor_Data): SignatureDescriptor_DataAminoMsg { + return { + type: "cosmos-sdk/Data", + value: SignatureDescriptor_Data.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureDescriptor_DataProtoMsg): SignatureDescriptor_Data { + return SignatureDescriptor_Data.decode(message.value); + }, + toProto(message: SignatureDescriptor_Data): Uint8Array { + return SignatureDescriptor_Data.encode(message).finish(); + }, + toProtoMsg(message: SignatureDescriptor_Data): SignatureDescriptor_DataProtoMsg { + return { + typeUrl: "/cosmos.tx.signing.v1beta1.Data", + value: SignatureDescriptor_Data.encode(message).finish() + }; } }; function createBaseSignatureDescriptor_Data_Single(): SignatureDescriptor_Data_Single { @@ -394,6 +500,7 @@ function createBaseSignatureDescriptor_Data_Single(): SignatureDescriptor_Data_S }; } export const SignatureDescriptor_Data_Single = { + typeUrl: "/cosmos.tx.signing.v1beta1.Single", encode(message: SignatureDescriptor_Data_Single, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mode !== 0) { writer.uint32(8).int32(message.mode); @@ -458,6 +565,39 @@ export const SignatureDescriptor_Data_Single = { message.mode !== undefined && (obj.mode = signModeToJSON(message.mode)); obj.signature = message.signature; return obj; + }, + fromAmino(object: SignatureDescriptor_Data_SingleAmino): SignatureDescriptor_Data_Single { + return { + mode: isSet(object.mode) ? signModeFromJSON(object.mode) : -1, + signature: object.signature + }; + }, + toAmino(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAmino { + const obj: any = {}; + obj.mode = message.mode; + obj.signature = message.signature; + return obj; + }, + fromAminoMsg(object: SignatureDescriptor_Data_SingleAminoMsg): SignatureDescriptor_Data_Single { + return SignatureDescriptor_Data_Single.fromAmino(object.value); + }, + toAminoMsg(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleAminoMsg { + return { + type: "cosmos-sdk/Single", + value: SignatureDescriptor_Data_Single.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureDescriptor_Data_SingleProtoMsg): SignatureDescriptor_Data_Single { + return SignatureDescriptor_Data_Single.decode(message.value); + }, + toProto(message: SignatureDescriptor_Data_Single): Uint8Array { + return SignatureDescriptor_Data_Single.encode(message).finish(); + }, + toProtoMsg(message: SignatureDescriptor_Data_Single): SignatureDescriptor_Data_SingleProtoMsg { + return { + typeUrl: "/cosmos.tx.signing.v1beta1.Single", + value: SignatureDescriptor_Data_Single.encode(message).finish() + }; } }; function createBaseSignatureDescriptor_Data_Multi(): SignatureDescriptor_Data_Multi { @@ -467,6 +607,7 @@ function createBaseSignatureDescriptor_Data_Multi(): SignatureDescriptor_Data_Mu }; } export const SignatureDescriptor_Data_Multi = { + typeUrl: "/cosmos.tx.signing.v1beta1.Multi", encode(message: SignatureDescriptor_Data_Multi, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bitarray !== undefined) { CompactBitArray.encode(message.bitarray, writer.uint32(10).fork()).ldelim(); @@ -539,5 +680,42 @@ export const SignatureDescriptor_Data_Multi = { obj.signatures = []; } return obj; + }, + fromAmino(object: SignatureDescriptor_Data_MultiAmino): SignatureDescriptor_Data_Multi { + return { + bitarray: object?.bitarray ? CompactBitArray.fromAmino(object.bitarray) : undefined, + signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => SignatureDescriptor_Data.fromAmino(e)) : [] + }; + }, + toAmino(message: SignatureDescriptor_Data_Multi): SignatureDescriptor_Data_MultiAmino { + const obj: any = {}; + obj.bitarray = message.bitarray ? CompactBitArray.toAmino(message.bitarray) : undefined; + if (message.signatures) { + obj.signatures = message.signatures.map(e => e ? SignatureDescriptor_Data.toAmino(e) : undefined); + } else { + obj.signatures = []; + } + return obj; + }, + fromAminoMsg(object: SignatureDescriptor_Data_MultiAminoMsg): SignatureDescriptor_Data_Multi { + return SignatureDescriptor_Data_Multi.fromAmino(object.value); + }, + toAminoMsg(message: SignatureDescriptor_Data_Multi): SignatureDescriptor_Data_MultiAminoMsg { + return { + type: "cosmos-sdk/Multi", + value: SignatureDescriptor_Data_Multi.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureDescriptor_Data_MultiProtoMsg): SignatureDescriptor_Data_Multi { + return SignatureDescriptor_Data_Multi.decode(message.value); + }, + toProto(message: SignatureDescriptor_Data_Multi): Uint8Array { + return SignatureDescriptor_Data_Multi.encode(message).finish(); + }, + toProtoMsg(message: SignatureDescriptor_Data_Multi): SignatureDescriptor_Data_MultiProtoMsg { + return { + typeUrl: "/cosmos.tx.signing.v1beta1.Multi", + value: SignatureDescriptor_Data_Multi.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts index e936a7b2c2..089e715655 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/service.ts @@ -303,6 +303,7 @@ function createBaseGetTxsEventRequest(): GetTxsEventRequest { }; } export const GetTxsEventRequest = { + typeUrl: "/cosmos.tx.v1beta1.GetTxsEventRequest", encode(message: GetTxsEventRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.events) { writer.uint32(10).string(v!); @@ -387,6 +388,45 @@ export const GetTxsEventRequest = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); message.orderBy !== undefined && (obj.order_by = orderByToJSON(message.orderBy)); return obj; + }, + fromAmino(object: GetTxsEventRequestAmino): GetTxsEventRequest { + return { + events: Array.isArray(object?.events) ? object.events.map((e: any) => e) : [], + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined, + orderBy: isSet(object.order_by) ? orderByFromJSON(object.order_by) : -1 + }; + }, + toAmino(message: GetTxsEventRequest): GetTxsEventRequestAmino { + const obj: any = {}; + if (message.events) { + obj.events = message.events.map(e => e); + } else { + obj.events = []; + } + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + obj.order_by = message.orderBy; + return obj; + }, + fromAminoMsg(object: GetTxsEventRequestAminoMsg): GetTxsEventRequest { + return GetTxsEventRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetTxsEventRequest): GetTxsEventRequestAminoMsg { + return { + type: "cosmos-sdk/GetTxsEventRequest", + value: GetTxsEventRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetTxsEventRequestProtoMsg): GetTxsEventRequest { + return GetTxsEventRequest.decode(message.value); + }, + toProto(message: GetTxsEventRequest): Uint8Array { + return GetTxsEventRequest.encode(message).finish(); + }, + toProtoMsg(message: GetTxsEventRequest): GetTxsEventRequestProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.GetTxsEventRequest", + value: GetTxsEventRequest.encode(message).finish() + }; } }; function createBaseGetTxsEventResponse(): GetTxsEventResponse { @@ -397,6 +437,7 @@ function createBaseGetTxsEventResponse(): GetTxsEventResponse { }; } export const GetTxsEventResponse = { + typeUrl: "/cosmos.tx.v1beta1.GetTxsEventResponse", encode(message: GetTxsEventResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.txs) { Tx.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -489,6 +530,49 @@ export const GetTxsEventResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetTxsEventResponseAmino): GetTxsEventResponse { + return { + txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => Tx.fromAmino(e)) : [], + txResponses: Array.isArray(object?.tx_responses) ? object.tx_responses.map((e: any) => TxResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetTxsEventResponse): GetTxsEventResponseAmino { + const obj: any = {}; + if (message.txs) { + obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); + } else { + obj.txs = []; + } + if (message.txResponses) { + obj.tx_responses = message.txResponses.map(e => e ? TxResponse.toAmino(e) : undefined); + } else { + obj.tx_responses = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetTxsEventResponseAminoMsg): GetTxsEventResponse { + return GetTxsEventResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetTxsEventResponse): GetTxsEventResponseAminoMsg { + return { + type: "cosmos-sdk/GetTxsEventResponse", + value: GetTxsEventResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetTxsEventResponseProtoMsg): GetTxsEventResponse { + return GetTxsEventResponse.decode(message.value); + }, + toProto(message: GetTxsEventResponse): Uint8Array { + return GetTxsEventResponse.encode(message).finish(); + }, + toProtoMsg(message: GetTxsEventResponse): GetTxsEventResponseProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.GetTxsEventResponse", + value: GetTxsEventResponse.encode(message).finish() + }; } }; function createBaseBroadcastTxRequest(): BroadcastTxRequest { @@ -498,6 +582,7 @@ function createBaseBroadcastTxRequest(): BroadcastTxRequest { }; } export const BroadcastTxRequest = { + typeUrl: "/cosmos.tx.v1beta1.BroadcastTxRequest", encode(message: BroadcastTxRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.txBytes.length !== 0) { writer.uint32(10).bytes(message.txBytes); @@ -562,6 +647,39 @@ export const BroadcastTxRequest = { obj.tx_bytes = message.txBytes; message.mode !== undefined && (obj.mode = broadcastModeToJSON(message.mode)); return obj; + }, + fromAmino(object: BroadcastTxRequestAmino): BroadcastTxRequest { + return { + txBytes: object.tx_bytes, + mode: isSet(object.mode) ? broadcastModeFromJSON(object.mode) : -1 + }; + }, + toAmino(message: BroadcastTxRequest): BroadcastTxRequestAmino { + const obj: any = {}; + obj.tx_bytes = message.txBytes; + obj.mode = message.mode; + return obj; + }, + fromAminoMsg(object: BroadcastTxRequestAminoMsg): BroadcastTxRequest { + return BroadcastTxRequest.fromAmino(object.value); + }, + toAminoMsg(message: BroadcastTxRequest): BroadcastTxRequestAminoMsg { + return { + type: "cosmos-sdk/BroadcastTxRequest", + value: BroadcastTxRequest.toAmino(message) + }; + }, + fromProtoMsg(message: BroadcastTxRequestProtoMsg): BroadcastTxRequest { + return BroadcastTxRequest.decode(message.value); + }, + toProto(message: BroadcastTxRequest): Uint8Array { + return BroadcastTxRequest.encode(message).finish(); + }, + toProtoMsg(message: BroadcastTxRequest): BroadcastTxRequestProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.BroadcastTxRequest", + value: BroadcastTxRequest.encode(message).finish() + }; } }; function createBaseBroadcastTxResponse(): BroadcastTxResponse { @@ -570,6 +688,7 @@ function createBaseBroadcastTxResponse(): BroadcastTxResponse { }; } export const BroadcastTxResponse = { + typeUrl: "/cosmos.tx.v1beta1.BroadcastTxResponse", encode(message: BroadcastTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.txResponse !== undefined) { TxResponse.encode(message.txResponse, writer.uint32(10).fork()).ldelim(); @@ -622,6 +741,37 @@ export const BroadcastTxResponse = { const obj: any = {}; message.txResponse !== undefined && (obj.tx_response = message.txResponse ? TxResponse.toSDK(message.txResponse) : undefined); return obj; + }, + fromAmino(object: BroadcastTxResponseAmino): BroadcastTxResponse { + return { + txResponse: object?.tx_response ? TxResponse.fromAmino(object.tx_response) : undefined + }; + }, + toAmino(message: BroadcastTxResponse): BroadcastTxResponseAmino { + const obj: any = {}; + obj.tx_response = message.txResponse ? TxResponse.toAmino(message.txResponse) : undefined; + return obj; + }, + fromAminoMsg(object: BroadcastTxResponseAminoMsg): BroadcastTxResponse { + return BroadcastTxResponse.fromAmino(object.value); + }, + toAminoMsg(message: BroadcastTxResponse): BroadcastTxResponseAminoMsg { + return { + type: "cosmos-sdk/BroadcastTxResponse", + value: BroadcastTxResponse.toAmino(message) + }; + }, + fromProtoMsg(message: BroadcastTxResponseProtoMsg): BroadcastTxResponse { + return BroadcastTxResponse.decode(message.value); + }, + toProto(message: BroadcastTxResponse): Uint8Array { + return BroadcastTxResponse.encode(message).finish(); + }, + toProtoMsg(message: BroadcastTxResponse): BroadcastTxResponseProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.BroadcastTxResponse", + value: BroadcastTxResponse.encode(message).finish() + }; } }; function createBaseSimulateRequest(): SimulateRequest { @@ -631,6 +781,7 @@ function createBaseSimulateRequest(): SimulateRequest { }; } export const SimulateRequest = { + typeUrl: "/cosmos.tx.v1beta1.SimulateRequest", encode(message: SimulateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx !== undefined) { Tx.encode(message.tx, writer.uint32(10).fork()).ldelim(); @@ -695,6 +846,39 @@ export const SimulateRequest = { message.tx !== undefined && (obj.tx = message.tx ? Tx.toSDK(message.tx) : undefined); obj.tx_bytes = message.txBytes; return obj; + }, + fromAmino(object: SimulateRequestAmino): SimulateRequest { + return { + tx: object?.tx ? Tx.fromAmino(object.tx) : undefined, + txBytes: object.tx_bytes + }; + }, + toAmino(message: SimulateRequest): SimulateRequestAmino { + const obj: any = {}; + obj.tx = message.tx ? Tx.toAmino(message.tx) : undefined; + obj.tx_bytes = message.txBytes; + return obj; + }, + fromAminoMsg(object: SimulateRequestAminoMsg): SimulateRequest { + return SimulateRequest.fromAmino(object.value); + }, + toAminoMsg(message: SimulateRequest): SimulateRequestAminoMsg { + return { + type: "cosmos-sdk/SimulateRequest", + value: SimulateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SimulateRequestProtoMsg): SimulateRequest { + return SimulateRequest.decode(message.value); + }, + toProto(message: SimulateRequest): Uint8Array { + return SimulateRequest.encode(message).finish(); + }, + toProtoMsg(message: SimulateRequest): SimulateRequestProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.SimulateRequest", + value: SimulateRequest.encode(message).finish() + }; } }; function createBaseSimulateResponse(): SimulateResponse { @@ -704,6 +888,7 @@ function createBaseSimulateResponse(): SimulateResponse { }; } export const SimulateResponse = { + typeUrl: "/cosmos.tx.v1beta1.SimulateResponse", encode(message: SimulateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gasInfo !== undefined) { GasInfo.encode(message.gasInfo, writer.uint32(10).fork()).ldelim(); @@ -768,6 +953,39 @@ export const SimulateResponse = { message.gasInfo !== undefined && (obj.gas_info = message.gasInfo ? GasInfo.toSDK(message.gasInfo) : undefined); message.result !== undefined && (obj.result = message.result ? Result.toSDK(message.result) : undefined); return obj; + }, + fromAmino(object: SimulateResponseAmino): SimulateResponse { + return { + gasInfo: object?.gas_info ? GasInfo.fromAmino(object.gas_info) : undefined, + result: object?.result ? Result.fromAmino(object.result) : undefined + }; + }, + toAmino(message: SimulateResponse): SimulateResponseAmino { + const obj: any = {}; + obj.gas_info = message.gasInfo ? GasInfo.toAmino(message.gasInfo) : undefined; + obj.result = message.result ? Result.toAmino(message.result) : undefined; + return obj; + }, + fromAminoMsg(object: SimulateResponseAminoMsg): SimulateResponse { + return SimulateResponse.fromAmino(object.value); + }, + toAminoMsg(message: SimulateResponse): SimulateResponseAminoMsg { + return { + type: "cosmos-sdk/SimulateResponse", + value: SimulateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SimulateResponseProtoMsg): SimulateResponse { + return SimulateResponse.decode(message.value); + }, + toProto(message: SimulateResponse): Uint8Array { + return SimulateResponse.encode(message).finish(); + }, + toProtoMsg(message: SimulateResponse): SimulateResponseProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.SimulateResponse", + value: SimulateResponse.encode(message).finish() + }; } }; function createBaseGetTxRequest(): GetTxRequest { @@ -776,6 +994,7 @@ function createBaseGetTxRequest(): GetTxRequest { }; } export const GetTxRequest = { + typeUrl: "/cosmos.tx.v1beta1.GetTxRequest", encode(message: GetTxRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== "") { writer.uint32(10).string(message.hash); @@ -828,6 +1047,37 @@ export const GetTxRequest = { const obj: any = {}; obj.hash = message.hash; return obj; + }, + fromAmino(object: GetTxRequestAmino): GetTxRequest { + return { + hash: object.hash + }; + }, + toAmino(message: GetTxRequest): GetTxRequestAmino { + const obj: any = {}; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: GetTxRequestAminoMsg): GetTxRequest { + return GetTxRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetTxRequest): GetTxRequestAminoMsg { + return { + type: "cosmos-sdk/GetTxRequest", + value: GetTxRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetTxRequestProtoMsg): GetTxRequest { + return GetTxRequest.decode(message.value); + }, + toProto(message: GetTxRequest): Uint8Array { + return GetTxRequest.encode(message).finish(); + }, + toProtoMsg(message: GetTxRequest): GetTxRequestProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.GetTxRequest", + value: GetTxRequest.encode(message).finish() + }; } }; function createBaseGetTxResponse(): GetTxResponse { @@ -837,6 +1087,7 @@ function createBaseGetTxResponse(): GetTxResponse { }; } export const GetTxResponse = { + typeUrl: "/cosmos.tx.v1beta1.GetTxResponse", encode(message: GetTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx !== undefined) { Tx.encode(message.tx, writer.uint32(10).fork()).ldelim(); @@ -901,6 +1152,39 @@ export const GetTxResponse = { message.tx !== undefined && (obj.tx = message.tx ? Tx.toSDK(message.tx) : undefined); message.txResponse !== undefined && (obj.tx_response = message.txResponse ? TxResponse.toSDK(message.txResponse) : undefined); return obj; + }, + fromAmino(object: GetTxResponseAmino): GetTxResponse { + return { + tx: object?.tx ? Tx.fromAmino(object.tx) : undefined, + txResponse: object?.tx_response ? TxResponse.fromAmino(object.tx_response) : undefined + }; + }, + toAmino(message: GetTxResponse): GetTxResponseAmino { + const obj: any = {}; + obj.tx = message.tx ? Tx.toAmino(message.tx) : undefined; + obj.tx_response = message.txResponse ? TxResponse.toAmino(message.txResponse) : undefined; + return obj; + }, + fromAminoMsg(object: GetTxResponseAminoMsg): GetTxResponse { + return GetTxResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetTxResponse): GetTxResponseAminoMsg { + return { + type: "cosmos-sdk/GetTxResponse", + value: GetTxResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetTxResponseProtoMsg): GetTxResponse { + return GetTxResponse.decode(message.value); + }, + toProto(message: GetTxResponse): Uint8Array { + return GetTxResponse.encode(message).finish(); + }, + toProtoMsg(message: GetTxResponse): GetTxResponseProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.GetTxResponse", + value: GetTxResponse.encode(message).finish() + }; } }; function createBaseGetBlockWithTxsRequest(): GetBlockWithTxsRequest { @@ -910,6 +1194,7 @@ function createBaseGetBlockWithTxsRequest(): GetBlockWithTxsRequest { }; } export const GetBlockWithTxsRequest = { + typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsRequest", encode(message: GetBlockWithTxsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -974,6 +1259,39 @@ export const GetBlockWithTxsRequest = { obj.height = message.height; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetBlockWithTxsRequestAmino): GetBlockWithTxsRequest { + return { + height: BigInt(object.height), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetBlockWithTxsRequestAminoMsg): GetBlockWithTxsRequest { + return GetBlockWithTxsRequest.fromAmino(object.value); + }, + toAminoMsg(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestAminoMsg { + return { + type: "cosmos-sdk/GetBlockWithTxsRequest", + value: GetBlockWithTxsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GetBlockWithTxsRequestProtoMsg): GetBlockWithTxsRequest { + return GetBlockWithTxsRequest.decode(message.value); + }, + toProto(message: GetBlockWithTxsRequest): Uint8Array { + return GetBlockWithTxsRequest.encode(message).finish(); + }, + toProtoMsg(message: GetBlockWithTxsRequest): GetBlockWithTxsRequestProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsRequest", + value: GetBlockWithTxsRequest.encode(message).finish() + }; } }; function createBaseGetBlockWithTxsResponse(): GetBlockWithTxsResponse { @@ -985,6 +1303,7 @@ function createBaseGetBlockWithTxsResponse(): GetBlockWithTxsResponse { }; } export const GetBlockWithTxsResponse = { + typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsResponse", encode(message: GetBlockWithTxsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.txs) { Tx.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1081,5 +1400,46 @@ export const GetBlockWithTxsResponse = { message.block !== undefined && (obj.block = message.block ? Block.toSDK(message.block) : undefined); message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GetBlockWithTxsResponseAmino): GetBlockWithTxsResponse { + return { + txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => Tx.fromAmino(e)) : [], + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + block: object?.block ? Block.fromAmino(object.block) : undefined, + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GetBlockWithTxsResponse): GetBlockWithTxsResponseAmino { + const obj: any = {}; + if (message.txs) { + obj.txs = message.txs.map(e => e ? Tx.toAmino(e) : undefined); + } else { + obj.txs = []; + } + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + obj.block = message.block ? Block.toAmino(message.block) : undefined; + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GetBlockWithTxsResponseAminoMsg): GetBlockWithTxsResponse { + return GetBlockWithTxsResponse.fromAmino(object.value); + }, + toAminoMsg(message: GetBlockWithTxsResponse): GetBlockWithTxsResponseAminoMsg { + return { + type: "cosmos-sdk/GetBlockWithTxsResponse", + value: GetBlockWithTxsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GetBlockWithTxsResponseProtoMsg): GetBlockWithTxsResponse { + return GetBlockWithTxsResponse.decode(message.value); + }, + toProto(message: GetBlockWithTxsResponse): Uint8Array { + return GetBlockWithTxsResponse.encode(message).finish(); + }, + toProtoMsg(message: GetBlockWithTxsResponse): GetBlockWithTxsResponseProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsResponse", + value: GetBlockWithTxsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts index c6584f0e7c..93818d5cf3 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/tx/v1beta1/tx.ts @@ -396,6 +396,7 @@ function createBaseTx(): Tx { }; } export const Tx = { + typeUrl: "/cosmos.tx.v1beta1.Tx", encode(message: Tx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.body !== undefined) { TxBody.encode(message.body, writer.uint32(10).fork()).ldelim(); @@ -480,6 +481,45 @@ export const Tx = { obj.signatures = []; } return obj; + }, + fromAmino(object: TxAmino): Tx { + return { + body: object?.body ? TxBody.fromAmino(object.body) : undefined, + authInfo: object?.auth_info ? AuthInfo.fromAmino(object.auth_info) : undefined, + signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => e) : [] + }; + }, + toAmino(message: Tx): TxAmino { + const obj: any = {}; + obj.body = message.body ? TxBody.toAmino(message.body) : undefined; + obj.auth_info = message.authInfo ? AuthInfo.toAmino(message.authInfo) : undefined; + if (message.signatures) { + obj.signatures = message.signatures.map(e => e); + } else { + obj.signatures = []; + } + return obj; + }, + fromAminoMsg(object: TxAminoMsg): Tx { + return Tx.fromAmino(object.value); + }, + toAminoMsg(message: Tx): TxAminoMsg { + return { + type: "cosmos-sdk/Tx", + value: Tx.toAmino(message) + }; + }, + fromProtoMsg(message: TxProtoMsg): Tx { + return Tx.decode(message.value); + }, + toProto(message: Tx): Uint8Array { + return Tx.encode(message).finish(); + }, + toProtoMsg(message: Tx): TxProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.Tx", + value: Tx.encode(message).finish() + }; } }; function createBaseTxRaw(): TxRaw { @@ -490,6 +530,7 @@ function createBaseTxRaw(): TxRaw { }; } export const TxRaw = { + typeUrl: "/cosmos.tx.v1beta1.TxRaw", encode(message: TxRaw, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bodyBytes.length !== 0) { writer.uint32(10).bytes(message.bodyBytes); @@ -574,6 +615,45 @@ export const TxRaw = { obj.signatures = []; } return obj; + }, + fromAmino(object: TxRawAmino): TxRaw { + return { + bodyBytes: object.body_bytes, + authInfoBytes: object.auth_info_bytes, + signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => e) : [] + }; + }, + toAmino(message: TxRaw): TxRawAmino { + const obj: any = {}; + obj.body_bytes = message.bodyBytes; + obj.auth_info_bytes = message.authInfoBytes; + if (message.signatures) { + obj.signatures = message.signatures.map(e => e); + } else { + obj.signatures = []; + } + return obj; + }, + fromAminoMsg(object: TxRawAminoMsg): TxRaw { + return TxRaw.fromAmino(object.value); + }, + toAminoMsg(message: TxRaw): TxRawAminoMsg { + return { + type: "cosmos-sdk/TxRaw", + value: TxRaw.toAmino(message) + }; + }, + fromProtoMsg(message: TxRawProtoMsg): TxRaw { + return TxRaw.decode(message.value); + }, + toProto(message: TxRaw): Uint8Array { + return TxRaw.encode(message).finish(); + }, + toProtoMsg(message: TxRaw): TxRawProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.TxRaw", + value: TxRaw.encode(message).finish() + }; } }; function createBaseSignDoc(): SignDoc { @@ -585,6 +665,7 @@ function createBaseSignDoc(): SignDoc { }; } export const SignDoc = { + typeUrl: "/cosmos.tx.v1beta1.SignDoc", encode(message: SignDoc, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bodyBytes.length !== 0) { writer.uint32(10).bytes(message.bodyBytes); @@ -673,6 +754,43 @@ export const SignDoc = { obj.chain_id = message.chainId; obj.account_number = message.accountNumber; return obj; + }, + fromAmino(object: SignDocAmino): SignDoc { + return { + bodyBytes: object.body_bytes, + authInfoBytes: object.auth_info_bytes, + chainId: object.chain_id, + accountNumber: BigInt(object.account_number) + }; + }, + toAmino(message: SignDoc): SignDocAmino { + const obj: any = {}; + obj.body_bytes = message.bodyBytes; + obj.auth_info_bytes = message.authInfoBytes; + obj.chain_id = message.chainId; + obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SignDocAminoMsg): SignDoc { + return SignDoc.fromAmino(object.value); + }, + toAminoMsg(message: SignDoc): SignDocAminoMsg { + return { + type: "cosmos-sdk/SignDoc", + value: SignDoc.toAmino(message) + }; + }, + fromProtoMsg(message: SignDocProtoMsg): SignDoc { + return SignDoc.decode(message.value); + }, + toProto(message: SignDoc): Uint8Array { + return SignDoc.encode(message).finish(); + }, + toProtoMsg(message: SignDoc): SignDocProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.SignDoc", + value: SignDoc.encode(message).finish() + }; } }; function createBaseSignDocDirectAux(): SignDocDirectAux { @@ -686,6 +804,7 @@ function createBaseSignDocDirectAux(): SignDocDirectAux { }; } export const SignDocDirectAux = { + typeUrl: "/cosmos.tx.v1beta1.SignDocDirectAux", encode(message: SignDocDirectAux, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bodyBytes.length !== 0) { writer.uint32(10).bytes(message.bodyBytes); @@ -798,6 +917,47 @@ export const SignDocDirectAux = { obj.sequence = message.sequence; message.tip !== undefined && (obj.tip = message.tip ? Tip.toSDK(message.tip) : undefined); return obj; + }, + fromAmino(object: SignDocDirectAuxAmino): SignDocDirectAux { + return { + bodyBytes: object.body_bytes, + publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, + chainId: object.chain_id, + accountNumber: BigInt(object.account_number), + sequence: BigInt(object.sequence), + tip: object?.tip ? Tip.fromAmino(object.tip) : undefined + }; + }, + toAmino(message: SignDocDirectAux): SignDocDirectAuxAmino { + const obj: any = {}; + obj.body_bytes = message.bodyBytes; + obj.public_key = message.publicKey ? Any.toAmino(message.publicKey) : undefined; + obj.chain_id = message.chainId; + obj.account_number = message.accountNumber ? message.accountNumber.toString() : undefined; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; + return obj; + }, + fromAminoMsg(object: SignDocDirectAuxAminoMsg): SignDocDirectAux { + return SignDocDirectAux.fromAmino(object.value); + }, + toAminoMsg(message: SignDocDirectAux): SignDocDirectAuxAminoMsg { + return { + type: "cosmos-sdk/SignDocDirectAux", + value: SignDocDirectAux.toAmino(message) + }; + }, + fromProtoMsg(message: SignDocDirectAuxProtoMsg): SignDocDirectAux { + return SignDocDirectAux.decode(message.value); + }, + toProto(message: SignDocDirectAux): Uint8Array { + return SignDocDirectAux.encode(message).finish(); + }, + toProtoMsg(message: SignDocDirectAux): SignDocDirectAuxProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.SignDocDirectAux", + value: SignDocDirectAux.encode(message).finish() + }; } }; function createBaseTxBody(): TxBody { @@ -810,6 +970,7 @@ function createBaseTxBody(): TxBody { }; } export const TxBody = { + typeUrl: "/cosmos.tx.v1beta1.TxBody", encode(message: TxBody, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.messages) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -934,6 +1095,57 @@ export const TxBody = { obj.non_critical_extension_options = []; } return obj; + }, + fromAmino(object: TxBodyAmino): TxBody { + return { + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [], + memo: object.memo, + timeoutHeight: BigInt(object.timeout_height), + extensionOptions: Array.isArray(object?.extension_options) ? object.extension_options.map((e: any) => Any.fromAmino(e)) : [], + nonCriticalExtensionOptions: Array.isArray(object?.non_critical_extension_options) ? object.non_critical_extension_options.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: TxBody): TxBodyAmino { + const obj: any = {}; + if (message.messages) { + obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.messages = []; + } + obj.memo = message.memo; + obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + if (message.extensionOptions) { + obj.extension_options = message.extensionOptions.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.extension_options = []; + } + if (message.nonCriticalExtensionOptions) { + obj.non_critical_extension_options = message.nonCriticalExtensionOptions.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.non_critical_extension_options = []; + } + return obj; + }, + fromAminoMsg(object: TxBodyAminoMsg): TxBody { + return TxBody.fromAmino(object.value); + }, + toAminoMsg(message: TxBody): TxBodyAminoMsg { + return { + type: "cosmos-sdk/TxBody", + value: TxBody.toAmino(message) + }; + }, + fromProtoMsg(message: TxBodyProtoMsg): TxBody { + return TxBody.decode(message.value); + }, + toProto(message: TxBody): Uint8Array { + return TxBody.encode(message).finish(); + }, + toProtoMsg(message: TxBody): TxBodyProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.TxBody", + value: TxBody.encode(message).finish() + }; } }; function createBaseAuthInfo(): AuthInfo { @@ -944,6 +1156,7 @@ function createBaseAuthInfo(): AuthInfo { }; } export const AuthInfo = { + typeUrl: "/cosmos.tx.v1beta1.AuthInfo", encode(message: AuthInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signerInfos) { SignerInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1028,6 +1241,45 @@ export const AuthInfo = { message.fee !== undefined && (obj.fee = message.fee ? Fee.toSDK(message.fee) : undefined); message.tip !== undefined && (obj.tip = message.tip ? Tip.toSDK(message.tip) : undefined); return obj; + }, + fromAmino(object: AuthInfoAmino): AuthInfo { + return { + signerInfos: Array.isArray(object?.signer_infos) ? object.signer_infos.map((e: any) => SignerInfo.fromAmino(e)) : [], + fee: object?.fee ? Fee.fromAmino(object.fee) : undefined, + tip: object?.tip ? Tip.fromAmino(object.tip) : undefined + }; + }, + toAmino(message: AuthInfo): AuthInfoAmino { + const obj: any = {}; + if (message.signerInfos) { + obj.signer_infos = message.signerInfos.map(e => e ? SignerInfo.toAmino(e) : undefined); + } else { + obj.signer_infos = []; + } + obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; + obj.tip = message.tip ? Tip.toAmino(message.tip) : undefined; + return obj; + }, + fromAminoMsg(object: AuthInfoAminoMsg): AuthInfo { + return AuthInfo.fromAmino(object.value); + }, + toAminoMsg(message: AuthInfo): AuthInfoAminoMsg { + return { + type: "cosmos-sdk/AuthInfo", + value: AuthInfo.toAmino(message) + }; + }, + fromProtoMsg(message: AuthInfoProtoMsg): AuthInfo { + return AuthInfo.decode(message.value); + }, + toProto(message: AuthInfo): Uint8Array { + return AuthInfo.encode(message).finish(); + }, + toProtoMsg(message: AuthInfo): AuthInfoProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.AuthInfo", + value: AuthInfo.encode(message).finish() + }; } }; function createBaseSignerInfo(): SignerInfo { @@ -1038,6 +1290,7 @@ function createBaseSignerInfo(): SignerInfo { }; } export const SignerInfo = { + typeUrl: "/cosmos.tx.v1beta1.SignerInfo", encode(message: SignerInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); @@ -1114,6 +1367,41 @@ export const SignerInfo = { message.modeInfo !== undefined && (obj.mode_info = message.modeInfo ? ModeInfo.toSDK(message.modeInfo) : undefined); obj.sequence = message.sequence; return obj; + }, + fromAmino(object: SignerInfoAmino): SignerInfo { + return { + publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, + modeInfo: object?.mode_info ? ModeInfo.fromAmino(object.mode_info) : undefined, + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: SignerInfo): SignerInfoAmino { + const obj: any = {}; + obj.public_key = message.publicKey ? Any.toAmino(message.publicKey) : undefined; + obj.mode_info = message.modeInfo ? ModeInfo.toAmino(message.modeInfo) : undefined; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SignerInfoAminoMsg): SignerInfo { + return SignerInfo.fromAmino(object.value); + }, + toAminoMsg(message: SignerInfo): SignerInfoAminoMsg { + return { + type: "cosmos-sdk/SignerInfo", + value: SignerInfo.toAmino(message) + }; + }, + fromProtoMsg(message: SignerInfoProtoMsg): SignerInfo { + return SignerInfo.decode(message.value); + }, + toProto(message: SignerInfo): Uint8Array { + return SignerInfo.encode(message).finish(); + }, + toProtoMsg(message: SignerInfo): SignerInfoProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.SignerInfo", + value: SignerInfo.encode(message).finish() + }; } }; function createBaseModeInfo(): ModeInfo { @@ -1123,6 +1411,7 @@ function createBaseModeInfo(): ModeInfo { }; } export const ModeInfo = { + typeUrl: "/cosmos.tx.v1beta1.ModeInfo", encode(message: ModeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.single !== undefined) { ModeInfo_Single.encode(message.single, writer.uint32(10).fork()).ldelim(); @@ -1187,6 +1476,39 @@ export const ModeInfo = { message.single !== undefined && (obj.single = message.single ? ModeInfo_Single.toSDK(message.single) : undefined); message.multi !== undefined && (obj.multi = message.multi ? ModeInfo_Multi.toSDK(message.multi) : undefined); return obj; + }, + fromAmino(object: ModeInfoAmino): ModeInfo { + return { + single: object?.single ? ModeInfo_Single.fromAmino(object.single) : undefined, + multi: object?.multi ? ModeInfo_Multi.fromAmino(object.multi) : undefined + }; + }, + toAmino(message: ModeInfo): ModeInfoAmino { + const obj: any = {}; + obj.single = message.single ? ModeInfo_Single.toAmino(message.single) : undefined; + obj.multi = message.multi ? ModeInfo_Multi.toAmino(message.multi) : undefined; + return obj; + }, + fromAminoMsg(object: ModeInfoAminoMsg): ModeInfo { + return ModeInfo.fromAmino(object.value); + }, + toAminoMsg(message: ModeInfo): ModeInfoAminoMsg { + return { + type: "cosmos-sdk/ModeInfo", + value: ModeInfo.toAmino(message) + }; + }, + fromProtoMsg(message: ModeInfoProtoMsg): ModeInfo { + return ModeInfo.decode(message.value); + }, + toProto(message: ModeInfo): Uint8Array { + return ModeInfo.encode(message).finish(); + }, + toProtoMsg(message: ModeInfo): ModeInfoProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.ModeInfo", + value: ModeInfo.encode(message).finish() + }; } }; function createBaseModeInfo_Single(): ModeInfo_Single { @@ -1195,6 +1517,7 @@ function createBaseModeInfo_Single(): ModeInfo_Single { }; } export const ModeInfo_Single = { + typeUrl: "/cosmos.tx.v1beta1.Single", encode(message: ModeInfo_Single, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mode !== 0) { writer.uint32(8).int32(message.mode); @@ -1247,6 +1570,37 @@ export const ModeInfo_Single = { const obj: any = {}; message.mode !== undefined && (obj.mode = signModeToJSON(message.mode)); return obj; + }, + fromAmino(object: ModeInfo_SingleAmino): ModeInfo_Single { + return { + mode: isSet(object.mode) ? signModeFromJSON(object.mode) : -1 + }; + }, + toAmino(message: ModeInfo_Single): ModeInfo_SingleAmino { + const obj: any = {}; + obj.mode = message.mode; + return obj; + }, + fromAminoMsg(object: ModeInfo_SingleAminoMsg): ModeInfo_Single { + return ModeInfo_Single.fromAmino(object.value); + }, + toAminoMsg(message: ModeInfo_Single): ModeInfo_SingleAminoMsg { + return { + type: "cosmos-sdk/Single", + value: ModeInfo_Single.toAmino(message) + }; + }, + fromProtoMsg(message: ModeInfo_SingleProtoMsg): ModeInfo_Single { + return ModeInfo_Single.decode(message.value); + }, + toProto(message: ModeInfo_Single): Uint8Array { + return ModeInfo_Single.encode(message).finish(); + }, + toProtoMsg(message: ModeInfo_Single): ModeInfo_SingleProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.Single", + value: ModeInfo_Single.encode(message).finish() + }; } }; function createBaseModeInfo_Multi(): ModeInfo_Multi { @@ -1256,6 +1610,7 @@ function createBaseModeInfo_Multi(): ModeInfo_Multi { }; } export const ModeInfo_Multi = { + typeUrl: "/cosmos.tx.v1beta1.Multi", encode(message: ModeInfo_Multi, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bitarray !== undefined) { CompactBitArray.encode(message.bitarray, writer.uint32(10).fork()).ldelim(); @@ -1328,6 +1683,43 @@ export const ModeInfo_Multi = { obj.mode_infos = []; } return obj; + }, + fromAmino(object: ModeInfo_MultiAmino): ModeInfo_Multi { + return { + bitarray: object?.bitarray ? CompactBitArray.fromAmino(object.bitarray) : undefined, + modeInfos: Array.isArray(object?.mode_infos) ? object.mode_infos.map((e: any) => ModeInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: ModeInfo_Multi): ModeInfo_MultiAmino { + const obj: any = {}; + obj.bitarray = message.bitarray ? CompactBitArray.toAmino(message.bitarray) : undefined; + if (message.modeInfos) { + obj.mode_infos = message.modeInfos.map(e => e ? ModeInfo.toAmino(e) : undefined); + } else { + obj.mode_infos = []; + } + return obj; + }, + fromAminoMsg(object: ModeInfo_MultiAminoMsg): ModeInfo_Multi { + return ModeInfo_Multi.fromAmino(object.value); + }, + toAminoMsg(message: ModeInfo_Multi): ModeInfo_MultiAminoMsg { + return { + type: "cosmos-sdk/Multi", + value: ModeInfo_Multi.toAmino(message) + }; + }, + fromProtoMsg(message: ModeInfo_MultiProtoMsg): ModeInfo_Multi { + return ModeInfo_Multi.decode(message.value); + }, + toProto(message: ModeInfo_Multi): Uint8Array { + return ModeInfo_Multi.encode(message).finish(); + }, + toProtoMsg(message: ModeInfo_Multi): ModeInfo_MultiProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.Multi", + value: ModeInfo_Multi.encode(message).finish() + }; } }; function createBaseFee(): Fee { @@ -1339,6 +1731,7 @@ function createBaseFee(): Fee { }; } export const Fee = { + typeUrl: "/cosmos.tx.v1beta1.Fee", encode(message: Fee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1435,6 +1828,47 @@ export const Fee = { obj.payer = message.payer; obj.granter = message.granter; return obj; + }, + fromAmino(object: FeeAmino): Fee { + return { + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [], + gasLimit: BigInt(object.gas_limit), + payer: object.payer, + granter: object.granter + }; + }, + toAmino(message: Fee): FeeAmino { + const obj: any = {}; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + obj.gas_limit = message.gasLimit ? message.gasLimit.toString() : undefined; + obj.payer = message.payer; + obj.granter = message.granter; + return obj; + }, + fromAminoMsg(object: FeeAminoMsg): Fee { + return Fee.fromAmino(object.value); + }, + toAminoMsg(message: Fee): FeeAminoMsg { + return { + type: "cosmos-sdk/Fee", + value: Fee.toAmino(message) + }; + }, + fromProtoMsg(message: FeeProtoMsg): Fee { + return Fee.decode(message.value); + }, + toProto(message: Fee): Uint8Array { + return Fee.encode(message).finish(); + }, + toProtoMsg(message: Fee): FeeProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.Fee", + value: Fee.encode(message).finish() + }; } }; function createBaseTip(): Tip { @@ -1444,6 +1878,7 @@ function createBaseTip(): Tip { }; } export const Tip = { + typeUrl: "/cosmos.tx.v1beta1.Tip", encode(message: Tip, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1516,6 +1951,43 @@ export const Tip = { } obj.tipper = message.tipper; return obj; + }, + fromAmino(object: TipAmino): Tip { + return { + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [], + tipper: object.tipper + }; + }, + toAmino(message: Tip): TipAmino { + const obj: any = {}; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + obj.tipper = message.tipper; + return obj; + }, + fromAminoMsg(object: TipAminoMsg): Tip { + return Tip.fromAmino(object.value); + }, + toAminoMsg(message: Tip): TipAminoMsg { + return { + type: "cosmos-sdk/Tip", + value: Tip.toAmino(message) + }; + }, + fromProtoMsg(message: TipProtoMsg): Tip { + return Tip.decode(message.value); + }, + toProto(message: Tip): Uint8Array { + return Tip.encode(message).finish(); + }, + toProtoMsg(message: Tip): TipProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.Tip", + value: Tip.encode(message).finish() + }; } }; function createBaseAuxSignerData(): AuxSignerData { @@ -1527,6 +1999,7 @@ function createBaseAuxSignerData(): AuxSignerData { }; } export const AuxSignerData = { + typeUrl: "/cosmos.tx.v1beta1.AuxSignerData", encode(message: AuxSignerData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1615,5 +2088,42 @@ export const AuxSignerData = { message.mode !== undefined && (obj.mode = signModeToJSON(message.mode)); obj.sig = message.sig; return obj; + }, + fromAmino(object: AuxSignerDataAmino): AuxSignerData { + return { + address: object.address, + signDoc: object?.sign_doc ? SignDocDirectAux.fromAmino(object.sign_doc) : undefined, + mode: isSet(object.mode) ? signModeFromJSON(object.mode) : -1, + sig: object.sig + }; + }, + toAmino(message: AuxSignerData): AuxSignerDataAmino { + const obj: any = {}; + obj.address = message.address; + obj.sign_doc = message.signDoc ? SignDocDirectAux.toAmino(message.signDoc) : undefined; + obj.mode = message.mode; + obj.sig = message.sig; + return obj; + }, + fromAminoMsg(object: AuxSignerDataAminoMsg): AuxSignerData { + return AuxSignerData.fromAmino(object.value); + }, + toAminoMsg(message: AuxSignerData): AuxSignerDataAminoMsg { + return { + type: "cosmos-sdk/AuxSignerData", + value: AuxSignerData.toAmino(message) + }; + }, + fromProtoMsg(message: AuxSignerDataProtoMsg): AuxSignerData { + return AuxSignerData.decode(message.value); + }, + toProto(message: AuxSignerData): Uint8Array { + return AuxSignerData.encode(message).finish(); + }, + toProtoMsg(message: AuxSignerData): AuxSignerDataProtoMsg { + return { + typeUrl: "/cosmos.tx.v1beta1.AuxSignerData", + value: AuxSignerData.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts index 80a262c24c..e6d26d2c5c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/query.ts @@ -168,6 +168,7 @@ function createBaseQueryCurrentPlanRequest(): QueryCurrentPlanRequest { return {}; } export const QueryCurrentPlanRequest = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanRequest", encode(_: QueryCurrentPlanRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -205,6 +206,34 @@ export const QueryCurrentPlanRequest = { toSDK(_: QueryCurrentPlanRequest): QueryCurrentPlanRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryCurrentPlanRequestAmino): QueryCurrentPlanRequest { + return {}; + }, + toAmino(_: QueryCurrentPlanRequest): QueryCurrentPlanRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryCurrentPlanRequestAminoMsg): QueryCurrentPlanRequest { + return QueryCurrentPlanRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCurrentPlanRequest): QueryCurrentPlanRequestAminoMsg { + return { + type: "cosmos-sdk/QueryCurrentPlanRequest", + value: QueryCurrentPlanRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCurrentPlanRequestProtoMsg): QueryCurrentPlanRequest { + return QueryCurrentPlanRequest.decode(message.value); + }, + toProto(message: QueryCurrentPlanRequest): Uint8Array { + return QueryCurrentPlanRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCurrentPlanRequest): QueryCurrentPlanRequestProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanRequest", + value: QueryCurrentPlanRequest.encode(message).finish() + }; } }; function createBaseQueryCurrentPlanResponse(): QueryCurrentPlanResponse { @@ -213,6 +242,7 @@ function createBaseQueryCurrentPlanResponse(): QueryCurrentPlanResponse { }; } export const QueryCurrentPlanResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanResponse", encode(message: QueryCurrentPlanResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.plan !== undefined) { Plan.encode(message.plan, writer.uint32(10).fork()).ldelim(); @@ -265,6 +295,37 @@ export const QueryCurrentPlanResponse = { const obj: any = {}; message.plan !== undefined && (obj.plan = message.plan ? Plan.toSDK(message.plan) : undefined); return obj; + }, + fromAmino(object: QueryCurrentPlanResponseAmino): QueryCurrentPlanResponse { + return { + plan: object?.plan ? Plan.fromAmino(object.plan) : undefined + }; + }, + toAmino(message: QueryCurrentPlanResponse): QueryCurrentPlanResponseAmino { + const obj: any = {}; + obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCurrentPlanResponseAminoMsg): QueryCurrentPlanResponse { + return QueryCurrentPlanResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCurrentPlanResponse): QueryCurrentPlanResponseAminoMsg { + return { + type: "cosmos-sdk/QueryCurrentPlanResponse", + value: QueryCurrentPlanResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCurrentPlanResponseProtoMsg): QueryCurrentPlanResponse { + return QueryCurrentPlanResponse.decode(message.value); + }, + toProto(message: QueryCurrentPlanResponse): Uint8Array { + return QueryCurrentPlanResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCurrentPlanResponse): QueryCurrentPlanResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanResponse", + value: QueryCurrentPlanResponse.encode(message).finish() + }; } }; function createBaseQueryAppliedPlanRequest(): QueryAppliedPlanRequest { @@ -273,6 +334,7 @@ function createBaseQueryAppliedPlanRequest(): QueryAppliedPlanRequest { }; } export const QueryAppliedPlanRequest = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanRequest", encode(message: QueryAppliedPlanRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -325,6 +387,37 @@ export const QueryAppliedPlanRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: QueryAppliedPlanRequestAmino): QueryAppliedPlanRequest { + return { + name: object.name + }; + }, + toAmino(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: QueryAppliedPlanRequestAminoMsg): QueryAppliedPlanRequest { + return QueryAppliedPlanRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAppliedPlanRequest", + value: QueryAppliedPlanRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAppliedPlanRequestProtoMsg): QueryAppliedPlanRequest { + return QueryAppliedPlanRequest.decode(message.value); + }, + toProto(message: QueryAppliedPlanRequest): Uint8Array { + return QueryAppliedPlanRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAppliedPlanRequest): QueryAppliedPlanRequestProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanRequest", + value: QueryAppliedPlanRequest.encode(message).finish() + }; } }; function createBaseQueryAppliedPlanResponse(): QueryAppliedPlanResponse { @@ -333,6 +426,7 @@ function createBaseQueryAppliedPlanResponse(): QueryAppliedPlanResponse { }; } export const QueryAppliedPlanResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse", encode(message: QueryAppliedPlanResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -385,6 +479,37 @@ export const QueryAppliedPlanResponse = { const obj: any = {}; obj.height = message.height; return obj; + }, + fromAmino(object: QueryAppliedPlanResponseAmino): QueryAppliedPlanResponse { + return { + height: BigInt(object.height) + }; + }, + toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryAppliedPlanResponseAminoMsg): QueryAppliedPlanResponse { + return QueryAppliedPlanResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAppliedPlanResponse", + value: QueryAppliedPlanResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAppliedPlanResponseProtoMsg): QueryAppliedPlanResponse { + return QueryAppliedPlanResponse.decode(message.value); + }, + toProto(message: QueryAppliedPlanResponse): Uint8Array { + return QueryAppliedPlanResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse", + value: QueryAppliedPlanResponse.encode(message).finish() + }; } }; function createBaseQueryUpgradedConsensusStateRequest(): QueryUpgradedConsensusStateRequest { @@ -393,6 +518,7 @@ function createBaseQueryUpgradedConsensusStateRequest(): QueryUpgradedConsensusS }; } export const QueryUpgradedConsensusStateRequest = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest", encode(message: QueryUpgradedConsensusStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lastHeight !== BigInt(0)) { writer.uint32(8).int64(message.lastHeight); @@ -445,6 +571,37 @@ export const QueryUpgradedConsensusStateRequest = { const obj: any = {}; obj.last_height = message.lastHeight; return obj; + }, + fromAmino(object: QueryUpgradedConsensusStateRequestAmino): QueryUpgradedConsensusStateRequest { + return { + lastHeight: BigInt(object.last_height) + }; + }, + toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { + const obj: any = {}; + obj.last_height = message.lastHeight ? message.lastHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { + return QueryUpgradedConsensusStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryUpgradedConsensusStateRequest", + value: QueryUpgradedConsensusStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUpgradedConsensusStateRequestProtoMsg): QueryUpgradedConsensusStateRequest { + return QueryUpgradedConsensusStateRequest.decode(message.value); + }, + toProto(message: QueryUpgradedConsensusStateRequest): Uint8Array { + return QueryUpgradedConsensusStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest", + value: QueryUpgradedConsensusStateRequest.encode(message).finish() + }; } }; function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensusStateResponse { @@ -453,6 +610,7 @@ function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensus }; } export const QueryUpgradedConsensusStateResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateResponse", encode(message: QueryUpgradedConsensusStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.upgradedConsensusState.length !== 0) { writer.uint32(18).bytes(message.upgradedConsensusState); @@ -505,6 +663,37 @@ export const QueryUpgradedConsensusStateResponse = { const obj: any = {}; obj.upgraded_consensus_state = message.upgradedConsensusState; return obj; + }, + fromAmino(object: QueryUpgradedConsensusStateResponseAmino): QueryUpgradedConsensusStateResponse { + return { + upgradedConsensusState: object.upgraded_consensus_state + }; + }, + toAmino(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseAmino { + const obj: any = {}; + obj.upgraded_consensus_state = message.upgradedConsensusState; + return obj; + }, + fromAminoMsg(object: QueryUpgradedConsensusStateResponseAminoMsg): QueryUpgradedConsensusStateResponse { + return QueryUpgradedConsensusStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryUpgradedConsensusStateResponse", + value: QueryUpgradedConsensusStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUpgradedConsensusStateResponseProtoMsg): QueryUpgradedConsensusStateResponse { + return QueryUpgradedConsensusStateResponse.decode(message.value); + }, + toProto(message: QueryUpgradedConsensusStateResponse): Uint8Array { + return QueryUpgradedConsensusStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateResponse", + value: QueryUpgradedConsensusStateResponse.encode(message).finish() + }; } }; function createBaseQueryModuleVersionsRequest(): QueryModuleVersionsRequest { @@ -513,6 +702,7 @@ function createBaseQueryModuleVersionsRequest(): QueryModuleVersionsRequest { }; } export const QueryModuleVersionsRequest = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsRequest", encode(message: QueryModuleVersionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.moduleName !== "") { writer.uint32(10).string(message.moduleName); @@ -565,6 +755,37 @@ export const QueryModuleVersionsRequest = { const obj: any = {}; obj.module_name = message.moduleName; return obj; + }, + fromAmino(object: QueryModuleVersionsRequestAmino): QueryModuleVersionsRequest { + return { + moduleName: object.module_name + }; + }, + toAmino(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAmino { + const obj: any = {}; + obj.module_name = message.moduleName; + return obj; + }, + fromAminoMsg(object: QueryModuleVersionsRequestAminoMsg): QueryModuleVersionsRequest { + return QueryModuleVersionsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryModuleVersionsRequest", + value: QueryModuleVersionsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryModuleVersionsRequestProtoMsg): QueryModuleVersionsRequest { + return QueryModuleVersionsRequest.decode(message.value); + }, + toProto(message: QueryModuleVersionsRequest): Uint8Array { + return QueryModuleVersionsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryModuleVersionsRequest): QueryModuleVersionsRequestProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsRequest", + value: QueryModuleVersionsRequest.encode(message).finish() + }; } }; function createBaseQueryModuleVersionsResponse(): QueryModuleVersionsResponse { @@ -573,6 +794,7 @@ function createBaseQueryModuleVersionsResponse(): QueryModuleVersionsResponse { }; } export const QueryModuleVersionsResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsResponse", encode(message: QueryModuleVersionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.moduleVersions) { ModuleVersion.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -633,12 +855,48 @@ export const QueryModuleVersionsResponse = { obj.module_versions = []; } return obj; + }, + fromAmino(object: QueryModuleVersionsResponseAmino): QueryModuleVersionsResponse { + return { + moduleVersions: Array.isArray(object?.module_versions) ? object.module_versions.map((e: any) => ModuleVersion.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryModuleVersionsResponse): QueryModuleVersionsResponseAmino { + const obj: any = {}; + if (message.moduleVersions) { + obj.module_versions = message.moduleVersions.map(e => e ? ModuleVersion.toAmino(e) : undefined); + } else { + obj.module_versions = []; + } + return obj; + }, + fromAminoMsg(object: QueryModuleVersionsResponseAminoMsg): QueryModuleVersionsResponse { + return QueryModuleVersionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryModuleVersionsResponse): QueryModuleVersionsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryModuleVersionsResponse", + value: QueryModuleVersionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryModuleVersionsResponseProtoMsg): QueryModuleVersionsResponse { + return QueryModuleVersionsResponse.decode(message.value); + }, + toProto(message: QueryModuleVersionsResponse): Uint8Array { + return QueryModuleVersionsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryModuleVersionsResponse): QueryModuleVersionsResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsResponse", + value: QueryModuleVersionsResponse.encode(message).finish() + }; } }; function createBaseQueryAuthorityRequest(): QueryAuthorityRequest { return {}; } export const QueryAuthorityRequest = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityRequest", encode(_: QueryAuthorityRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -676,6 +934,34 @@ export const QueryAuthorityRequest = { toSDK(_: QueryAuthorityRequest): QueryAuthorityRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryAuthorityRequestAmino): QueryAuthorityRequest { + return {}; + }, + toAmino(_: QueryAuthorityRequest): QueryAuthorityRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryAuthorityRequestAminoMsg): QueryAuthorityRequest { + return QueryAuthorityRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAuthorityRequest): QueryAuthorityRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAuthorityRequest", + value: QueryAuthorityRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAuthorityRequestProtoMsg): QueryAuthorityRequest { + return QueryAuthorityRequest.decode(message.value); + }, + toProto(message: QueryAuthorityRequest): Uint8Array { + return QueryAuthorityRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAuthorityRequest): QueryAuthorityRequestProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityRequest", + value: QueryAuthorityRequest.encode(message).finish() + }; } }; function createBaseQueryAuthorityResponse(): QueryAuthorityResponse { @@ -684,6 +970,7 @@ function createBaseQueryAuthorityResponse(): QueryAuthorityResponse { }; } export const QueryAuthorityResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityResponse", encode(message: QueryAuthorityResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -736,5 +1023,36 @@ export const QueryAuthorityResponse = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryAuthorityResponseAmino): QueryAuthorityResponse { + return { + address: object.address + }; + }, + toAmino(message: QueryAuthorityResponse): QueryAuthorityResponseAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryAuthorityResponseAminoMsg): QueryAuthorityResponse { + return QueryAuthorityResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAuthorityResponse): QueryAuthorityResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAuthorityResponse", + value: QueryAuthorityResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAuthorityResponseProtoMsg): QueryAuthorityResponse { + return QueryAuthorityResponse.decode(message.value); + }, + toProto(message: QueryAuthorityResponse): Uint8Array { + return QueryAuthorityResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAuthorityResponse): QueryAuthorityResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityResponse", + value: QueryAuthorityResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts index 3ecbab754d..c4208170e0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/tx.ts @@ -70,6 +70,7 @@ function createBaseMsgSoftwareUpgrade(): MsgSoftwareUpgrade { }; } export const MsgSoftwareUpgrade = { + typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade", encode(message: MsgSoftwareUpgrade, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authority !== "") { writer.uint32(10).string(message.authority); @@ -134,12 +135,46 @@ export const MsgSoftwareUpgrade = { obj.authority = message.authority; message.plan !== undefined && (obj.plan = message.plan ? Plan.toSDK(message.plan) : undefined); return obj; + }, + fromAmino(object: MsgSoftwareUpgradeAmino): MsgSoftwareUpgrade { + return { + authority: object.authority, + plan: object?.plan ? Plan.fromAmino(object.plan) : undefined + }; + }, + toAmino(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAmino { + const obj: any = {}; + obj.authority = message.authority; + obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; + return obj; + }, + fromAminoMsg(object: MsgSoftwareUpgradeAminoMsg): MsgSoftwareUpgrade { + return MsgSoftwareUpgrade.fromAmino(object.value); + }, + toAminoMsg(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeAminoMsg { + return { + type: "cosmos-sdk/MsgSoftwareUpgrade", + value: MsgSoftwareUpgrade.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSoftwareUpgradeProtoMsg): MsgSoftwareUpgrade { + return MsgSoftwareUpgrade.decode(message.value); + }, + toProto(message: MsgSoftwareUpgrade): Uint8Array { + return MsgSoftwareUpgrade.encode(message).finish(); + }, + toProtoMsg(message: MsgSoftwareUpgrade): MsgSoftwareUpgradeProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade", + value: MsgSoftwareUpgrade.encode(message).finish() + }; } }; function createBaseMsgSoftwareUpgradeResponse(): MsgSoftwareUpgradeResponse { return {}; } export const MsgSoftwareUpgradeResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse", encode(_: MsgSoftwareUpgradeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -177,6 +212,34 @@ export const MsgSoftwareUpgradeResponse = { toSDK(_: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSoftwareUpgradeResponseAmino): MsgSoftwareUpgradeResponse { + return {}; + }, + toAmino(_: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSoftwareUpgradeResponseAminoMsg): MsgSoftwareUpgradeResponse { + return MsgSoftwareUpgradeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSoftwareUpgradeResponse", + value: MsgSoftwareUpgradeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSoftwareUpgradeResponseProtoMsg): MsgSoftwareUpgradeResponse { + return MsgSoftwareUpgradeResponse.decode(message.value); + }, + toProto(message: MsgSoftwareUpgradeResponse): Uint8Array { + return MsgSoftwareUpgradeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSoftwareUpgradeResponse): MsgSoftwareUpgradeResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse", + value: MsgSoftwareUpgradeResponse.encode(message).finish() + }; } }; function createBaseMsgCancelUpgrade(): MsgCancelUpgrade { @@ -185,6 +248,7 @@ function createBaseMsgCancelUpgrade(): MsgCancelUpgrade { }; } export const MsgCancelUpgrade = { + typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade", encode(message: MsgCancelUpgrade, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authority !== "") { writer.uint32(10).string(message.authority); @@ -237,12 +301,44 @@ export const MsgCancelUpgrade = { const obj: any = {}; obj.authority = message.authority; return obj; + }, + fromAmino(object: MsgCancelUpgradeAmino): MsgCancelUpgrade { + return { + authority: object.authority + }; + }, + toAmino(message: MsgCancelUpgrade): MsgCancelUpgradeAmino { + const obj: any = {}; + obj.authority = message.authority; + return obj; + }, + fromAminoMsg(object: MsgCancelUpgradeAminoMsg): MsgCancelUpgrade { + return MsgCancelUpgrade.fromAmino(object.value); + }, + toAminoMsg(message: MsgCancelUpgrade): MsgCancelUpgradeAminoMsg { + return { + type: "cosmos-sdk/MsgCancelUpgrade", + value: MsgCancelUpgrade.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCancelUpgradeProtoMsg): MsgCancelUpgrade { + return MsgCancelUpgrade.decode(message.value); + }, + toProto(message: MsgCancelUpgrade): Uint8Array { + return MsgCancelUpgrade.encode(message).finish(); + }, + toProtoMsg(message: MsgCancelUpgrade): MsgCancelUpgradeProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade", + value: MsgCancelUpgrade.encode(message).finish() + }; } }; function createBaseMsgCancelUpgradeResponse(): MsgCancelUpgradeResponse { return {}; } export const MsgCancelUpgradeResponse = { + typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse", encode(_: MsgCancelUpgradeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -280,5 +376,33 @@ export const MsgCancelUpgradeResponse = { toSDK(_: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCancelUpgradeResponseAmino): MsgCancelUpgradeResponse { + return {}; + }, + toAmino(_: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCancelUpgradeResponseAminoMsg): MsgCancelUpgradeResponse { + return MsgCancelUpgradeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCancelUpgradeResponse", + value: MsgCancelUpgradeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCancelUpgradeResponseProtoMsg): MsgCancelUpgradeResponse { + return MsgCancelUpgradeResponse.decode(message.value); + }, + toProto(message: MsgCancelUpgradeResponse): Uint8Array { + return MsgCancelUpgradeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCancelUpgradeResponse): MsgCancelUpgradeResponseProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse", + value: MsgCancelUpgradeResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts index 8c3852a83b..9e71338b93 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/upgrade/v1beta1/upgrade.ts @@ -126,6 +126,7 @@ function createBasePlan(): Plan { }; } export const Plan = { + typeUrl: "/cosmos.upgrade.v1beta1.Plan", encode(message: Plan, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -226,6 +227,45 @@ export const Plan = { obj.info = message.info; message.upgradedClientState !== undefined && (obj.upgraded_client_state = message.upgradedClientState ? Any.toSDK(message.upgradedClientState) : undefined); return obj; + }, + fromAmino(object: PlanAmino): Plan { + return { + name: object.name, + time: object.time, + height: BigInt(object.height), + info: object.info, + upgradedClientState: object?.upgraded_client_state ? Any.fromAmino(object.upgraded_client_state) : undefined + }; + }, + toAmino(message: Plan): PlanAmino { + const obj: any = {}; + obj.name = message.name; + obj.time = message.time; + obj.height = message.height ? message.height.toString() : undefined; + obj.info = message.info; + obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; + return obj; + }, + fromAminoMsg(object: PlanAminoMsg): Plan { + return Plan.fromAmino(object.value); + }, + toAminoMsg(message: Plan): PlanAminoMsg { + return { + type: "cosmos-sdk/Plan", + value: Plan.toAmino(message) + }; + }, + fromProtoMsg(message: PlanProtoMsg): Plan { + return Plan.decode(message.value); + }, + toProto(message: Plan): Uint8Array { + return Plan.encode(message).finish(); + }, + toProtoMsg(message: Plan): PlanProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.Plan", + value: Plan.encode(message).finish() + }; } }; function createBaseSoftwareUpgradeProposal(): SoftwareUpgradeProposal { @@ -236,6 +276,7 @@ function createBaseSoftwareUpgradeProposal(): SoftwareUpgradeProposal { }; } export const SoftwareUpgradeProposal = { + typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal", encode(message: SoftwareUpgradeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -312,6 +353,41 @@ export const SoftwareUpgradeProposal = { obj.description = message.description; message.plan !== undefined && (obj.plan = message.plan ? Plan.toSDK(message.plan) : undefined); return obj; + }, + fromAmino(object: SoftwareUpgradeProposalAmino): SoftwareUpgradeProposal { + return { + title: object.title, + description: object.description, + plan: object?.plan ? Plan.fromAmino(object.plan) : undefined + }; + }, + toAmino(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; + return obj; + }, + fromAminoMsg(object: SoftwareUpgradeProposalAminoMsg): SoftwareUpgradeProposal { + return SoftwareUpgradeProposal.fromAmino(object.value); + }, + toAminoMsg(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalAminoMsg { + return { + type: "cosmos-sdk/SoftwareUpgradeProposal", + value: SoftwareUpgradeProposal.toAmino(message) + }; + }, + fromProtoMsg(message: SoftwareUpgradeProposalProtoMsg): SoftwareUpgradeProposal { + return SoftwareUpgradeProposal.decode(message.value); + }, + toProto(message: SoftwareUpgradeProposal): Uint8Array { + return SoftwareUpgradeProposal.encode(message).finish(); + }, + toProtoMsg(message: SoftwareUpgradeProposal): SoftwareUpgradeProposalProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal", + value: SoftwareUpgradeProposal.encode(message).finish() + }; } }; function createBaseCancelSoftwareUpgradeProposal(): CancelSoftwareUpgradeProposal { @@ -321,6 +397,7 @@ function createBaseCancelSoftwareUpgradeProposal(): CancelSoftwareUpgradeProposa }; } export const CancelSoftwareUpgradeProposal = { + typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal", encode(message: CancelSoftwareUpgradeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -385,6 +462,39 @@ export const CancelSoftwareUpgradeProposal = { obj.title = message.title; obj.description = message.description; return obj; + }, + fromAmino(object: CancelSoftwareUpgradeProposalAmino): CancelSoftwareUpgradeProposal { + return { + title: object.title, + description: object.description + }; + }, + toAmino(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: CancelSoftwareUpgradeProposalAminoMsg): CancelSoftwareUpgradeProposal { + return CancelSoftwareUpgradeProposal.fromAmino(object.value); + }, + toAminoMsg(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalAminoMsg { + return { + type: "cosmos-sdk/CancelSoftwareUpgradeProposal", + value: CancelSoftwareUpgradeProposal.toAmino(message) + }; + }, + fromProtoMsg(message: CancelSoftwareUpgradeProposalProtoMsg): CancelSoftwareUpgradeProposal { + return CancelSoftwareUpgradeProposal.decode(message.value); + }, + toProto(message: CancelSoftwareUpgradeProposal): Uint8Array { + return CancelSoftwareUpgradeProposal.encode(message).finish(); + }, + toProtoMsg(message: CancelSoftwareUpgradeProposal): CancelSoftwareUpgradeProposalProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal", + value: CancelSoftwareUpgradeProposal.encode(message).finish() + }; } }; function createBaseModuleVersion(): ModuleVersion { @@ -394,6 +504,7 @@ function createBaseModuleVersion(): ModuleVersion { }; } export const ModuleVersion = { + typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion", encode(message: ModuleVersion, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -458,5 +569,38 @@ export const ModuleVersion = { obj.name = message.name; obj.version = message.version; return obj; + }, + fromAmino(object: ModuleVersionAmino): ModuleVersion { + return { + name: object.name, + version: BigInt(object.version) + }; + }, + toAmino(message: ModuleVersion): ModuleVersionAmino { + const obj: any = {}; + obj.name = message.name; + obj.version = message.version ? message.version.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ModuleVersionAminoMsg): ModuleVersion { + return ModuleVersion.fromAmino(object.value); + }, + toAminoMsg(message: ModuleVersion): ModuleVersionAminoMsg { + return { + type: "cosmos-sdk/ModuleVersion", + value: ModuleVersion.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleVersionProtoMsg): ModuleVersion { + return ModuleVersion.decode(message.value); + }, + toProto(message: ModuleVersion): Uint8Array { + return ModuleVersion.encode(message).finish(); + }, + toProtoMsg(message: ModuleVersion): ModuleVersionProtoMsg { + return { + typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion", + value: ModuleVersion.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts index 7776e588f8..6b3512e4aa 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/tx.ts @@ -91,6 +91,7 @@ function createBaseMsgCreateVestingAccount(): MsgCreateVestingAccount { }; } export const MsgCreateVestingAccount = { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount", encode(message: MsgCreateVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); @@ -199,12 +200,56 @@ export const MsgCreateVestingAccount = { obj.end_time = message.endTime; obj.delayed = message.delayed; return obj; + }, + fromAmino(object: MsgCreateVestingAccountAmino): MsgCreateVestingAccount { + return { + fromAddress: object.from_address, + toAddress: object.to_address, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [], + endTime: BigInt(object.end_time), + delayed: object.delayed + }; + }, + toAmino(message: MsgCreateVestingAccount): MsgCreateVestingAccountAmino { + const obj: any = {}; + obj.from_address = message.fromAddress; + obj.to_address = message.toAddress; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + obj.end_time = message.endTime ? message.endTime.toString() : undefined; + obj.delayed = message.delayed; + return obj; + }, + fromAminoMsg(object: MsgCreateVestingAccountAminoMsg): MsgCreateVestingAccount { + return MsgCreateVestingAccount.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateVestingAccount): MsgCreateVestingAccountAminoMsg { + return { + type: "cosmos-sdk/MsgCreateVestingAccount", + value: MsgCreateVestingAccount.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateVestingAccountProtoMsg): MsgCreateVestingAccount { + return MsgCreateVestingAccount.decode(message.value); + }, + toProto(message: MsgCreateVestingAccount): Uint8Array { + return MsgCreateVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateVestingAccount): MsgCreateVestingAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount", + value: MsgCreateVestingAccount.encode(message).finish() + }; } }; function createBaseMsgCreateVestingAccountResponse(): MsgCreateVestingAccountResponse { return {}; } export const MsgCreateVestingAccountResponse = { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse", encode(_: MsgCreateVestingAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -242,6 +287,34 @@ export const MsgCreateVestingAccountResponse = { toSDK(_: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateVestingAccountResponseAmino): MsgCreateVestingAccountResponse { + return {}; + }, + toAmino(_: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateVestingAccountResponseAminoMsg): MsgCreateVestingAccountResponse { + return MsgCreateVestingAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreateVestingAccountResponse", + value: MsgCreateVestingAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateVestingAccountResponseProtoMsg): MsgCreateVestingAccountResponse { + return MsgCreateVestingAccountResponse.decode(message.value); + }, + toProto(message: MsgCreateVestingAccountResponse): Uint8Array { + return MsgCreateVestingAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateVestingAccountResponse): MsgCreateVestingAccountResponseProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse", + value: MsgCreateVestingAccountResponse.encode(message).finish() + }; } }; function createBaseMsgCreatePermanentLockedAccount(): MsgCreatePermanentLockedAccount { @@ -252,6 +325,7 @@ function createBaseMsgCreatePermanentLockedAccount(): MsgCreatePermanentLockedAc }; } export const MsgCreatePermanentLockedAccount = { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount", encode(message: MsgCreatePermanentLockedAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); @@ -336,12 +410,52 @@ export const MsgCreatePermanentLockedAccount = { obj.amount = []; } return obj; + }, + fromAmino(object: MsgCreatePermanentLockedAccountAmino): MsgCreatePermanentLockedAccount { + return { + fromAddress: object.from_address, + toAddress: object.to_address, + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAmino { + const obj: any = {}; + obj.from_address = message.fromAddress; + obj.to_address = message.toAddress; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: MsgCreatePermanentLockedAccountAminoMsg): MsgCreatePermanentLockedAccount { + return MsgCreatePermanentLockedAccount.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountAminoMsg { + return { + type: "cosmos-sdk/MsgCreatePermanentLockedAccount", + value: MsgCreatePermanentLockedAccount.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreatePermanentLockedAccountProtoMsg): MsgCreatePermanentLockedAccount { + return MsgCreatePermanentLockedAccount.decode(message.value); + }, + toProto(message: MsgCreatePermanentLockedAccount): Uint8Array { + return MsgCreatePermanentLockedAccount.encode(message).finish(); + }, + toProtoMsg(message: MsgCreatePermanentLockedAccount): MsgCreatePermanentLockedAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount", + value: MsgCreatePermanentLockedAccount.encode(message).finish() + }; } }; function createBaseMsgCreatePermanentLockedAccountResponse(): MsgCreatePermanentLockedAccountResponse { return {}; } export const MsgCreatePermanentLockedAccountResponse = { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse", encode(_: MsgCreatePermanentLockedAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -379,6 +493,34 @@ export const MsgCreatePermanentLockedAccountResponse = { toSDK(_: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreatePermanentLockedAccountResponseAmino): MsgCreatePermanentLockedAccountResponse { + return {}; + }, + toAmino(_: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreatePermanentLockedAccountResponseAminoMsg): MsgCreatePermanentLockedAccountResponse { + return MsgCreatePermanentLockedAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreatePermanentLockedAccountResponse", + value: MsgCreatePermanentLockedAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreatePermanentLockedAccountResponseProtoMsg): MsgCreatePermanentLockedAccountResponse { + return MsgCreatePermanentLockedAccountResponse.decode(message.value); + }, + toProto(message: MsgCreatePermanentLockedAccountResponse): Uint8Array { + return MsgCreatePermanentLockedAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreatePermanentLockedAccountResponse): MsgCreatePermanentLockedAccountResponseProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse", + value: MsgCreatePermanentLockedAccountResponse.encode(message).finish() + }; } }; function createBaseMsgCreatePeriodicVestingAccount(): MsgCreatePeriodicVestingAccount { @@ -390,6 +532,7 @@ function createBaseMsgCreatePeriodicVestingAccount(): MsgCreatePeriodicVestingAc }; } export const MsgCreatePeriodicVestingAccount = { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount", encode(message: MsgCreatePeriodicVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); @@ -486,12 +629,54 @@ export const MsgCreatePeriodicVestingAccount = { obj.vesting_periods = []; } return obj; + }, + fromAmino(object: MsgCreatePeriodicVestingAccountAmino): MsgCreatePeriodicVestingAccount { + return { + fromAddress: object.from_address, + toAddress: object.to_address, + startTime: BigInt(object.start_time), + vestingPeriods: Array.isArray(object?.vesting_periods) ? object.vesting_periods.map((e: any) => Period.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgCreatePeriodicVestingAccount): MsgCreatePeriodicVestingAccountAmino { + const obj: any = {}; + obj.from_address = message.fromAddress; + obj.to_address = message.toAddress; + obj.start_time = message.startTime ? message.startTime.toString() : undefined; + if (message.vestingPeriods) { + obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); + } else { + obj.vesting_periods = []; + } + return obj; + }, + fromAminoMsg(object: MsgCreatePeriodicVestingAccountAminoMsg): MsgCreatePeriodicVestingAccount { + return MsgCreatePeriodicVestingAccount.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreatePeriodicVestingAccount): MsgCreatePeriodicVestingAccountAminoMsg { + return { + type: "cosmos-sdk/MsgCreatePeriodicVestingAccount", + value: MsgCreatePeriodicVestingAccount.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreatePeriodicVestingAccountProtoMsg): MsgCreatePeriodicVestingAccount { + return MsgCreatePeriodicVestingAccount.decode(message.value); + }, + toProto(message: MsgCreatePeriodicVestingAccount): Uint8Array { + return MsgCreatePeriodicVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: MsgCreatePeriodicVestingAccount): MsgCreatePeriodicVestingAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount", + value: MsgCreatePeriodicVestingAccount.encode(message).finish() + }; } }; function createBaseMsgCreatePeriodicVestingAccountResponse(): MsgCreatePeriodicVestingAccountResponse { return {}; } export const MsgCreatePeriodicVestingAccountResponse = { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse", encode(_: MsgCreatePeriodicVestingAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -529,5 +714,33 @@ export const MsgCreatePeriodicVestingAccountResponse = { toSDK(_: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreatePeriodicVestingAccountResponseAmino): MsgCreatePeriodicVestingAccountResponse { + return {}; + }, + toAmino(_: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreatePeriodicVestingAccountResponseAminoMsg): MsgCreatePeriodicVestingAccountResponse { + return MsgCreatePeriodicVestingAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreatePeriodicVestingAccountResponse", + value: MsgCreatePeriodicVestingAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreatePeriodicVestingAccountResponseProtoMsg): MsgCreatePeriodicVestingAccountResponse { + return MsgCreatePeriodicVestingAccountResponse.decode(message.value); + }, + toProto(message: MsgCreatePeriodicVestingAccountResponse): Uint8Array { + return MsgCreatePeriodicVestingAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreatePeriodicVestingAccountResponse): MsgCreatePeriodicVestingAccountResponseProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse", + value: MsgCreatePeriodicVestingAccountResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts index 5bbef3dc17..d7eaac7e1b 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos/vesting/v1beta1/vesting.ts @@ -115,6 +115,7 @@ function createBaseBaseVestingAccount(): BaseVestingAccount { }; } export const BaseVestingAccount = { + typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount", encode(message: BaseVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseAccount !== undefined) { BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim(); @@ -239,6 +240,57 @@ export const BaseVestingAccount = { } obj.end_time = message.endTime; return obj; + }, + fromAmino(object: BaseVestingAccountAmino): BaseVestingAccount { + return { + baseAccount: object?.base_account ? BaseAccount.fromAmino(object.base_account) : undefined, + originalVesting: Array.isArray(object?.original_vesting) ? object.original_vesting.map((e: any) => Coin.fromAmino(e)) : [], + delegatedFree: Array.isArray(object?.delegated_free) ? object.delegated_free.map((e: any) => Coin.fromAmino(e)) : [], + delegatedVesting: Array.isArray(object?.delegated_vesting) ? object.delegated_vesting.map((e: any) => Coin.fromAmino(e)) : [], + endTime: BigInt(object.end_time) + }; + }, + toAmino(message: BaseVestingAccount): BaseVestingAccountAmino { + const obj: any = {}; + obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; + if (message.originalVesting) { + obj.original_vesting = message.originalVesting.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.original_vesting = []; + } + if (message.delegatedFree) { + obj.delegated_free = message.delegatedFree.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.delegated_free = []; + } + if (message.delegatedVesting) { + obj.delegated_vesting = message.delegatedVesting.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.delegated_vesting = []; + } + obj.end_time = message.endTime ? message.endTime.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BaseVestingAccountAminoMsg): BaseVestingAccount { + return BaseVestingAccount.fromAmino(object.value); + }, + toAminoMsg(message: BaseVestingAccount): BaseVestingAccountAminoMsg { + return { + type: "cosmos-sdk/BaseVestingAccount", + value: BaseVestingAccount.toAmino(message) + }; + }, + fromProtoMsg(message: BaseVestingAccountProtoMsg): BaseVestingAccount { + return BaseVestingAccount.decode(message.value); + }, + toProto(message: BaseVestingAccount): Uint8Array { + return BaseVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: BaseVestingAccount): BaseVestingAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount", + value: BaseVestingAccount.encode(message).finish() + }; } }; function createBaseContinuousVestingAccount(): ContinuousVestingAccount { @@ -248,6 +300,7 @@ function createBaseContinuousVestingAccount(): ContinuousVestingAccount { }; } export const ContinuousVestingAccount = { + typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount", encode(message: ContinuousVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); @@ -312,6 +365,39 @@ export const ContinuousVestingAccount = { message.baseVestingAccount !== undefined && (obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toSDK(message.baseVestingAccount) : undefined); obj.start_time = message.startTime; return obj; + }, + fromAmino(object: ContinuousVestingAccountAmino): ContinuousVestingAccount { + return { + baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined, + startTime: BigInt(object.start_time) + }; + }, + toAmino(message: ContinuousVestingAccount): ContinuousVestingAccountAmino { + const obj: any = {}; + obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; + obj.start_time = message.startTime ? message.startTime.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ContinuousVestingAccountAminoMsg): ContinuousVestingAccount { + return ContinuousVestingAccount.fromAmino(object.value); + }, + toAminoMsg(message: ContinuousVestingAccount): ContinuousVestingAccountAminoMsg { + return { + type: "cosmos-sdk/ContinuousVestingAccount", + value: ContinuousVestingAccount.toAmino(message) + }; + }, + fromProtoMsg(message: ContinuousVestingAccountProtoMsg): ContinuousVestingAccount { + return ContinuousVestingAccount.decode(message.value); + }, + toProto(message: ContinuousVestingAccount): Uint8Array { + return ContinuousVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: ContinuousVestingAccount): ContinuousVestingAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount", + value: ContinuousVestingAccount.encode(message).finish() + }; } }; function createBaseDelayedVestingAccount(): DelayedVestingAccount { @@ -320,6 +406,7 @@ function createBaseDelayedVestingAccount(): DelayedVestingAccount { }; } export const DelayedVestingAccount = { + typeUrl: "/cosmos.vesting.v1beta1.DelayedVestingAccount", encode(message: DelayedVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); @@ -372,6 +459,37 @@ export const DelayedVestingAccount = { const obj: any = {}; message.baseVestingAccount !== undefined && (obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toSDK(message.baseVestingAccount) : undefined); return obj; + }, + fromAmino(object: DelayedVestingAccountAmino): DelayedVestingAccount { + return { + baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined + }; + }, + toAmino(message: DelayedVestingAccount): DelayedVestingAccountAmino { + const obj: any = {}; + obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; + return obj; + }, + fromAminoMsg(object: DelayedVestingAccountAminoMsg): DelayedVestingAccount { + return DelayedVestingAccount.fromAmino(object.value); + }, + toAminoMsg(message: DelayedVestingAccount): DelayedVestingAccountAminoMsg { + return { + type: "cosmos-sdk/DelayedVestingAccount", + value: DelayedVestingAccount.toAmino(message) + }; + }, + fromProtoMsg(message: DelayedVestingAccountProtoMsg): DelayedVestingAccount { + return DelayedVestingAccount.decode(message.value); + }, + toProto(message: DelayedVestingAccount): Uint8Array { + return DelayedVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: DelayedVestingAccount): DelayedVestingAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.DelayedVestingAccount", + value: DelayedVestingAccount.encode(message).finish() + }; } }; function createBasePeriod(): Period { @@ -381,6 +499,7 @@ function createBasePeriod(): Period { }; } export const Period = { + typeUrl: "/cosmos.vesting.v1beta1.Period", encode(message: Period, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.length !== BigInt(0)) { writer.uint32(8).int64(message.length); @@ -453,6 +572,43 @@ export const Period = { obj.amount = []; } return obj; + }, + fromAmino(object: PeriodAmino): Period { + return { + length: BigInt(object.length), + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Period): PeriodAmino { + const obj: any = {}; + obj.length = message.length ? message.length.toString() : undefined; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: PeriodAminoMsg): Period { + return Period.fromAmino(object.value); + }, + toAminoMsg(message: Period): PeriodAminoMsg { + return { + type: "cosmos-sdk/Period", + value: Period.toAmino(message) + }; + }, + fromProtoMsg(message: PeriodProtoMsg): Period { + return Period.decode(message.value); + }, + toProto(message: Period): Uint8Array { + return Period.encode(message).finish(); + }, + toProtoMsg(message: Period): PeriodProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.Period", + value: Period.encode(message).finish() + }; } }; function createBasePeriodicVestingAccount(): PeriodicVestingAccount { @@ -463,6 +619,7 @@ function createBasePeriodicVestingAccount(): PeriodicVestingAccount { }; } export const PeriodicVestingAccount = { + typeUrl: "/cosmos.vesting.v1beta1.PeriodicVestingAccount", encode(message: PeriodicVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); @@ -547,6 +704,45 @@ export const PeriodicVestingAccount = { obj.vesting_periods = []; } return obj; + }, + fromAmino(object: PeriodicVestingAccountAmino): PeriodicVestingAccount { + return { + baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined, + startTime: BigInt(object.start_time), + vestingPeriods: Array.isArray(object?.vesting_periods) ? object.vesting_periods.map((e: any) => Period.fromAmino(e)) : [] + }; + }, + toAmino(message: PeriodicVestingAccount): PeriodicVestingAccountAmino { + const obj: any = {}; + obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; + obj.start_time = message.startTime ? message.startTime.toString() : undefined; + if (message.vestingPeriods) { + obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); + } else { + obj.vesting_periods = []; + } + return obj; + }, + fromAminoMsg(object: PeriodicVestingAccountAminoMsg): PeriodicVestingAccount { + return PeriodicVestingAccount.fromAmino(object.value); + }, + toAminoMsg(message: PeriodicVestingAccount): PeriodicVestingAccountAminoMsg { + return { + type: "cosmos-sdk/PeriodicVestingAccount", + value: PeriodicVestingAccount.toAmino(message) + }; + }, + fromProtoMsg(message: PeriodicVestingAccountProtoMsg): PeriodicVestingAccount { + return PeriodicVestingAccount.decode(message.value); + }, + toProto(message: PeriodicVestingAccount): Uint8Array { + return PeriodicVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: PeriodicVestingAccount): PeriodicVestingAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.PeriodicVestingAccount", + value: PeriodicVestingAccount.encode(message).finish() + }; } }; function createBasePermanentLockedAccount(): PermanentLockedAccount { @@ -555,6 +751,7 @@ function createBasePermanentLockedAccount(): PermanentLockedAccount { }; } export const PermanentLockedAccount = { + typeUrl: "/cosmos.vesting.v1beta1.PermanentLockedAccount", encode(message: PermanentLockedAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); @@ -607,5 +804,36 @@ export const PermanentLockedAccount = { const obj: any = {}; message.baseVestingAccount !== undefined && (obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toSDK(message.baseVestingAccount) : undefined); return obj; + }, + fromAmino(object: PermanentLockedAccountAmino): PermanentLockedAccount { + return { + baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined + }; + }, + toAmino(message: PermanentLockedAccount): PermanentLockedAccountAmino { + const obj: any = {}; + obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; + return obj; + }, + fromAminoMsg(object: PermanentLockedAccountAminoMsg): PermanentLockedAccount { + return PermanentLockedAccount.fromAmino(object.value); + }, + toAminoMsg(message: PermanentLockedAccount): PermanentLockedAccountAminoMsg { + return { + type: "cosmos-sdk/PermanentLockedAccount", + value: PermanentLockedAccount.toAmino(message) + }; + }, + fromProtoMsg(message: PermanentLockedAccountProtoMsg): PermanentLockedAccount { + return PermanentLockedAccount.decode(message.value); + }, + toProto(message: PermanentLockedAccount): Uint8Array { + return PermanentLockedAccount.encode(message).finish(); + }, + toProtoMsg(message: PermanentLockedAccount): PermanentLockedAccountProtoMsg { + return { + typeUrl: "/cosmos.vesting.v1beta1.PermanentLockedAccount", + value: PermanentLockedAccount.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts index 9d7664ec4d..c802974c9c 100644 --- a/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputosmojs/cosmos_proto/cosmos.ts @@ -116,6 +116,7 @@ function createBaseInterfaceDescriptor(): InterfaceDescriptor { }; } export const InterfaceDescriptor = { + typeUrl: "/cosmos_proto.InterfaceDescriptor", encode(message: InterfaceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -180,6 +181,33 @@ export const InterfaceDescriptor = { obj.name = message.name; obj.description = message.description; return obj; + }, + fromAmino(object: InterfaceDescriptorAmino): InterfaceDescriptor { + return { + name: object.name, + description: object.description + }; + }, + toAmino(message: InterfaceDescriptor): InterfaceDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: InterfaceDescriptorAminoMsg): InterfaceDescriptor { + return InterfaceDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: InterfaceDescriptorProtoMsg): InterfaceDescriptor { + return InterfaceDescriptor.decode(message.value); + }, + toProto(message: InterfaceDescriptor): Uint8Array { + return InterfaceDescriptor.encode(message).finish(); + }, + toProtoMsg(message: InterfaceDescriptor): InterfaceDescriptorProtoMsg { + return { + typeUrl: "/cosmos_proto.InterfaceDescriptor", + value: InterfaceDescriptor.encode(message).finish() + }; } }; function createBaseScalarDescriptor(): ScalarDescriptor { @@ -190,6 +218,7 @@ function createBaseScalarDescriptor(): ScalarDescriptor { }; } export const ScalarDescriptor = { + typeUrl: "/cosmos_proto.ScalarDescriptor", encode(message: ScalarDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -283,5 +312,38 @@ export const ScalarDescriptor = { obj.field_type = []; } return obj; + }, + fromAmino(object: ScalarDescriptorAmino): ScalarDescriptor { + return { + name: object.name, + description: object.description, + fieldType: Array.isArray(object?.field_type) ? object.field_type.map((e: any) => scalarTypeFromJSON(e)) : [] + }; + }, + toAmino(message: ScalarDescriptor): ScalarDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + if (message.fieldType) { + obj.field_type = message.fieldType.map(e => scalarTypeToJSON(e)); + } else { + obj.field_type = []; + } + return obj; + }, + fromAminoMsg(object: ScalarDescriptorAminoMsg): ScalarDescriptor { + return ScalarDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: ScalarDescriptorProtoMsg): ScalarDescriptor { + return ScalarDescriptor.decode(message.value); + }, + toProto(message: ScalarDescriptor): Uint8Array { + return ScalarDescriptor.encode(message).finish(); + }, + toProtoMsg(message: ScalarDescriptor): ScalarDescriptorProtoMsg { + return { + typeUrl: "/cosmos_proto.ScalarDescriptor", + value: ScalarDescriptor.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts index 652203610c..fb1c397a42 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/authz.ts @@ -163,6 +163,7 @@ function createBaseContractExecutionAuthorization(): ContractExecutionAuthorizat }; } export const ContractExecutionAuthorization = { + typeUrl: "/cosmwasm.wasm.v1.ContractExecutionAuthorization", encode(message: ContractExecutionAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { ContractGrant.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -223,6 +224,41 @@ export const ContractExecutionAuthorization = { obj.grants = []; } return obj; + }, + fromAmino(object: ContractExecutionAuthorizationAmino): ContractExecutionAuthorization { + return { + grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => ContractGrant.fromAmino(e)) : [] + }; + }, + toAmino(message: ContractExecutionAuthorization): ContractExecutionAuthorizationAmino { + const obj: any = {}; + if (message.grants) { + obj.grants = message.grants.map(e => e ? ContractGrant.toAmino(e) : undefined); + } else { + obj.grants = []; + } + return obj; + }, + fromAminoMsg(object: ContractExecutionAuthorizationAminoMsg): ContractExecutionAuthorization { + return ContractExecutionAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: ContractExecutionAuthorization): ContractExecutionAuthorizationAminoMsg { + return { + type: "wasm/ContractExecutionAuthorization", + value: ContractExecutionAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: ContractExecutionAuthorizationProtoMsg): ContractExecutionAuthorization { + return ContractExecutionAuthorization.decode(message.value); + }, + toProto(message: ContractExecutionAuthorization): Uint8Array { + return ContractExecutionAuthorization.encode(message).finish(); + }, + toProtoMsg(message: ContractExecutionAuthorization): ContractExecutionAuthorizationProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ContractExecutionAuthorization", + value: ContractExecutionAuthorization.encode(message).finish() + }; } }; function createBaseContractMigrationAuthorization(): ContractMigrationAuthorization { @@ -231,6 +267,7 @@ function createBaseContractMigrationAuthorization(): ContractMigrationAuthorizat }; } export const ContractMigrationAuthorization = { + typeUrl: "/cosmwasm.wasm.v1.ContractMigrationAuthorization", encode(message: ContractMigrationAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { ContractGrant.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -291,6 +328,41 @@ export const ContractMigrationAuthorization = { obj.grants = []; } return obj; + }, + fromAmino(object: ContractMigrationAuthorizationAmino): ContractMigrationAuthorization { + return { + grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => ContractGrant.fromAmino(e)) : [] + }; + }, + toAmino(message: ContractMigrationAuthorization): ContractMigrationAuthorizationAmino { + const obj: any = {}; + if (message.grants) { + obj.grants = message.grants.map(e => e ? ContractGrant.toAmino(e) : undefined); + } else { + obj.grants = []; + } + return obj; + }, + fromAminoMsg(object: ContractMigrationAuthorizationAminoMsg): ContractMigrationAuthorization { + return ContractMigrationAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: ContractMigrationAuthorization): ContractMigrationAuthorizationAminoMsg { + return { + type: "wasm/ContractMigrationAuthorization", + value: ContractMigrationAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: ContractMigrationAuthorizationProtoMsg): ContractMigrationAuthorization { + return ContractMigrationAuthorization.decode(message.value); + }, + toProto(message: ContractMigrationAuthorization): Uint8Array { + return ContractMigrationAuthorization.encode(message).finish(); + }, + toProtoMsg(message: ContractMigrationAuthorization): ContractMigrationAuthorizationProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ContractMigrationAuthorization", + value: ContractMigrationAuthorization.encode(message).finish() + }; } }; function createBaseContractGrant(): ContractGrant { @@ -301,6 +373,7 @@ function createBaseContractGrant(): ContractGrant { }; } export const ContractGrant = { + typeUrl: "/cosmwasm.wasm.v1.ContractGrant", encode(message: ContractGrant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); @@ -377,6 +450,41 @@ export const ContractGrant = { message.limit !== undefined && (obj.limit = message.limit ? Any.toSDK(message.limit) : undefined); message.filter !== undefined && (obj.filter = message.filter ? Any.toSDK(message.filter) : undefined); return obj; + }, + fromAmino(object: ContractGrantAmino): ContractGrant { + return { + contract: object.contract, + limit: object?.limit ? Any.fromAmino(object.limit) : undefined, + filter: object?.filter ? Any.fromAmino(object.filter) : undefined + }; + }, + toAmino(message: ContractGrant): ContractGrantAmino { + const obj: any = {}; + obj.contract = message.contract; + obj.limit = message.limit ? Any.toAmino(message.limit) : undefined; + obj.filter = message.filter ? Any.toAmino(message.filter) : undefined; + return obj; + }, + fromAminoMsg(object: ContractGrantAminoMsg): ContractGrant { + return ContractGrant.fromAmino(object.value); + }, + toAminoMsg(message: ContractGrant): ContractGrantAminoMsg { + return { + type: "wasm/ContractGrant", + value: ContractGrant.toAmino(message) + }; + }, + fromProtoMsg(message: ContractGrantProtoMsg): ContractGrant { + return ContractGrant.decode(message.value); + }, + toProto(message: ContractGrant): Uint8Array { + return ContractGrant.encode(message).finish(); + }, + toProtoMsg(message: ContractGrant): ContractGrantProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ContractGrant", + value: ContractGrant.encode(message).finish() + }; } }; function createBaseMaxCallsLimit(): MaxCallsLimit { @@ -385,6 +493,7 @@ function createBaseMaxCallsLimit(): MaxCallsLimit { }; } export const MaxCallsLimit = { + typeUrl: "/cosmwasm.wasm.v1.MaxCallsLimit", encode(message: MaxCallsLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.remaining !== BigInt(0)) { writer.uint32(8).uint64(message.remaining); @@ -437,6 +546,37 @@ export const MaxCallsLimit = { const obj: any = {}; obj.remaining = message.remaining; return obj; + }, + fromAmino(object: MaxCallsLimitAmino): MaxCallsLimit { + return { + remaining: BigInt(object.remaining) + }; + }, + toAmino(message: MaxCallsLimit): MaxCallsLimitAmino { + const obj: any = {}; + obj.remaining = message.remaining ? message.remaining.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MaxCallsLimitAminoMsg): MaxCallsLimit { + return MaxCallsLimit.fromAmino(object.value); + }, + toAminoMsg(message: MaxCallsLimit): MaxCallsLimitAminoMsg { + return { + type: "wasm/MaxCallsLimit", + value: MaxCallsLimit.toAmino(message) + }; + }, + fromProtoMsg(message: MaxCallsLimitProtoMsg): MaxCallsLimit { + return MaxCallsLimit.decode(message.value); + }, + toProto(message: MaxCallsLimit): Uint8Array { + return MaxCallsLimit.encode(message).finish(); + }, + toProtoMsg(message: MaxCallsLimit): MaxCallsLimitProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MaxCallsLimit", + value: MaxCallsLimit.encode(message).finish() + }; } }; function createBaseMaxFundsLimit(): MaxFundsLimit { @@ -445,6 +585,7 @@ function createBaseMaxFundsLimit(): MaxFundsLimit { }; } export const MaxFundsLimit = { + typeUrl: "/cosmwasm.wasm.v1.MaxFundsLimit", encode(message: MaxFundsLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amounts) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -505,6 +646,41 @@ export const MaxFundsLimit = { obj.amounts = []; } return obj; + }, + fromAmino(object: MaxFundsLimitAmino): MaxFundsLimit { + return { + amounts: Array.isArray(object?.amounts) ? object.amounts.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MaxFundsLimit): MaxFundsLimitAmino { + const obj: any = {}; + if (message.amounts) { + obj.amounts = message.amounts.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amounts = []; + } + return obj; + }, + fromAminoMsg(object: MaxFundsLimitAminoMsg): MaxFundsLimit { + return MaxFundsLimit.fromAmino(object.value); + }, + toAminoMsg(message: MaxFundsLimit): MaxFundsLimitAminoMsg { + return { + type: "wasm/MaxFundsLimit", + value: MaxFundsLimit.toAmino(message) + }; + }, + fromProtoMsg(message: MaxFundsLimitProtoMsg): MaxFundsLimit { + return MaxFundsLimit.decode(message.value); + }, + toProto(message: MaxFundsLimit): Uint8Array { + return MaxFundsLimit.encode(message).finish(); + }, + toProtoMsg(message: MaxFundsLimit): MaxFundsLimitProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MaxFundsLimit", + value: MaxFundsLimit.encode(message).finish() + }; } }; function createBaseCombinedLimit(): CombinedLimit { @@ -514,6 +690,7 @@ function createBaseCombinedLimit(): CombinedLimit { }; } export const CombinedLimit = { + typeUrl: "/cosmwasm.wasm.v1.CombinedLimit", encode(message: CombinedLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.callsRemaining !== BigInt(0)) { writer.uint32(8).uint64(message.callsRemaining); @@ -586,12 +763,50 @@ export const CombinedLimit = { obj.amounts = []; } return obj; + }, + fromAmino(object: CombinedLimitAmino): CombinedLimit { + return { + callsRemaining: BigInt(object.calls_remaining), + amounts: Array.isArray(object?.amounts) ? object.amounts.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: CombinedLimit): CombinedLimitAmino { + const obj: any = {}; + obj.calls_remaining = message.callsRemaining ? message.callsRemaining.toString() : undefined; + if (message.amounts) { + obj.amounts = message.amounts.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amounts = []; + } + return obj; + }, + fromAminoMsg(object: CombinedLimitAminoMsg): CombinedLimit { + return CombinedLimit.fromAmino(object.value); + }, + toAminoMsg(message: CombinedLimit): CombinedLimitAminoMsg { + return { + type: "wasm/CombinedLimit", + value: CombinedLimit.toAmino(message) + }; + }, + fromProtoMsg(message: CombinedLimitProtoMsg): CombinedLimit { + return CombinedLimit.decode(message.value); + }, + toProto(message: CombinedLimit): Uint8Array { + return CombinedLimit.encode(message).finish(); + }, + toProtoMsg(message: CombinedLimit): CombinedLimitProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.CombinedLimit", + value: CombinedLimit.encode(message).finish() + }; } }; function createBaseAllowAllMessagesFilter(): AllowAllMessagesFilter { return {}; } export const AllowAllMessagesFilter = { + typeUrl: "/cosmwasm.wasm.v1.AllowAllMessagesFilter", encode(_: AllowAllMessagesFilter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -629,6 +844,34 @@ export const AllowAllMessagesFilter = { toSDK(_: AllowAllMessagesFilter): AllowAllMessagesFilterSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: AllowAllMessagesFilterAmino): AllowAllMessagesFilter { + return {}; + }, + toAmino(_: AllowAllMessagesFilter): AllowAllMessagesFilterAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: AllowAllMessagesFilterAminoMsg): AllowAllMessagesFilter { + return AllowAllMessagesFilter.fromAmino(object.value); + }, + toAminoMsg(message: AllowAllMessagesFilter): AllowAllMessagesFilterAminoMsg { + return { + type: "wasm/AllowAllMessagesFilter", + value: AllowAllMessagesFilter.toAmino(message) + }; + }, + fromProtoMsg(message: AllowAllMessagesFilterProtoMsg): AllowAllMessagesFilter { + return AllowAllMessagesFilter.decode(message.value); + }, + toProto(message: AllowAllMessagesFilter): Uint8Array { + return AllowAllMessagesFilter.encode(message).finish(); + }, + toProtoMsg(message: AllowAllMessagesFilter): AllowAllMessagesFilterProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.AllowAllMessagesFilter", + value: AllowAllMessagesFilter.encode(message).finish() + }; } }; function createBaseAcceptedMessageKeysFilter(): AcceptedMessageKeysFilter { @@ -637,6 +880,7 @@ function createBaseAcceptedMessageKeysFilter(): AcceptedMessageKeysFilter { }; } export const AcceptedMessageKeysFilter = { + typeUrl: "/cosmwasm.wasm.v1.AcceptedMessageKeysFilter", encode(message: AcceptedMessageKeysFilter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.keys) { writer.uint32(10).string(v!); @@ -697,6 +941,41 @@ export const AcceptedMessageKeysFilter = { obj.keys = []; } return obj; + }, + fromAmino(object: AcceptedMessageKeysFilterAmino): AcceptedMessageKeysFilter { + return { + keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => e) : [] + }; + }, + toAmino(message: AcceptedMessageKeysFilter): AcceptedMessageKeysFilterAmino { + const obj: any = {}; + if (message.keys) { + obj.keys = message.keys.map(e => e); + } else { + obj.keys = []; + } + return obj; + }, + fromAminoMsg(object: AcceptedMessageKeysFilterAminoMsg): AcceptedMessageKeysFilter { + return AcceptedMessageKeysFilter.fromAmino(object.value); + }, + toAminoMsg(message: AcceptedMessageKeysFilter): AcceptedMessageKeysFilterAminoMsg { + return { + type: "wasm/AcceptedMessageKeysFilter", + value: AcceptedMessageKeysFilter.toAmino(message) + }; + }, + fromProtoMsg(message: AcceptedMessageKeysFilterProtoMsg): AcceptedMessageKeysFilter { + return AcceptedMessageKeysFilter.decode(message.value); + }, + toProto(message: AcceptedMessageKeysFilter): Uint8Array { + return AcceptedMessageKeysFilter.encode(message).finish(); + }, + toProtoMsg(message: AcceptedMessageKeysFilter): AcceptedMessageKeysFilterProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.AcceptedMessageKeysFilter", + value: AcceptedMessageKeysFilter.encode(message).finish() + }; } }; function createBaseAcceptedMessagesFilter(): AcceptedMessagesFilter { @@ -705,6 +984,7 @@ function createBaseAcceptedMessagesFilter(): AcceptedMessagesFilter { }; } export const AcceptedMessagesFilter = { + typeUrl: "/cosmwasm.wasm.v1.AcceptedMessagesFilter", encode(message: AcceptedMessagesFilter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.messages) { writer.uint32(10).bytes(v!); @@ -765,5 +1045,40 @@ export const AcceptedMessagesFilter = { obj.messages = []; } return obj; + }, + fromAmino(object: AcceptedMessagesFilterAmino): AcceptedMessagesFilter { + return { + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => e) : [] + }; + }, + toAmino(message: AcceptedMessagesFilter): AcceptedMessagesFilterAmino { + const obj: any = {}; + if (message.messages) { + obj.messages = message.messages.map(e => e); + } else { + obj.messages = []; + } + return obj; + }, + fromAminoMsg(object: AcceptedMessagesFilterAminoMsg): AcceptedMessagesFilter { + return AcceptedMessagesFilter.fromAmino(object.value); + }, + toAminoMsg(message: AcceptedMessagesFilter): AcceptedMessagesFilterAminoMsg { + return { + type: "wasm/AcceptedMessagesFilter", + value: AcceptedMessagesFilter.toAmino(message) + }; + }, + fromProtoMsg(message: AcceptedMessagesFilterProtoMsg): AcceptedMessagesFilter { + return AcceptedMessagesFilter.decode(message.value); + }, + toProto(message: AcceptedMessagesFilter): Uint8Array { + return AcceptedMessagesFilter.encode(message).finish(); + }, + toProtoMsg(message: AcceptedMessagesFilter): AcceptedMessagesFilterProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.AcceptedMessagesFilter", + value: AcceptedMessagesFilter.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts index 4d0639eb11..5e69794dee 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/genesis.ts @@ -84,6 +84,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/cosmwasm.wasm.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -216,6 +217,61 @@ export const GenesisState = { obj.gen_msgs = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + codes: Array.isArray(object?.codes) ? object.codes.map((e: any) => Code.fromAmino(e)) : [], + contracts: Array.isArray(object?.contracts) ? object.contracts.map((e: any) => Contract.fromAmino(e)) : [], + sequences: Array.isArray(object?.sequences) ? object.sequences.map((e: any) => Sequence.fromAmino(e)) : [], + genMsgs: Array.isArray(object?.gen_msgs) ? object.gen_msgs.map((e: any) => GenesisState_GenMsgs.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.codes) { + obj.codes = message.codes.map(e => e ? Code.toAmino(e) : undefined); + } else { + obj.codes = []; + } + if (message.contracts) { + obj.contracts = message.contracts.map(e => e ? Contract.toAmino(e) : undefined); + } else { + obj.contracts = []; + } + if (message.sequences) { + obj.sequences = message.sequences.map(e => e ? Sequence.toAmino(e) : undefined); + } else { + obj.sequences = []; + } + if (message.genMsgs) { + obj.gen_msgs = message.genMsgs.map(e => e ? GenesisState_GenMsgs.toAmino(e) : undefined); + } else { + obj.gen_msgs = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "wasm/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseGenesisState_GenMsgs(): GenesisState_GenMsgs { @@ -226,6 +282,7 @@ function createBaseGenesisState_GenMsgs(): GenesisState_GenMsgs { }; } export const GenesisState_GenMsgs = { + typeUrl: "/cosmwasm.wasm.v1.GenMsgs", encode(message: GenesisState_GenMsgs, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.storeCode !== undefined) { MsgStoreCode.encode(message.storeCode, writer.uint32(10).fork()).ldelim(); @@ -302,6 +359,41 @@ export const GenesisState_GenMsgs = { message.instantiateContract !== undefined && (obj.instantiate_contract = message.instantiateContract ? MsgInstantiateContract.toSDK(message.instantiateContract) : undefined); message.executeContract !== undefined && (obj.execute_contract = message.executeContract ? MsgExecuteContract.toSDK(message.executeContract) : undefined); return obj; + }, + fromAmino(object: GenesisState_GenMsgsAmino): GenesisState_GenMsgs { + return { + storeCode: object?.store_code ? MsgStoreCode.fromAmino(object.store_code) : undefined, + instantiateContract: object?.instantiate_contract ? MsgInstantiateContract.fromAmino(object.instantiate_contract) : undefined, + executeContract: object?.execute_contract ? MsgExecuteContract.fromAmino(object.execute_contract) : undefined + }; + }, + toAmino(message: GenesisState_GenMsgs): GenesisState_GenMsgsAmino { + const obj: any = {}; + obj.store_code = message.storeCode ? MsgStoreCode.toAmino(message.storeCode) : undefined; + obj.instantiate_contract = message.instantiateContract ? MsgInstantiateContract.toAmino(message.instantiateContract) : undefined; + obj.execute_contract = message.executeContract ? MsgExecuteContract.toAmino(message.executeContract) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisState_GenMsgsAminoMsg): GenesisState_GenMsgs { + return GenesisState_GenMsgs.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState_GenMsgs): GenesisState_GenMsgsAminoMsg { + return { + type: "wasm/GenMsgs", + value: GenesisState_GenMsgs.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisState_GenMsgsProtoMsg): GenesisState_GenMsgs { + return GenesisState_GenMsgs.decode(message.value); + }, + toProto(message: GenesisState_GenMsgs): Uint8Array { + return GenesisState_GenMsgs.encode(message).finish(); + }, + toProtoMsg(message: GenesisState_GenMsgs): GenesisState_GenMsgsProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.GenMsgs", + value: GenesisState_GenMsgs.encode(message).finish() + }; } }; function createBaseCode(): Code { @@ -313,6 +405,7 @@ function createBaseCode(): Code { }; } export const Code = { + typeUrl: "/cosmwasm.wasm.v1.Code", encode(message: Code, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -401,6 +494,43 @@ export const Code = { obj.code_bytes = message.codeBytes; obj.pinned = message.pinned; return obj; + }, + fromAmino(object: CodeAmino): Code { + return { + codeId: BigInt(object.code_id), + codeInfo: object?.code_info ? CodeInfo.fromAmino(object.code_info) : undefined, + codeBytes: object.code_bytes, + pinned: object.pinned + }; + }, + toAmino(message: Code): CodeAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.code_info = message.codeInfo ? CodeInfo.toAmino(message.codeInfo) : undefined; + obj.code_bytes = message.codeBytes; + obj.pinned = message.pinned; + return obj; + }, + fromAminoMsg(object: CodeAminoMsg): Code { + return Code.fromAmino(object.value); + }, + toAminoMsg(message: Code): CodeAminoMsg { + return { + type: "wasm/Code", + value: Code.toAmino(message) + }; + }, + fromProtoMsg(message: CodeProtoMsg): Code { + return Code.decode(message.value); + }, + toProto(message: Code): Uint8Array { + return Code.encode(message).finish(); + }, + toProtoMsg(message: Code): CodeProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.Code", + value: Code.encode(message).finish() + }; } }; function createBaseContract(): Contract { @@ -411,6 +541,7 @@ function createBaseContract(): Contract { }; } export const Contract = { + typeUrl: "/cosmwasm.wasm.v1.Contract", encode(message: Contract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -495,6 +626,45 @@ export const Contract = { obj.contract_state = []; } return obj; + }, + fromAmino(object: ContractAmino): Contract { + return { + contractAddress: object.contract_address, + contractInfo: object?.contract_info ? ContractInfo.fromAmino(object.contract_info) : undefined, + contractState: Array.isArray(object?.contract_state) ? object.contract_state.map((e: any) => Model.fromAmino(e)) : [] + }; + }, + toAmino(message: Contract): ContractAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; + if (message.contractState) { + obj.contract_state = message.contractState.map(e => e ? Model.toAmino(e) : undefined); + } else { + obj.contract_state = []; + } + return obj; + }, + fromAminoMsg(object: ContractAminoMsg): Contract { + return Contract.fromAmino(object.value); + }, + toAminoMsg(message: Contract): ContractAminoMsg { + return { + type: "wasm/Contract", + value: Contract.toAmino(message) + }; + }, + fromProtoMsg(message: ContractProtoMsg): Contract { + return Contract.decode(message.value); + }, + toProto(message: Contract): Uint8Array { + return Contract.encode(message).finish(); + }, + toProtoMsg(message: Contract): ContractProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.Contract", + value: Contract.encode(message).finish() + }; } }; function createBaseSequence(): Sequence { @@ -504,6 +674,7 @@ function createBaseSequence(): Sequence { }; } export const Sequence = { + typeUrl: "/cosmwasm.wasm.v1.Sequence", encode(message: Sequence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.idKey.length !== 0) { writer.uint32(10).bytes(message.idKey); @@ -568,5 +739,38 @@ export const Sequence = { obj.id_key = message.idKey; obj.value = message.value; return obj; + }, + fromAmino(object: SequenceAmino): Sequence { + return { + idKey: object.id_key, + value: BigInt(object.value) + }; + }, + toAmino(message: Sequence): SequenceAmino { + const obj: any = {}; + obj.id_key = message.idKey; + obj.value = message.value ? message.value.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SequenceAminoMsg): Sequence { + return Sequence.fromAmino(object.value); + }, + toAminoMsg(message: Sequence): SequenceAminoMsg { + return { + type: "wasm/Sequence", + value: Sequence.toAmino(message) + }; + }, + fromProtoMsg(message: SequenceProtoMsg): Sequence { + return Sequence.decode(message.value); + }, + toProto(message: Sequence): Uint8Array { + return Sequence.encode(message).finish(); + }, + toProtoMsg(message: Sequence): SequenceProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.Sequence", + value: Sequence.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts index 428d301b74..105112803a 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/ibc.ts @@ -45,6 +45,7 @@ function createBaseMsgIBCSend(): MsgIBCSend { }; } export const MsgIBCSend = { + typeUrl: "/cosmwasm.wasm.v1.MsgIBCSend", encode(message: MsgIBCSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channel !== "") { writer.uint32(18).string(message.channel); @@ -133,6 +134,43 @@ export const MsgIBCSend = { obj.timeout_timestamp = message.timeoutTimestamp; obj.data = message.data; return obj; + }, + fromAmino(object: MsgIBCSendAmino): MsgIBCSend { + return { + channel: object.channel, + timeoutHeight: BigInt(object.timeout_height), + timeoutTimestamp: BigInt(object.timeout_timestamp), + data: object.data + }; + }, + toAmino(message: MsgIBCSend): MsgIBCSendAmino { + const obj: any = {}; + obj.channel = message.channel; + obj.timeout_height = message.timeoutHeight ? message.timeoutHeight.toString() : undefined; + obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: MsgIBCSendAminoMsg): MsgIBCSend { + return MsgIBCSend.fromAmino(object.value); + }, + toAminoMsg(message: MsgIBCSend): MsgIBCSendAminoMsg { + return { + type: "wasm/MsgIBCSend", + value: MsgIBCSend.toAmino(message) + }; + }, + fromProtoMsg(message: MsgIBCSendProtoMsg): MsgIBCSend { + return MsgIBCSend.decode(message.value); + }, + toProto(message: MsgIBCSend): Uint8Array { + return MsgIBCSend.encode(message).finish(); + }, + toProtoMsg(message: MsgIBCSend): MsgIBCSendProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgIBCSend", + value: MsgIBCSend.encode(message).finish() + }; } }; function createBaseMsgIBCCloseChannel(): MsgIBCCloseChannel { @@ -141,6 +179,7 @@ function createBaseMsgIBCCloseChannel(): MsgIBCCloseChannel { }; } export const MsgIBCCloseChannel = { + typeUrl: "/cosmwasm.wasm.v1.MsgIBCCloseChannel", encode(message: MsgIBCCloseChannel, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channel !== "") { writer.uint32(18).string(message.channel); @@ -193,5 +232,36 @@ export const MsgIBCCloseChannel = { const obj: any = {}; obj.channel = message.channel; return obj; + }, + fromAmino(object: MsgIBCCloseChannelAmino): MsgIBCCloseChannel { + return { + channel: object.channel + }; + }, + toAmino(message: MsgIBCCloseChannel): MsgIBCCloseChannelAmino { + const obj: any = {}; + obj.channel = message.channel; + return obj; + }, + fromAminoMsg(object: MsgIBCCloseChannelAminoMsg): MsgIBCCloseChannel { + return MsgIBCCloseChannel.fromAmino(object.value); + }, + toAminoMsg(message: MsgIBCCloseChannel): MsgIBCCloseChannelAminoMsg { + return { + type: "wasm/MsgIBCCloseChannel", + value: MsgIBCCloseChannel.toAmino(message) + }; + }, + fromProtoMsg(message: MsgIBCCloseChannelProtoMsg): MsgIBCCloseChannel { + return MsgIBCCloseChannel.decode(message.value); + }, + toProto(message: MsgIBCCloseChannel): Uint8Array { + return MsgIBCCloseChannel.encode(message).finish(); + }, + toProtoMsg(message: MsgIBCCloseChannel): MsgIBCCloseChannelProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgIBCCloseChannel", + value: MsgIBCCloseChannel.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts index 9bccbcea79..d7ee78345e 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/proposal.ts @@ -2,6 +2,7 @@ import { AccessConfig, AccessConfigSDKType } from "./types"; import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; +import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** StoreCodeProposal gov proposal content type to submit WASM code to the system */ export interface StoreCodeProposal { @@ -220,6 +221,7 @@ function createBaseStoreCodeProposal(): StoreCodeProposal { }; } export const StoreCodeProposal = { + typeUrl: "/cosmwasm.wasm.v1.StoreCodeProposal", encode(message: StoreCodeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -320,6 +322,45 @@ export const StoreCodeProposal = { obj.wasm_byte_code = message.wasmByteCode; message.instantiatePermission !== undefined && (obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toSDK(message.instantiatePermission) : undefined); return obj; + }, + fromAmino(object: StoreCodeProposalAmino): StoreCodeProposal { + return { + title: object.title, + description: object.description, + runAs: object.run_as, + wasmByteCode: fromBase64(object.wasm_byte_code), + instantiatePermission: object?.instantiate_permission ? AccessConfig.fromAmino(object.instantiate_permission) : undefined + }; + }, + toAmino(message: StoreCodeProposal): StoreCodeProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.run_as = message.runAs; + obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; + obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; + return obj; + }, + fromAminoMsg(object: StoreCodeProposalAminoMsg): StoreCodeProposal { + return StoreCodeProposal.fromAmino(object.value); + }, + toAminoMsg(message: StoreCodeProposal): StoreCodeProposalAminoMsg { + return { + type: "wasm/StoreCodeProposal", + value: StoreCodeProposal.toAmino(message) + }; + }, + fromProtoMsg(message: StoreCodeProposalProtoMsg): StoreCodeProposal { + return StoreCodeProposal.decode(message.value); + }, + toProto(message: StoreCodeProposal): Uint8Array { + return StoreCodeProposal.encode(message).finish(); + }, + toProtoMsg(message: StoreCodeProposal): StoreCodeProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.StoreCodeProposal", + value: StoreCodeProposal.encode(message).finish() + }; } }; function createBaseInstantiateContractProposal(): InstantiateContractProposal { @@ -335,6 +376,7 @@ function createBaseInstantiateContractProposal(): InstantiateContractProposal { }; } export const InstantiateContractProposal = { + typeUrl: "/cosmwasm.wasm.v1.InstantiateContractProposal", encode(message: InstantiateContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -479,6 +521,55 @@ export const InstantiateContractProposal = { obj.funds = []; } return obj; + }, + fromAmino(object: InstantiateContractProposalAmino): InstantiateContractProposal { + return { + title: object.title, + description: object.description, + runAs: object.run_as, + admin: object.admin, + codeId: BigInt(object.code_id), + label: object.label, + msg: toUtf8(JSON.stringify(object.msg)), + funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: InstantiateContractProposal): InstantiateContractProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.run_as = message.runAs; + obj.admin = message.admin; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.label = message.label; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + if (message.funds) { + obj.funds = message.funds.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.funds = []; + } + return obj; + }, + fromAminoMsg(object: InstantiateContractProposalAminoMsg): InstantiateContractProposal { + return InstantiateContractProposal.fromAmino(object.value); + }, + toAminoMsg(message: InstantiateContractProposal): InstantiateContractProposalAminoMsg { + return { + type: "wasm/InstantiateContractProposal", + value: InstantiateContractProposal.toAmino(message) + }; + }, + fromProtoMsg(message: InstantiateContractProposalProtoMsg): InstantiateContractProposal { + return InstantiateContractProposal.decode(message.value); + }, + toProto(message: InstantiateContractProposal): Uint8Array { + return InstantiateContractProposal.encode(message).finish(); + }, + toProtoMsg(message: InstantiateContractProposal): InstantiateContractProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.InstantiateContractProposal", + value: InstantiateContractProposal.encode(message).finish() + }; } }; function createBaseMigrateContractProposal(): MigrateContractProposal { @@ -491,6 +582,7 @@ function createBaseMigrateContractProposal(): MigrateContractProposal { }; } export const MigrateContractProposal = { + typeUrl: "/cosmwasm.wasm.v1.MigrateContractProposal", encode(message: MigrateContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -591,6 +683,45 @@ export const MigrateContractProposal = { obj.code_id = message.codeId; obj.msg = message.msg; return obj; + }, + fromAmino(object: MigrateContractProposalAmino): MigrateContractProposal { + return { + title: object.title, + description: object.description, + contract: object.contract, + codeId: BigInt(object.code_id), + msg: toUtf8(JSON.stringify(object.msg)) + }; + }, + toAmino(message: MigrateContractProposal): MigrateContractProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.contract = message.contract; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + return obj; + }, + fromAminoMsg(object: MigrateContractProposalAminoMsg): MigrateContractProposal { + return MigrateContractProposal.fromAmino(object.value); + }, + toAminoMsg(message: MigrateContractProposal): MigrateContractProposalAminoMsg { + return { + type: "wasm/MigrateContractProposal", + value: MigrateContractProposal.toAmino(message) + }; + }, + fromProtoMsg(message: MigrateContractProposalProtoMsg): MigrateContractProposal { + return MigrateContractProposal.decode(message.value); + }, + toProto(message: MigrateContractProposal): Uint8Array { + return MigrateContractProposal.encode(message).finish(); + }, + toProtoMsg(message: MigrateContractProposal): MigrateContractProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MigrateContractProposal", + value: MigrateContractProposal.encode(message).finish() + }; } }; function createBaseSudoContractProposal(): SudoContractProposal { @@ -602,6 +733,7 @@ function createBaseSudoContractProposal(): SudoContractProposal { }; } export const SudoContractProposal = { + typeUrl: "/cosmwasm.wasm.v1.SudoContractProposal", encode(message: SudoContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -690,6 +822,43 @@ export const SudoContractProposal = { obj.contract = message.contract; obj.msg = message.msg; return obj; + }, + fromAmino(object: SudoContractProposalAmino): SudoContractProposal { + return { + title: object.title, + description: object.description, + contract: object.contract, + msg: toUtf8(JSON.stringify(object.msg)) + }; + }, + toAmino(message: SudoContractProposal): SudoContractProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.contract = message.contract; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + return obj; + }, + fromAminoMsg(object: SudoContractProposalAminoMsg): SudoContractProposal { + return SudoContractProposal.fromAmino(object.value); + }, + toAminoMsg(message: SudoContractProposal): SudoContractProposalAminoMsg { + return { + type: "wasm/SudoContractProposal", + value: SudoContractProposal.toAmino(message) + }; + }, + fromProtoMsg(message: SudoContractProposalProtoMsg): SudoContractProposal { + return SudoContractProposal.decode(message.value); + }, + toProto(message: SudoContractProposal): Uint8Array { + return SudoContractProposal.encode(message).finish(); + }, + toProtoMsg(message: SudoContractProposal): SudoContractProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.SudoContractProposal", + value: SudoContractProposal.encode(message).finish() + }; } }; function createBaseExecuteContractProposal(): ExecuteContractProposal { @@ -703,6 +872,7 @@ function createBaseExecuteContractProposal(): ExecuteContractProposal { }; } export const ExecuteContractProposal = { + typeUrl: "/cosmwasm.wasm.v1.ExecuteContractProposal", encode(message: ExecuteContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -823,6 +993,51 @@ export const ExecuteContractProposal = { obj.funds = []; } return obj; + }, + fromAmino(object: ExecuteContractProposalAmino): ExecuteContractProposal { + return { + title: object.title, + description: object.description, + runAs: object.run_as, + contract: object.contract, + msg: toUtf8(JSON.stringify(object.msg)), + funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: ExecuteContractProposal): ExecuteContractProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.run_as = message.runAs; + obj.contract = message.contract; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + if (message.funds) { + obj.funds = message.funds.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.funds = []; + } + return obj; + }, + fromAminoMsg(object: ExecuteContractProposalAminoMsg): ExecuteContractProposal { + return ExecuteContractProposal.fromAmino(object.value); + }, + toAminoMsg(message: ExecuteContractProposal): ExecuteContractProposalAminoMsg { + return { + type: "wasm/ExecuteContractProposal", + value: ExecuteContractProposal.toAmino(message) + }; + }, + fromProtoMsg(message: ExecuteContractProposalProtoMsg): ExecuteContractProposal { + return ExecuteContractProposal.decode(message.value); + }, + toProto(message: ExecuteContractProposal): Uint8Array { + return ExecuteContractProposal.encode(message).finish(); + }, + toProtoMsg(message: ExecuteContractProposal): ExecuteContractProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ExecuteContractProposal", + value: ExecuteContractProposal.encode(message).finish() + }; } }; function createBaseUpdateAdminProposal(): UpdateAdminProposal { @@ -834,6 +1049,7 @@ function createBaseUpdateAdminProposal(): UpdateAdminProposal { }; } export const UpdateAdminProposal = { + typeUrl: "/cosmwasm.wasm.v1.UpdateAdminProposal", encode(message: UpdateAdminProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -922,6 +1138,43 @@ export const UpdateAdminProposal = { obj.new_admin = message.newAdmin; obj.contract = message.contract; return obj; + }, + fromAmino(object: UpdateAdminProposalAmino): UpdateAdminProposal { + return { + title: object.title, + description: object.description, + newAdmin: object.new_admin, + contract: object.contract + }; + }, + toAmino(message: UpdateAdminProposal): UpdateAdminProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.new_admin = message.newAdmin; + obj.contract = message.contract; + return obj; + }, + fromAminoMsg(object: UpdateAdminProposalAminoMsg): UpdateAdminProposal { + return UpdateAdminProposal.fromAmino(object.value); + }, + toAminoMsg(message: UpdateAdminProposal): UpdateAdminProposalAminoMsg { + return { + type: "wasm/UpdateAdminProposal", + value: UpdateAdminProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UpdateAdminProposalProtoMsg): UpdateAdminProposal { + return UpdateAdminProposal.decode(message.value); + }, + toProto(message: UpdateAdminProposal): Uint8Array { + return UpdateAdminProposal.encode(message).finish(); + }, + toProtoMsg(message: UpdateAdminProposal): UpdateAdminProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.UpdateAdminProposal", + value: UpdateAdminProposal.encode(message).finish() + }; } }; function createBaseClearAdminProposal(): ClearAdminProposal { @@ -932,6 +1185,7 @@ function createBaseClearAdminProposal(): ClearAdminProposal { }; } export const ClearAdminProposal = { + typeUrl: "/cosmwasm.wasm.v1.ClearAdminProposal", encode(message: ClearAdminProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -1008,6 +1262,41 @@ export const ClearAdminProposal = { obj.description = message.description; obj.contract = message.contract; return obj; + }, + fromAmino(object: ClearAdminProposalAmino): ClearAdminProposal { + return { + title: object.title, + description: object.description, + contract: object.contract + }; + }, + toAmino(message: ClearAdminProposal): ClearAdminProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.contract = message.contract; + return obj; + }, + fromAminoMsg(object: ClearAdminProposalAminoMsg): ClearAdminProposal { + return ClearAdminProposal.fromAmino(object.value); + }, + toAminoMsg(message: ClearAdminProposal): ClearAdminProposalAminoMsg { + return { + type: "wasm/ClearAdminProposal", + value: ClearAdminProposal.toAmino(message) + }; + }, + fromProtoMsg(message: ClearAdminProposalProtoMsg): ClearAdminProposal { + return ClearAdminProposal.decode(message.value); + }, + toProto(message: ClearAdminProposal): Uint8Array { + return ClearAdminProposal.encode(message).finish(); + }, + toProtoMsg(message: ClearAdminProposal): ClearAdminProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ClearAdminProposal", + value: ClearAdminProposal.encode(message).finish() + }; } }; function createBasePinCodesProposal(): PinCodesProposal { @@ -1018,6 +1307,7 @@ function createBasePinCodesProposal(): PinCodesProposal { }; } export const PinCodesProposal = { + typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal", encode(message: PinCodesProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -1111,6 +1401,45 @@ export const PinCodesProposal = { obj.code_ids = []; } return obj; + }, + fromAmino(object: PinCodesProposalAmino): PinCodesProposal { + return { + title: object.title, + description: object.description, + codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: PinCodesProposal): PinCodesProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.codeIds) { + obj.code_ids = message.codeIds.map(e => e.toString()); + } else { + obj.code_ids = []; + } + return obj; + }, + fromAminoMsg(object: PinCodesProposalAminoMsg): PinCodesProposal { + return PinCodesProposal.fromAmino(object.value); + }, + toAminoMsg(message: PinCodesProposal): PinCodesProposalAminoMsg { + return { + type: "wasm/PinCodesProposal", + value: PinCodesProposal.toAmino(message) + }; + }, + fromProtoMsg(message: PinCodesProposalProtoMsg): PinCodesProposal { + return PinCodesProposal.decode(message.value); + }, + toProto(message: PinCodesProposal): Uint8Array { + return PinCodesProposal.encode(message).finish(); + }, + toProtoMsg(message: PinCodesProposal): PinCodesProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal", + value: PinCodesProposal.encode(message).finish() + }; } }; function createBaseUnpinCodesProposal(): UnpinCodesProposal { @@ -1121,6 +1450,7 @@ function createBaseUnpinCodesProposal(): UnpinCodesProposal { }; } export const UnpinCodesProposal = { + typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal", encode(message: UnpinCodesProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -1214,5 +1544,44 @@ export const UnpinCodesProposal = { obj.code_ids = []; } return obj; + }, + fromAmino(object: UnpinCodesProposalAmino): UnpinCodesProposal { + return { + title: object.title, + description: object.description, + codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.codeIds) { + obj.code_ids = message.codeIds.map(e => e.toString()); + } else { + obj.code_ids = []; + } + return obj; + }, + fromAminoMsg(object: UnpinCodesProposalAminoMsg): UnpinCodesProposal { + return UnpinCodesProposal.fromAmino(object.value); + }, + toAminoMsg(message: UnpinCodesProposal): UnpinCodesProposalAminoMsg { + return { + type: "wasm/UnpinCodesProposal", + value: UnpinCodesProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UnpinCodesProposalProtoMsg): UnpinCodesProposal { + return UnpinCodesProposal.decode(message.value); + }, + toProto(message: UnpinCodesProposal): Uint8Array { + return UnpinCodesProposal.encode(message).finish(); + }, + toProtoMsg(message: UnpinCodesProposal): UnpinCodesProposalProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal", + value: UnpinCodesProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts index 72efd76441..60062c05f5 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/query.ts @@ -2,6 +2,7 @@ import { PageRequest, PageRequestSDKType, PageResponse, PageResponseSDKType } fr import { ContractInfo, ContractInfoSDKType, ContractCodeHistoryEntry, ContractCodeHistoryEntrySDKType, Model, ModelSDKType } from "./types"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; +import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** * QueryContractInfoRequest is the request type for the Query/ContractInfo RPC @@ -297,6 +298,7 @@ function createBaseQueryContractInfoRequest(): QueryContractInfoRequest { }; } export const QueryContractInfoRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoRequest", encode(message: QueryContractInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -349,6 +351,37 @@ export const QueryContractInfoRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryContractInfoRequestAmino): QueryContractInfoRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryContractInfoRequest): QueryContractInfoRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryContractInfoRequestAminoMsg): QueryContractInfoRequest { + return QueryContractInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryContractInfoRequest): QueryContractInfoRequestAminoMsg { + return { + type: "wasm/QueryContractInfoRequest", + value: QueryContractInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryContractInfoRequestProtoMsg): QueryContractInfoRequest { + return QueryContractInfoRequest.decode(message.value); + }, + toProto(message: QueryContractInfoRequest): Uint8Array { + return QueryContractInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryContractInfoRequest): QueryContractInfoRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoRequest", + value: QueryContractInfoRequest.encode(message).finish() + }; } }; function createBaseQueryContractInfoResponse(): QueryContractInfoResponse { @@ -358,6 +391,7 @@ function createBaseQueryContractInfoResponse(): QueryContractInfoResponse { }; } export const QueryContractInfoResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoResponse", encode(message: QueryContractInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -422,6 +456,39 @@ export const QueryContractInfoResponse = { obj.address = message.address; message.contractInfo !== undefined && (obj.contract_info = message.contractInfo ? ContractInfo.toSDK(message.contractInfo) : undefined); return obj; + }, + fromAmino(object: QueryContractInfoResponseAmino): QueryContractInfoResponse { + return { + address: object.address, + contractInfo: object?.contract_info ? ContractInfo.fromAmino(object.contract_info) : undefined + }; + }, + toAmino(message: QueryContractInfoResponse): QueryContractInfoResponseAmino { + const obj: any = {}; + obj.address = message.address; + obj.contract_info = message.contractInfo ? ContractInfo.toAmino(message.contractInfo) : undefined; + return obj; + }, + fromAminoMsg(object: QueryContractInfoResponseAminoMsg): QueryContractInfoResponse { + return QueryContractInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryContractInfoResponse): QueryContractInfoResponseAminoMsg { + return { + type: "wasm/QueryContractInfoResponse", + value: QueryContractInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryContractInfoResponseProtoMsg): QueryContractInfoResponse { + return QueryContractInfoResponse.decode(message.value); + }, + toProto(message: QueryContractInfoResponse): Uint8Array { + return QueryContractInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryContractInfoResponse): QueryContractInfoResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoResponse", + value: QueryContractInfoResponse.encode(message).finish() + }; } }; function createBaseQueryContractHistoryRequest(): QueryContractHistoryRequest { @@ -431,6 +498,7 @@ function createBaseQueryContractHistoryRequest(): QueryContractHistoryRequest { }; } export const QueryContractHistoryRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryRequest", encode(message: QueryContractHistoryRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -495,6 +563,39 @@ export const QueryContractHistoryRequest = { obj.address = message.address; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryContractHistoryRequestAmino): QueryContractHistoryRequest { + return { + address: object.address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryContractHistoryRequest): QueryContractHistoryRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryContractHistoryRequestAminoMsg): QueryContractHistoryRequest { + return QueryContractHistoryRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryContractHistoryRequest): QueryContractHistoryRequestAminoMsg { + return { + type: "wasm/QueryContractHistoryRequest", + value: QueryContractHistoryRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryContractHistoryRequestProtoMsg): QueryContractHistoryRequest { + return QueryContractHistoryRequest.decode(message.value); + }, + toProto(message: QueryContractHistoryRequest): Uint8Array { + return QueryContractHistoryRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryContractHistoryRequest): QueryContractHistoryRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryRequest", + value: QueryContractHistoryRequest.encode(message).finish() + }; } }; function createBaseQueryContractHistoryResponse(): QueryContractHistoryResponse { @@ -504,6 +605,7 @@ function createBaseQueryContractHistoryResponse(): QueryContractHistoryResponse }; } export const QueryContractHistoryResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryResponse", encode(message: QueryContractHistoryResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { ContractCodeHistoryEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -576,6 +678,43 @@ export const QueryContractHistoryResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryContractHistoryResponseAmino): QueryContractHistoryResponse { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => ContractCodeHistoryEntry.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryContractHistoryResponse): QueryContractHistoryResponseAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? ContractCodeHistoryEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryContractHistoryResponseAminoMsg): QueryContractHistoryResponse { + return QueryContractHistoryResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryContractHistoryResponse): QueryContractHistoryResponseAminoMsg { + return { + type: "wasm/QueryContractHistoryResponse", + value: QueryContractHistoryResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryContractHistoryResponseProtoMsg): QueryContractHistoryResponse { + return QueryContractHistoryResponse.decode(message.value); + }, + toProto(message: QueryContractHistoryResponse): Uint8Array { + return QueryContractHistoryResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryContractHistoryResponse): QueryContractHistoryResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryResponse", + value: QueryContractHistoryResponse.encode(message).finish() + }; } }; function createBaseQueryContractsByCodeRequest(): QueryContractsByCodeRequest { @@ -585,6 +724,7 @@ function createBaseQueryContractsByCodeRequest(): QueryContractsByCodeRequest { }; } export const QueryContractsByCodeRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeRequest", encode(message: QueryContractsByCodeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -649,6 +789,39 @@ export const QueryContractsByCodeRequest = { obj.code_id = message.codeId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryContractsByCodeRequestAmino): QueryContractsByCodeRequest { + return { + codeId: BigInt(object.code_id), + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryContractsByCodeRequestAminoMsg): QueryContractsByCodeRequest { + return QueryContractsByCodeRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestAminoMsg { + return { + type: "wasm/QueryContractsByCodeRequest", + value: QueryContractsByCodeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryContractsByCodeRequestProtoMsg): QueryContractsByCodeRequest { + return QueryContractsByCodeRequest.decode(message.value); + }, + toProto(message: QueryContractsByCodeRequest): Uint8Array { + return QueryContractsByCodeRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryContractsByCodeRequest): QueryContractsByCodeRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeRequest", + value: QueryContractsByCodeRequest.encode(message).finish() + }; } }; function createBaseQueryContractsByCodeResponse(): QueryContractsByCodeResponse { @@ -658,6 +831,7 @@ function createBaseQueryContractsByCodeResponse(): QueryContractsByCodeResponse }; } export const QueryContractsByCodeResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeResponse", encode(message: QueryContractsByCodeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.contracts) { writer.uint32(10).string(v!); @@ -730,6 +904,43 @@ export const QueryContractsByCodeResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryContractsByCodeResponseAmino): QueryContractsByCodeResponse { + return { + contracts: Array.isArray(object?.contracts) ? object.contracts.map((e: any) => e) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryContractsByCodeResponse): QueryContractsByCodeResponseAmino { + const obj: any = {}; + if (message.contracts) { + obj.contracts = message.contracts.map(e => e); + } else { + obj.contracts = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryContractsByCodeResponseAminoMsg): QueryContractsByCodeResponse { + return QueryContractsByCodeResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryContractsByCodeResponse): QueryContractsByCodeResponseAminoMsg { + return { + type: "wasm/QueryContractsByCodeResponse", + value: QueryContractsByCodeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryContractsByCodeResponseProtoMsg): QueryContractsByCodeResponse { + return QueryContractsByCodeResponse.decode(message.value); + }, + toProto(message: QueryContractsByCodeResponse): Uint8Array { + return QueryContractsByCodeResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryContractsByCodeResponse): QueryContractsByCodeResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeResponse", + value: QueryContractsByCodeResponse.encode(message).finish() + }; } }; function createBaseQueryAllContractStateRequest(): QueryAllContractStateRequest { @@ -739,6 +950,7 @@ function createBaseQueryAllContractStateRequest(): QueryAllContractStateRequest }; } export const QueryAllContractStateRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateRequest", encode(message: QueryAllContractStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -803,6 +1015,39 @@ export const QueryAllContractStateRequest = { obj.address = message.address; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllContractStateRequestAmino): QueryAllContractStateRequest { + return { + address: object.address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllContractStateRequest): QueryAllContractStateRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllContractStateRequestAminoMsg): QueryAllContractStateRequest { + return QueryAllContractStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllContractStateRequest): QueryAllContractStateRequestAminoMsg { + return { + type: "wasm/QueryAllContractStateRequest", + value: QueryAllContractStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllContractStateRequestProtoMsg): QueryAllContractStateRequest { + return QueryAllContractStateRequest.decode(message.value); + }, + toProto(message: QueryAllContractStateRequest): Uint8Array { + return QueryAllContractStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllContractStateRequest): QueryAllContractStateRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateRequest", + value: QueryAllContractStateRequest.encode(message).finish() + }; } }; function createBaseQueryAllContractStateResponse(): QueryAllContractStateResponse { @@ -812,6 +1057,7 @@ function createBaseQueryAllContractStateResponse(): QueryAllContractStateRespons }; } export const QueryAllContractStateResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateResponse", encode(message: QueryAllContractStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.models) { Model.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -884,6 +1130,43 @@ export const QueryAllContractStateResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllContractStateResponseAmino): QueryAllContractStateResponse { + return { + models: Array.isArray(object?.models) ? object.models.map((e: any) => Model.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllContractStateResponse): QueryAllContractStateResponseAmino { + const obj: any = {}; + if (message.models) { + obj.models = message.models.map(e => e ? Model.toAmino(e) : undefined); + } else { + obj.models = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllContractStateResponseAminoMsg): QueryAllContractStateResponse { + return QueryAllContractStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAllContractStateResponse): QueryAllContractStateResponseAminoMsg { + return { + type: "wasm/QueryAllContractStateResponse", + value: QueryAllContractStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAllContractStateResponseProtoMsg): QueryAllContractStateResponse { + return QueryAllContractStateResponse.decode(message.value); + }, + toProto(message: QueryAllContractStateResponse): Uint8Array { + return QueryAllContractStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllContractStateResponse): QueryAllContractStateResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateResponse", + value: QueryAllContractStateResponse.encode(message).finish() + }; } }; function createBaseQueryRawContractStateRequest(): QueryRawContractStateRequest { @@ -893,6 +1176,7 @@ function createBaseQueryRawContractStateRequest(): QueryRawContractStateRequest }; } export const QueryRawContractStateRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateRequest", encode(message: QueryRawContractStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -957,6 +1241,39 @@ export const QueryRawContractStateRequest = { obj.address = message.address; obj.query_data = message.queryData; return obj; + }, + fromAmino(object: QueryRawContractStateRequestAmino): QueryRawContractStateRequest { + return { + address: object.address, + queryData: object.query_data + }; + }, + toAmino(message: QueryRawContractStateRequest): QueryRawContractStateRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.query_data = message.queryData; + return obj; + }, + fromAminoMsg(object: QueryRawContractStateRequestAminoMsg): QueryRawContractStateRequest { + return QueryRawContractStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryRawContractStateRequest): QueryRawContractStateRequestAminoMsg { + return { + type: "wasm/QueryRawContractStateRequest", + value: QueryRawContractStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryRawContractStateRequestProtoMsg): QueryRawContractStateRequest { + return QueryRawContractStateRequest.decode(message.value); + }, + toProto(message: QueryRawContractStateRequest): Uint8Array { + return QueryRawContractStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryRawContractStateRequest): QueryRawContractStateRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateRequest", + value: QueryRawContractStateRequest.encode(message).finish() + }; } }; function createBaseQueryRawContractStateResponse(): QueryRawContractStateResponse { @@ -965,6 +1282,7 @@ function createBaseQueryRawContractStateResponse(): QueryRawContractStateRespons }; } export const QueryRawContractStateResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateResponse", encode(message: QueryRawContractStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); @@ -1017,6 +1335,37 @@ export const QueryRawContractStateResponse = { const obj: any = {}; obj.data = message.data; return obj; + }, + fromAmino(object: QueryRawContractStateResponseAmino): QueryRawContractStateResponse { + return { + data: object.data + }; + }, + toAmino(message: QueryRawContractStateResponse): QueryRawContractStateResponseAmino { + const obj: any = {}; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: QueryRawContractStateResponseAminoMsg): QueryRawContractStateResponse { + return QueryRawContractStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryRawContractStateResponse): QueryRawContractStateResponseAminoMsg { + return { + type: "wasm/QueryRawContractStateResponse", + value: QueryRawContractStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryRawContractStateResponseProtoMsg): QueryRawContractStateResponse { + return QueryRawContractStateResponse.decode(message.value); + }, + toProto(message: QueryRawContractStateResponse): Uint8Array { + return QueryRawContractStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryRawContractStateResponse): QueryRawContractStateResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateResponse", + value: QueryRawContractStateResponse.encode(message).finish() + }; } }; function createBaseQuerySmartContractStateRequest(): QuerySmartContractStateRequest { @@ -1026,6 +1375,7 @@ function createBaseQuerySmartContractStateRequest(): QuerySmartContractStateRequ }; } export const QuerySmartContractStateRequest = { + typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateRequest", encode(message: QuerySmartContractStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -1090,6 +1440,39 @@ export const QuerySmartContractStateRequest = { obj.address = message.address; obj.query_data = message.queryData; return obj; + }, + fromAmino(object: QuerySmartContractStateRequestAmino): QuerySmartContractStateRequest { + return { + address: object.address, + queryData: toUtf8(JSON.stringify(object.query_data)) + }; + }, + toAmino(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.query_data = message.queryData ? JSON.parse(fromUtf8(message.queryData)) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySmartContractStateRequestAminoMsg): QuerySmartContractStateRequest { + return QuerySmartContractStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestAminoMsg { + return { + type: "wasm/QuerySmartContractStateRequest", + value: QuerySmartContractStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySmartContractStateRequestProtoMsg): QuerySmartContractStateRequest { + return QuerySmartContractStateRequest.decode(message.value); + }, + toProto(message: QuerySmartContractStateRequest): Uint8Array { + return QuerySmartContractStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySmartContractStateRequest): QuerySmartContractStateRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateRequest", + value: QuerySmartContractStateRequest.encode(message).finish() + }; } }; function createBaseQuerySmartContractStateResponse(): QuerySmartContractStateResponse { @@ -1098,6 +1481,7 @@ function createBaseQuerySmartContractStateResponse(): QuerySmartContractStateRes }; } export const QuerySmartContractStateResponse = { + typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateResponse", encode(message: QuerySmartContractStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); @@ -1150,6 +1534,37 @@ export const QuerySmartContractStateResponse = { const obj: any = {}; obj.data = message.data; return obj; + }, + fromAmino(object: QuerySmartContractStateResponseAmino): QuerySmartContractStateResponse { + return { + data: toUtf8(JSON.stringify(object.data)) + }; + }, + toAmino(message: QuerySmartContractStateResponse): QuerySmartContractStateResponseAmino { + const obj: any = {}; + obj.data = message.data ? JSON.parse(fromUtf8(message.data)) : undefined; + return obj; + }, + fromAminoMsg(object: QuerySmartContractStateResponseAminoMsg): QuerySmartContractStateResponse { + return QuerySmartContractStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySmartContractStateResponse): QuerySmartContractStateResponseAminoMsg { + return { + type: "wasm/QuerySmartContractStateResponse", + value: QuerySmartContractStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySmartContractStateResponseProtoMsg): QuerySmartContractStateResponse { + return QuerySmartContractStateResponse.decode(message.value); + }, + toProto(message: QuerySmartContractStateResponse): Uint8Array { + return QuerySmartContractStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySmartContractStateResponse): QuerySmartContractStateResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateResponse", + value: QuerySmartContractStateResponse.encode(message).finish() + }; } }; function createBaseQueryCodeRequest(): QueryCodeRequest { @@ -1158,6 +1573,7 @@ function createBaseQueryCodeRequest(): QueryCodeRequest { }; } export const QueryCodeRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest", encode(message: QueryCodeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -1210,6 +1626,37 @@ export const QueryCodeRequest = { const obj: any = {}; obj.code_id = message.codeId; return obj; + }, + fromAmino(object: QueryCodeRequestAmino): QueryCodeRequest { + return { + codeId: BigInt(object.code_id) + }; + }, + toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryCodeRequestAminoMsg): QueryCodeRequest { + return QueryCodeRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCodeRequest): QueryCodeRequestAminoMsg { + return { + type: "wasm/QueryCodeRequest", + value: QueryCodeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCodeRequestProtoMsg): QueryCodeRequest { + return QueryCodeRequest.decode(message.value); + }, + toProto(message: QueryCodeRequest): Uint8Array { + return QueryCodeRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCodeRequest): QueryCodeRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest", + value: QueryCodeRequest.encode(message).finish() + }; } }; function createBaseCodeInfoResponse(): CodeInfoResponse { @@ -1220,6 +1667,7 @@ function createBaseCodeInfoResponse(): CodeInfoResponse { }; } export const CodeInfoResponse = { + typeUrl: "/cosmwasm.wasm.v1.CodeInfoResponse", encode(message: CodeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -1296,6 +1744,41 @@ export const CodeInfoResponse = { obj.creator = message.creator; obj.data_hash = message.dataHash; return obj; + }, + fromAmino(object: CodeInfoResponseAmino): CodeInfoResponse { + return { + codeId: BigInt(object.code_id), + creator: object.creator, + dataHash: object.data_hash + }; + }, + toAmino(message: CodeInfoResponse): CodeInfoResponseAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.creator = message.creator; + obj.data_hash = message.dataHash; + return obj; + }, + fromAminoMsg(object: CodeInfoResponseAminoMsg): CodeInfoResponse { + return CodeInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: CodeInfoResponse): CodeInfoResponseAminoMsg { + return { + type: "wasm/CodeInfoResponse", + value: CodeInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: CodeInfoResponseProtoMsg): CodeInfoResponse { + return CodeInfoResponse.decode(message.value); + }, + toProto(message: CodeInfoResponse): Uint8Array { + return CodeInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: CodeInfoResponse): CodeInfoResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.CodeInfoResponse", + value: CodeInfoResponse.encode(message).finish() + }; } }; function createBaseQueryCodeResponse(): QueryCodeResponse { @@ -1305,6 +1788,7 @@ function createBaseQueryCodeResponse(): QueryCodeResponse { }; } export const QueryCodeResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryCodeResponse", encode(message: QueryCodeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeInfo !== undefined) { CodeInfoResponse.encode(message.codeInfo, writer.uint32(10).fork()).ldelim(); @@ -1369,6 +1853,39 @@ export const QueryCodeResponse = { message.codeInfo !== undefined && (obj.code_info = message.codeInfo ? CodeInfoResponse.toSDK(message.codeInfo) : undefined); obj.data = message.data; return obj; + }, + fromAmino(object: QueryCodeResponseAmino): QueryCodeResponse { + return { + codeInfo: object?.code_info ? CodeInfoResponse.fromAmino(object.code_info) : undefined, + data: object.data + }; + }, + toAmino(message: QueryCodeResponse): QueryCodeResponseAmino { + const obj: any = {}; + obj.code_info = message.codeInfo ? CodeInfoResponse.toAmino(message.codeInfo) : undefined; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: QueryCodeResponseAminoMsg): QueryCodeResponse { + return QueryCodeResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCodeResponse): QueryCodeResponseAminoMsg { + return { + type: "wasm/QueryCodeResponse", + value: QueryCodeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCodeResponseProtoMsg): QueryCodeResponse { + return QueryCodeResponse.decode(message.value); + }, + toProto(message: QueryCodeResponse): Uint8Array { + return QueryCodeResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCodeResponse): QueryCodeResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryCodeResponse", + value: QueryCodeResponse.encode(message).finish() + }; } }; function createBaseQueryCodesRequest(): QueryCodesRequest { @@ -1377,6 +1894,7 @@ function createBaseQueryCodesRequest(): QueryCodesRequest { }; } export const QueryCodesRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryCodesRequest", encode(message: QueryCodesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -1429,6 +1947,37 @@ export const QueryCodesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryCodesRequestAmino): QueryCodesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryCodesRequest): QueryCodesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCodesRequestAminoMsg): QueryCodesRequest { + return QueryCodesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCodesRequest): QueryCodesRequestAminoMsg { + return { + type: "wasm/QueryCodesRequest", + value: QueryCodesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCodesRequestProtoMsg): QueryCodesRequest { + return QueryCodesRequest.decode(message.value); + }, + toProto(message: QueryCodesRequest): Uint8Array { + return QueryCodesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCodesRequest): QueryCodesRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryCodesRequest", + value: QueryCodesRequest.encode(message).finish() + }; } }; function createBaseQueryCodesResponse(): QueryCodesResponse { @@ -1438,6 +1987,7 @@ function createBaseQueryCodesResponse(): QueryCodesResponse { }; } export const QueryCodesResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryCodesResponse", encode(message: QueryCodesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.codeInfos) { CodeInfoResponse.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1510,6 +2060,43 @@ export const QueryCodesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryCodesResponseAmino): QueryCodesResponse { + return { + codeInfos: Array.isArray(object?.code_infos) ? object.code_infos.map((e: any) => CodeInfoResponse.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryCodesResponse): QueryCodesResponseAmino { + const obj: any = {}; + if (message.codeInfos) { + obj.code_infos = message.codeInfos.map(e => e ? CodeInfoResponse.toAmino(e) : undefined); + } else { + obj.code_infos = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCodesResponseAminoMsg): QueryCodesResponse { + return QueryCodesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCodesResponse): QueryCodesResponseAminoMsg { + return { + type: "wasm/QueryCodesResponse", + value: QueryCodesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCodesResponseProtoMsg): QueryCodesResponse { + return QueryCodesResponse.decode(message.value); + }, + toProto(message: QueryCodesResponse): Uint8Array { + return QueryCodesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCodesResponse): QueryCodesResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryCodesResponse", + value: QueryCodesResponse.encode(message).finish() + }; } }; function createBaseQueryPinnedCodesRequest(): QueryPinnedCodesRequest { @@ -1518,6 +2105,7 @@ function createBaseQueryPinnedCodesRequest(): QueryPinnedCodesRequest { }; } export const QueryPinnedCodesRequest = { + typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesRequest", encode(message: QueryPinnedCodesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim(); @@ -1570,6 +2158,37 @@ export const QueryPinnedCodesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPinnedCodesRequestAmino): QueryPinnedCodesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPinnedCodesRequest): QueryPinnedCodesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPinnedCodesRequestAminoMsg): QueryPinnedCodesRequest { + return QueryPinnedCodesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPinnedCodesRequest): QueryPinnedCodesRequestAminoMsg { + return { + type: "wasm/QueryPinnedCodesRequest", + value: QueryPinnedCodesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPinnedCodesRequestProtoMsg): QueryPinnedCodesRequest { + return QueryPinnedCodesRequest.decode(message.value); + }, + toProto(message: QueryPinnedCodesRequest): Uint8Array { + return QueryPinnedCodesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPinnedCodesRequest): QueryPinnedCodesRequestProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesRequest", + value: QueryPinnedCodesRequest.encode(message).finish() + }; } }; function createBaseQueryPinnedCodesResponse(): QueryPinnedCodesResponse { @@ -1579,6 +2198,7 @@ function createBaseQueryPinnedCodesResponse(): QueryPinnedCodesResponse { }; } export const QueryPinnedCodesResponse = { + typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesResponse", encode(message: QueryPinnedCodesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.codeIds) { @@ -1660,5 +2280,42 @@ export const QueryPinnedCodesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPinnedCodesResponseAmino): QueryPinnedCodesResponse { + return { + codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => BigInt(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPinnedCodesResponse): QueryPinnedCodesResponseAmino { + const obj: any = {}; + if (message.codeIds) { + obj.code_ids = message.codeIds.map(e => e.toString()); + } else { + obj.code_ids = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPinnedCodesResponseAminoMsg): QueryPinnedCodesResponse { + return QueryPinnedCodesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPinnedCodesResponse): QueryPinnedCodesResponseAminoMsg { + return { + type: "wasm/QueryPinnedCodesResponse", + value: QueryPinnedCodesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPinnedCodesResponseProtoMsg): QueryPinnedCodesResponse { + return QueryPinnedCodesResponse.decode(message.value); + }, + toProto(message: QueryPinnedCodesResponse): Uint8Array { + return QueryPinnedCodesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPinnedCodesResponse): QueryPinnedCodesResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesResponse", + value: QueryPinnedCodesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts index b7cad7dd64..a6225a4362 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/tx.ts @@ -2,6 +2,7 @@ import { AccessConfig, AccessConfigSDKType } from "./types"; import { Coin, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; +import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** MsgStoreCode submit Wasm code to the system */ export interface MsgStoreCode { @@ -172,6 +173,7 @@ function createBaseMsgStoreCode(): MsgStoreCode { }; } export const MsgStoreCode = { + typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode", encode(message: MsgStoreCode, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -248,6 +250,41 @@ export const MsgStoreCode = { obj.wasm_byte_code = message.wasmByteCode; message.instantiatePermission !== undefined && (obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toSDK(message.instantiatePermission) : undefined); return obj; + }, + fromAmino(object: MsgStoreCodeAmino): MsgStoreCode { + return { + sender: object.sender, + wasmByteCode: fromBase64(object.wasm_byte_code), + instantiatePermission: object?.instantiate_permission ? AccessConfig.fromAmino(object.instantiate_permission) : undefined + }; + }, + toAmino(message: MsgStoreCode): MsgStoreCodeAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.wasm_byte_code = message.wasmByteCode ? toBase64(message.wasmByteCode) : undefined; + obj.instantiate_permission = message.instantiatePermission ? AccessConfig.toAmino(message.instantiatePermission) : undefined; + return obj; + }, + fromAminoMsg(object: MsgStoreCodeAminoMsg): MsgStoreCode { + return MsgStoreCode.fromAmino(object.value); + }, + toAminoMsg(message: MsgStoreCode): MsgStoreCodeAminoMsg { + return { + type: "wasm/MsgStoreCode", + value: MsgStoreCode.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStoreCodeProtoMsg): MsgStoreCode { + return MsgStoreCode.decode(message.value); + }, + toProto(message: MsgStoreCode): Uint8Array { + return MsgStoreCode.encode(message).finish(); + }, + toProtoMsg(message: MsgStoreCode): MsgStoreCodeProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode", + value: MsgStoreCode.encode(message).finish() + }; } }; function createBaseMsgStoreCodeResponse(): MsgStoreCodeResponse { @@ -256,6 +293,7 @@ function createBaseMsgStoreCodeResponse(): MsgStoreCodeResponse { }; } export const MsgStoreCodeResponse = { + typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse", encode(message: MsgStoreCodeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -308,6 +346,37 @@ export const MsgStoreCodeResponse = { const obj: any = {}; obj.code_id = message.codeId; return obj; + }, + fromAmino(object: MsgStoreCodeResponseAmino): MsgStoreCodeResponse { + return { + codeId: BigInt(object.code_id) + }; + }, + toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgStoreCodeResponseAminoMsg): MsgStoreCodeResponse { + return MsgStoreCodeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgStoreCodeResponse): MsgStoreCodeResponseAminoMsg { + return { + type: "wasm/MsgStoreCodeResponse", + value: MsgStoreCodeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStoreCodeResponseProtoMsg): MsgStoreCodeResponse { + return MsgStoreCodeResponse.decode(message.value); + }, + toProto(message: MsgStoreCodeResponse): Uint8Array { + return MsgStoreCodeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgStoreCodeResponse): MsgStoreCodeResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse", + value: MsgStoreCodeResponse.encode(message).finish() + }; } }; function createBaseMsgInstantiateContract(): MsgInstantiateContract { @@ -321,6 +390,7 @@ function createBaseMsgInstantiateContract(): MsgInstantiateContract { }; } export const MsgInstantiateContract = { + typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract", encode(message: MsgInstantiateContract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -441,6 +511,51 @@ export const MsgInstantiateContract = { obj.funds = []; } return obj; + }, + fromAmino(object: MsgInstantiateContractAmino): MsgInstantiateContract { + return { + sender: object.sender, + admin: object.admin, + codeId: BigInt(object.code_id), + label: object.label, + msg: toUtf8(JSON.stringify(object.msg)), + funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgInstantiateContract): MsgInstantiateContractAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.admin = message.admin; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.label = message.label; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + if (message.funds) { + obj.funds = message.funds.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.funds = []; + } + return obj; + }, + fromAminoMsg(object: MsgInstantiateContractAminoMsg): MsgInstantiateContract { + return MsgInstantiateContract.fromAmino(object.value); + }, + toAminoMsg(message: MsgInstantiateContract): MsgInstantiateContractAminoMsg { + return { + type: "wasm/MsgInstantiateContract", + value: MsgInstantiateContract.toAmino(message) + }; + }, + fromProtoMsg(message: MsgInstantiateContractProtoMsg): MsgInstantiateContract { + return MsgInstantiateContract.decode(message.value); + }, + toProto(message: MsgInstantiateContract): Uint8Array { + return MsgInstantiateContract.encode(message).finish(); + }, + toProtoMsg(message: MsgInstantiateContract): MsgInstantiateContractProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract", + value: MsgInstantiateContract.encode(message).finish() + }; } }; function createBaseMsgInstantiateContractResponse(): MsgInstantiateContractResponse { @@ -450,6 +565,7 @@ function createBaseMsgInstantiateContractResponse(): MsgInstantiateContractRespo }; } export const MsgInstantiateContractResponse = { + typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContractResponse", encode(message: MsgInstantiateContractResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -514,6 +630,39 @@ export const MsgInstantiateContractResponse = { obj.address = message.address; obj.data = message.data; return obj; + }, + fromAmino(object: MsgInstantiateContractResponseAmino): MsgInstantiateContractResponse { + return { + address: object.address, + data: object.data + }; + }, + toAmino(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAmino { + const obj: any = {}; + obj.address = message.address; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: MsgInstantiateContractResponseAminoMsg): MsgInstantiateContractResponse { + return MsgInstantiateContractResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseAminoMsg { + return { + type: "wasm/MsgInstantiateContractResponse", + value: MsgInstantiateContractResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgInstantiateContractResponseProtoMsg): MsgInstantiateContractResponse { + return MsgInstantiateContractResponse.decode(message.value); + }, + toProto(message: MsgInstantiateContractResponse): Uint8Array { + return MsgInstantiateContractResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgInstantiateContractResponse): MsgInstantiateContractResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContractResponse", + value: MsgInstantiateContractResponse.encode(message).finish() + }; } }; function createBaseMsgExecuteContract(): MsgExecuteContract { @@ -525,6 +674,7 @@ function createBaseMsgExecuteContract(): MsgExecuteContract { }; } export const MsgExecuteContract = { + typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract", encode(message: MsgExecuteContract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -621,6 +771,47 @@ export const MsgExecuteContract = { obj.funds = []; } return obj; + }, + fromAmino(object: MsgExecuteContractAmino): MsgExecuteContract { + return { + sender: object.sender, + contract: object.contract, + msg: toUtf8(JSON.stringify(object.msg)), + funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgExecuteContract): MsgExecuteContractAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.contract = message.contract; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + if (message.funds) { + obj.funds = message.funds.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.funds = []; + } + return obj; + }, + fromAminoMsg(object: MsgExecuteContractAminoMsg): MsgExecuteContract { + return MsgExecuteContract.fromAmino(object.value); + }, + toAminoMsg(message: MsgExecuteContract): MsgExecuteContractAminoMsg { + return { + type: "wasm/MsgExecuteContract", + value: MsgExecuteContract.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecuteContractProtoMsg): MsgExecuteContract { + return MsgExecuteContract.decode(message.value); + }, + toProto(message: MsgExecuteContract): Uint8Array { + return MsgExecuteContract.encode(message).finish(); + }, + toProtoMsg(message: MsgExecuteContract): MsgExecuteContractProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract", + value: MsgExecuteContract.encode(message).finish() + }; } }; function createBaseMsgExecuteContractResponse(): MsgExecuteContractResponse { @@ -629,6 +820,7 @@ function createBaseMsgExecuteContractResponse(): MsgExecuteContractResponse { }; } export const MsgExecuteContractResponse = { + typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContractResponse", encode(message: MsgExecuteContractResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); @@ -681,6 +873,37 @@ export const MsgExecuteContractResponse = { const obj: any = {}; obj.data = message.data; return obj; + }, + fromAmino(object: MsgExecuteContractResponseAmino): MsgExecuteContractResponse { + return { + data: object.data + }; + }, + toAmino(message: MsgExecuteContractResponse): MsgExecuteContractResponseAmino { + const obj: any = {}; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: MsgExecuteContractResponseAminoMsg): MsgExecuteContractResponse { + return MsgExecuteContractResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExecuteContractResponse): MsgExecuteContractResponseAminoMsg { + return { + type: "wasm/MsgExecuteContractResponse", + value: MsgExecuteContractResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExecuteContractResponseProtoMsg): MsgExecuteContractResponse { + return MsgExecuteContractResponse.decode(message.value); + }, + toProto(message: MsgExecuteContractResponse): Uint8Array { + return MsgExecuteContractResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExecuteContractResponse): MsgExecuteContractResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContractResponse", + value: MsgExecuteContractResponse.encode(message).finish() + }; } }; function createBaseMsgMigrateContract(): MsgMigrateContract { @@ -692,6 +915,7 @@ function createBaseMsgMigrateContract(): MsgMigrateContract { }; } export const MsgMigrateContract = { + typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContract", encode(message: MsgMigrateContract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -780,6 +1004,43 @@ export const MsgMigrateContract = { obj.code_id = message.codeId; obj.msg = message.msg; return obj; + }, + fromAmino(object: MsgMigrateContractAmino): MsgMigrateContract { + return { + sender: object.sender, + contract: object.contract, + codeId: BigInt(object.code_id), + msg: toUtf8(JSON.stringify(object.msg)) + }; + }, + toAmino(message: MsgMigrateContract): MsgMigrateContractAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.contract = message.contract; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + return obj; + }, + fromAminoMsg(object: MsgMigrateContractAminoMsg): MsgMigrateContract { + return MsgMigrateContract.fromAmino(object.value); + }, + toAminoMsg(message: MsgMigrateContract): MsgMigrateContractAminoMsg { + return { + type: "wasm/MsgMigrateContract", + value: MsgMigrateContract.toAmino(message) + }; + }, + fromProtoMsg(message: MsgMigrateContractProtoMsg): MsgMigrateContract { + return MsgMigrateContract.decode(message.value); + }, + toProto(message: MsgMigrateContract): Uint8Array { + return MsgMigrateContract.encode(message).finish(); + }, + toProtoMsg(message: MsgMigrateContract): MsgMigrateContractProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContract", + value: MsgMigrateContract.encode(message).finish() + }; } }; function createBaseMsgMigrateContractResponse(): MsgMigrateContractResponse { @@ -788,6 +1049,7 @@ function createBaseMsgMigrateContractResponse(): MsgMigrateContractResponse { }; } export const MsgMigrateContractResponse = { + typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContractResponse", encode(message: MsgMigrateContractResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); @@ -840,6 +1102,37 @@ export const MsgMigrateContractResponse = { const obj: any = {}; obj.data = message.data; return obj; + }, + fromAmino(object: MsgMigrateContractResponseAmino): MsgMigrateContractResponse { + return { + data: object.data + }; + }, + toAmino(message: MsgMigrateContractResponse): MsgMigrateContractResponseAmino { + const obj: any = {}; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: MsgMigrateContractResponseAminoMsg): MsgMigrateContractResponse { + return MsgMigrateContractResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgMigrateContractResponse): MsgMigrateContractResponseAminoMsg { + return { + type: "wasm/MsgMigrateContractResponse", + value: MsgMigrateContractResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgMigrateContractResponseProtoMsg): MsgMigrateContractResponse { + return MsgMigrateContractResponse.decode(message.value); + }, + toProto(message: MsgMigrateContractResponse): Uint8Array { + return MsgMigrateContractResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgMigrateContractResponse): MsgMigrateContractResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContractResponse", + value: MsgMigrateContractResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateAdmin(): MsgUpdateAdmin { @@ -850,6 +1143,7 @@ function createBaseMsgUpdateAdmin(): MsgUpdateAdmin { }; } export const MsgUpdateAdmin = { + typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdmin", encode(message: MsgUpdateAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -926,12 +1220,48 @@ export const MsgUpdateAdmin = { obj.new_admin = message.newAdmin; obj.contract = message.contract; return obj; + }, + fromAmino(object: MsgUpdateAdminAmino): MsgUpdateAdmin { + return { + sender: object.sender, + newAdmin: object.new_admin, + contract: object.contract + }; + }, + toAmino(message: MsgUpdateAdmin): MsgUpdateAdminAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.new_admin = message.newAdmin; + obj.contract = message.contract; + return obj; + }, + fromAminoMsg(object: MsgUpdateAdminAminoMsg): MsgUpdateAdmin { + return MsgUpdateAdmin.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateAdmin): MsgUpdateAdminAminoMsg { + return { + type: "wasm/MsgUpdateAdmin", + value: MsgUpdateAdmin.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateAdminProtoMsg): MsgUpdateAdmin { + return MsgUpdateAdmin.decode(message.value); + }, + toProto(message: MsgUpdateAdmin): Uint8Array { + return MsgUpdateAdmin.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateAdmin): MsgUpdateAdminProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdmin", + value: MsgUpdateAdmin.encode(message).finish() + }; } }; function createBaseMsgUpdateAdminResponse(): MsgUpdateAdminResponse { return {}; } export const MsgUpdateAdminResponse = { + typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdminResponse", encode(_: MsgUpdateAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -969,6 +1299,34 @@ export const MsgUpdateAdminResponse = { toSDK(_: MsgUpdateAdminResponse): MsgUpdateAdminResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateAdminResponseAmino): MsgUpdateAdminResponse { + return {}; + }, + toAmino(_: MsgUpdateAdminResponse): MsgUpdateAdminResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateAdminResponseAminoMsg): MsgUpdateAdminResponse { + return MsgUpdateAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateAdminResponse): MsgUpdateAdminResponseAminoMsg { + return { + type: "wasm/MsgUpdateAdminResponse", + value: MsgUpdateAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateAdminResponseProtoMsg): MsgUpdateAdminResponse { + return MsgUpdateAdminResponse.decode(message.value); + }, + toProto(message: MsgUpdateAdminResponse): Uint8Array { + return MsgUpdateAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateAdminResponse): MsgUpdateAdminResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdminResponse", + value: MsgUpdateAdminResponse.encode(message).finish() + }; } }; function createBaseMsgClearAdmin(): MsgClearAdmin { @@ -978,6 +1336,7 @@ function createBaseMsgClearAdmin(): MsgClearAdmin { }; } export const MsgClearAdmin = { + typeUrl: "/cosmwasm.wasm.v1.MsgClearAdmin", encode(message: MsgClearAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -1042,12 +1401,46 @@ export const MsgClearAdmin = { obj.sender = message.sender; obj.contract = message.contract; return obj; + }, + fromAmino(object: MsgClearAdminAmino): MsgClearAdmin { + return { + sender: object.sender, + contract: object.contract + }; + }, + toAmino(message: MsgClearAdmin): MsgClearAdminAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.contract = message.contract; + return obj; + }, + fromAminoMsg(object: MsgClearAdminAminoMsg): MsgClearAdmin { + return MsgClearAdmin.fromAmino(object.value); + }, + toAminoMsg(message: MsgClearAdmin): MsgClearAdminAminoMsg { + return { + type: "wasm/MsgClearAdmin", + value: MsgClearAdmin.toAmino(message) + }; + }, + fromProtoMsg(message: MsgClearAdminProtoMsg): MsgClearAdmin { + return MsgClearAdmin.decode(message.value); + }, + toProto(message: MsgClearAdmin): Uint8Array { + return MsgClearAdmin.encode(message).finish(); + }, + toProtoMsg(message: MsgClearAdmin): MsgClearAdminProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgClearAdmin", + value: MsgClearAdmin.encode(message).finish() + }; } }; function createBaseMsgClearAdminResponse(): MsgClearAdminResponse { return {}; } export const MsgClearAdminResponse = { + typeUrl: "/cosmwasm.wasm.v1.MsgClearAdminResponse", encode(_: MsgClearAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1085,5 +1478,33 @@ export const MsgClearAdminResponse = { toSDK(_: MsgClearAdminResponse): MsgClearAdminResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgClearAdminResponseAmino): MsgClearAdminResponse { + return {}; + }, + toAmino(_: MsgClearAdminResponse): MsgClearAdminResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgClearAdminResponseAminoMsg): MsgClearAdminResponse { + return MsgClearAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgClearAdminResponse): MsgClearAdminResponseAminoMsg { + return { + type: "wasm/MsgClearAdminResponse", + value: MsgClearAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgClearAdminResponseProtoMsg): MsgClearAdminResponse { + return MsgClearAdminResponse.decode(message.value); + }, + toProto(message: MsgClearAdminResponse): Uint8Array { + return MsgClearAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgClearAdminResponse): MsgClearAdminResponseProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.MsgClearAdminResponse", + value: MsgClearAdminResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts index bdb3bb2a79..cbf707b4d0 100644 --- a/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputosmojs/cosmwasm/wasm/v1/types.ts @@ -1,6 +1,7 @@ import { Any, AnySDKType } from "../../../google/protobuf/any"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; +import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** AccessType permission types */ export enum AccessType { @@ -231,6 +232,7 @@ function createBaseAccessTypeParam(): AccessTypeParam { }; } export const AccessTypeParam = { + typeUrl: "/cosmwasm.wasm.v1.AccessTypeParam", encode(message: AccessTypeParam, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(8).int32(message.value); @@ -283,6 +285,37 @@ export const AccessTypeParam = { const obj: any = {}; message.value !== undefined && (obj.value = accessTypeToJSON(message.value)); return obj; + }, + fromAmino(object: AccessTypeParamAmino): AccessTypeParam { + return { + value: isSet(object.value) ? accessTypeFromJSON(object.value) : -1 + }; + }, + toAmino(message: AccessTypeParam): AccessTypeParamAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AccessTypeParamAminoMsg): AccessTypeParam { + return AccessTypeParam.fromAmino(object.value); + }, + toAminoMsg(message: AccessTypeParam): AccessTypeParamAminoMsg { + return { + type: "wasm/AccessTypeParam", + value: AccessTypeParam.toAmino(message) + }; + }, + fromProtoMsg(message: AccessTypeParamProtoMsg): AccessTypeParam { + return AccessTypeParam.decode(message.value); + }, + toProto(message: AccessTypeParam): Uint8Array { + return AccessTypeParam.encode(message).finish(); + }, + toProtoMsg(message: AccessTypeParam): AccessTypeParamProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.AccessTypeParam", + value: AccessTypeParam.encode(message).finish() + }; } }; function createBaseAccessConfig(): AccessConfig { @@ -292,6 +325,7 @@ function createBaseAccessConfig(): AccessConfig { }; } export const AccessConfig = { + typeUrl: "/cosmwasm.wasm.v1.AccessConfig", encode(message: AccessConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.permission !== 0) { writer.uint32(8).int32(message.permission); @@ -356,6 +390,39 @@ export const AccessConfig = { message.permission !== undefined && (obj.permission = accessTypeToJSON(message.permission)); obj.address = message.address; return obj; + }, + fromAmino(object: AccessConfigAmino): AccessConfig { + return { + permission: isSet(object.permission) ? accessTypeFromJSON(object.permission) : -1, + address: object.address + }; + }, + toAmino(message: AccessConfig): AccessConfigAmino { + const obj: any = {}; + obj.permission = message.permission; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: AccessConfigAminoMsg): AccessConfig { + return AccessConfig.fromAmino(object.value); + }, + toAminoMsg(message: AccessConfig): AccessConfigAminoMsg { + return { + type: "wasm/AccessConfig", + value: AccessConfig.toAmino(message) + }; + }, + fromProtoMsg(message: AccessConfigProtoMsg): AccessConfig { + return AccessConfig.decode(message.value); + }, + toProto(message: AccessConfig): Uint8Array { + return AccessConfig.encode(message).finish(); + }, + toProtoMsg(message: AccessConfig): AccessConfigProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.AccessConfig", + value: AccessConfig.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -366,6 +433,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/cosmwasm.wasm.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeUploadAccess !== undefined) { AccessConfig.encode(message.codeUploadAccess, writer.uint32(10).fork()).ldelim(); @@ -442,6 +510,41 @@ export const Params = { message.instantiateDefaultPermission !== undefined && (obj.instantiate_default_permission = accessTypeToJSON(message.instantiateDefaultPermission)); obj.max_wasm_code_size = message.maxWasmCodeSize; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + codeUploadAccess: object?.code_upload_access ? AccessConfig.fromAmino(object.code_upload_access) : undefined, + instantiateDefaultPermission: isSet(object.instantiate_default_permission) ? accessTypeFromJSON(object.instantiate_default_permission) : -1, + maxWasmCodeSize: BigInt(object.max_wasm_code_size) + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.code_upload_access = message.codeUploadAccess ? AccessConfig.toAmino(message.codeUploadAccess) : undefined; + obj.instantiate_default_permission = message.instantiateDefaultPermission; + obj.max_wasm_code_size = message.maxWasmCodeSize ? message.maxWasmCodeSize.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "wasm/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseCodeInfo(): CodeInfo { @@ -452,6 +555,7 @@ function createBaseCodeInfo(): CodeInfo { }; } export const CodeInfo = { + typeUrl: "/cosmwasm.wasm.v1.CodeInfo", encode(message: CodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeHash.length !== 0) { writer.uint32(10).bytes(message.codeHash); @@ -528,6 +632,41 @@ export const CodeInfo = { obj.creator = message.creator; message.instantiateConfig !== undefined && (obj.instantiate_config = message.instantiateConfig ? AccessConfig.toSDK(message.instantiateConfig) : undefined); return obj; + }, + fromAmino(object: CodeInfoAmino): CodeInfo { + return { + codeHash: object.code_hash, + creator: object.creator, + instantiateConfig: object?.instantiate_config ? AccessConfig.fromAmino(object.instantiate_config) : undefined + }; + }, + toAmino(message: CodeInfo): CodeInfoAmino { + const obj: any = {}; + obj.code_hash = message.codeHash; + obj.creator = message.creator; + obj.instantiate_config = message.instantiateConfig ? AccessConfig.toAmino(message.instantiateConfig) : undefined; + return obj; + }, + fromAminoMsg(object: CodeInfoAminoMsg): CodeInfo { + return CodeInfo.fromAmino(object.value); + }, + toAminoMsg(message: CodeInfo): CodeInfoAminoMsg { + return { + type: "wasm/CodeInfo", + value: CodeInfo.toAmino(message) + }; + }, + fromProtoMsg(message: CodeInfoProtoMsg): CodeInfo { + return CodeInfo.decode(message.value); + }, + toProto(message: CodeInfo): Uint8Array { + return CodeInfo.encode(message).finish(); + }, + toProtoMsg(message: CodeInfo): CodeInfoProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.CodeInfo", + value: CodeInfo.encode(message).finish() + }; } }; function createBaseContractInfo(): ContractInfo { @@ -542,6 +681,7 @@ function createBaseContractInfo(): ContractInfo { }; } export const ContractInfo = { + typeUrl: "/cosmwasm.wasm.v1.ContractInfo", encode(message: ContractInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -666,6 +806,49 @@ export const ContractInfo = { obj.ibc_port_id = message.ibcPortId; message.extension !== undefined && (obj.extension = message.extension ? Any.toSDK(message.extension) : undefined); return obj; + }, + fromAmino(object: ContractInfoAmino): ContractInfo { + return { + codeId: BigInt(object.code_id), + creator: object.creator, + admin: object.admin, + label: object.label, + created: object?.created ? AbsoluteTxPosition.fromAmino(object.created) : undefined, + ibcPortId: object.ibc_port_id, + extension: object?.extension ? Any.fromAmino(object.extension) : undefined + }; + }, + toAmino(message: ContractInfo): ContractInfoAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.creator = message.creator; + obj.admin = message.admin; + obj.label = message.label; + obj.created = message.created ? AbsoluteTxPosition.toAmino(message.created) : undefined; + obj.ibc_port_id = message.ibcPortId; + obj.extension = message.extension ? Any.toAmino(message.extension) : undefined; + return obj; + }, + fromAminoMsg(object: ContractInfoAminoMsg): ContractInfo { + return ContractInfo.fromAmino(object.value); + }, + toAminoMsg(message: ContractInfo): ContractInfoAminoMsg { + return { + type: "wasm/ContractInfo", + value: ContractInfo.toAmino(message) + }; + }, + fromProtoMsg(message: ContractInfoProtoMsg): ContractInfo { + return ContractInfo.decode(message.value); + }, + toProto(message: ContractInfo): Uint8Array { + return ContractInfo.encode(message).finish(); + }, + toProtoMsg(message: ContractInfo): ContractInfoProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ContractInfo", + value: ContractInfo.encode(message).finish() + }; } }; function createBaseContractCodeHistoryEntry(): ContractCodeHistoryEntry { @@ -677,6 +860,7 @@ function createBaseContractCodeHistoryEntry(): ContractCodeHistoryEntry { }; } export const ContractCodeHistoryEntry = { + typeUrl: "/cosmwasm.wasm.v1.ContractCodeHistoryEntry", encode(message: ContractCodeHistoryEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operation !== 0) { writer.uint32(8).int32(message.operation); @@ -765,6 +949,43 @@ export const ContractCodeHistoryEntry = { message.updated !== undefined && (obj.updated = message.updated ? AbsoluteTxPosition.toSDK(message.updated) : undefined); obj.msg = message.msg; return obj; + }, + fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { + return { + operation: isSet(object.operation) ? contractCodeHistoryOperationTypeFromJSON(object.operation) : -1, + codeId: BigInt(object.code_id), + updated: object?.updated ? AbsoluteTxPosition.fromAmino(object.updated) : undefined, + msg: toUtf8(JSON.stringify(object.msg)) + }; + }, + toAmino(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAmino { + const obj: any = {}; + obj.operation = message.operation; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.updated = message.updated ? AbsoluteTxPosition.toAmino(message.updated) : undefined; + obj.msg = message.msg ? JSON.parse(fromUtf8(message.msg)) : undefined; + return obj; + }, + fromAminoMsg(object: ContractCodeHistoryEntryAminoMsg): ContractCodeHistoryEntry { + return ContractCodeHistoryEntry.fromAmino(object.value); + }, + toAminoMsg(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryAminoMsg { + return { + type: "wasm/ContractCodeHistoryEntry", + value: ContractCodeHistoryEntry.toAmino(message) + }; + }, + fromProtoMsg(message: ContractCodeHistoryEntryProtoMsg): ContractCodeHistoryEntry { + return ContractCodeHistoryEntry.decode(message.value); + }, + toProto(message: ContractCodeHistoryEntry): Uint8Array { + return ContractCodeHistoryEntry.encode(message).finish(); + }, + toProtoMsg(message: ContractCodeHistoryEntry): ContractCodeHistoryEntryProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.ContractCodeHistoryEntry", + value: ContractCodeHistoryEntry.encode(message).finish() + }; } }; function createBaseAbsoluteTxPosition(): AbsoluteTxPosition { @@ -774,6 +995,7 @@ function createBaseAbsoluteTxPosition(): AbsoluteTxPosition { }; } export const AbsoluteTxPosition = { + typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition", encode(message: AbsoluteTxPosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockHeight !== BigInt(0)) { writer.uint32(8).uint64(message.blockHeight); @@ -838,6 +1060,39 @@ export const AbsoluteTxPosition = { obj.block_height = message.blockHeight; obj.tx_index = message.txIndex; return obj; + }, + fromAmino(object: AbsoluteTxPositionAmino): AbsoluteTxPosition { + return { + blockHeight: BigInt(object.block_height), + txIndex: BigInt(object.tx_index) + }; + }, + toAmino(message: AbsoluteTxPosition): AbsoluteTxPositionAmino { + const obj: any = {}; + obj.block_height = message.blockHeight ? message.blockHeight.toString() : undefined; + obj.tx_index = message.txIndex ? message.txIndex.toString() : undefined; + return obj; + }, + fromAminoMsg(object: AbsoluteTxPositionAminoMsg): AbsoluteTxPosition { + return AbsoluteTxPosition.fromAmino(object.value); + }, + toAminoMsg(message: AbsoluteTxPosition): AbsoluteTxPositionAminoMsg { + return { + type: "wasm/AbsoluteTxPosition", + value: AbsoluteTxPosition.toAmino(message) + }; + }, + fromProtoMsg(message: AbsoluteTxPositionProtoMsg): AbsoluteTxPosition { + return AbsoluteTxPosition.decode(message.value); + }, + toProto(message: AbsoluteTxPosition): Uint8Array { + return AbsoluteTxPosition.encode(message).finish(); + }, + toProtoMsg(message: AbsoluteTxPosition): AbsoluteTxPositionProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition", + value: AbsoluteTxPosition.encode(message).finish() + }; } }; function createBaseModel(): Model { @@ -847,6 +1102,7 @@ function createBaseModel(): Model { }; } export const Model = { + typeUrl: "/cosmwasm.wasm.v1.Model", encode(message: Model, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -911,5 +1167,38 @@ export const Model = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: ModelAmino): Model { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Model): ModelAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: ModelAminoMsg): Model { + return Model.fromAmino(object.value); + }, + toAminoMsg(message: Model): ModelAminoMsg { + return { + type: "wasm/Model", + value: Model.toAmino(message) + }; + }, + fromProtoMsg(message: ModelProtoMsg): Model { + return Model.decode(message.value); + }, + toProto(message: Model): Uint8Array { + return Model.encode(message).finish(); + }, + toProtoMsg(message: Model): ModelProtoMsg { + return { + typeUrl: "/cosmwasm.wasm.v1.Model", + value: Model.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts index 768b5ceac5..3854732c9e 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/claims.ts @@ -118,6 +118,7 @@ function createBaseClaim(): Claim { }; } export const Claim = { + typeUrl: "/evmos.claims.v1.Claim", encode(message: Claim, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.action !== 0) { writer.uint32(8).int32(message.action); @@ -194,6 +195,35 @@ export const Claim = { obj.completed = message.completed; obj.claimable_amount = message.claimableAmount; return obj; + }, + fromAmino(object: ClaimAmino): Claim { + return { + action: isSet(object.action) ? actionFromJSON(object.action) : -1, + completed: object.completed, + claimableAmount: object.claimable_amount + }; + }, + toAmino(message: Claim): ClaimAmino { + const obj: any = {}; + obj.action = message.action; + obj.completed = message.completed; + obj.claimable_amount = message.claimableAmount; + return obj; + }, + fromAminoMsg(object: ClaimAminoMsg): Claim { + return Claim.fromAmino(object.value); + }, + fromProtoMsg(message: ClaimProtoMsg): Claim { + return Claim.decode(message.value); + }, + toProto(message: Claim): Uint8Array { + return Claim.encode(message).finish(); + }, + toProtoMsg(message: Claim): ClaimProtoMsg { + return { + typeUrl: "/evmos.claims.v1.Claim", + value: Claim.encode(message).finish() + }; } }; function createBaseClaimsRecordAddress(): ClaimsRecordAddress { @@ -204,6 +234,7 @@ function createBaseClaimsRecordAddress(): ClaimsRecordAddress { }; } export const ClaimsRecordAddress = { + typeUrl: "/evmos.claims.v1.ClaimsRecordAddress", encode(message: ClaimsRecordAddress, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -297,6 +328,39 @@ export const ClaimsRecordAddress = { obj.actions_completed = []; } return obj; + }, + fromAmino(object: ClaimsRecordAddressAmino): ClaimsRecordAddress { + return { + address: object.address, + initialClaimableAmount: object.initial_claimable_amount, + actionsCompleted: Array.isArray(object?.actions_completed) ? object.actions_completed.map((e: any) => e) : [] + }; + }, + toAmino(message: ClaimsRecordAddress): ClaimsRecordAddressAmino { + const obj: any = {}; + obj.address = message.address; + obj.initial_claimable_amount = message.initialClaimableAmount; + if (message.actionsCompleted) { + obj.actions_completed = message.actionsCompleted.map(e => e); + } else { + obj.actions_completed = []; + } + return obj; + }, + fromAminoMsg(object: ClaimsRecordAddressAminoMsg): ClaimsRecordAddress { + return ClaimsRecordAddress.fromAmino(object.value); + }, + fromProtoMsg(message: ClaimsRecordAddressProtoMsg): ClaimsRecordAddress { + return ClaimsRecordAddress.decode(message.value); + }, + toProto(message: ClaimsRecordAddress): Uint8Array { + return ClaimsRecordAddress.encode(message).finish(); + }, + toProtoMsg(message: ClaimsRecordAddress): ClaimsRecordAddressProtoMsg { + return { + typeUrl: "/evmos.claims.v1.ClaimsRecordAddress", + value: ClaimsRecordAddress.encode(message).finish() + }; } }; function createBaseClaimsRecord(): ClaimsRecord { @@ -306,6 +370,7 @@ function createBaseClaimsRecord(): ClaimsRecord { }; } export const ClaimsRecord = { + typeUrl: "/evmos.claims.v1.ClaimsRecord", encode(message: ClaimsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.initialClaimableAmount !== "") { writer.uint32(10).string(message.initialClaimableAmount); @@ -387,5 +452,36 @@ export const ClaimsRecord = { obj.actions_completed = []; } return obj; + }, + fromAmino(object: ClaimsRecordAmino): ClaimsRecord { + return { + initialClaimableAmount: object.initial_claimable_amount, + actionsCompleted: Array.isArray(object?.actions_completed) ? object.actions_completed.map((e: any) => e) : [] + }; + }, + toAmino(message: ClaimsRecord): ClaimsRecordAmino { + const obj: any = {}; + obj.initial_claimable_amount = message.initialClaimableAmount; + if (message.actionsCompleted) { + obj.actions_completed = message.actionsCompleted.map(e => e); + } else { + obj.actions_completed = []; + } + return obj; + }, + fromAminoMsg(object: ClaimsRecordAminoMsg): ClaimsRecord { + return ClaimsRecord.fromAmino(object.value); + }, + fromProtoMsg(message: ClaimsRecordProtoMsg): ClaimsRecord { + return ClaimsRecord.decode(message.value); + }, + toProto(message: ClaimsRecord): Uint8Array { + return ClaimsRecord.encode(message).finish(); + }, + toProtoMsg(message: ClaimsRecord): ClaimsRecordProtoMsg { + return { + typeUrl: "/evmos.claims.v1.ClaimsRecord", + value: ClaimsRecord.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts index 266f773b00..b41d1f279d 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/genesis.ts @@ -53,6 +53,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.claims.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -125,6 +126,37 @@ export const GenesisState = { obj.claims_records = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + claimsRecords: Array.isArray(object?.claims_records) ? object.claims_records.map((e: any) => ClaimsRecordAddress.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.claimsRecords) { + obj.claims_records = message.claimsRecords.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); + } else { + obj.claims_records = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.claims.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -139,6 +171,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/evmos.claims.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableClaims === true) { writer.uint32(8).bool(message.enableClaims); @@ -279,5 +312,50 @@ export const Params = { obj.evm_channels = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + enableClaims: object.enable_claims, + airdropStartTime: object.airdrop_start_time, + durationUntilDecay: object?.duration_until_decay ? Duration.fromAmino(object.duration_until_decay) : undefined, + durationOfDecay: object?.duration_of_decay ? Duration.fromAmino(object.duration_of_decay) : undefined, + claimsDenom: object.claims_denom, + authorizedChannels: Array.isArray(object?.authorized_channels) ? object.authorized_channels.map((e: any) => e) : [], + evmChannels: Array.isArray(object?.evm_channels) ? object.evm_channels.map((e: any) => e) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.enable_claims = message.enableClaims; + obj.airdrop_start_time = message.airdropStartTime; + obj.duration_until_decay = message.durationUntilDecay ? Duration.toAmino(message.durationUntilDecay) : undefined; + obj.duration_of_decay = message.durationOfDecay ? Duration.toAmino(message.durationOfDecay) : undefined; + obj.claims_denom = message.claimsDenom; + if (message.authorizedChannels) { + obj.authorized_channels = message.authorizedChannels.map(e => e); + } else { + obj.authorized_channels = []; + } + if (message.evmChannels) { + obj.evm_channels = message.evmChannels.map(e => e); + } else { + obj.evm_channels = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/evmos.claims.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts index 5ba61073dd..30e290a2f4 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/claims/v1/query.ts @@ -113,6 +113,7 @@ function createBaseQueryTotalUnclaimedRequest(): QueryTotalUnclaimedRequest { return {}; } export const QueryTotalUnclaimedRequest = { + typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedRequest", encode(_: QueryTotalUnclaimedRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -150,6 +151,28 @@ export const QueryTotalUnclaimedRequest = { toSDK(_: QueryTotalUnclaimedRequest): QueryTotalUnclaimedRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryTotalUnclaimedRequestAmino): QueryTotalUnclaimedRequest { + return {}; + }, + toAmino(_: QueryTotalUnclaimedRequest): QueryTotalUnclaimedRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryTotalUnclaimedRequestAminoMsg): QueryTotalUnclaimedRequest { + return QueryTotalUnclaimedRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryTotalUnclaimedRequestProtoMsg): QueryTotalUnclaimedRequest { + return QueryTotalUnclaimedRequest.decode(message.value); + }, + toProto(message: QueryTotalUnclaimedRequest): Uint8Array { + return QueryTotalUnclaimedRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalUnclaimedRequest): QueryTotalUnclaimedRequestProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedRequest", + value: QueryTotalUnclaimedRequest.encode(message).finish() + }; } }; function createBaseQueryTotalUnclaimedResponse(): QueryTotalUnclaimedResponse { @@ -158,6 +181,7 @@ function createBaseQueryTotalUnclaimedResponse(): QueryTotalUnclaimedResponse { }; } export const QueryTotalUnclaimedResponse = { + typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedResponse", encode(message: QueryTotalUnclaimedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -218,12 +242,42 @@ export const QueryTotalUnclaimedResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: QueryTotalUnclaimedResponseAmino): QueryTotalUnclaimedResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalUnclaimedResponse): QueryTotalUnclaimedResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalUnclaimedResponseAminoMsg): QueryTotalUnclaimedResponse { + return QueryTotalUnclaimedResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryTotalUnclaimedResponseProtoMsg): QueryTotalUnclaimedResponse { + return QueryTotalUnclaimedResponse.decode(message.value); + }, + toProto(message: QueryTotalUnclaimedResponse): Uint8Array { + return QueryTotalUnclaimedResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalUnclaimedResponse): QueryTotalUnclaimedResponseProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedResponse", + value: QueryTotalUnclaimedResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/evmos.claims.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -261,6 +315,28 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -269,6 +345,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/evmos.claims.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -321,6 +398,31 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryClaimsRecordsRequest(): QueryClaimsRecordsRequest { @@ -329,6 +431,7 @@ function createBaseQueryClaimsRecordsRequest(): QueryClaimsRecordsRequest { }; } export const QueryClaimsRecordsRequest = { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordsRequest", encode(message: QueryClaimsRecordsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -381,6 +484,31 @@ export const QueryClaimsRecordsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryClaimsRecordsRequestAmino): QueryClaimsRecordsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryClaimsRecordsRequest): QueryClaimsRecordsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClaimsRecordsRequestAminoMsg): QueryClaimsRecordsRequest { + return QueryClaimsRecordsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryClaimsRecordsRequestProtoMsg): QueryClaimsRecordsRequest { + return QueryClaimsRecordsRequest.decode(message.value); + }, + toProto(message: QueryClaimsRecordsRequest): Uint8Array { + return QueryClaimsRecordsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimsRecordsRequest): QueryClaimsRecordsRequestProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordsRequest", + value: QueryClaimsRecordsRequest.encode(message).finish() + }; } }; function createBaseQueryClaimsRecordsResponse(): QueryClaimsRecordsResponse { @@ -390,6 +518,7 @@ function createBaseQueryClaimsRecordsResponse(): QueryClaimsRecordsResponse { }; } export const QueryClaimsRecordsResponse = { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordsResponse", encode(message: QueryClaimsRecordsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.claims) { ClaimsRecordAddress.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -462,6 +591,37 @@ export const QueryClaimsRecordsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryClaimsRecordsResponseAmino): QueryClaimsRecordsResponse { + return { + claims: Array.isArray(object?.claims) ? object.claims.map((e: any) => ClaimsRecordAddress.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryClaimsRecordsResponse): QueryClaimsRecordsResponseAmino { + const obj: any = {}; + if (message.claims) { + obj.claims = message.claims.map(e => e ? ClaimsRecordAddress.toAmino(e) : undefined); + } else { + obj.claims = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClaimsRecordsResponseAminoMsg): QueryClaimsRecordsResponse { + return QueryClaimsRecordsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryClaimsRecordsResponseProtoMsg): QueryClaimsRecordsResponse { + return QueryClaimsRecordsResponse.decode(message.value); + }, + toProto(message: QueryClaimsRecordsResponse): Uint8Array { + return QueryClaimsRecordsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimsRecordsResponse): QueryClaimsRecordsResponseProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordsResponse", + value: QueryClaimsRecordsResponse.encode(message).finish() + }; } }; function createBaseQueryClaimsRecordRequest(): QueryClaimsRecordRequest { @@ -470,6 +630,7 @@ function createBaseQueryClaimsRecordRequest(): QueryClaimsRecordRequest { }; } export const QueryClaimsRecordRequest = { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordRequest", encode(message: QueryClaimsRecordRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -522,6 +683,31 @@ export const QueryClaimsRecordRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryClaimsRecordRequestAmino): QueryClaimsRecordRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryClaimsRecordRequestAminoMsg): QueryClaimsRecordRequest { + return QueryClaimsRecordRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryClaimsRecordRequestProtoMsg): QueryClaimsRecordRequest { + return QueryClaimsRecordRequest.decode(message.value); + }, + toProto(message: QueryClaimsRecordRequest): Uint8Array { + return QueryClaimsRecordRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimsRecordRequest): QueryClaimsRecordRequestProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordRequest", + value: QueryClaimsRecordRequest.encode(message).finish() + }; } }; function createBaseQueryClaimsRecordResponse(): QueryClaimsRecordResponse { @@ -531,6 +717,7 @@ function createBaseQueryClaimsRecordResponse(): QueryClaimsRecordResponse { }; } export const QueryClaimsRecordResponse = { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordResponse", encode(message: QueryClaimsRecordResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.initialClaimableAmount !== "") { writer.uint32(10).string(message.initialClaimableAmount); @@ -603,5 +790,36 @@ export const QueryClaimsRecordResponse = { obj.claims = []; } return obj; + }, + fromAmino(object: QueryClaimsRecordResponseAmino): QueryClaimsRecordResponse { + return { + initialClaimableAmount: object.initial_claimable_amount, + claims: Array.isArray(object?.claims) ? object.claims.map((e: any) => Claim.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseAmino { + const obj: any = {}; + obj.initial_claimable_amount = message.initialClaimableAmount; + if (message.claims) { + obj.claims = message.claims.map(e => e ? Claim.toAmino(e) : undefined); + } else { + obj.claims = []; + } + return obj; + }, + fromAminoMsg(object: QueryClaimsRecordResponseAminoMsg): QueryClaimsRecordResponse { + return QueryClaimsRecordResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryClaimsRecordResponseProtoMsg): QueryClaimsRecordResponse { + return QueryClaimsRecordResponse.decode(message.value); + }, + toProto(message: QueryClaimsRecordResponse): Uint8Array { + return QueryClaimsRecordResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimsRecordResponse): QueryClaimsRecordResponseProtoMsg { + return { + typeUrl: "/evmos.claims.v1.QueryClaimsRecordResponse", + value: QueryClaimsRecordResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts index 65b7546dcf..3d5963e85c 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/genesis.ts @@ -41,6 +41,7 @@ function createBaseEpochInfo(): EpochInfo { }; } export const EpochInfo = { + typeUrl: "/evmos.epochs.v1.EpochInfo", encode(message: EpochInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); @@ -165,6 +166,43 @@ export const EpochInfo = { obj.epoch_counting_started = message.epochCountingStarted; obj.current_epoch_start_height = message.currentEpochStartHeight; return obj; + }, + fromAmino(object: EpochInfoAmino): EpochInfo { + return { + identifier: object.identifier, + startTime: object.start_time, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + currentEpoch: BigInt(object.current_epoch), + currentEpochStartTime: object.current_epoch_start_time, + epochCountingStarted: object.epoch_counting_started, + currentEpochStartHeight: BigInt(object.current_epoch_start_height) + }; + }, + toAmino(message: EpochInfo): EpochInfoAmino { + const obj: any = {}; + obj.identifier = message.identifier; + obj.start_time = message.startTime; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch_start_time = message.currentEpochStartTime; + obj.epoch_counting_started = message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { + return EpochInfo.fromAmino(object.value); + }, + fromProtoMsg(message: EpochInfoProtoMsg): EpochInfo { + return EpochInfo.decode(message.value); + }, + toProto(message: EpochInfo): Uint8Array { + return EpochInfo.encode(message).finish(); + }, + toProtoMsg(message: EpochInfo): EpochInfoProtoMsg { + return { + typeUrl: "/evmos.epochs.v1.EpochInfo", + value: EpochInfo.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -173,6 +211,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.epochs.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.epochs) { EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -233,5 +272,34 @@ export const GenesisState = { obj.epochs = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + epochs: Array.isArray(object?.epochs) ? object.epochs.map((e: any) => EpochInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.epochs) { + obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); + } else { + obj.epochs = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.epochs.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts index 591fc69cd5..4469e08520 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/epochs/v1/query.ts @@ -35,6 +35,7 @@ function createBaseQueryEpochsInfoRequest(): QueryEpochsInfoRequest { }; } export const QueryEpochsInfoRequest = { + typeUrl: "/evmos.epochs.v1.QueryEpochsInfoRequest", encode(message: QueryEpochsInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -87,6 +88,31 @@ export const QueryEpochsInfoRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryEpochsInfoRequestAmino): QueryEpochsInfoRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryEpochsInfoRequestAminoMsg): QueryEpochsInfoRequest { + return QueryEpochsInfoRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryEpochsInfoRequestProtoMsg): QueryEpochsInfoRequest { + return QueryEpochsInfoRequest.decode(message.value); + }, + toProto(message: QueryEpochsInfoRequest): Uint8Array { + return QueryEpochsInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestProtoMsg { + return { + typeUrl: "/evmos.epochs.v1.QueryEpochsInfoRequest", + value: QueryEpochsInfoRequest.encode(message).finish() + }; } }; function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse { @@ -96,6 +122,7 @@ function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse { }; } export const QueryEpochsInfoResponse = { + typeUrl: "/evmos.epochs.v1.QueryEpochsInfoResponse", encode(message: QueryEpochsInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.epochs) { EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -168,6 +195,37 @@ export const QueryEpochsInfoResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryEpochsInfoResponseAmino): QueryEpochsInfoResponse { + return { + epochs: Array.isArray(object?.epochs) ? object.epochs.map((e: any) => EpochInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseAmino { + const obj: any = {}; + if (message.epochs) { + obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); + } else { + obj.epochs = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryEpochsInfoResponseAminoMsg): QueryEpochsInfoResponse { + return QueryEpochsInfoResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryEpochsInfoResponseProtoMsg): QueryEpochsInfoResponse { + return QueryEpochsInfoResponse.decode(message.value); + }, + toProto(message: QueryEpochsInfoResponse): Uint8Array { + return QueryEpochsInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseProtoMsg { + return { + typeUrl: "/evmos.epochs.v1.QueryEpochsInfoResponse", + value: QueryEpochsInfoResponse.encode(message).finish() + }; } }; function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest { @@ -176,6 +234,7 @@ function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest { }; } export const QueryCurrentEpochRequest = { + typeUrl: "/evmos.epochs.v1.QueryCurrentEpochRequest", encode(message: QueryCurrentEpochRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); @@ -228,6 +287,31 @@ export const QueryCurrentEpochRequest = { const obj: any = {}; obj.identifier = message.identifier; return obj; + }, + fromAmino(object: QueryCurrentEpochRequestAmino): QueryCurrentEpochRequest { + return { + identifier: object.identifier + }; + }, + toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { + const obj: any = {}; + obj.identifier = message.identifier; + return obj; + }, + fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { + return QueryCurrentEpochRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryCurrentEpochRequestProtoMsg): QueryCurrentEpochRequest { + return QueryCurrentEpochRequest.decode(message.value); + }, + toProto(message: QueryCurrentEpochRequest): Uint8Array { + return QueryCurrentEpochRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestProtoMsg { + return { + typeUrl: "/evmos.epochs.v1.QueryCurrentEpochRequest", + value: QueryCurrentEpochRequest.encode(message).finish() + }; } }; function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse { @@ -236,6 +320,7 @@ function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse { }; } export const QueryCurrentEpochResponse = { + typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse", encode(message: QueryCurrentEpochResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.currentEpoch !== BigInt(0)) { writer.uint32(8).int64(message.currentEpoch); @@ -288,5 +373,30 @@ export const QueryCurrentEpochResponse = { const obj: any = {}; obj.current_epoch = message.currentEpoch; return obj; + }, + fromAmino(object: QueryCurrentEpochResponseAmino): QueryCurrentEpochResponse { + return { + currentEpoch: BigInt(object.current_epoch) + }; + }, + toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { + const obj: any = {}; + obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { + return QueryCurrentEpochResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryCurrentEpochResponseProtoMsg): QueryCurrentEpochResponse { + return QueryCurrentEpochResponse.decode(message.value); + }, + toProto(message: QueryCurrentEpochResponse): Uint8Array { + return QueryCurrentEpochResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseProtoMsg { + return { + typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse", + value: QueryCurrentEpochResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts index bb45f83756..fb222047d1 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/erc20.ts @@ -142,6 +142,7 @@ function createBaseTokenPair(): TokenPair { }; } export const TokenPair = { + typeUrl: "/evmos.erc20.v1.TokenPair", encode(message: TokenPair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.erc20Address !== "") { writer.uint32(10).string(message.erc20Address); @@ -230,6 +231,37 @@ export const TokenPair = { obj.enabled = message.enabled; message.contractOwner !== undefined && (obj.contract_owner = ownerToJSON(message.contractOwner)); return obj; + }, + fromAmino(object: TokenPairAmino): TokenPair { + return { + erc20Address: object.erc20_address, + denom: object.denom, + enabled: object.enabled, + contractOwner: isSet(object.contract_owner) ? ownerFromJSON(object.contract_owner) : -1 + }; + }, + toAmino(message: TokenPair): TokenPairAmino { + const obj: any = {}; + obj.erc20_address = message.erc20Address; + obj.denom = message.denom; + obj.enabled = message.enabled; + obj.contract_owner = message.contractOwner; + return obj; + }, + fromAminoMsg(object: TokenPairAminoMsg): TokenPair { + return TokenPair.fromAmino(object.value); + }, + fromProtoMsg(message: TokenPairProtoMsg): TokenPair { + return TokenPair.decode(message.value); + }, + toProto(message: TokenPair): Uint8Array { + return TokenPair.encode(message).finish(); + }, + toProtoMsg(message: TokenPair): TokenPairProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.TokenPair", + value: TokenPair.encode(message).finish() + }; } }; function createBaseRegisterCoinProposal(): RegisterCoinProposal { @@ -240,6 +272,7 @@ function createBaseRegisterCoinProposal(): RegisterCoinProposal { }; } export const RegisterCoinProposal = { + typeUrl: "/evmos.erc20.v1.RegisterCoinProposal", encode(message: RegisterCoinProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -316,6 +349,35 @@ export const RegisterCoinProposal = { obj.description = message.description; message.metadata !== undefined && (obj.metadata = message.metadata ? Metadata.toSDK(message.metadata) : undefined); return obj; + }, + fromAmino(object: RegisterCoinProposalAmino): RegisterCoinProposal { + return { + title: object.title, + description: object.description, + metadata: object?.metadata ? Metadata.fromAmino(object.metadata) : undefined + }; + }, + toAmino(message: RegisterCoinProposal): RegisterCoinProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; + return obj; + }, + fromAminoMsg(object: RegisterCoinProposalAminoMsg): RegisterCoinProposal { + return RegisterCoinProposal.fromAmino(object.value); + }, + fromProtoMsg(message: RegisterCoinProposalProtoMsg): RegisterCoinProposal { + return RegisterCoinProposal.decode(message.value); + }, + toProto(message: RegisterCoinProposal): Uint8Array { + return RegisterCoinProposal.encode(message).finish(); + }, + toProtoMsg(message: RegisterCoinProposal): RegisterCoinProposalProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.RegisterCoinProposal", + value: RegisterCoinProposal.encode(message).finish() + }; } }; function createBaseRegisterERC20Proposal(): RegisterERC20Proposal { @@ -326,6 +388,7 @@ function createBaseRegisterERC20Proposal(): RegisterERC20Proposal { }; } export const RegisterERC20Proposal = { + typeUrl: "/evmos.erc20.v1.RegisterERC20Proposal", encode(message: RegisterERC20Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -402,6 +465,35 @@ export const RegisterERC20Proposal = { obj.description = message.description; obj.erc20address = message.erc20address; return obj; + }, + fromAmino(object: RegisterERC20ProposalAmino): RegisterERC20Proposal { + return { + title: object.title, + description: object.description, + erc20address: object.erc20address + }; + }, + toAmino(message: RegisterERC20Proposal): RegisterERC20ProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.erc20address = message.erc20address; + return obj; + }, + fromAminoMsg(object: RegisterERC20ProposalAminoMsg): RegisterERC20Proposal { + return RegisterERC20Proposal.fromAmino(object.value); + }, + fromProtoMsg(message: RegisterERC20ProposalProtoMsg): RegisterERC20Proposal { + return RegisterERC20Proposal.decode(message.value); + }, + toProto(message: RegisterERC20Proposal): Uint8Array { + return RegisterERC20Proposal.encode(message).finish(); + }, + toProtoMsg(message: RegisterERC20Proposal): RegisterERC20ProposalProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.RegisterERC20Proposal", + value: RegisterERC20Proposal.encode(message).finish() + }; } }; function createBaseToggleTokenConversionProposal(): ToggleTokenConversionProposal { @@ -412,6 +504,7 @@ function createBaseToggleTokenConversionProposal(): ToggleTokenConversionProposa }; } export const ToggleTokenConversionProposal = { + typeUrl: "/evmos.erc20.v1.ToggleTokenConversionProposal", encode(message: ToggleTokenConversionProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -488,5 +581,34 @@ export const ToggleTokenConversionProposal = { obj.description = message.description; obj.token = message.token; return obj; + }, + fromAmino(object: ToggleTokenConversionProposalAmino): ToggleTokenConversionProposal { + return { + title: object.title, + description: object.description, + token: object.token + }; + }, + toAmino(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.token = message.token; + return obj; + }, + fromAminoMsg(object: ToggleTokenConversionProposalAminoMsg): ToggleTokenConversionProposal { + return ToggleTokenConversionProposal.fromAmino(object.value); + }, + fromProtoMsg(message: ToggleTokenConversionProposalProtoMsg): ToggleTokenConversionProposal { + return ToggleTokenConversionProposal.decode(message.value); + }, + toProto(message: ToggleTokenConversionProposal): Uint8Array { + return ToggleTokenConversionProposal.encode(message).finish(); + }, + toProtoMsg(message: ToggleTokenConversionProposal): ToggleTokenConversionProposalProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.ToggleTokenConversionProposal", + value: ToggleTokenConversionProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts index 4786a93684..827ed639cc 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/genesis.ts @@ -37,6 +37,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.erc20.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -109,6 +110,37 @@ export const GenesisState = { obj.token_pairs = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + tokenPairs: Array.isArray(object?.token_pairs) ? object.token_pairs.map((e: any) => TokenPair.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.tokenPairs) { + obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); + } else { + obj.token_pairs = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -118,6 +150,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/evmos.erc20.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableErc20 === true) { writer.uint32(8).bool(message.enableErc20); @@ -182,5 +215,32 @@ export const Params = { obj.enable_erc20 = message.enableErc20; obj.enable_evm_hook = message.enableEvmHook; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + enableErc20: object.enable_erc20, + enableEvmHook: object.enable_evm_hook + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.enable_erc20 = message.enableErc20; + obj.enable_evm_hook = message.enableEvmHook; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts index 50f43c1907..e9dc1d28c8 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/query.ts @@ -86,6 +86,7 @@ function createBaseQueryTokenPairsRequest(): QueryTokenPairsRequest { }; } export const QueryTokenPairsRequest = { + typeUrl: "/evmos.erc20.v1.QueryTokenPairsRequest", encode(message: QueryTokenPairsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -138,6 +139,31 @@ export const QueryTokenPairsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryTokenPairsRequestAmino): QueryTokenPairsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryTokenPairsRequest): QueryTokenPairsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTokenPairsRequestAminoMsg): QueryTokenPairsRequest { + return QueryTokenPairsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryTokenPairsRequestProtoMsg): QueryTokenPairsRequest { + return QueryTokenPairsRequest.decode(message.value); + }, + toProto(message: QueryTokenPairsRequest): Uint8Array { + return QueryTokenPairsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTokenPairsRequest): QueryTokenPairsRequestProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.QueryTokenPairsRequest", + value: QueryTokenPairsRequest.encode(message).finish() + }; } }; function createBaseQueryTokenPairsResponse(): QueryTokenPairsResponse { @@ -147,6 +173,7 @@ function createBaseQueryTokenPairsResponse(): QueryTokenPairsResponse { }; } export const QueryTokenPairsResponse = { + typeUrl: "/evmos.erc20.v1.QueryTokenPairsResponse", encode(message: QueryTokenPairsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.tokenPairs) { TokenPair.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -219,6 +246,37 @@ export const QueryTokenPairsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryTokenPairsResponseAmino): QueryTokenPairsResponse { + return { + tokenPairs: Array.isArray(object?.token_pairs) ? object.token_pairs.map((e: any) => TokenPair.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryTokenPairsResponse): QueryTokenPairsResponseAmino { + const obj: any = {}; + if (message.tokenPairs) { + obj.token_pairs = message.tokenPairs.map(e => e ? TokenPair.toAmino(e) : undefined); + } else { + obj.token_pairs = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTokenPairsResponseAminoMsg): QueryTokenPairsResponse { + return QueryTokenPairsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryTokenPairsResponseProtoMsg): QueryTokenPairsResponse { + return QueryTokenPairsResponse.decode(message.value); + }, + toProto(message: QueryTokenPairsResponse): Uint8Array { + return QueryTokenPairsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTokenPairsResponse): QueryTokenPairsResponseProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.QueryTokenPairsResponse", + value: QueryTokenPairsResponse.encode(message).finish() + }; } }; function createBaseQueryTokenPairRequest(): QueryTokenPairRequest { @@ -227,6 +285,7 @@ function createBaseQueryTokenPairRequest(): QueryTokenPairRequest { }; } export const QueryTokenPairRequest = { + typeUrl: "/evmos.erc20.v1.QueryTokenPairRequest", encode(message: QueryTokenPairRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.token !== "") { writer.uint32(10).string(message.token); @@ -279,6 +338,31 @@ export const QueryTokenPairRequest = { const obj: any = {}; obj.token = message.token; return obj; + }, + fromAmino(object: QueryTokenPairRequestAmino): QueryTokenPairRequest { + return { + token: object.token + }; + }, + toAmino(message: QueryTokenPairRequest): QueryTokenPairRequestAmino { + const obj: any = {}; + obj.token = message.token; + return obj; + }, + fromAminoMsg(object: QueryTokenPairRequestAminoMsg): QueryTokenPairRequest { + return QueryTokenPairRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryTokenPairRequestProtoMsg): QueryTokenPairRequest { + return QueryTokenPairRequest.decode(message.value); + }, + toProto(message: QueryTokenPairRequest): Uint8Array { + return QueryTokenPairRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTokenPairRequest): QueryTokenPairRequestProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.QueryTokenPairRequest", + value: QueryTokenPairRequest.encode(message).finish() + }; } }; function createBaseQueryTokenPairResponse(): QueryTokenPairResponse { @@ -287,6 +371,7 @@ function createBaseQueryTokenPairResponse(): QueryTokenPairResponse { }; } export const QueryTokenPairResponse = { + typeUrl: "/evmos.erc20.v1.QueryTokenPairResponse", encode(message: QueryTokenPairResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenPair !== undefined) { TokenPair.encode(message.tokenPair, writer.uint32(10).fork()).ldelim(); @@ -339,12 +424,38 @@ export const QueryTokenPairResponse = { const obj: any = {}; message.tokenPair !== undefined && (obj.token_pair = message.tokenPair ? TokenPair.toSDK(message.tokenPair) : undefined); return obj; + }, + fromAmino(object: QueryTokenPairResponseAmino): QueryTokenPairResponse { + return { + tokenPair: object?.token_pair ? TokenPair.fromAmino(object.token_pair) : undefined + }; + }, + toAmino(message: QueryTokenPairResponse): QueryTokenPairResponseAmino { + const obj: any = {}; + obj.token_pair = message.tokenPair ? TokenPair.toAmino(message.tokenPair) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTokenPairResponseAminoMsg): QueryTokenPairResponse { + return QueryTokenPairResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryTokenPairResponseProtoMsg): QueryTokenPairResponse { + return QueryTokenPairResponse.decode(message.value); + }, + toProto(message: QueryTokenPairResponse): Uint8Array { + return QueryTokenPairResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTokenPairResponse): QueryTokenPairResponseProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.QueryTokenPairResponse", + value: QueryTokenPairResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/evmos.erc20.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -382,6 +493,28 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -390,6 +523,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/evmos.erc20.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -442,5 +576,30 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts index bb43597058..589a1a9219 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/erc20/v1/tx.ts @@ -60,6 +60,7 @@ function createBaseMsgConvertCoin(): MsgConvertCoin { }; } export const MsgConvertCoin = { + typeUrl: "/evmos.erc20.v1.MsgConvertCoin", encode(message: MsgConvertCoin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.coin !== undefined) { Coin.encode(message.coin, writer.uint32(10).fork()).ldelim(); @@ -136,12 +137,42 @@ export const MsgConvertCoin = { obj.receiver = message.receiver; obj.sender = message.sender; return obj; + }, + fromAmino(object: MsgConvertCoinAmino): MsgConvertCoin { + return { + coin: object?.coin ? Coin.fromAmino(object.coin) : undefined, + receiver: object.receiver, + sender: object.sender + }; + }, + toAmino(message: MsgConvertCoin): MsgConvertCoinAmino { + const obj: any = {}; + obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; + obj.receiver = message.receiver; + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: MsgConvertCoinAminoMsg): MsgConvertCoin { + return MsgConvertCoin.fromAmino(object.value); + }, + fromProtoMsg(message: MsgConvertCoinProtoMsg): MsgConvertCoin { + return MsgConvertCoin.decode(message.value); + }, + toProto(message: MsgConvertCoin): Uint8Array { + return MsgConvertCoin.encode(message).finish(); + }, + toProtoMsg(message: MsgConvertCoin): MsgConvertCoinProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.MsgConvertCoin", + value: MsgConvertCoin.encode(message).finish() + }; } }; function createBaseMsgConvertCoinResponse(): MsgConvertCoinResponse { return {}; } export const MsgConvertCoinResponse = { + typeUrl: "/evmos.erc20.v1.MsgConvertCoinResponse", encode(_: MsgConvertCoinResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -179,6 +210,28 @@ export const MsgConvertCoinResponse = { toSDK(_: MsgConvertCoinResponse): MsgConvertCoinResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgConvertCoinResponseAmino): MsgConvertCoinResponse { + return {}; + }, + toAmino(_: MsgConvertCoinResponse): MsgConvertCoinResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgConvertCoinResponseAminoMsg): MsgConvertCoinResponse { + return MsgConvertCoinResponse.fromAmino(object.value); + }, + fromProtoMsg(message: MsgConvertCoinResponseProtoMsg): MsgConvertCoinResponse { + return MsgConvertCoinResponse.decode(message.value); + }, + toProto(message: MsgConvertCoinResponse): Uint8Array { + return MsgConvertCoinResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgConvertCoinResponse): MsgConvertCoinResponseProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.MsgConvertCoinResponse", + value: MsgConvertCoinResponse.encode(message).finish() + }; } }; function createBaseMsgConvertERC20(): MsgConvertERC20 { @@ -190,6 +243,7 @@ function createBaseMsgConvertERC20(): MsgConvertERC20 { }; } export const MsgConvertERC20 = { + typeUrl: "/evmos.erc20.v1.MsgConvertERC20", encode(message: MsgConvertERC20, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -278,12 +332,44 @@ export const MsgConvertERC20 = { obj.receiver = message.receiver; obj.sender = message.sender; return obj; + }, + fromAmino(object: MsgConvertERC20Amino): MsgConvertERC20 { + return { + contractAddress: object.contract_address, + amount: object.amount, + receiver: object.receiver, + sender: object.sender + }; + }, + toAmino(message: MsgConvertERC20): MsgConvertERC20Amino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + obj.amount = message.amount; + obj.receiver = message.receiver; + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: MsgConvertERC20AminoMsg): MsgConvertERC20 { + return MsgConvertERC20.fromAmino(object.value); + }, + fromProtoMsg(message: MsgConvertERC20ProtoMsg): MsgConvertERC20 { + return MsgConvertERC20.decode(message.value); + }, + toProto(message: MsgConvertERC20): Uint8Array { + return MsgConvertERC20.encode(message).finish(); + }, + toProtoMsg(message: MsgConvertERC20): MsgConvertERC20ProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.MsgConvertERC20", + value: MsgConvertERC20.encode(message).finish() + }; } }; function createBaseMsgConvertERC20Response(): MsgConvertERC20Response { return {}; } export const MsgConvertERC20Response = { + typeUrl: "/evmos.erc20.v1.MsgConvertERC20Response", encode(_: MsgConvertERC20Response, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -321,5 +407,27 @@ export const MsgConvertERC20Response = { toSDK(_: MsgConvertERC20Response): MsgConvertERC20ResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgConvertERC20ResponseAmino): MsgConvertERC20Response { + return {}; + }, + toAmino(_: MsgConvertERC20Response): MsgConvertERC20ResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgConvertERC20ResponseAminoMsg): MsgConvertERC20Response { + return MsgConvertERC20Response.fromAmino(object.value); + }, + fromProtoMsg(message: MsgConvertERC20ResponseProtoMsg): MsgConvertERC20Response { + return MsgConvertERC20Response.decode(message.value); + }, + toProto(message: MsgConvertERC20Response): Uint8Array { + return MsgConvertERC20Response.encode(message).finish(); + }, + toProtoMsg(message: MsgConvertERC20Response): MsgConvertERC20ResponseProtoMsg { + return { + typeUrl: "/evmos.erc20.v1.MsgConvertERC20Response", + value: MsgConvertERC20Response.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts index 4420c37c68..29394204e6 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/fees.ts @@ -33,6 +33,7 @@ function createBaseDevFeeInfo(): DevFeeInfo { }; } export const DevFeeInfo = { + typeUrl: "/evmos.fees.v1.DevFeeInfo", encode(message: DevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -109,5 +110,34 @@ export const DevFeeInfo = { obj.deployer_address = message.deployerAddress; obj.withdraw_address = message.withdrawAddress; return obj; + }, + fromAmino(object: DevFeeInfoAmino): DevFeeInfo { + return { + contractAddress: object.contract_address, + deployerAddress: object.deployer_address, + withdrawAddress: object.withdraw_address + }; + }, + toAmino(message: DevFeeInfo): DevFeeInfoAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + obj.deployer_address = message.deployerAddress; + obj.withdraw_address = message.withdrawAddress; + return obj; + }, + fromAminoMsg(object: DevFeeInfoAminoMsg): DevFeeInfo { + return DevFeeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: DevFeeInfoProtoMsg): DevFeeInfo { + return DevFeeInfo.decode(message.value); + }, + toProto(message: DevFeeInfo): Uint8Array { + return DevFeeInfo.encode(message).finish(); + }, + toProtoMsg(message: DevFeeInfo): DevFeeInfoProtoMsg { + return { + typeUrl: "/evmos.fees.v1.DevFeeInfo", + value: DevFeeInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts index 390d3e062b..98a304e97a 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/genesis.ts @@ -52,6 +52,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.fees.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -124,6 +125,37 @@ export const GenesisState = { obj.dev_fee_infos = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + devFeeInfos: Array.isArray(object?.dev_fee_infos) ? object.dev_fee_infos.map((e: any) => DevFeeInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.devFeeInfos) { + obj.dev_fee_infos = message.devFeeInfos.map(e => e ? DevFeeInfo.toAmino(e) : undefined); + } else { + obj.dev_fee_infos = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.fees.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -136,6 +168,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/evmos.fees.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableFees === true) { writer.uint32(8).bool(message.enableFees); @@ -236,5 +269,38 @@ export const Params = { obj.addr_derivation_cost_create = message.addrDerivationCostCreate; obj.min_gas_price = message.minGasPrice; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + enableFees: object.enable_fees, + developerShares: object.developer_shares, + validatorShares: object.validator_shares, + addrDerivationCostCreate: BigInt(object.addr_derivation_cost_create), + minGasPrice: object.min_gas_price + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.enable_fees = message.enableFees; + obj.developer_shares = message.developerShares; + obj.validator_shares = message.validatorShares; + obj.addr_derivation_cost_create = message.addrDerivationCostCreate ? message.addrDerivationCostCreate.toString() : undefined; + obj.min_gas_price = message.minGasPrice; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/evmos.fees.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts index 59b917c6eb..78ed82eb07 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/query.ts @@ -124,6 +124,7 @@ function createBaseQueryDevFeeInfosRequest(): QueryDevFeeInfosRequest { }; } export const QueryDevFeeInfosRequest = { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosRequest", encode(message: QueryDevFeeInfosRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -176,6 +177,31 @@ export const QueryDevFeeInfosRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDevFeeInfosRequestAmino): QueryDevFeeInfosRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDevFeeInfosRequest): QueryDevFeeInfosRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDevFeeInfosRequestAminoMsg): QueryDevFeeInfosRequest { + return QueryDevFeeInfosRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryDevFeeInfosRequestProtoMsg): QueryDevFeeInfosRequest { + return QueryDevFeeInfosRequest.decode(message.value); + }, + toProto(message: QueryDevFeeInfosRequest): Uint8Array { + return QueryDevFeeInfosRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDevFeeInfosRequest): QueryDevFeeInfosRequestProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosRequest", + value: QueryDevFeeInfosRequest.encode(message).finish() + }; } }; function createBaseQueryDevFeeInfosResponse(): QueryDevFeeInfosResponse { @@ -185,6 +211,7 @@ function createBaseQueryDevFeeInfosResponse(): QueryDevFeeInfosResponse { }; } export const QueryDevFeeInfosResponse = { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosResponse", encode(message: QueryDevFeeInfosResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fees) { DevFeeInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -257,6 +284,37 @@ export const QueryDevFeeInfosResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDevFeeInfosResponseAmino): QueryDevFeeInfosResponse { + return { + fees: Array.isArray(object?.fees) ? object.fees.map((e: any) => DevFeeInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDevFeeInfosResponse): QueryDevFeeInfosResponseAmino { + const obj: any = {}; + if (message.fees) { + obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); + } else { + obj.fees = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDevFeeInfosResponseAminoMsg): QueryDevFeeInfosResponse { + return QueryDevFeeInfosResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryDevFeeInfosResponseProtoMsg): QueryDevFeeInfosResponse { + return QueryDevFeeInfosResponse.decode(message.value); + }, + toProto(message: QueryDevFeeInfosResponse): Uint8Array { + return QueryDevFeeInfosResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDevFeeInfosResponse): QueryDevFeeInfosResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosResponse", + value: QueryDevFeeInfosResponse.encode(message).finish() + }; } }; function createBaseQueryDevFeeInfoRequest(): QueryDevFeeInfoRequest { @@ -265,6 +323,7 @@ function createBaseQueryDevFeeInfoRequest(): QueryDevFeeInfoRequest { }; } export const QueryDevFeeInfoRequest = { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfoRequest", encode(message: QueryDevFeeInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -317,6 +376,31 @@ export const QueryDevFeeInfoRequest = { const obj: any = {}; obj.contract_address = message.contractAddress; return obj; + }, + fromAmino(object: QueryDevFeeInfoRequestAmino): QueryDevFeeInfoRequest { + return { + contractAddress: object.contract_address + }; + }, + toAmino(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + return obj; + }, + fromAminoMsg(object: QueryDevFeeInfoRequestAminoMsg): QueryDevFeeInfoRequest { + return QueryDevFeeInfoRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryDevFeeInfoRequestProtoMsg): QueryDevFeeInfoRequest { + return QueryDevFeeInfoRequest.decode(message.value); + }, + toProto(message: QueryDevFeeInfoRequest): Uint8Array { + return QueryDevFeeInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDevFeeInfoRequest): QueryDevFeeInfoRequestProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfoRequest", + value: QueryDevFeeInfoRequest.encode(message).finish() + }; } }; function createBaseQueryDevFeeInfoResponse(): QueryDevFeeInfoResponse { @@ -325,6 +409,7 @@ function createBaseQueryDevFeeInfoResponse(): QueryDevFeeInfoResponse { }; } export const QueryDevFeeInfoResponse = { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfoResponse", encode(message: QueryDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fee !== undefined) { DevFeeInfo.encode(message.fee, writer.uint32(10).fork()).ldelim(); @@ -377,12 +462,38 @@ export const QueryDevFeeInfoResponse = { const obj: any = {}; message.fee !== undefined && (obj.fee = message.fee ? DevFeeInfo.toSDK(message.fee) : undefined); return obj; + }, + fromAmino(object: QueryDevFeeInfoResponseAmino): QueryDevFeeInfoResponse { + return { + fee: object?.fee ? DevFeeInfo.fromAmino(object.fee) : undefined + }; + }, + toAmino(message: QueryDevFeeInfoResponse): QueryDevFeeInfoResponseAmino { + const obj: any = {}; + obj.fee = message.fee ? DevFeeInfo.toAmino(message.fee) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDevFeeInfoResponseAminoMsg): QueryDevFeeInfoResponse { + return QueryDevFeeInfoResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryDevFeeInfoResponseProtoMsg): QueryDevFeeInfoResponse { + return QueryDevFeeInfoResponse.decode(message.value); + }, + toProto(message: QueryDevFeeInfoResponse): Uint8Array { + return QueryDevFeeInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDevFeeInfoResponse): QueryDevFeeInfoResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfoResponse", + value: QueryDevFeeInfoResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/evmos.fees.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -420,6 +531,28 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -428,6 +561,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/evmos.fees.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -480,6 +614,31 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryDevFeeInfosPerDeployerRequest(): QueryDevFeeInfosPerDeployerRequest { @@ -489,6 +648,7 @@ function createBaseQueryDevFeeInfosPerDeployerRequest(): QueryDevFeeInfosPerDepl }; } export const QueryDevFeeInfosPerDeployerRequest = { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest", encode(message: QueryDevFeeInfosPerDeployerRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployerAddress !== "") { writer.uint32(10).string(message.deployerAddress); @@ -553,6 +713,33 @@ export const QueryDevFeeInfosPerDeployerRequest = { obj.deployer_address = message.deployerAddress; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDevFeeInfosPerDeployerRequestAmino): QueryDevFeeInfosPerDeployerRequest { + return { + deployerAddress: object.deployer_address, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestAmino { + const obj: any = {}; + obj.deployer_address = message.deployerAddress; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDevFeeInfosPerDeployerRequestAminoMsg): QueryDevFeeInfosPerDeployerRequest { + return QueryDevFeeInfosPerDeployerRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryDevFeeInfosPerDeployerRequestProtoMsg): QueryDevFeeInfosPerDeployerRequest { + return QueryDevFeeInfosPerDeployerRequest.decode(message.value); + }, + toProto(message: QueryDevFeeInfosPerDeployerRequest): Uint8Array { + return QueryDevFeeInfosPerDeployerRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDevFeeInfosPerDeployerRequest): QueryDevFeeInfosPerDeployerRequestProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest", + value: QueryDevFeeInfosPerDeployerRequest.encode(message).finish() + }; } }; function createBaseQueryDevFeeInfosPerDeployerResponse(): QueryDevFeeInfosPerDeployerResponse { @@ -562,6 +749,7 @@ function createBaseQueryDevFeeInfosPerDeployerResponse(): QueryDevFeeInfosPerDep }; } export const QueryDevFeeInfosPerDeployerResponse = { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse", encode(message: QueryDevFeeInfosPerDeployerResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fees) { DevFeeInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -634,5 +822,36 @@ export const QueryDevFeeInfosPerDeployerResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDevFeeInfosPerDeployerResponseAmino): QueryDevFeeInfosPerDeployerResponse { + return { + fees: Array.isArray(object?.fees) ? object.fees.map((e: any) => DevFeeInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDevFeeInfosPerDeployerResponse): QueryDevFeeInfosPerDeployerResponseAmino { + const obj: any = {}; + if (message.fees) { + obj.fees = message.fees.map(e => e ? DevFeeInfo.toAmino(e) : undefined); + } else { + obj.fees = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDevFeeInfosPerDeployerResponseAminoMsg): QueryDevFeeInfosPerDeployerResponse { + return QueryDevFeeInfosPerDeployerResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryDevFeeInfosPerDeployerResponseProtoMsg): QueryDevFeeInfosPerDeployerResponse { + return QueryDevFeeInfosPerDeployerResponse.decode(message.value); + }, + toProto(message: QueryDevFeeInfosPerDeployerResponse): Uint8Array { + return QueryDevFeeInfosPerDeployerResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDevFeeInfosPerDeployerResponse): QueryDevFeeInfosPerDeployerResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse", + value: QueryDevFeeInfosPerDeployerResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts index 33250c36c5..be56e0a897 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/fees/v1/tx.ts @@ -92,6 +92,7 @@ function createBaseMsgRegisterDevFeeInfo(): MsgRegisterDevFeeInfo { }; } export const MsgRegisterDevFeeInfo = { + typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo", encode(message: MsgRegisterDevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -197,12 +198,48 @@ export const MsgRegisterDevFeeInfo = { obj.nonces = []; } return obj; + }, + fromAmino(object: MsgRegisterDevFeeInfoAmino): MsgRegisterDevFeeInfo { + return { + contractAddress: object.contract_address, + deployerAddress: object.deployer_address, + withdrawAddress: object.withdraw_address, + nonces: Array.isArray(object?.nonces) ? object.nonces.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + obj.deployer_address = message.deployerAddress; + obj.withdraw_address = message.withdrawAddress; + if (message.nonces) { + obj.nonces = message.nonces.map(e => e.toString()); + } else { + obj.nonces = []; + } + return obj; + }, + fromAminoMsg(object: MsgRegisterDevFeeInfoAminoMsg): MsgRegisterDevFeeInfo { + return MsgRegisterDevFeeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: MsgRegisterDevFeeInfoProtoMsg): MsgRegisterDevFeeInfo { + return MsgRegisterDevFeeInfo.decode(message.value); + }, + toProto(message: MsgRegisterDevFeeInfo): Uint8Array { + return MsgRegisterDevFeeInfo.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoProtoMsg { + return { + typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo", + value: MsgRegisterDevFeeInfo.encode(message).finish() + }; } }; function createBaseMsgRegisterDevFeeInfoResponse(): MsgRegisterDevFeeInfoResponse { return {}; } export const MsgRegisterDevFeeInfoResponse = { + typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse", encode(_: MsgRegisterDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -240,6 +277,28 @@ export const MsgRegisterDevFeeInfoResponse = { toSDK(_: MsgRegisterDevFeeInfoResponse): MsgRegisterDevFeeInfoResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRegisterDevFeeInfoResponseAmino): MsgRegisterDevFeeInfoResponse { + return {}; + }, + toAmino(_: MsgRegisterDevFeeInfoResponse): MsgRegisterDevFeeInfoResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRegisterDevFeeInfoResponseAminoMsg): MsgRegisterDevFeeInfoResponse { + return MsgRegisterDevFeeInfoResponse.fromAmino(object.value); + }, + fromProtoMsg(message: MsgRegisterDevFeeInfoResponseProtoMsg): MsgRegisterDevFeeInfoResponse { + return MsgRegisterDevFeeInfoResponse.decode(message.value); + }, + toProto(message: MsgRegisterDevFeeInfoResponse): Uint8Array { + return MsgRegisterDevFeeInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterDevFeeInfoResponse): MsgRegisterDevFeeInfoResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse", + value: MsgRegisterDevFeeInfoResponse.encode(message).finish() + }; } }; function createBaseMsgCancelDevFeeInfo(): MsgCancelDevFeeInfo { @@ -249,6 +308,7 @@ function createBaseMsgCancelDevFeeInfo(): MsgCancelDevFeeInfo { }; } export const MsgCancelDevFeeInfo = { + typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfo", encode(message: MsgCancelDevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -313,12 +373,40 @@ export const MsgCancelDevFeeInfo = { obj.contract_address = message.contractAddress; obj.deployer_address = message.deployerAddress; return obj; + }, + fromAmino(object: MsgCancelDevFeeInfoAmino): MsgCancelDevFeeInfo { + return { + contractAddress: object.contract_address, + deployerAddress: object.deployer_address + }; + }, + toAmino(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + obj.deployer_address = message.deployerAddress; + return obj; + }, + fromAminoMsg(object: MsgCancelDevFeeInfoAminoMsg): MsgCancelDevFeeInfo { + return MsgCancelDevFeeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: MsgCancelDevFeeInfoProtoMsg): MsgCancelDevFeeInfo { + return MsgCancelDevFeeInfo.decode(message.value); + }, + toProto(message: MsgCancelDevFeeInfo): Uint8Array { + return MsgCancelDevFeeInfo.encode(message).finish(); + }, + toProtoMsg(message: MsgCancelDevFeeInfo): MsgCancelDevFeeInfoProtoMsg { + return { + typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfo", + value: MsgCancelDevFeeInfo.encode(message).finish() + }; } }; function createBaseMsgCancelDevFeeInfoResponse(): MsgCancelDevFeeInfoResponse { return {}; } export const MsgCancelDevFeeInfoResponse = { + typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse", encode(_: MsgCancelDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -356,6 +444,28 @@ export const MsgCancelDevFeeInfoResponse = { toSDK(_: MsgCancelDevFeeInfoResponse): MsgCancelDevFeeInfoResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCancelDevFeeInfoResponseAmino): MsgCancelDevFeeInfoResponse { + return {}; + }, + toAmino(_: MsgCancelDevFeeInfoResponse): MsgCancelDevFeeInfoResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCancelDevFeeInfoResponseAminoMsg): MsgCancelDevFeeInfoResponse { + return MsgCancelDevFeeInfoResponse.fromAmino(object.value); + }, + fromProtoMsg(message: MsgCancelDevFeeInfoResponseProtoMsg): MsgCancelDevFeeInfoResponse { + return MsgCancelDevFeeInfoResponse.decode(message.value); + }, + toProto(message: MsgCancelDevFeeInfoResponse): Uint8Array { + return MsgCancelDevFeeInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCancelDevFeeInfoResponse): MsgCancelDevFeeInfoResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse", + value: MsgCancelDevFeeInfoResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateDevFeeInfo(): MsgUpdateDevFeeInfo { @@ -366,6 +476,7 @@ function createBaseMsgUpdateDevFeeInfo(): MsgUpdateDevFeeInfo { }; } export const MsgUpdateDevFeeInfo = { + typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfo", encode(message: MsgUpdateDevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -442,12 +553,42 @@ export const MsgUpdateDevFeeInfo = { obj.deployer_address = message.deployerAddress; obj.withdraw_address = message.withdrawAddress; return obj; + }, + fromAmino(object: MsgUpdateDevFeeInfoAmino): MsgUpdateDevFeeInfo { + return { + contractAddress: object.contract_address, + deployerAddress: object.deployer_address, + withdrawAddress: object.withdraw_address + }; + }, + toAmino(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + obj.deployer_address = message.deployerAddress; + obj.withdraw_address = message.withdrawAddress; + return obj; + }, + fromAminoMsg(object: MsgUpdateDevFeeInfoAminoMsg): MsgUpdateDevFeeInfo { + return MsgUpdateDevFeeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: MsgUpdateDevFeeInfoProtoMsg): MsgUpdateDevFeeInfo { + return MsgUpdateDevFeeInfo.decode(message.value); + }, + toProto(message: MsgUpdateDevFeeInfo): Uint8Array { + return MsgUpdateDevFeeInfo.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateDevFeeInfo): MsgUpdateDevFeeInfoProtoMsg { + return { + typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfo", + value: MsgUpdateDevFeeInfo.encode(message).finish() + }; } }; function createBaseMsgUpdateDevFeeInfoResponse(): MsgUpdateDevFeeInfoResponse { return {}; } export const MsgUpdateDevFeeInfoResponse = { + typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse", encode(_: MsgUpdateDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -485,5 +626,27 @@ export const MsgUpdateDevFeeInfoResponse = { toSDK(_: MsgUpdateDevFeeInfoResponse): MsgUpdateDevFeeInfoResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateDevFeeInfoResponseAmino): MsgUpdateDevFeeInfoResponse { + return {}; + }, + toAmino(_: MsgUpdateDevFeeInfoResponse): MsgUpdateDevFeeInfoResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateDevFeeInfoResponseAminoMsg): MsgUpdateDevFeeInfoResponse { + return MsgUpdateDevFeeInfoResponse.fromAmino(object.value); + }, + fromProtoMsg(message: MsgUpdateDevFeeInfoResponseProtoMsg): MsgUpdateDevFeeInfoResponse { + return MsgUpdateDevFeeInfoResponse.decode(message.value); + }, + toProto(message: MsgUpdateDevFeeInfoResponse): Uint8Array { + return MsgUpdateDevFeeInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateDevFeeInfoResponse): MsgUpdateDevFeeInfoResponseProtoMsg { + return { + typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse", + value: MsgUpdateDevFeeInfoResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts index a96096e851..bd6e8c593b 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/genesis.ts @@ -44,6 +44,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.incentives.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -136,6 +137,43 @@ export const GenesisState = { obj.gas_meters = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + incentives: Array.isArray(object?.incentives) ? object.incentives.map((e: any) => Incentive.fromAmino(e)) : [], + gasMeters: Array.isArray(object?.gas_meters) ? object.gas_meters.map((e: any) => GasMeter.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.incentives) { + obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); + } else { + obj.incentives = []; + } + if (message.gasMeters) { + obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); + } else { + obj.gas_meters = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -147,6 +185,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/evmos.incentives.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableIncentives === true) { writer.uint32(8).bool(message.enableIncentives); @@ -235,5 +274,36 @@ export const Params = { obj.incentives_epoch_identifier = message.incentivesEpochIdentifier; obj.reward_scaler = message.rewardScaler; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + enableIncentives: object.enable_incentives, + allocationLimit: object.allocation_limit, + incentivesEpochIdentifier: object.incentives_epoch_identifier, + rewardScaler: object.reward_scaler + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.enable_incentives = message.enableIncentives; + obj.allocation_limit = message.allocationLimit; + obj.incentives_epoch_identifier = message.incentivesEpochIdentifier; + obj.reward_scaler = message.rewardScaler; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts index 528a404c21..1dbb692fa1 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/incentives.ts @@ -91,6 +91,7 @@ function createBaseIncentive(): Incentive { }; } export const Incentive = { + typeUrl: "/evmos.incentives.v1.Incentive", encode(message: Incentive, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); @@ -199,6 +200,43 @@ export const Incentive = { message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); obj.total_gas = message.totalGas; return obj; + }, + fromAmino(object: IncentiveAmino): Incentive { + return { + contract: object.contract, + allocations: Array.isArray(object?.allocations) ? object.allocations.map((e: any) => DecCoin.fromAmino(e)) : [], + epochs: object.epochs, + startTime: object.start_time, + totalGas: BigInt(object.total_gas) + }; + }, + toAmino(message: Incentive): IncentiveAmino { + const obj: any = {}; + obj.contract = message.contract; + if (message.allocations) { + obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.allocations = []; + } + obj.epochs = message.epochs; + obj.start_time = message.startTime; + obj.total_gas = message.totalGas ? message.totalGas.toString() : undefined; + return obj; + }, + fromAminoMsg(object: IncentiveAminoMsg): Incentive { + return Incentive.fromAmino(object.value); + }, + fromProtoMsg(message: IncentiveProtoMsg): Incentive { + return Incentive.decode(message.value); + }, + toProto(message: Incentive): Uint8Array { + return Incentive.encode(message).finish(); + }, + toProtoMsg(message: Incentive): IncentiveProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.Incentive", + value: Incentive.encode(message).finish() + }; } }; function createBaseGasMeter(): GasMeter { @@ -209,6 +247,7 @@ function createBaseGasMeter(): GasMeter { }; } export const GasMeter = { + typeUrl: "/evmos.incentives.v1.GasMeter", encode(message: GasMeter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); @@ -285,6 +324,35 @@ export const GasMeter = { obj.participant = message.participant; obj.cumulative_gas = message.cumulativeGas; return obj; + }, + fromAmino(object: GasMeterAmino): GasMeter { + return { + contract: object.contract, + participant: object.participant, + cumulativeGas: BigInt(object.cumulative_gas) + }; + }, + toAmino(message: GasMeter): GasMeterAmino { + const obj: any = {}; + obj.contract = message.contract; + obj.participant = message.participant; + obj.cumulative_gas = message.cumulativeGas ? message.cumulativeGas.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GasMeterAminoMsg): GasMeter { + return GasMeter.fromAmino(object.value); + }, + fromProtoMsg(message: GasMeterProtoMsg): GasMeter { + return GasMeter.decode(message.value); + }, + toProto(message: GasMeter): Uint8Array { + return GasMeter.encode(message).finish(); + }, + toProtoMsg(message: GasMeter): GasMeterProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.GasMeter", + value: GasMeter.encode(message).finish() + }; } }; function createBaseRegisterIncentiveProposal(): RegisterIncentiveProposal { @@ -297,6 +365,7 @@ function createBaseRegisterIncentiveProposal(): RegisterIncentiveProposal { }; } export const RegisterIncentiveProposal = { + typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal", encode(message: RegisterIncentiveProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -405,6 +474,43 @@ export const RegisterIncentiveProposal = { } obj.epochs = message.epochs; return obj; + }, + fromAmino(object: RegisterIncentiveProposalAmino): RegisterIncentiveProposal { + return { + title: object.title, + description: object.description, + contract: object.contract, + allocations: Array.isArray(object?.allocations) ? object.allocations.map((e: any) => DecCoin.fromAmino(e)) : [], + epochs: object.epochs + }; + }, + toAmino(message: RegisterIncentiveProposal): RegisterIncentiveProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.contract = message.contract; + if (message.allocations) { + obj.allocations = message.allocations.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.allocations = []; + } + obj.epochs = message.epochs; + return obj; + }, + fromAminoMsg(object: RegisterIncentiveProposalAminoMsg): RegisterIncentiveProposal { + return RegisterIncentiveProposal.fromAmino(object.value); + }, + fromProtoMsg(message: RegisterIncentiveProposalProtoMsg): RegisterIncentiveProposal { + return RegisterIncentiveProposal.decode(message.value); + }, + toProto(message: RegisterIncentiveProposal): Uint8Array { + return RegisterIncentiveProposal.encode(message).finish(); + }, + toProtoMsg(message: RegisterIncentiveProposal): RegisterIncentiveProposalProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal", + value: RegisterIncentiveProposal.encode(message).finish() + }; } }; function createBaseCancelIncentiveProposal(): CancelIncentiveProposal { @@ -415,6 +521,7 @@ function createBaseCancelIncentiveProposal(): CancelIncentiveProposal { }; } export const CancelIncentiveProposal = { + typeUrl: "/evmos.incentives.v1.CancelIncentiveProposal", encode(message: CancelIncentiveProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -491,5 +598,34 @@ export const CancelIncentiveProposal = { obj.description = message.description; obj.contract = message.contract; return obj; + }, + fromAmino(object: CancelIncentiveProposalAmino): CancelIncentiveProposal { + return { + title: object.title, + description: object.description, + contract: object.contract + }; + }, + toAmino(message: CancelIncentiveProposal): CancelIncentiveProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.contract = message.contract; + return obj; + }, + fromAminoMsg(object: CancelIncentiveProposalAminoMsg): CancelIncentiveProposal { + return CancelIncentiveProposal.fromAmino(object.value); + }, + fromProtoMsg(message: CancelIncentiveProposalProtoMsg): CancelIncentiveProposal { + return CancelIncentiveProposal.decode(message.value); + }, + toProto(message: CancelIncentiveProposal): Uint8Array { + return CancelIncentiveProposal.encode(message).finish(); + }, + toProtoMsg(message: CancelIncentiveProposal): CancelIncentiveProposalProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.CancelIncentiveProposal", + value: CancelIncentiveProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts index 9ea93caaf8..fd9e6ad0f5 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/incentives/v1/query.ts @@ -210,6 +210,7 @@ function createBaseQueryIncentivesRequest(): QueryIncentivesRequest { }; } export const QueryIncentivesRequest = { + typeUrl: "/evmos.incentives.v1.QueryIncentivesRequest", encode(message: QueryIncentivesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -262,6 +263,31 @@ export const QueryIncentivesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryIncentivesRequestAmino): QueryIncentivesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryIncentivesRequest): QueryIncentivesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivesRequestAminoMsg): QueryIncentivesRequest { + return QueryIncentivesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryIncentivesRequestProtoMsg): QueryIncentivesRequest { + return QueryIncentivesRequest.decode(message.value); + }, + toProto(message: QueryIncentivesRequest): Uint8Array { + return QueryIncentivesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivesRequest): QueryIncentivesRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryIncentivesRequest", + value: QueryIncentivesRequest.encode(message).finish() + }; } }; function createBaseQueryIncentivesResponse(): QueryIncentivesResponse { @@ -271,6 +297,7 @@ function createBaseQueryIncentivesResponse(): QueryIncentivesResponse { }; } export const QueryIncentivesResponse = { + typeUrl: "/evmos.incentives.v1.QueryIncentivesResponse", encode(message: QueryIncentivesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.incentives) { Incentive.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -343,6 +370,37 @@ export const QueryIncentivesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryIncentivesResponseAmino): QueryIncentivesResponse { + return { + incentives: Array.isArray(object?.incentives) ? object.incentives.map((e: any) => Incentive.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryIncentivesResponse): QueryIncentivesResponseAmino { + const obj: any = {}; + if (message.incentives) { + obj.incentives = message.incentives.map(e => e ? Incentive.toAmino(e) : undefined); + } else { + obj.incentives = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivesResponseAminoMsg): QueryIncentivesResponse { + return QueryIncentivesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryIncentivesResponseProtoMsg): QueryIncentivesResponse { + return QueryIncentivesResponse.decode(message.value); + }, + toProto(message: QueryIncentivesResponse): Uint8Array { + return QueryIncentivesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivesResponse): QueryIncentivesResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryIncentivesResponse", + value: QueryIncentivesResponse.encode(message).finish() + }; } }; function createBaseQueryIncentiveRequest(): QueryIncentiveRequest { @@ -351,6 +409,7 @@ function createBaseQueryIncentiveRequest(): QueryIncentiveRequest { }; } export const QueryIncentiveRequest = { + typeUrl: "/evmos.incentives.v1.QueryIncentiveRequest", encode(message: QueryIncentiveRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); @@ -403,6 +462,31 @@ export const QueryIncentiveRequest = { const obj: any = {}; obj.contract = message.contract; return obj; + }, + fromAmino(object: QueryIncentiveRequestAmino): QueryIncentiveRequest { + return { + contract: object.contract + }; + }, + toAmino(message: QueryIncentiveRequest): QueryIncentiveRequestAmino { + const obj: any = {}; + obj.contract = message.contract; + return obj; + }, + fromAminoMsg(object: QueryIncentiveRequestAminoMsg): QueryIncentiveRequest { + return QueryIncentiveRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryIncentiveRequestProtoMsg): QueryIncentiveRequest { + return QueryIncentiveRequest.decode(message.value); + }, + toProto(message: QueryIncentiveRequest): Uint8Array { + return QueryIncentiveRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentiveRequest): QueryIncentiveRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryIncentiveRequest", + value: QueryIncentiveRequest.encode(message).finish() + }; } }; function createBaseQueryIncentiveResponse(): QueryIncentiveResponse { @@ -411,6 +495,7 @@ function createBaseQueryIncentiveResponse(): QueryIncentiveResponse { }; } export const QueryIncentiveResponse = { + typeUrl: "/evmos.incentives.v1.QueryIncentiveResponse", encode(message: QueryIncentiveResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.incentive !== undefined) { Incentive.encode(message.incentive, writer.uint32(10).fork()).ldelim(); @@ -463,6 +548,31 @@ export const QueryIncentiveResponse = { const obj: any = {}; message.incentive !== undefined && (obj.incentive = message.incentive ? Incentive.toSDK(message.incentive) : undefined); return obj; + }, + fromAmino(object: QueryIncentiveResponseAmino): QueryIncentiveResponse { + return { + incentive: object?.incentive ? Incentive.fromAmino(object.incentive) : undefined + }; + }, + toAmino(message: QueryIncentiveResponse): QueryIncentiveResponseAmino { + const obj: any = {}; + obj.incentive = message.incentive ? Incentive.toAmino(message.incentive) : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentiveResponseAminoMsg): QueryIncentiveResponse { + return QueryIncentiveResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryIncentiveResponseProtoMsg): QueryIncentiveResponse { + return QueryIncentiveResponse.decode(message.value); + }, + toProto(message: QueryIncentiveResponse): Uint8Array { + return QueryIncentiveResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentiveResponse): QueryIncentiveResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryIncentiveResponse", + value: QueryIncentiveResponse.encode(message).finish() + }; } }; function createBaseQueryGasMetersRequest(): QueryGasMetersRequest { @@ -472,6 +582,7 @@ function createBaseQueryGasMetersRequest(): QueryGasMetersRequest { }; } export const QueryGasMetersRequest = { + typeUrl: "/evmos.incentives.v1.QueryGasMetersRequest", encode(message: QueryGasMetersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); @@ -536,6 +647,33 @@ export const QueryGasMetersRequest = { obj.contract = message.contract; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGasMetersRequestAmino): QueryGasMetersRequest { + return { + contract: object.contract, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGasMetersRequest): QueryGasMetersRequestAmino { + const obj: any = {}; + obj.contract = message.contract; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGasMetersRequestAminoMsg): QueryGasMetersRequest { + return QueryGasMetersRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryGasMetersRequestProtoMsg): QueryGasMetersRequest { + return QueryGasMetersRequest.decode(message.value); + }, + toProto(message: QueryGasMetersRequest): Uint8Array { + return QueryGasMetersRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGasMetersRequest): QueryGasMetersRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryGasMetersRequest", + value: QueryGasMetersRequest.encode(message).finish() + }; } }; function createBaseQueryGasMetersResponse(): QueryGasMetersResponse { @@ -545,6 +683,7 @@ function createBaseQueryGasMetersResponse(): QueryGasMetersResponse { }; } export const QueryGasMetersResponse = { + typeUrl: "/evmos.incentives.v1.QueryGasMetersResponse", encode(message: QueryGasMetersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.gasMeters) { GasMeter.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -617,6 +756,37 @@ export const QueryGasMetersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryGasMetersResponseAmino): QueryGasMetersResponse { + return { + gasMeters: Array.isArray(object?.gas_meters) ? object.gas_meters.map((e: any) => GasMeter.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryGasMetersResponse): QueryGasMetersResponseAmino { + const obj: any = {}; + if (message.gasMeters) { + obj.gas_meters = message.gasMeters.map(e => e ? GasMeter.toAmino(e) : undefined); + } else { + obj.gas_meters = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGasMetersResponseAminoMsg): QueryGasMetersResponse { + return QueryGasMetersResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryGasMetersResponseProtoMsg): QueryGasMetersResponse { + return QueryGasMetersResponse.decode(message.value); + }, + toProto(message: QueryGasMetersResponse): Uint8Array { + return QueryGasMetersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGasMetersResponse): QueryGasMetersResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryGasMetersResponse", + value: QueryGasMetersResponse.encode(message).finish() + }; } }; function createBaseQueryGasMeterRequest(): QueryGasMeterRequest { @@ -626,6 +796,7 @@ function createBaseQueryGasMeterRequest(): QueryGasMeterRequest { }; } export const QueryGasMeterRequest = { + typeUrl: "/evmos.incentives.v1.QueryGasMeterRequest", encode(message: QueryGasMeterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); @@ -690,6 +861,33 @@ export const QueryGasMeterRequest = { obj.contract = message.contract; obj.participant = message.participant; return obj; + }, + fromAmino(object: QueryGasMeterRequestAmino): QueryGasMeterRequest { + return { + contract: object.contract, + participant: object.participant + }; + }, + toAmino(message: QueryGasMeterRequest): QueryGasMeterRequestAmino { + const obj: any = {}; + obj.contract = message.contract; + obj.participant = message.participant; + return obj; + }, + fromAminoMsg(object: QueryGasMeterRequestAminoMsg): QueryGasMeterRequest { + return QueryGasMeterRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryGasMeterRequestProtoMsg): QueryGasMeterRequest { + return QueryGasMeterRequest.decode(message.value); + }, + toProto(message: QueryGasMeterRequest): Uint8Array { + return QueryGasMeterRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGasMeterRequest): QueryGasMeterRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryGasMeterRequest", + value: QueryGasMeterRequest.encode(message).finish() + }; } }; function createBaseQueryGasMeterResponse(): QueryGasMeterResponse { @@ -698,6 +896,7 @@ function createBaseQueryGasMeterResponse(): QueryGasMeterResponse { }; } export const QueryGasMeterResponse = { + typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse", encode(message: QueryGasMeterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gasMeter !== BigInt(0)) { writer.uint32(8).uint64(message.gasMeter); @@ -750,6 +949,31 @@ export const QueryGasMeterResponse = { const obj: any = {}; obj.gas_meter = message.gasMeter; return obj; + }, + fromAmino(object: QueryGasMeterResponseAmino): QueryGasMeterResponse { + return { + gasMeter: BigInt(object.gas_meter) + }; + }, + toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { + const obj: any = {}; + obj.gas_meter = message.gasMeter ? message.gasMeter.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryGasMeterResponseAminoMsg): QueryGasMeterResponse { + return QueryGasMeterResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryGasMeterResponseProtoMsg): QueryGasMeterResponse { + return QueryGasMeterResponse.decode(message.value); + }, + toProto(message: QueryGasMeterResponse): Uint8Array { + return QueryGasMeterResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGasMeterResponse): QueryGasMeterResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse", + value: QueryGasMeterResponse.encode(message).finish() + }; } }; function createBaseQueryAllocationMetersRequest(): QueryAllocationMetersRequest { @@ -758,6 +982,7 @@ function createBaseQueryAllocationMetersRequest(): QueryAllocationMetersRequest }; } export const QueryAllocationMetersRequest = { + typeUrl: "/evmos.incentives.v1.QueryAllocationMetersRequest", encode(message: QueryAllocationMetersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -810,6 +1035,31 @@ export const QueryAllocationMetersRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllocationMetersRequestAmino): QueryAllocationMetersRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllocationMetersRequest): QueryAllocationMetersRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllocationMetersRequestAminoMsg): QueryAllocationMetersRequest { + return QueryAllocationMetersRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryAllocationMetersRequestProtoMsg): QueryAllocationMetersRequest { + return QueryAllocationMetersRequest.decode(message.value); + }, + toProto(message: QueryAllocationMetersRequest): Uint8Array { + return QueryAllocationMetersRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllocationMetersRequest): QueryAllocationMetersRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryAllocationMetersRequest", + value: QueryAllocationMetersRequest.encode(message).finish() + }; } }; function createBaseQueryAllocationMetersResponse(): QueryAllocationMetersResponse { @@ -819,6 +1069,7 @@ function createBaseQueryAllocationMetersResponse(): QueryAllocationMetersRespons }; } export const QueryAllocationMetersResponse = { + typeUrl: "/evmos.incentives.v1.QueryAllocationMetersResponse", encode(message: QueryAllocationMetersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allocationMeters) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -891,6 +1142,37 @@ export const QueryAllocationMetersResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryAllocationMetersResponseAmino): QueryAllocationMetersResponse { + return { + allocationMeters: Array.isArray(object?.allocation_meters) ? object.allocation_meters.map((e: any) => DecCoin.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryAllocationMetersResponse): QueryAllocationMetersResponseAmino { + const obj: any = {}; + if (message.allocationMeters) { + obj.allocation_meters = message.allocationMeters.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.allocation_meters = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllocationMetersResponseAminoMsg): QueryAllocationMetersResponse { + return QueryAllocationMetersResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryAllocationMetersResponseProtoMsg): QueryAllocationMetersResponse { + return QueryAllocationMetersResponse.decode(message.value); + }, + toProto(message: QueryAllocationMetersResponse): Uint8Array { + return QueryAllocationMetersResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllocationMetersResponse): QueryAllocationMetersResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryAllocationMetersResponse", + value: QueryAllocationMetersResponse.encode(message).finish() + }; } }; function createBaseQueryAllocationMeterRequest(): QueryAllocationMeterRequest { @@ -899,6 +1181,7 @@ function createBaseQueryAllocationMeterRequest(): QueryAllocationMeterRequest { }; } export const QueryAllocationMeterRequest = { + typeUrl: "/evmos.incentives.v1.QueryAllocationMeterRequest", encode(message: QueryAllocationMeterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -951,6 +1234,31 @@ export const QueryAllocationMeterRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryAllocationMeterRequestAmino): QueryAllocationMeterRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryAllocationMeterRequestAminoMsg): QueryAllocationMeterRequest { + return QueryAllocationMeterRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryAllocationMeterRequestProtoMsg): QueryAllocationMeterRequest { + return QueryAllocationMeterRequest.decode(message.value); + }, + toProto(message: QueryAllocationMeterRequest): Uint8Array { + return QueryAllocationMeterRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAllocationMeterRequest): QueryAllocationMeterRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryAllocationMeterRequest", + value: QueryAllocationMeterRequest.encode(message).finish() + }; } }; function createBaseQueryAllocationMeterResponse(): QueryAllocationMeterResponse { @@ -959,6 +1267,7 @@ function createBaseQueryAllocationMeterResponse(): QueryAllocationMeterResponse }; } export const QueryAllocationMeterResponse = { + typeUrl: "/evmos.incentives.v1.QueryAllocationMeterResponse", encode(message: QueryAllocationMeterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allocationMeter !== undefined) { DecCoin.encode(message.allocationMeter, writer.uint32(10).fork()).ldelim(); @@ -1011,12 +1320,38 @@ export const QueryAllocationMeterResponse = { const obj: any = {}; message.allocationMeter !== undefined && (obj.allocation_meter = message.allocationMeter ? DecCoin.toSDK(message.allocationMeter) : undefined); return obj; + }, + fromAmino(object: QueryAllocationMeterResponseAmino): QueryAllocationMeterResponse { + return { + allocationMeter: object?.allocation_meter ? DecCoin.fromAmino(object.allocation_meter) : undefined + }; + }, + toAmino(message: QueryAllocationMeterResponse): QueryAllocationMeterResponseAmino { + const obj: any = {}; + obj.allocation_meter = message.allocationMeter ? DecCoin.toAmino(message.allocationMeter) : undefined; + return obj; + }, + fromAminoMsg(object: QueryAllocationMeterResponseAminoMsg): QueryAllocationMeterResponse { + return QueryAllocationMeterResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryAllocationMeterResponseProtoMsg): QueryAllocationMeterResponse { + return QueryAllocationMeterResponse.decode(message.value); + }, + toProto(message: QueryAllocationMeterResponse): Uint8Array { + return QueryAllocationMeterResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAllocationMeterResponse): QueryAllocationMeterResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryAllocationMeterResponse", + value: QueryAllocationMeterResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/evmos.incentives.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1054,6 +1389,28 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -1062,6 +1419,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/evmos.incentives.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -1114,5 +1472,30 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/evmos.incentives.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts index 5b26cafcc9..aefac9f788 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/genesis.ts @@ -51,6 +51,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.inflation.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -151,6 +152,39 @@ export const GenesisState = { obj.epochs_per_period = message.epochsPerPeriod; obj.skipped_epochs = message.skippedEpochs; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + period: BigInt(object.period), + epochIdentifier: object.epoch_identifier, + epochsPerPeriod: BigInt(object.epochs_per_period), + skippedEpochs: BigInt(object.skipped_epochs) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.period = message.period ? message.period.toString() : undefined; + obj.epoch_identifier = message.epochIdentifier; + obj.epochs_per_period = message.epochsPerPeriod ? message.epochsPerPeriod.toString() : undefined; + obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -162,6 +196,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/evmos.inflation.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mintDenom !== "") { writer.uint32(10).string(message.mintDenom); @@ -250,5 +285,36 @@ export const Params = { message.inflationDistribution !== undefined && (obj.inflation_distribution = message.inflationDistribution ? InflationDistribution.toSDK(message.inflationDistribution) : undefined); obj.enable_inflation = message.enableInflation; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + mintDenom: object.mint_denom, + exponentialCalculation: object?.exponential_calculation ? ExponentialCalculation.fromAmino(object.exponential_calculation) : undefined, + inflationDistribution: object?.inflation_distribution ? InflationDistribution.fromAmino(object.inflation_distribution) : undefined, + enableInflation: object.enable_inflation + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.mint_denom = message.mintDenom; + obj.exponential_calculation = message.exponentialCalculation ? ExponentialCalculation.toAmino(message.exponentialCalculation) : undefined; + obj.inflation_distribution = message.inflationDistribution ? InflationDistribution.toAmino(message.inflationDistribution) : undefined; + obj.enable_inflation = message.enableInflation; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts index a3f890b7e8..843ea1bf5f 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/inflation.ts @@ -83,6 +83,7 @@ function createBaseInflationDistribution(): InflationDistribution { }; } export const InflationDistribution = { + typeUrl: "/evmos.inflation.v1.InflationDistribution", encode(message: InflationDistribution, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.stakingRewards !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.stakingRewards, 18).atomics); @@ -159,6 +160,35 @@ export const InflationDistribution = { obj.usage_incentives = message.usageIncentives; obj.community_pool = message.communityPool; return obj; + }, + fromAmino(object: InflationDistributionAmino): InflationDistribution { + return { + stakingRewards: object.staking_rewards, + usageIncentives: object.usage_incentives, + communityPool: object.community_pool + }; + }, + toAmino(message: InflationDistribution): InflationDistributionAmino { + const obj: any = {}; + obj.staking_rewards = message.stakingRewards; + obj.usage_incentives = message.usageIncentives; + obj.community_pool = message.communityPool; + return obj; + }, + fromAminoMsg(object: InflationDistributionAminoMsg): InflationDistribution { + return InflationDistribution.fromAmino(object.value); + }, + fromProtoMsg(message: InflationDistributionProtoMsg): InflationDistribution { + return InflationDistribution.decode(message.value); + }, + toProto(message: InflationDistribution): Uint8Array { + return InflationDistribution.encode(message).finish(); + }, + toProtoMsg(message: InflationDistribution): InflationDistributionProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.InflationDistribution", + value: InflationDistribution.encode(message).finish() + }; } }; function createBaseExponentialCalculation(): ExponentialCalculation { @@ -171,6 +201,7 @@ function createBaseExponentialCalculation(): ExponentialCalculation { }; } export const ExponentialCalculation = { + typeUrl: "/evmos.inflation.v1.ExponentialCalculation", encode(message: ExponentialCalculation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.a !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.a, 18).atomics); @@ -271,5 +302,38 @@ export const ExponentialCalculation = { obj.bonding_target = message.bondingTarget; obj.max_variance = message.maxVariance; return obj; + }, + fromAmino(object: ExponentialCalculationAmino): ExponentialCalculation { + return { + a: object.a, + r: object.r, + c: object.c, + bondingTarget: object.bonding_target, + maxVariance: object.max_variance + }; + }, + toAmino(message: ExponentialCalculation): ExponentialCalculationAmino { + const obj: any = {}; + obj.a = message.a; + obj.r = message.r; + obj.c = message.c; + obj.bonding_target = message.bondingTarget; + obj.max_variance = message.maxVariance; + return obj; + }, + fromAminoMsg(object: ExponentialCalculationAminoMsg): ExponentialCalculation { + return ExponentialCalculation.fromAmino(object.value); + }, + fromProtoMsg(message: ExponentialCalculationProtoMsg): ExponentialCalculation { + return ExponentialCalculation.decode(message.value); + }, + toProto(message: ExponentialCalculation): Uint8Array { + return ExponentialCalculation.encode(message).finish(); + }, + toProtoMsg(message: ExponentialCalculation): ExponentialCalculationProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.ExponentialCalculation", + value: ExponentialCalculation.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts index 62fd80ce17..159dc1f1bd 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/inflation/v1/query.ts @@ -134,6 +134,7 @@ function createBaseQueryPeriodRequest(): QueryPeriodRequest { return {}; } export const QueryPeriodRequest = { + typeUrl: "/evmos.inflation.v1.QueryPeriodRequest", encode(_: QueryPeriodRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -171,6 +172,28 @@ export const QueryPeriodRequest = { toSDK(_: QueryPeriodRequest): QueryPeriodRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryPeriodRequestAmino): QueryPeriodRequest { + return {}; + }, + toAmino(_: QueryPeriodRequest): QueryPeriodRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryPeriodRequestAminoMsg): QueryPeriodRequest { + return QueryPeriodRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryPeriodRequestProtoMsg): QueryPeriodRequest { + return QueryPeriodRequest.decode(message.value); + }, + toProto(message: QueryPeriodRequest): Uint8Array { + return QueryPeriodRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPeriodRequest): QueryPeriodRequestProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryPeriodRequest", + value: QueryPeriodRequest.encode(message).finish() + }; } }; function createBaseQueryPeriodResponse(): QueryPeriodResponse { @@ -179,6 +202,7 @@ function createBaseQueryPeriodResponse(): QueryPeriodResponse { }; } export const QueryPeriodResponse = { + typeUrl: "/evmos.inflation.v1.QueryPeriodResponse", encode(message: QueryPeriodResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.period !== BigInt(0)) { writer.uint32(8).uint64(message.period); @@ -231,12 +255,38 @@ export const QueryPeriodResponse = { const obj: any = {}; obj.period = message.period; return obj; + }, + fromAmino(object: QueryPeriodResponseAmino): QueryPeriodResponse { + return { + period: BigInt(object.period) + }; + }, + toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { + const obj: any = {}; + obj.period = message.period ? message.period.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPeriodResponseAminoMsg): QueryPeriodResponse { + return QueryPeriodResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryPeriodResponseProtoMsg): QueryPeriodResponse { + return QueryPeriodResponse.decode(message.value); + }, + toProto(message: QueryPeriodResponse): Uint8Array { + return QueryPeriodResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPeriodResponse): QueryPeriodResponseProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryPeriodResponse", + value: QueryPeriodResponse.encode(message).finish() + }; } }; function createBaseQueryEpochMintProvisionRequest(): QueryEpochMintProvisionRequest { return {}; } export const QueryEpochMintProvisionRequest = { + typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionRequest", encode(_: QueryEpochMintProvisionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -274,6 +324,28 @@ export const QueryEpochMintProvisionRequest = { toSDK(_: QueryEpochMintProvisionRequest): QueryEpochMintProvisionRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryEpochMintProvisionRequestAmino): QueryEpochMintProvisionRequest { + return {}; + }, + toAmino(_: QueryEpochMintProvisionRequest): QueryEpochMintProvisionRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryEpochMintProvisionRequestAminoMsg): QueryEpochMintProvisionRequest { + return QueryEpochMintProvisionRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryEpochMintProvisionRequestProtoMsg): QueryEpochMintProvisionRequest { + return QueryEpochMintProvisionRequest.decode(message.value); + }, + toProto(message: QueryEpochMintProvisionRequest): Uint8Array { + return QueryEpochMintProvisionRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochMintProvisionRequest): QueryEpochMintProvisionRequestProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionRequest", + value: QueryEpochMintProvisionRequest.encode(message).finish() + }; } }; function createBaseQueryEpochMintProvisionResponse(): QueryEpochMintProvisionResponse { @@ -282,6 +354,7 @@ function createBaseQueryEpochMintProvisionResponse(): QueryEpochMintProvisionRes }; } export const QueryEpochMintProvisionResponse = { + typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionResponse", encode(message: QueryEpochMintProvisionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.epochMintProvision !== undefined) { DecCoin.encode(message.epochMintProvision, writer.uint32(10).fork()).ldelim(); @@ -334,12 +407,38 @@ export const QueryEpochMintProvisionResponse = { const obj: any = {}; message.epochMintProvision !== undefined && (obj.epoch_mint_provision = message.epochMintProvision ? DecCoin.toSDK(message.epochMintProvision) : undefined); return obj; + }, + fromAmino(object: QueryEpochMintProvisionResponseAmino): QueryEpochMintProvisionResponse { + return { + epochMintProvision: object?.epoch_mint_provision ? DecCoin.fromAmino(object.epoch_mint_provision) : undefined + }; + }, + toAmino(message: QueryEpochMintProvisionResponse): QueryEpochMintProvisionResponseAmino { + const obj: any = {}; + obj.epoch_mint_provision = message.epochMintProvision ? DecCoin.toAmino(message.epochMintProvision) : undefined; + return obj; + }, + fromAminoMsg(object: QueryEpochMintProvisionResponseAminoMsg): QueryEpochMintProvisionResponse { + return QueryEpochMintProvisionResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryEpochMintProvisionResponseProtoMsg): QueryEpochMintProvisionResponse { + return QueryEpochMintProvisionResponse.decode(message.value); + }, + toProto(message: QueryEpochMintProvisionResponse): Uint8Array { + return QueryEpochMintProvisionResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochMintProvisionResponse): QueryEpochMintProvisionResponseProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionResponse", + value: QueryEpochMintProvisionResponse.encode(message).finish() + }; } }; function createBaseQuerySkippedEpochsRequest(): QuerySkippedEpochsRequest { return {}; } export const QuerySkippedEpochsRequest = { + typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsRequest", encode(_: QuerySkippedEpochsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -377,6 +476,28 @@ export const QuerySkippedEpochsRequest = { toSDK(_: QuerySkippedEpochsRequest): QuerySkippedEpochsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QuerySkippedEpochsRequestAmino): QuerySkippedEpochsRequest { + return {}; + }, + toAmino(_: QuerySkippedEpochsRequest): QuerySkippedEpochsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QuerySkippedEpochsRequestAminoMsg): QuerySkippedEpochsRequest { + return QuerySkippedEpochsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QuerySkippedEpochsRequestProtoMsg): QuerySkippedEpochsRequest { + return QuerySkippedEpochsRequest.decode(message.value); + }, + toProto(message: QuerySkippedEpochsRequest): Uint8Array { + return QuerySkippedEpochsRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySkippedEpochsRequest): QuerySkippedEpochsRequestProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsRequest", + value: QuerySkippedEpochsRequest.encode(message).finish() + }; } }; function createBaseQuerySkippedEpochsResponse(): QuerySkippedEpochsResponse { @@ -385,6 +506,7 @@ function createBaseQuerySkippedEpochsResponse(): QuerySkippedEpochsResponse { }; } export const QuerySkippedEpochsResponse = { + typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse", encode(message: QuerySkippedEpochsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.skippedEpochs !== BigInt(0)) { writer.uint32(8).uint64(message.skippedEpochs); @@ -437,12 +559,38 @@ export const QuerySkippedEpochsResponse = { const obj: any = {}; obj.skipped_epochs = message.skippedEpochs; return obj; + }, + fromAmino(object: QuerySkippedEpochsResponseAmino): QuerySkippedEpochsResponse { + return { + skippedEpochs: BigInt(object.skipped_epochs) + }; + }, + toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { + const obj: any = {}; + obj.skipped_epochs = message.skippedEpochs ? message.skippedEpochs.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QuerySkippedEpochsResponseAminoMsg): QuerySkippedEpochsResponse { + return QuerySkippedEpochsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QuerySkippedEpochsResponseProtoMsg): QuerySkippedEpochsResponse { + return QuerySkippedEpochsResponse.decode(message.value); + }, + toProto(message: QuerySkippedEpochsResponse): Uint8Array { + return QuerySkippedEpochsResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse", + value: QuerySkippedEpochsResponse.encode(message).finish() + }; } }; function createBaseQueryCirculatingSupplyRequest(): QueryCirculatingSupplyRequest { return {}; } export const QueryCirculatingSupplyRequest = { + typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyRequest", encode(_: QueryCirculatingSupplyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -480,6 +628,28 @@ export const QueryCirculatingSupplyRequest = { toSDK(_: QueryCirculatingSupplyRequest): QueryCirculatingSupplyRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryCirculatingSupplyRequestAmino): QueryCirculatingSupplyRequest { + return {}; + }, + toAmino(_: QueryCirculatingSupplyRequest): QueryCirculatingSupplyRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryCirculatingSupplyRequestAminoMsg): QueryCirculatingSupplyRequest { + return QueryCirculatingSupplyRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryCirculatingSupplyRequestProtoMsg): QueryCirculatingSupplyRequest { + return QueryCirculatingSupplyRequest.decode(message.value); + }, + toProto(message: QueryCirculatingSupplyRequest): Uint8Array { + return QueryCirculatingSupplyRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCirculatingSupplyRequest): QueryCirculatingSupplyRequestProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyRequest", + value: QueryCirculatingSupplyRequest.encode(message).finish() + }; } }; function createBaseQueryCirculatingSupplyResponse(): QueryCirculatingSupplyResponse { @@ -488,6 +658,7 @@ function createBaseQueryCirculatingSupplyResponse(): QueryCirculatingSupplyRespo }; } export const QueryCirculatingSupplyResponse = { + typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyResponse", encode(message: QueryCirculatingSupplyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.circulatingSupply !== undefined) { DecCoin.encode(message.circulatingSupply, writer.uint32(10).fork()).ldelim(); @@ -540,12 +711,38 @@ export const QueryCirculatingSupplyResponse = { const obj: any = {}; message.circulatingSupply !== undefined && (obj.circulating_supply = message.circulatingSupply ? DecCoin.toSDK(message.circulatingSupply) : undefined); return obj; + }, + fromAmino(object: QueryCirculatingSupplyResponseAmino): QueryCirculatingSupplyResponse { + return { + circulatingSupply: object?.circulating_supply ? DecCoin.fromAmino(object.circulating_supply) : undefined + }; + }, + toAmino(message: QueryCirculatingSupplyResponse): QueryCirculatingSupplyResponseAmino { + const obj: any = {}; + obj.circulating_supply = message.circulatingSupply ? DecCoin.toAmino(message.circulatingSupply) : undefined; + return obj; + }, + fromAminoMsg(object: QueryCirculatingSupplyResponseAminoMsg): QueryCirculatingSupplyResponse { + return QueryCirculatingSupplyResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryCirculatingSupplyResponseProtoMsg): QueryCirculatingSupplyResponse { + return QueryCirculatingSupplyResponse.decode(message.value); + }, + toProto(message: QueryCirculatingSupplyResponse): Uint8Array { + return QueryCirculatingSupplyResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCirculatingSupplyResponse): QueryCirculatingSupplyResponseProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyResponse", + value: QueryCirculatingSupplyResponse.encode(message).finish() + }; } }; function createBaseQueryInflationRateRequest(): QueryInflationRateRequest { return {}; } export const QueryInflationRateRequest = { + typeUrl: "/evmos.inflation.v1.QueryInflationRateRequest", encode(_: QueryInflationRateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -583,6 +780,28 @@ export const QueryInflationRateRequest = { toSDK(_: QueryInflationRateRequest): QueryInflationRateRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryInflationRateRequestAmino): QueryInflationRateRequest { + return {}; + }, + toAmino(_: QueryInflationRateRequest): QueryInflationRateRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryInflationRateRequestAminoMsg): QueryInflationRateRequest { + return QueryInflationRateRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryInflationRateRequestProtoMsg): QueryInflationRateRequest { + return QueryInflationRateRequest.decode(message.value); + }, + toProto(message: QueryInflationRateRequest): Uint8Array { + return QueryInflationRateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryInflationRateRequest): QueryInflationRateRequestProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryInflationRateRequest", + value: QueryInflationRateRequest.encode(message).finish() + }; } }; function createBaseQueryInflationRateResponse(): QueryInflationRateResponse { @@ -591,6 +810,7 @@ function createBaseQueryInflationRateResponse(): QueryInflationRateResponse { }; } export const QueryInflationRateResponse = { + typeUrl: "/evmos.inflation.v1.QueryInflationRateResponse", encode(message: QueryInflationRateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflationRate !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.inflationRate, 18).atomics); @@ -643,12 +863,38 @@ export const QueryInflationRateResponse = { const obj: any = {}; obj.inflation_rate = message.inflationRate; return obj; + }, + fromAmino(object: QueryInflationRateResponseAmino): QueryInflationRateResponse { + return { + inflationRate: object.inflation_rate + }; + }, + toAmino(message: QueryInflationRateResponse): QueryInflationRateResponseAmino { + const obj: any = {}; + obj.inflation_rate = message.inflationRate; + return obj; + }, + fromAminoMsg(object: QueryInflationRateResponseAminoMsg): QueryInflationRateResponse { + return QueryInflationRateResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryInflationRateResponseProtoMsg): QueryInflationRateResponse { + return QueryInflationRateResponse.decode(message.value); + }, + toProto(message: QueryInflationRateResponse): Uint8Array { + return QueryInflationRateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryInflationRateResponse): QueryInflationRateResponseProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryInflationRateResponse", + value: QueryInflationRateResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/evmos.inflation.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -686,6 +932,28 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -694,6 +962,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/evmos.inflation.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -746,5 +1015,30 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/evmos.inflation.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts index befe18f2e4..f4aae79a45 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/genesis.ts @@ -29,6 +29,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/evmos.recovery.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -81,6 +82,31 @@ export const GenesisState = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/evmos.recovery.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -90,6 +116,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/evmos.recovery.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableRecovery === true) { writer.uint32(8).bool(message.enableRecovery); @@ -154,5 +181,32 @@ export const Params = { obj.enable_recovery = message.enableRecovery; message.packetTimeoutDuration !== undefined && (obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toSDK(message.packetTimeoutDuration) : undefined); return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + enableRecovery: object.enable_recovery, + packetTimeoutDuration: object?.packet_timeout_duration ? Duration.fromAmino(object.packet_timeout_duration) : undefined + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.enable_recovery = message.enableRecovery; + obj.packet_timeout_duration = message.packetTimeoutDuration ? Duration.toAmino(message.packetTimeoutDuration) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/evmos.recovery.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/query.ts index 3333102d95..5219f950ec 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/recovery/v1/query.ts @@ -19,6 +19,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/evmos.recovery.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -56,6 +57,28 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/evmos.recovery.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -64,6 +87,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/evmos.recovery.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -116,5 +140,30 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/evmos.recovery.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts index 9b9c102fc0..1babe85b3e 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/query.ts @@ -38,6 +38,7 @@ function createBaseQueryBalancesRequest(): QueryBalancesRequest { }; } export const QueryBalancesRequest = { + typeUrl: "/evmos.vesting.v1.QueryBalancesRequest", encode(message: QueryBalancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -90,6 +91,31 @@ export const QueryBalancesRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryBalancesRequestAmino): QueryBalancesRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryBalancesRequest): QueryBalancesRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryBalancesRequestAminoMsg): QueryBalancesRequest { + return QueryBalancesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: QueryBalancesRequestProtoMsg): QueryBalancesRequest { + return QueryBalancesRequest.decode(message.value); + }, + toProto(message: QueryBalancesRequest): Uint8Array { + return QueryBalancesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBalancesRequest): QueryBalancesRequestProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.QueryBalancesRequest", + value: QueryBalancesRequest.encode(message).finish() + }; } }; function createBaseQueryBalancesResponse(): QueryBalancesResponse { @@ -100,6 +126,7 @@ function createBaseQueryBalancesResponse(): QueryBalancesResponse { }; } export const QueryBalancesResponse = { + typeUrl: "/evmos.vesting.v1.QueryBalancesResponse", encode(message: QueryBalancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locked) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -200,5 +227,46 @@ export const QueryBalancesResponse = { obj.vested = []; } return obj; + }, + fromAmino(object: QueryBalancesResponseAmino): QueryBalancesResponse { + return { + locked: Array.isArray(object?.locked) ? object.locked.map((e: any) => Coin.fromAmino(e)) : [], + unvested: Array.isArray(object?.unvested) ? object.unvested.map((e: any) => Coin.fromAmino(e)) : [], + vested: Array.isArray(object?.vested) ? object.vested.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryBalancesResponse): QueryBalancesResponseAmino { + const obj: any = {}; + if (message.locked) { + obj.locked = message.locked.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.locked = []; + } + if (message.unvested) { + obj.unvested = message.unvested.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.unvested = []; + } + if (message.vested) { + obj.vested = message.vested.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.vested = []; + } + return obj; + }, + fromAminoMsg(object: QueryBalancesResponseAminoMsg): QueryBalancesResponse { + return QueryBalancesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: QueryBalancesResponseProtoMsg): QueryBalancesResponse { + return QueryBalancesResponse.decode(message.value); + }, + toProto(message: QueryBalancesResponse): Uint8Array { + return QueryBalancesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBalancesResponse): QueryBalancesResponseProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.QueryBalancesResponse", + value: QueryBalancesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts index bffad3bb8a..666c941d8d 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/tx.ts @@ -86,6 +86,7 @@ function createBaseMsgCreateClawbackVestingAccount(): MsgCreateClawbackVestingAc }; } export const MsgCreateClawbackVestingAccount = { + typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount", encode(message: MsgCreateClawbackVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); @@ -214,12 +215,56 @@ export const MsgCreateClawbackVestingAccount = { } obj.merge = message.merge; return obj; + }, + fromAmino(object: MsgCreateClawbackVestingAccountAmino): MsgCreateClawbackVestingAccount { + return { + fromAddress: object.from_address, + toAddress: object.to_address, + startTime: object.start_time, + lockupPeriods: Array.isArray(object?.lockup_periods) ? object.lockup_periods.map((e: any) => Period.fromAmino(e)) : [], + vestingPeriods: Array.isArray(object?.vesting_periods) ? object.vesting_periods.map((e: any) => Period.fromAmino(e)) : [], + merge: object.merge + }; + }, + toAmino(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountAmino { + const obj: any = {}; + obj.from_address = message.fromAddress; + obj.to_address = message.toAddress; + obj.start_time = message.startTime; + if (message.lockupPeriods) { + obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); + } else { + obj.lockup_periods = []; + } + if (message.vestingPeriods) { + obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); + } else { + obj.vesting_periods = []; + } + obj.merge = message.merge; + return obj; + }, + fromAminoMsg(object: MsgCreateClawbackVestingAccountAminoMsg): MsgCreateClawbackVestingAccount { + return MsgCreateClawbackVestingAccount.fromAmino(object.value); + }, + fromProtoMsg(message: MsgCreateClawbackVestingAccountProtoMsg): MsgCreateClawbackVestingAccount { + return MsgCreateClawbackVestingAccount.decode(message.value); + }, + toProto(message: MsgCreateClawbackVestingAccount): Uint8Array { + return MsgCreateClawbackVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateClawbackVestingAccount): MsgCreateClawbackVestingAccountProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount", + value: MsgCreateClawbackVestingAccount.encode(message).finish() + }; } }; function createBaseMsgCreateClawbackVestingAccountResponse(): MsgCreateClawbackVestingAccountResponse { return {}; } export const MsgCreateClawbackVestingAccountResponse = { + typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse", encode(_: MsgCreateClawbackVestingAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -257,6 +302,28 @@ export const MsgCreateClawbackVestingAccountResponse = { toSDK(_: MsgCreateClawbackVestingAccountResponse): MsgCreateClawbackVestingAccountResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateClawbackVestingAccountResponseAmino): MsgCreateClawbackVestingAccountResponse { + return {}; + }, + toAmino(_: MsgCreateClawbackVestingAccountResponse): MsgCreateClawbackVestingAccountResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateClawbackVestingAccountResponseAminoMsg): MsgCreateClawbackVestingAccountResponse { + return MsgCreateClawbackVestingAccountResponse.fromAmino(object.value); + }, + fromProtoMsg(message: MsgCreateClawbackVestingAccountResponseProtoMsg): MsgCreateClawbackVestingAccountResponse { + return MsgCreateClawbackVestingAccountResponse.decode(message.value); + }, + toProto(message: MsgCreateClawbackVestingAccountResponse): Uint8Array { + return MsgCreateClawbackVestingAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateClawbackVestingAccountResponse): MsgCreateClawbackVestingAccountResponseProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse", + value: MsgCreateClawbackVestingAccountResponse.encode(message).finish() + }; } }; function createBaseMsgClawback(): MsgClawback { @@ -267,6 +334,7 @@ function createBaseMsgClawback(): MsgClawback { }; } export const MsgClawback = { + typeUrl: "/evmos.vesting.v1.MsgClawback", encode(message: MsgClawback, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.funderAddress !== "") { writer.uint32(10).string(message.funderAddress); @@ -343,12 +411,42 @@ export const MsgClawback = { obj.account_address = message.accountAddress; obj.dest_address = message.destAddress; return obj; + }, + fromAmino(object: MsgClawbackAmino): MsgClawback { + return { + funderAddress: object.funder_address, + accountAddress: object.account_address, + destAddress: object.dest_address + }; + }, + toAmino(message: MsgClawback): MsgClawbackAmino { + const obj: any = {}; + obj.funder_address = message.funderAddress; + obj.account_address = message.accountAddress; + obj.dest_address = message.destAddress; + return obj; + }, + fromAminoMsg(object: MsgClawbackAminoMsg): MsgClawback { + return MsgClawback.fromAmino(object.value); + }, + fromProtoMsg(message: MsgClawbackProtoMsg): MsgClawback { + return MsgClawback.decode(message.value); + }, + toProto(message: MsgClawback): Uint8Array { + return MsgClawback.encode(message).finish(); + }, + toProtoMsg(message: MsgClawback): MsgClawbackProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.MsgClawback", + value: MsgClawback.encode(message).finish() + }; } }; function createBaseMsgClawbackResponse(): MsgClawbackResponse { return {}; } export const MsgClawbackResponse = { + typeUrl: "/evmos.vesting.v1.MsgClawbackResponse", encode(_: MsgClawbackResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -386,5 +484,27 @@ export const MsgClawbackResponse = { toSDK(_: MsgClawbackResponse): MsgClawbackResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgClawbackResponseAmino): MsgClawbackResponse { + return {}; + }, + toAmino(_: MsgClawbackResponse): MsgClawbackResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgClawbackResponseAminoMsg): MsgClawbackResponse { + return MsgClawbackResponse.fromAmino(object.value); + }, + fromProtoMsg(message: MsgClawbackResponseProtoMsg): MsgClawbackResponse { + return MsgClawbackResponse.decode(message.value); + }, + toProto(message: MsgClawbackResponse): Uint8Array { + return MsgClawbackResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgClawbackResponse): MsgClawbackResponseProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.MsgClawbackResponse", + value: MsgClawbackResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts index 8c2577056c..8c09524940 100644 --- a/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputosmojs/evmos/vesting/v1/vesting.ts @@ -47,6 +47,7 @@ function createBaseClawbackVestingAccount(): ClawbackVestingAccount { }; } export const ClawbackVestingAccount = { + typeUrl: "/evmos.vesting.v1.ClawbackVestingAccount", encode(message: ClawbackVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); @@ -163,5 +164,46 @@ export const ClawbackVestingAccount = { obj.vesting_periods = []; } return obj; + }, + fromAmino(object: ClawbackVestingAccountAmino): ClawbackVestingAccount { + return { + baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined, + funderAddress: object.funder_address, + startTime: object.start_time, + lockupPeriods: Array.isArray(object?.lockup_periods) ? object.lockup_periods.map((e: any) => Period.fromAmino(e)) : [], + vestingPeriods: Array.isArray(object?.vesting_periods) ? object.vesting_periods.map((e: any) => Period.fromAmino(e)) : [] + }; + }, + toAmino(message: ClawbackVestingAccount): ClawbackVestingAccountAmino { + const obj: any = {}; + obj.base_vesting_account = message.baseVestingAccount ? BaseVestingAccount.toAmino(message.baseVestingAccount) : undefined; + obj.funder_address = message.funderAddress; + obj.start_time = message.startTime; + if (message.lockupPeriods) { + obj.lockup_periods = message.lockupPeriods.map(e => e ? Period.toAmino(e) : undefined); + } else { + obj.lockup_periods = []; + } + if (message.vestingPeriods) { + obj.vesting_periods = message.vestingPeriods.map(e => e ? Period.toAmino(e) : undefined); + } else { + obj.vesting_periods = []; + } + return obj; + }, + fromAminoMsg(object: ClawbackVestingAccountAminoMsg): ClawbackVestingAccount { + return ClawbackVestingAccount.fromAmino(object.value); + }, + fromProtoMsg(message: ClawbackVestingAccountProtoMsg): ClawbackVestingAccount { + return ClawbackVestingAccount.decode(message.value); + }, + toProto(message: ClawbackVestingAccount): Uint8Array { + return ClawbackVestingAccount.encode(message).finish(); + }, + toProtoMsg(message: ClawbackVestingAccount): ClawbackVestingAccountProtoMsg { + return { + typeUrl: "/evmos.vesting.v1.ClawbackVestingAccount", + value: ClawbackVestingAccount.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/auth.ts b/__fixtures__/v-next/outputosmojs/google/api/auth.ts index 620565e3e9..5f29c5d813 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/auth.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/auth.ts @@ -325,6 +325,7 @@ function createBaseAuthentication(): Authentication { }; } export const Authentication = { + typeUrl: "/google.api.Authentication", encode(message: Authentication, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { AuthenticationRule.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -405,6 +406,41 @@ export const Authentication = { obj.providers = []; } return obj; + }, + fromAmino(object: AuthenticationAmino): Authentication { + return { + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => AuthenticationRule.fromAmino(e)) : [], + providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => AuthProvider.fromAmino(e)) : [] + }; + }, + toAmino(message: Authentication): AuthenticationAmino { + const obj: any = {}; + if (message.rules) { + obj.rules = message.rules.map(e => e ? AuthenticationRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + if (message.providers) { + obj.providers = message.providers.map(e => e ? AuthProvider.toAmino(e) : undefined); + } else { + obj.providers = []; + } + return obj; + }, + fromAminoMsg(object: AuthenticationAminoMsg): Authentication { + return Authentication.fromAmino(object.value); + }, + fromProtoMsg(message: AuthenticationProtoMsg): Authentication { + return Authentication.decode(message.value); + }, + toProto(message: Authentication): Uint8Array { + return Authentication.encode(message).finish(); + }, + toProtoMsg(message: Authentication): AuthenticationProtoMsg { + return { + typeUrl: "/google.api.Authentication", + value: Authentication.encode(message).finish() + }; } }; function createBaseAuthenticationRule(): AuthenticationRule { @@ -416,6 +452,7 @@ function createBaseAuthenticationRule(): AuthenticationRule { }; } export const AuthenticationRule = { + typeUrl: "/google.api.AuthenticationRule", encode(message: AuthenticationRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -512,6 +549,41 @@ export const AuthenticationRule = { obj.requirements = []; } return obj; + }, + fromAmino(object: AuthenticationRuleAmino): AuthenticationRule { + return { + selector: object.selector, + oauth: object?.oauth ? OAuthRequirements.fromAmino(object.oauth) : undefined, + allowWithoutCredential: object.allow_without_credential, + requirements: Array.isArray(object?.requirements) ? object.requirements.map((e: any) => AuthRequirement.fromAmino(e)) : [] + }; + }, + toAmino(message: AuthenticationRule): AuthenticationRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.oauth = message.oauth ? OAuthRequirements.toAmino(message.oauth) : undefined; + obj.allow_without_credential = message.allowWithoutCredential; + if (message.requirements) { + obj.requirements = message.requirements.map(e => e ? AuthRequirement.toAmino(e) : undefined); + } else { + obj.requirements = []; + } + return obj; + }, + fromAminoMsg(object: AuthenticationRuleAminoMsg): AuthenticationRule { + return AuthenticationRule.fromAmino(object.value); + }, + fromProtoMsg(message: AuthenticationRuleProtoMsg): AuthenticationRule { + return AuthenticationRule.decode(message.value); + }, + toProto(message: AuthenticationRule): Uint8Array { + return AuthenticationRule.encode(message).finish(); + }, + toProtoMsg(message: AuthenticationRule): AuthenticationRuleProtoMsg { + return { + typeUrl: "/google.api.AuthenticationRule", + value: AuthenticationRule.encode(message).finish() + }; } }; function createBaseJwtLocation(): JwtLocation { @@ -522,6 +594,7 @@ function createBaseJwtLocation(): JwtLocation { }; } export const JwtLocation = { + typeUrl: "/google.api.JwtLocation", encode(message: JwtLocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.header !== undefined) { writer.uint32(10).string(message.header); @@ -598,6 +671,35 @@ export const JwtLocation = { obj.query = message.query; obj.value_prefix = message.valuePrefix; return obj; + }, + fromAmino(object: JwtLocationAmino): JwtLocation { + return { + header: object?.header, + query: object?.query, + valuePrefix: object.value_prefix + }; + }, + toAmino(message: JwtLocation): JwtLocationAmino { + const obj: any = {}; + obj.header = message.header; + obj.query = message.query; + obj.value_prefix = message.valuePrefix; + return obj; + }, + fromAminoMsg(object: JwtLocationAminoMsg): JwtLocation { + return JwtLocation.fromAmino(object.value); + }, + fromProtoMsg(message: JwtLocationProtoMsg): JwtLocation { + return JwtLocation.decode(message.value); + }, + toProto(message: JwtLocation): Uint8Array { + return JwtLocation.encode(message).finish(); + }, + toProtoMsg(message: JwtLocation): JwtLocationProtoMsg { + return { + typeUrl: "/google.api.JwtLocation", + value: JwtLocation.encode(message).finish() + }; } }; function createBaseAuthProvider(): AuthProvider { @@ -611,6 +713,7 @@ function createBaseAuthProvider(): AuthProvider { }; } export const AuthProvider = { + typeUrl: "/google.api.AuthProvider", encode(message: AuthProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -731,6 +834,45 @@ export const AuthProvider = { obj.jwt_locations = []; } return obj; + }, + fromAmino(object: AuthProviderAmino): AuthProvider { + return { + id: object.id, + issuer: object.issuer, + jwksUri: object.jwks_uri, + audiences: object.audiences, + authorizationUrl: object.authorization_url, + jwtLocations: Array.isArray(object?.jwt_locations) ? object.jwt_locations.map((e: any) => JwtLocation.fromAmino(e)) : [] + }; + }, + toAmino(message: AuthProvider): AuthProviderAmino { + const obj: any = {}; + obj.id = message.id; + obj.issuer = message.issuer; + obj.jwks_uri = message.jwksUri; + obj.audiences = message.audiences; + obj.authorization_url = message.authorizationUrl; + if (message.jwtLocations) { + obj.jwt_locations = message.jwtLocations.map(e => e ? JwtLocation.toAmino(e) : undefined); + } else { + obj.jwt_locations = []; + } + return obj; + }, + fromAminoMsg(object: AuthProviderAminoMsg): AuthProvider { + return AuthProvider.fromAmino(object.value); + }, + fromProtoMsg(message: AuthProviderProtoMsg): AuthProvider { + return AuthProvider.decode(message.value); + }, + toProto(message: AuthProvider): Uint8Array { + return AuthProvider.encode(message).finish(); + }, + toProtoMsg(message: AuthProvider): AuthProviderProtoMsg { + return { + typeUrl: "/google.api.AuthProvider", + value: AuthProvider.encode(message).finish() + }; } }; function createBaseOAuthRequirements(): OAuthRequirements { @@ -739,6 +881,7 @@ function createBaseOAuthRequirements(): OAuthRequirements { }; } export const OAuthRequirements = { + typeUrl: "/google.api.OAuthRequirements", encode(message: OAuthRequirements, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.canonicalScopes !== "") { writer.uint32(10).string(message.canonicalScopes); @@ -791,6 +934,31 @@ export const OAuthRequirements = { const obj: any = {}; obj.canonical_scopes = message.canonicalScopes; return obj; + }, + fromAmino(object: OAuthRequirementsAmino): OAuthRequirements { + return { + canonicalScopes: object.canonical_scopes + }; + }, + toAmino(message: OAuthRequirements): OAuthRequirementsAmino { + const obj: any = {}; + obj.canonical_scopes = message.canonicalScopes; + return obj; + }, + fromAminoMsg(object: OAuthRequirementsAminoMsg): OAuthRequirements { + return OAuthRequirements.fromAmino(object.value); + }, + fromProtoMsg(message: OAuthRequirementsProtoMsg): OAuthRequirements { + return OAuthRequirements.decode(message.value); + }, + toProto(message: OAuthRequirements): Uint8Array { + return OAuthRequirements.encode(message).finish(); + }, + toProtoMsg(message: OAuthRequirements): OAuthRequirementsProtoMsg { + return { + typeUrl: "/google.api.OAuthRequirements", + value: OAuthRequirements.encode(message).finish() + }; } }; function createBaseAuthRequirement(): AuthRequirement { @@ -800,6 +968,7 @@ function createBaseAuthRequirement(): AuthRequirement { }; } export const AuthRequirement = { + typeUrl: "/google.api.AuthRequirement", encode(message: AuthRequirement, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.providerId !== "") { writer.uint32(10).string(message.providerId); @@ -864,5 +1033,32 @@ export const AuthRequirement = { obj.provider_id = message.providerId; obj.audiences = message.audiences; return obj; + }, + fromAmino(object: AuthRequirementAmino): AuthRequirement { + return { + providerId: object.provider_id, + audiences: object.audiences + }; + }, + toAmino(message: AuthRequirement): AuthRequirementAmino { + const obj: any = {}; + obj.provider_id = message.providerId; + obj.audiences = message.audiences; + return obj; + }, + fromAminoMsg(object: AuthRequirementAminoMsg): AuthRequirement { + return AuthRequirement.fromAmino(object.value); + }, + fromProtoMsg(message: AuthRequirementProtoMsg): AuthRequirement { + return AuthRequirement.decode(message.value); + }, + toProto(message: AuthRequirement): Uint8Array { + return AuthRequirement.encode(message).finish(); + }, + toProtoMsg(message: AuthRequirement): AuthRequirementProtoMsg { + return { + typeUrl: "/google.api.AuthRequirement", + value: AuthRequirement.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/backend.ts b/__fixtures__/v-next/outputosmojs/google/api/backend.ts index ce44b73e80..d338bed164 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/backend.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/backend.ts @@ -209,6 +209,7 @@ function createBaseBackend(): Backend { }; } export const Backend = { + typeUrl: "/google.api.Backend", encode(message: Backend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { BackendRule.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -269,6 +270,35 @@ export const Backend = { obj.rules = []; } return obj; + }, + fromAmino(object: BackendAmino): Backend { + return { + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => BackendRule.fromAmino(e)) : [] + }; + }, + toAmino(message: Backend): BackendAmino { + const obj: any = {}; + if (message.rules) { + obj.rules = message.rules.map(e => e ? BackendRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + return obj; + }, + fromAminoMsg(object: BackendAminoMsg): Backend { + return Backend.fromAmino(object.value); + }, + fromProtoMsg(message: BackendProtoMsg): Backend { + return Backend.decode(message.value); + }, + toProto(message: Backend): Uint8Array { + return Backend.encode(message).finish(); + }, + toProtoMsg(message: Backend): BackendProtoMsg { + return { + typeUrl: "/google.api.Backend", + value: Backend.encode(message).finish() + }; } }; function createBaseBackendRule(): BackendRule { @@ -285,6 +315,7 @@ function createBaseBackendRule(): BackendRule { }; } export const BackendRule = { + typeUrl: "/google.api.BackendRule", encode(message: BackendRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -433,5 +464,46 @@ export const BackendRule = { obj.disable_auth = message.disableAuth; obj.protocol = message.protocol; return obj; + }, + fromAmino(object: BackendRuleAmino): BackendRule { + return { + selector: object.selector, + address: object.address, + deadline: object.deadline, + minDeadline: object.min_deadline, + operationDeadline: object.operation_deadline, + pathTranslation: isSet(object.path_translation) ? backendRule_PathTranslationFromJSON(object.path_translation) : -1, + jwtAudience: object?.jwt_audience, + disableAuth: object?.disable_auth, + protocol: object.protocol + }; + }, + toAmino(message: BackendRule): BackendRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.address = message.address; + obj.deadline = message.deadline; + obj.min_deadline = message.minDeadline; + obj.operation_deadline = message.operationDeadline; + obj.path_translation = message.pathTranslation; + obj.jwt_audience = message.jwtAudience; + obj.disable_auth = message.disableAuth; + obj.protocol = message.protocol; + return obj; + }, + fromAminoMsg(object: BackendRuleAminoMsg): BackendRule { + return BackendRule.fromAmino(object.value); + }, + fromProtoMsg(message: BackendRuleProtoMsg): BackendRule { + return BackendRule.decode(message.value); + }, + toProto(message: BackendRule): Uint8Array { + return BackendRule.encode(message).finish(); + }, + toProtoMsg(message: BackendRule): BackendRuleProtoMsg { + return { + typeUrl: "/google.api.BackendRule", + value: BackendRule.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/billing.ts b/__fixtures__/v-next/outputosmojs/google/api/billing.ts index 885f61e43b..27347f04dd 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/billing.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/billing.ts @@ -111,6 +111,7 @@ function createBaseBilling(): Billing { }; } export const Billing = { + typeUrl: "/google.api.Billing", encode(message: Billing, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.consumerDestinations) { Billing_BillingDestination.encode(v!, writer.uint32(66).fork()).ldelim(); @@ -171,6 +172,35 @@ export const Billing = { obj.consumer_destinations = []; } return obj; + }, + fromAmino(object: BillingAmino): Billing { + return { + consumerDestinations: Array.isArray(object?.consumer_destinations) ? object.consumer_destinations.map((e: any) => Billing_BillingDestination.fromAmino(e)) : [] + }; + }, + toAmino(message: Billing): BillingAmino { + const obj: any = {}; + if (message.consumerDestinations) { + obj.consumer_destinations = message.consumerDestinations.map(e => e ? Billing_BillingDestination.toAmino(e) : undefined); + } else { + obj.consumer_destinations = []; + } + return obj; + }, + fromAminoMsg(object: BillingAminoMsg): Billing { + return Billing.fromAmino(object.value); + }, + fromProtoMsg(message: BillingProtoMsg): Billing { + return Billing.decode(message.value); + }, + toProto(message: Billing): Uint8Array { + return Billing.encode(message).finish(); + }, + toProtoMsg(message: Billing): BillingProtoMsg { + return { + typeUrl: "/google.api.Billing", + value: Billing.encode(message).finish() + }; } }; function createBaseBilling_BillingDestination(): Billing_BillingDestination { @@ -180,6 +210,7 @@ function createBaseBilling_BillingDestination(): Billing_BillingDestination { }; } export const Billing_BillingDestination = { + typeUrl: "/google.api.BillingDestination", encode(message: Billing_BillingDestination, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.monitoredResource !== "") { writer.uint32(10).string(message.monitoredResource); @@ -252,5 +283,36 @@ export const Billing_BillingDestination = { obj.metrics = []; } return obj; + }, + fromAmino(object: Billing_BillingDestinationAmino): Billing_BillingDestination { + return { + monitoredResource: object.monitored_resource, + metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => e) : [] + }; + }, + toAmino(message: Billing_BillingDestination): Billing_BillingDestinationAmino { + const obj: any = {}; + obj.monitored_resource = message.monitoredResource; + if (message.metrics) { + obj.metrics = message.metrics.map(e => e); + } else { + obj.metrics = []; + } + return obj; + }, + fromAminoMsg(object: Billing_BillingDestinationAminoMsg): Billing_BillingDestination { + return Billing_BillingDestination.fromAmino(object.value); + }, + fromProtoMsg(message: Billing_BillingDestinationProtoMsg): Billing_BillingDestination { + return Billing_BillingDestination.decode(message.value); + }, + toProto(message: Billing_BillingDestination): Uint8Array { + return Billing_BillingDestination.encode(message).finish(); + }, + toProtoMsg(message: Billing_BillingDestination): Billing_BillingDestinationProtoMsg { + return { + typeUrl: "/google.api.BillingDestination", + value: Billing_BillingDestination.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/config_change.ts b/__fixtures__/v-next/outputosmojs/google/api/config_change.ts index 6d357c1e96..96400d8390 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/config_change.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/config_change.ts @@ -143,6 +143,7 @@ function createBaseConfigChange(): ConfigChange { }; } export const ConfigChange = { + typeUrl: "/google.api.ConfigChange", encode(message: ConfigChange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.element !== "") { writer.uint32(10).string(message.element); @@ -251,6 +252,43 @@ export const ConfigChange = { obj.advices = []; } return obj; + }, + fromAmino(object: ConfigChangeAmino): ConfigChange { + return { + element: object.element, + oldValue: object.old_value, + newValue: object.new_value, + changeType: isSet(object.change_type) ? changeTypeFromJSON(object.change_type) : -1, + advices: Array.isArray(object?.advices) ? object.advices.map((e: any) => Advice.fromAmino(e)) : [] + }; + }, + toAmino(message: ConfigChange): ConfigChangeAmino { + const obj: any = {}; + obj.element = message.element; + obj.old_value = message.oldValue; + obj.new_value = message.newValue; + obj.change_type = message.changeType; + if (message.advices) { + obj.advices = message.advices.map(e => e ? Advice.toAmino(e) : undefined); + } else { + obj.advices = []; + } + return obj; + }, + fromAminoMsg(object: ConfigChangeAminoMsg): ConfigChange { + return ConfigChange.fromAmino(object.value); + }, + fromProtoMsg(message: ConfigChangeProtoMsg): ConfigChange { + return ConfigChange.decode(message.value); + }, + toProto(message: ConfigChange): Uint8Array { + return ConfigChange.encode(message).finish(); + }, + toProtoMsg(message: ConfigChange): ConfigChangeProtoMsg { + return { + typeUrl: "/google.api.ConfigChange", + value: ConfigChange.encode(message).finish() + }; } }; function createBaseAdvice(): Advice { @@ -259,6 +297,7 @@ function createBaseAdvice(): Advice { }; } export const Advice = { + typeUrl: "/google.api.Advice", encode(message: Advice, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(18).string(message.description); @@ -311,5 +350,30 @@ export const Advice = { const obj: any = {}; obj.description = message.description; return obj; + }, + fromAmino(object: AdviceAmino): Advice { + return { + description: object.description + }; + }, + toAmino(message: Advice): AdviceAmino { + const obj: any = {}; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: AdviceAminoMsg): Advice { + return Advice.fromAmino(object.value); + }, + fromProtoMsg(message: AdviceProtoMsg): Advice { + return Advice.decode(message.value); + }, + toProto(message: Advice): Uint8Array { + return Advice.encode(message).finish(); + }, + toProtoMsg(message: Advice): AdviceProtoMsg { + return { + typeUrl: "/google.api.Advice", + value: Advice.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/consumer.ts b/__fixtures__/v-next/outputosmojs/google/api/consumer.ts index 3d94885cde..f44ff01000 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/consumer.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/consumer.ts @@ -142,6 +142,7 @@ function createBaseProjectProperties(): ProjectProperties { }; } export const ProjectProperties = { + typeUrl: "/google.api.ProjectProperties", encode(message: ProjectProperties, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.properties) { Property.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -202,6 +203,35 @@ export const ProjectProperties = { obj.properties = []; } return obj; + }, + fromAmino(object: ProjectPropertiesAmino): ProjectProperties { + return { + properties: Array.isArray(object?.properties) ? object.properties.map((e: any) => Property.fromAmino(e)) : [] + }; + }, + toAmino(message: ProjectProperties): ProjectPropertiesAmino { + const obj: any = {}; + if (message.properties) { + obj.properties = message.properties.map(e => e ? Property.toAmino(e) : undefined); + } else { + obj.properties = []; + } + return obj; + }, + fromAminoMsg(object: ProjectPropertiesAminoMsg): ProjectProperties { + return ProjectProperties.fromAmino(object.value); + }, + fromProtoMsg(message: ProjectPropertiesProtoMsg): ProjectProperties { + return ProjectProperties.decode(message.value); + }, + toProto(message: ProjectProperties): Uint8Array { + return ProjectProperties.encode(message).finish(); + }, + toProtoMsg(message: ProjectProperties): ProjectPropertiesProtoMsg { + return { + typeUrl: "/google.api.ProjectProperties", + value: ProjectProperties.encode(message).finish() + }; } }; function createBaseProperty(): Property { @@ -212,6 +242,7 @@ function createBaseProperty(): Property { }; } export const Property = { + typeUrl: "/google.api.Property", encode(message: Property, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -288,5 +319,34 @@ export const Property = { message.type !== undefined && (obj.type = property_PropertyTypeToJSON(message.type)); obj.description = message.description; return obj; + }, + fromAmino(object: PropertyAmino): Property { + return { + name: object.name, + type: isSet(object.type) ? property_PropertyTypeFromJSON(object.type) : -1, + description: object.description + }; + }, + toAmino(message: Property): PropertyAmino { + const obj: any = {}; + obj.name = message.name; + obj.type = message.type; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: PropertyAminoMsg): Property { + return Property.fromAmino(object.value); + }, + fromProtoMsg(message: PropertyProtoMsg): Property { + return Property.decode(message.value); + }, + toProto(message: Property): Uint8Array { + return Property.encode(message).finish(); + }, + toProtoMsg(message: Property): PropertyProtoMsg { + return { + typeUrl: "/google.api.Property", + value: Property.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/context.ts b/__fixtures__/v-next/outputosmojs/google/api/context.ts index b14572aec9..845e6385ca 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/context.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/context.ts @@ -131,6 +131,7 @@ function createBaseContext(): Context { }; } export const Context = { + typeUrl: "/google.api.Context", encode(message: Context, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { ContextRule.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -191,6 +192,35 @@ export const Context = { obj.rules = []; } return obj; + }, + fromAmino(object: ContextAmino): Context { + return { + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => ContextRule.fromAmino(e)) : [] + }; + }, + toAmino(message: Context): ContextAmino { + const obj: any = {}; + if (message.rules) { + obj.rules = message.rules.map(e => e ? ContextRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + return obj; + }, + fromAminoMsg(object: ContextAminoMsg): Context { + return Context.fromAmino(object.value); + }, + fromProtoMsg(message: ContextProtoMsg): Context { + return Context.decode(message.value); + }, + toProto(message: Context): Uint8Array { + return Context.encode(message).finish(); + }, + toProtoMsg(message: Context): ContextProtoMsg { + return { + typeUrl: "/google.api.Context", + value: Context.encode(message).finish() + }; } }; function createBaseContextRule(): ContextRule { @@ -203,6 +233,7 @@ function createBaseContextRule(): ContextRule { }; } export const ContextRule = { + typeUrl: "/google.api.ContextRule", encode(message: ContextRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -335,5 +366,54 @@ export const ContextRule = { obj.allowed_response_extensions = []; } return obj; + }, + fromAmino(object: ContextRuleAmino): ContextRule { + return { + selector: object.selector, + requested: Array.isArray(object?.requested) ? object.requested.map((e: any) => e) : [], + provided: Array.isArray(object?.provided) ? object.provided.map((e: any) => e) : [], + allowedRequestExtensions: Array.isArray(object?.allowed_request_extensions) ? object.allowed_request_extensions.map((e: any) => e) : [], + allowedResponseExtensions: Array.isArray(object?.allowed_response_extensions) ? object.allowed_response_extensions.map((e: any) => e) : [] + }; + }, + toAmino(message: ContextRule): ContextRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + if (message.requested) { + obj.requested = message.requested.map(e => e); + } else { + obj.requested = []; + } + if (message.provided) { + obj.provided = message.provided.map(e => e); + } else { + obj.provided = []; + } + if (message.allowedRequestExtensions) { + obj.allowed_request_extensions = message.allowedRequestExtensions.map(e => e); + } else { + obj.allowed_request_extensions = []; + } + if (message.allowedResponseExtensions) { + obj.allowed_response_extensions = message.allowedResponseExtensions.map(e => e); + } else { + obj.allowed_response_extensions = []; + } + return obj; + }, + fromAminoMsg(object: ContextRuleAminoMsg): ContextRule { + return ContextRule.fromAmino(object.value); + }, + fromProtoMsg(message: ContextRuleProtoMsg): ContextRule { + return ContextRule.decode(message.value); + }, + toProto(message: ContextRule): Uint8Array { + return ContextRule.encode(message).finish(); + }, + toProtoMsg(message: ContextRule): ContextRuleProtoMsg { + return { + typeUrl: "/google.api.ContextRule", + value: ContextRule.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/control.ts b/__fixtures__/v-next/outputosmojs/google/api/control.ts index 355043be90..7113f80159 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/control.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/control.ts @@ -27,6 +27,7 @@ function createBaseControl(): Control { }; } export const Control = { + typeUrl: "/google.api.Control", encode(message: Control, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.environment !== "") { writer.uint32(10).string(message.environment); @@ -79,5 +80,30 @@ export const Control = { const obj: any = {}; obj.environment = message.environment; return obj; + }, + fromAmino(object: ControlAmino): Control { + return { + environment: object.environment + }; + }, + toAmino(message: Control): ControlAmino { + const obj: any = {}; + obj.environment = message.environment; + return obj; + }, + fromAminoMsg(object: ControlAminoMsg): Control { + return Control.fromAmino(object.value); + }, + fromProtoMsg(message: ControlProtoMsg): Control { + return Control.decode(message.value); + }, + toProto(message: Control): Uint8Array { + return Control.encode(message).finish(); + }, + toProtoMsg(message: Control): ControlProtoMsg { + return { + typeUrl: "/google.api.Control", + value: Control.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/distribution.ts b/__fixtures__/v-next/outputosmojs/google/api/distribution.ts index 02209cf86f..74f1a529cf 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/distribution.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/distribution.ts @@ -315,6 +315,7 @@ function createBaseDistribution(): Distribution { }; } export const Distribution = { + typeUrl: "/google.api.Distribution", encode(message: Distribution, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.count !== BigInt(0)) { writer.uint32(8).int64(message.count); @@ -464,6 +465,51 @@ export const Distribution = { obj.exemplars = []; } return obj; + }, + fromAmino(object: DistributionAmino): Distribution { + return { + count: BigInt(object.count), + mean: object.mean, + sumOfSquaredDeviation: object.sum_of_squared_deviation, + range: object?.range ? Distribution_Range.fromAmino(object.range) : undefined, + bucketOptions: object?.bucket_options ? Distribution_BucketOptions.fromAmino(object.bucket_options) : undefined, + bucketCounts: Array.isArray(object?.bucket_counts) ? object.bucket_counts.map((e: any) => BigInt(e)) : [], + exemplars: Array.isArray(object?.exemplars) ? object.exemplars.map((e: any) => Distribution_Exemplar.fromAmino(e)) : [] + }; + }, + toAmino(message: Distribution): DistributionAmino { + const obj: any = {}; + obj.count = message.count ? message.count.toString() : undefined; + obj.mean = message.mean; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation; + obj.range = message.range ? Distribution_Range.toAmino(message.range) : undefined; + obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; + if (message.bucketCounts) { + obj.bucket_counts = message.bucketCounts.map(e => e.toString()); + } else { + obj.bucket_counts = []; + } + if (message.exemplars) { + obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); + } else { + obj.exemplars = []; + } + return obj; + }, + fromAminoMsg(object: DistributionAminoMsg): Distribution { + return Distribution.fromAmino(object.value); + }, + fromProtoMsg(message: DistributionProtoMsg): Distribution { + return Distribution.decode(message.value); + }, + toProto(message: Distribution): Uint8Array { + return Distribution.encode(message).finish(); + }, + toProtoMsg(message: Distribution): DistributionProtoMsg { + return { + typeUrl: "/google.api.Distribution", + value: Distribution.encode(message).finish() + }; } }; function createBaseDistribution_Range(): Distribution_Range { @@ -473,6 +519,7 @@ function createBaseDistribution_Range(): Distribution_Range { }; } export const Distribution_Range = { + typeUrl: "/google.api.Range", encode(message: Distribution_Range, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.min !== 0) { writer.uint32(9).double(message.min); @@ -537,6 +584,33 @@ export const Distribution_Range = { obj.min = message.min; obj.max = message.max; return obj; + }, + fromAmino(object: Distribution_RangeAmino): Distribution_Range { + return { + min: object.min, + max: object.max + }; + }, + toAmino(message: Distribution_Range): Distribution_RangeAmino { + const obj: any = {}; + obj.min = message.min; + obj.max = message.max; + return obj; + }, + fromAminoMsg(object: Distribution_RangeAminoMsg): Distribution_Range { + return Distribution_Range.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_RangeProtoMsg): Distribution_Range { + return Distribution_Range.decode(message.value); + }, + toProto(message: Distribution_Range): Uint8Array { + return Distribution_Range.encode(message).finish(); + }, + toProtoMsg(message: Distribution_Range): Distribution_RangeProtoMsg { + return { + typeUrl: "/google.api.Range", + value: Distribution_Range.encode(message).finish() + }; } }; function createBaseDistribution_BucketOptions(): Distribution_BucketOptions { @@ -547,6 +621,7 @@ function createBaseDistribution_BucketOptions(): Distribution_BucketOptions { }; } export const Distribution_BucketOptions = { + typeUrl: "/google.api.BucketOptions", encode(message: Distribution_BucketOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.linearBuckets !== undefined) { Distribution_BucketOptions_Linear.encode(message.linearBuckets, writer.uint32(10).fork()).ldelim(); @@ -623,6 +698,35 @@ export const Distribution_BucketOptions = { message.exponentialBuckets !== undefined && (obj.exponential_buckets = message.exponentialBuckets ? Distribution_BucketOptions_Exponential.toSDK(message.exponentialBuckets) : undefined); message.explicitBuckets !== undefined && (obj.explicit_buckets = message.explicitBuckets ? Distribution_BucketOptions_Explicit.toSDK(message.explicitBuckets) : undefined); return obj; + }, + fromAmino(object: Distribution_BucketOptionsAmino): Distribution_BucketOptions { + return { + linearBuckets: object?.linear_buckets ? Distribution_BucketOptions_Linear.fromAmino(object.linear_buckets) : undefined, + exponentialBuckets: object?.exponential_buckets ? Distribution_BucketOptions_Exponential.fromAmino(object.exponential_buckets) : undefined, + explicitBuckets: object?.explicit_buckets ? Distribution_BucketOptions_Explicit.fromAmino(object.explicit_buckets) : undefined + }; + }, + toAmino(message: Distribution_BucketOptions): Distribution_BucketOptionsAmino { + const obj: any = {}; + obj.linear_buckets = message.linearBuckets ? Distribution_BucketOptions_Linear.toAmino(message.linearBuckets) : undefined; + obj.exponential_buckets = message.exponentialBuckets ? Distribution_BucketOptions_Exponential.toAmino(message.exponentialBuckets) : undefined; + obj.explicit_buckets = message.explicitBuckets ? Distribution_BucketOptions_Explicit.toAmino(message.explicitBuckets) : undefined; + return obj; + }, + fromAminoMsg(object: Distribution_BucketOptionsAminoMsg): Distribution_BucketOptions { + return Distribution_BucketOptions.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_BucketOptionsProtoMsg): Distribution_BucketOptions { + return Distribution_BucketOptions.decode(message.value); + }, + toProto(message: Distribution_BucketOptions): Uint8Array { + return Distribution_BucketOptions.encode(message).finish(); + }, + toProtoMsg(message: Distribution_BucketOptions): Distribution_BucketOptionsProtoMsg { + return { + typeUrl: "/google.api.BucketOptions", + value: Distribution_BucketOptions.encode(message).finish() + }; } }; function createBaseDistribution_BucketOptions_Linear(): Distribution_BucketOptions_Linear { @@ -633,6 +737,7 @@ function createBaseDistribution_BucketOptions_Linear(): Distribution_BucketOptio }; } export const Distribution_BucketOptions_Linear = { + typeUrl: "/google.api.Linear", encode(message: Distribution_BucketOptions_Linear, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); @@ -709,6 +814,35 @@ export const Distribution_BucketOptions_Linear = { obj.width = message.width; obj.offset = message.offset; return obj; + }, + fromAmino(object: Distribution_BucketOptions_LinearAmino): Distribution_BucketOptions_Linear { + return { + numFiniteBuckets: object.num_finite_buckets, + width: object.width, + offset: object.offset + }; + }, + toAmino(message: Distribution_BucketOptions_Linear): Distribution_BucketOptions_LinearAmino { + const obj: any = {}; + obj.num_finite_buckets = message.numFiniteBuckets; + obj.width = message.width; + obj.offset = message.offset; + return obj; + }, + fromAminoMsg(object: Distribution_BucketOptions_LinearAminoMsg): Distribution_BucketOptions_Linear { + return Distribution_BucketOptions_Linear.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_BucketOptions_LinearProtoMsg): Distribution_BucketOptions_Linear { + return Distribution_BucketOptions_Linear.decode(message.value); + }, + toProto(message: Distribution_BucketOptions_Linear): Uint8Array { + return Distribution_BucketOptions_Linear.encode(message).finish(); + }, + toProtoMsg(message: Distribution_BucketOptions_Linear): Distribution_BucketOptions_LinearProtoMsg { + return { + typeUrl: "/google.api.Linear", + value: Distribution_BucketOptions_Linear.encode(message).finish() + }; } }; function createBaseDistribution_BucketOptions_Exponential(): Distribution_BucketOptions_Exponential { @@ -719,6 +853,7 @@ function createBaseDistribution_BucketOptions_Exponential(): Distribution_Bucket }; } export const Distribution_BucketOptions_Exponential = { + typeUrl: "/google.api.Exponential", encode(message: Distribution_BucketOptions_Exponential, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); @@ -795,6 +930,35 @@ export const Distribution_BucketOptions_Exponential = { obj.growth_factor = message.growthFactor; obj.scale = message.scale; return obj; + }, + fromAmino(object: Distribution_BucketOptions_ExponentialAmino): Distribution_BucketOptions_Exponential { + return { + numFiniteBuckets: object.num_finite_buckets, + growthFactor: object.growth_factor, + scale: object.scale + }; + }, + toAmino(message: Distribution_BucketOptions_Exponential): Distribution_BucketOptions_ExponentialAmino { + const obj: any = {}; + obj.num_finite_buckets = message.numFiniteBuckets; + obj.growth_factor = message.growthFactor; + obj.scale = message.scale; + return obj; + }, + fromAminoMsg(object: Distribution_BucketOptions_ExponentialAminoMsg): Distribution_BucketOptions_Exponential { + return Distribution_BucketOptions_Exponential.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_BucketOptions_ExponentialProtoMsg): Distribution_BucketOptions_Exponential { + return Distribution_BucketOptions_Exponential.decode(message.value); + }, + toProto(message: Distribution_BucketOptions_Exponential): Uint8Array { + return Distribution_BucketOptions_Exponential.encode(message).finish(); + }, + toProtoMsg(message: Distribution_BucketOptions_Exponential): Distribution_BucketOptions_ExponentialProtoMsg { + return { + typeUrl: "/google.api.Exponential", + value: Distribution_BucketOptions_Exponential.encode(message).finish() + }; } }; function createBaseDistribution_BucketOptions_Explicit(): Distribution_BucketOptions_Explicit { @@ -803,6 +967,7 @@ function createBaseDistribution_BucketOptions_Explicit(): Distribution_BucketOpt }; } export const Distribution_BucketOptions_Explicit = { + typeUrl: "/google.api.Explicit", encode(message: Distribution_BucketOptions_Explicit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.bounds) { @@ -872,6 +1037,35 @@ export const Distribution_BucketOptions_Explicit = { obj.bounds = []; } return obj; + }, + fromAmino(object: Distribution_BucketOptions_ExplicitAmino): Distribution_BucketOptions_Explicit { + return { + bounds: Array.isArray(object?.bounds) ? object.bounds.map((e: any) => e) : [] + }; + }, + toAmino(message: Distribution_BucketOptions_Explicit): Distribution_BucketOptions_ExplicitAmino { + const obj: any = {}; + if (message.bounds) { + obj.bounds = message.bounds.map(e => e); + } else { + obj.bounds = []; + } + return obj; + }, + fromAminoMsg(object: Distribution_BucketOptions_ExplicitAminoMsg): Distribution_BucketOptions_Explicit { + return Distribution_BucketOptions_Explicit.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_BucketOptions_ExplicitProtoMsg): Distribution_BucketOptions_Explicit { + return Distribution_BucketOptions_Explicit.decode(message.value); + }, + toProto(message: Distribution_BucketOptions_Explicit): Uint8Array { + return Distribution_BucketOptions_Explicit.encode(message).finish(); + }, + toProtoMsg(message: Distribution_BucketOptions_Explicit): Distribution_BucketOptions_ExplicitProtoMsg { + return { + typeUrl: "/google.api.Explicit", + value: Distribution_BucketOptions_Explicit.encode(message).finish() + }; } }; function createBaseDistribution_Exemplar(): Distribution_Exemplar { @@ -882,6 +1076,7 @@ function createBaseDistribution_Exemplar(): Distribution_Exemplar { }; } export const Distribution_Exemplar = { + typeUrl: "/google.api.Exemplar", encode(message: Distribution_Exemplar, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(9).double(message.value); @@ -966,5 +1161,38 @@ export const Distribution_Exemplar = { obj.attachments = []; } return obj; + }, + fromAmino(object: Distribution_ExemplarAmino): Distribution_Exemplar { + return { + value: object.value, + timestamp: object.timestamp, + attachments: Array.isArray(object?.attachments) ? object.attachments.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: Distribution_Exemplar): Distribution_ExemplarAmino { + const obj: any = {}; + obj.value = message.value; + obj.timestamp = message.timestamp; + if (message.attachments) { + obj.attachments = message.attachments.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.attachments = []; + } + return obj; + }, + fromAminoMsg(object: Distribution_ExemplarAminoMsg): Distribution_Exemplar { + return Distribution_Exemplar.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_ExemplarProtoMsg): Distribution_Exemplar { + return Distribution_Exemplar.decode(message.value); + }, + toProto(message: Distribution_Exemplar): Uint8Array { + return Distribution_Exemplar.encode(message).finish(); + }, + toProtoMsg(message: Distribution_Exemplar): Distribution_ExemplarProtoMsg { + return { + typeUrl: "/google.api.Exemplar", + value: Distribution_Exemplar.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/documentation.ts b/__fixtures__/v-next/outputosmojs/google/api/documentation.ts index 30232fcfbb..83abb83efd 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/documentation.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/documentation.ts @@ -241,6 +241,7 @@ function createBaseDocumentation(): Documentation { }; } export const Documentation = { + typeUrl: "/google.api.Documentation", encode(message: Documentation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.summary !== "") { writer.uint32(10).string(message.summary); @@ -369,6 +370,49 @@ export const Documentation = { obj.service_root_url = message.serviceRootUrl; obj.overview = message.overview; return obj; + }, + fromAmino(object: DocumentationAmino): Documentation { + return { + summary: object.summary, + pages: Array.isArray(object?.pages) ? object.pages.map((e: any) => Page.fromAmino(e)) : [], + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => DocumentationRule.fromAmino(e)) : [], + documentationRootUrl: object.documentation_root_url, + serviceRootUrl: object.service_root_url, + overview: object.overview + }; + }, + toAmino(message: Documentation): DocumentationAmino { + const obj: any = {}; + obj.summary = message.summary; + if (message.pages) { + obj.pages = message.pages.map(e => e ? Page.toAmino(e) : undefined); + } else { + obj.pages = []; + } + if (message.rules) { + obj.rules = message.rules.map(e => e ? DocumentationRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + obj.documentation_root_url = message.documentationRootUrl; + obj.service_root_url = message.serviceRootUrl; + obj.overview = message.overview; + return obj; + }, + fromAminoMsg(object: DocumentationAminoMsg): Documentation { + return Documentation.fromAmino(object.value); + }, + fromProtoMsg(message: DocumentationProtoMsg): Documentation { + return Documentation.decode(message.value); + }, + toProto(message: Documentation): Uint8Array { + return Documentation.encode(message).finish(); + }, + toProtoMsg(message: Documentation): DocumentationProtoMsg { + return { + typeUrl: "/google.api.Documentation", + value: Documentation.encode(message).finish() + }; } }; function createBaseDocumentationRule(): DocumentationRule { @@ -379,6 +423,7 @@ function createBaseDocumentationRule(): DocumentationRule { }; } export const DocumentationRule = { + typeUrl: "/google.api.DocumentationRule", encode(message: DocumentationRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -455,6 +500,35 @@ export const DocumentationRule = { obj.description = message.description; obj.deprecation_description = message.deprecationDescription; return obj; + }, + fromAmino(object: DocumentationRuleAmino): DocumentationRule { + return { + selector: object.selector, + description: object.description, + deprecationDescription: object.deprecation_description + }; + }, + toAmino(message: DocumentationRule): DocumentationRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.description = message.description; + obj.deprecation_description = message.deprecationDescription; + return obj; + }, + fromAminoMsg(object: DocumentationRuleAminoMsg): DocumentationRule { + return DocumentationRule.fromAmino(object.value); + }, + fromProtoMsg(message: DocumentationRuleProtoMsg): DocumentationRule { + return DocumentationRule.decode(message.value); + }, + toProto(message: DocumentationRule): Uint8Array { + return DocumentationRule.encode(message).finish(); + }, + toProtoMsg(message: DocumentationRule): DocumentationRuleProtoMsg { + return { + typeUrl: "/google.api.DocumentationRule", + value: DocumentationRule.encode(message).finish() + }; } }; function createBasePage(): Page { @@ -465,6 +539,7 @@ function createBasePage(): Page { }; } export const Page = { + typeUrl: "/google.api.Page", encode(message: Page, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -549,5 +624,38 @@ export const Page = { obj.subpages = []; } return obj; + }, + fromAmino(object: PageAmino): Page { + return { + name: object.name, + content: object.content, + subpages: Array.isArray(object?.subpages) ? object.subpages.map((e: any) => Page.fromAmino(e)) : [] + }; + }, + toAmino(message: Page): PageAmino { + const obj: any = {}; + obj.name = message.name; + obj.content = message.content; + if (message.subpages) { + obj.subpages = message.subpages.map(e => e ? Page.toAmino(e) : undefined); + } else { + obj.subpages = []; + } + return obj; + }, + fromAminoMsg(object: PageAminoMsg): Page { + return Page.fromAmino(object.value); + }, + fromProtoMsg(message: PageProtoMsg): Page { + return Page.decode(message.value); + }, + toProto(message: Page): Uint8Array { + return Page.encode(message).finish(); + }, + toProtoMsg(message: Page): PageProtoMsg { + return { + typeUrl: "/google.api.Page", + value: Page.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts b/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts index 37b394ca84..324c6217f5 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/endpoint.ts @@ -85,6 +85,7 @@ function createBaseEndpoint(): Endpoint { }; } export const Endpoint = { + typeUrl: "/google.api.Endpoint", encode(message: Endpoint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -181,5 +182,40 @@ export const Endpoint = { obj.target = message.target; obj.allow_cors = message.allowCors; return obj; + }, + fromAmino(object: EndpointAmino): Endpoint { + return { + name: object.name, + aliases: Array.isArray(object?.aliases) ? object.aliases.map((e: any) => e) : [], + target: object.target, + allowCors: object.allow_cors + }; + }, + toAmino(message: Endpoint): EndpointAmino { + const obj: any = {}; + obj.name = message.name; + if (message.aliases) { + obj.aliases = message.aliases.map(e => e); + } else { + obj.aliases = []; + } + obj.target = message.target; + obj.allow_cors = message.allowCors; + return obj; + }, + fromAminoMsg(object: EndpointAminoMsg): Endpoint { + return Endpoint.fromAmino(object.value); + }, + fromProtoMsg(message: EndpointProtoMsg): Endpoint { + return Endpoint.decode(message.value); + }, + toProto(message: Endpoint): Uint8Array { + return Endpoint.encode(message).finish(); + }, + toProtoMsg(message: Endpoint): EndpointProtoMsg { + return { + typeUrl: "/google.api.Endpoint", + value: Endpoint.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/conformance/v1alpha1/conformance_service.ts index d1e89afffc..38ec79acc4 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/conformance/v1alpha1/conformance_service.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/conformance/v1alpha1/conformance_service.ts @@ -209,6 +209,7 @@ function createBaseParseRequest(): ParseRequest { }; } export const ParseRequest = { + typeUrl: "/google.api.expr.conformance.v1alpha1.ParseRequest", encode(message: ParseRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.celSource !== "") { writer.uint32(10).string(message.celSource); @@ -297,6 +298,37 @@ export const ParseRequest = { obj.source_location = message.sourceLocation; obj.disable_macros = message.disableMacros; return obj; + }, + fromAmino(object: ParseRequestAmino): ParseRequest { + return { + celSource: object.cel_source, + syntaxVersion: object.syntax_version, + sourceLocation: object.source_location, + disableMacros: object.disable_macros + }; + }, + toAmino(message: ParseRequest): ParseRequestAmino { + const obj: any = {}; + obj.cel_source = message.celSource; + obj.syntax_version = message.syntaxVersion; + obj.source_location = message.sourceLocation; + obj.disable_macros = message.disableMacros; + return obj; + }, + fromAminoMsg(object: ParseRequestAminoMsg): ParseRequest { + return ParseRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ParseRequestProtoMsg): ParseRequest { + return ParseRequest.decode(message.value); + }, + toProto(message: ParseRequest): Uint8Array { + return ParseRequest.encode(message).finish(); + }, + toProtoMsg(message: ParseRequest): ParseRequestProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.ParseRequest", + value: ParseRequest.encode(message).finish() + }; } }; function createBaseParseResponse(): ParseResponse { @@ -306,6 +338,7 @@ function createBaseParseResponse(): ParseResponse { }; } export const ParseResponse = { + typeUrl: "/google.api.expr.conformance.v1alpha1.ParseResponse", encode(message: ParseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parsedExpr !== undefined) { ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim(); @@ -378,6 +411,37 @@ export const ParseResponse = { obj.issues = []; } return obj; + }, + fromAmino(object: ParseResponseAmino): ParseResponse { + return { + parsedExpr: object?.parsed_expr ? ParsedExpr.fromAmino(object.parsed_expr) : undefined, + issues: Array.isArray(object?.issues) ? object.issues.map((e: any) => Status.fromAmino(e)) : [] + }; + }, + toAmino(message: ParseResponse): ParseResponseAmino { + const obj: any = {}; + obj.parsed_expr = message.parsedExpr ? ParsedExpr.toAmino(message.parsedExpr) : undefined; + if (message.issues) { + obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); + } else { + obj.issues = []; + } + return obj; + }, + fromAminoMsg(object: ParseResponseAminoMsg): ParseResponse { + return ParseResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ParseResponseProtoMsg): ParseResponse { + return ParseResponse.decode(message.value); + }, + toProto(message: ParseResponse): Uint8Array { + return ParseResponse.encode(message).finish(); + }, + toProtoMsg(message: ParseResponse): ParseResponseProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.ParseResponse", + value: ParseResponse.encode(message).finish() + }; } }; function createBaseCheckRequest(): CheckRequest { @@ -389,6 +453,7 @@ function createBaseCheckRequest(): CheckRequest { }; } export const CheckRequest = { + typeUrl: "/google.api.expr.conformance.v1alpha1.CheckRequest", encode(message: CheckRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parsedExpr !== undefined) { ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim(); @@ -485,6 +550,41 @@ export const CheckRequest = { obj.container = message.container; obj.no_std_env = message.noStdEnv; return obj; + }, + fromAmino(object: CheckRequestAmino): CheckRequest { + return { + parsedExpr: object?.parsed_expr ? ParsedExpr.fromAmino(object.parsed_expr) : undefined, + typeEnv: Array.isArray(object?.type_env) ? object.type_env.map((e: any) => Decl.fromAmino(e)) : [], + container: object.container, + noStdEnv: object.no_std_env + }; + }, + toAmino(message: CheckRequest): CheckRequestAmino { + const obj: any = {}; + obj.parsed_expr = message.parsedExpr ? ParsedExpr.toAmino(message.parsedExpr) : undefined; + if (message.typeEnv) { + obj.type_env = message.typeEnv.map(e => e ? Decl.toAmino(e) : undefined); + } else { + obj.type_env = []; + } + obj.container = message.container; + obj.no_std_env = message.noStdEnv; + return obj; + }, + fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { + return CheckRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CheckRequestProtoMsg): CheckRequest { + return CheckRequest.decode(message.value); + }, + toProto(message: CheckRequest): Uint8Array { + return CheckRequest.encode(message).finish(); + }, + toProtoMsg(message: CheckRequest): CheckRequestProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.CheckRequest", + value: CheckRequest.encode(message).finish() + }; } }; function createBaseCheckResponse(): CheckResponse { @@ -494,6 +594,7 @@ function createBaseCheckResponse(): CheckResponse { }; } export const CheckResponse = { + typeUrl: "/google.api.expr.conformance.v1alpha1.CheckResponse", encode(message: CheckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.checkedExpr !== undefined) { CheckedExpr.encode(message.checkedExpr, writer.uint32(10).fork()).ldelim(); @@ -566,6 +667,37 @@ export const CheckResponse = { obj.issues = []; } return obj; + }, + fromAmino(object: CheckResponseAmino): CheckResponse { + return { + checkedExpr: object?.checked_expr ? CheckedExpr.fromAmino(object.checked_expr) : undefined, + issues: Array.isArray(object?.issues) ? object.issues.map((e: any) => Status.fromAmino(e)) : [] + }; + }, + toAmino(message: CheckResponse): CheckResponseAmino { + const obj: any = {}; + obj.checked_expr = message.checkedExpr ? CheckedExpr.toAmino(message.checkedExpr) : undefined; + if (message.issues) { + obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); + } else { + obj.issues = []; + } + return obj; + }, + fromAminoMsg(object: CheckResponseAminoMsg): CheckResponse { + return CheckResponse.fromAmino(object.value); + }, + fromProtoMsg(message: CheckResponseProtoMsg): CheckResponse { + return CheckResponse.decode(message.value); + }, + toProto(message: CheckResponse): Uint8Array { + return CheckResponse.encode(message).finish(); + }, + toProtoMsg(message: CheckResponse): CheckResponseProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.CheckResponse", + value: CheckResponse.encode(message).finish() + }; } }; function createBaseEvalRequest_BindingsEntry(): EvalRequest_BindingsEntry { @@ -639,6 +771,27 @@ export const EvalRequest_BindingsEntry = { obj.key = message.key; message.value !== undefined && (obj.value = message.value ? ExprValue.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: EvalRequest_BindingsEntryAmino): EvalRequest_BindingsEntry { + return { + key: object.key, + value: object?.value ? ExprValue.fromAmino(object.value) : undefined + }; + }, + toAmino(message: EvalRequest_BindingsEntry): EvalRequest_BindingsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value ? ExprValue.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: EvalRequest_BindingsEntryAminoMsg): EvalRequest_BindingsEntry { + return EvalRequest_BindingsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: EvalRequest_BindingsEntryProtoMsg): EvalRequest_BindingsEntry { + return EvalRequest_BindingsEntry.decode(message.value); + }, + toProto(message: EvalRequest_BindingsEntry): Uint8Array { + return EvalRequest_BindingsEntry.encode(message).finish(); } }; function createBaseEvalRequest(): EvalRequest { @@ -650,6 +803,7 @@ function createBaseEvalRequest(): EvalRequest { }; } export const EvalRequest = { + typeUrl: "/google.api.expr.conformance.v1alpha1.EvalRequest", encode(message: EvalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parsedExpr !== undefined) { ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim(); @@ -776,6 +930,47 @@ export const EvalRequest = { } obj.container = message.container; return obj; + }, + fromAmino(object: EvalRequestAmino): EvalRequest { + return { + parsedExpr: object?.parsed_expr ? ParsedExpr.fromAmino(object.parsed_expr) : undefined, + checkedExpr: object?.checked_expr ? CheckedExpr.fromAmino(object.checked_expr) : undefined, + bindings: isObject(object.bindings) ? Object.entries(object.bindings).reduce<{ + [key: string]: ExprValue; + }>((acc, [key, value]) => { + acc[key] = ExprValue.fromAmino(value); + return acc; + }, {}) : {}, + container: object.container + }; + }, + toAmino(message: EvalRequest): EvalRequestAmino { + const obj: any = {}; + obj.parsed_expr = message.parsedExpr ? ParsedExpr.toAmino(message.parsedExpr) : undefined; + obj.checked_expr = message.checkedExpr ? CheckedExpr.toAmino(message.checkedExpr) : undefined; + obj.bindings = {}; + if (message.bindings) { + Object.entries(message.bindings).forEach(([k, v]) => { + obj.bindings[k] = ExprValue.toAmino(v); + }); + } + obj.container = message.container; + return obj; + }, + fromAminoMsg(object: EvalRequestAminoMsg): EvalRequest { + return EvalRequest.fromAmino(object.value); + }, + fromProtoMsg(message: EvalRequestProtoMsg): EvalRequest { + return EvalRequest.decode(message.value); + }, + toProto(message: EvalRequest): Uint8Array { + return EvalRequest.encode(message).finish(); + }, + toProtoMsg(message: EvalRequest): EvalRequestProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.EvalRequest", + value: EvalRequest.encode(message).finish() + }; } }; function createBaseEvalResponse(): EvalResponse { @@ -785,6 +980,7 @@ function createBaseEvalResponse(): EvalResponse { }; } export const EvalResponse = { + typeUrl: "/google.api.expr.conformance.v1alpha1.EvalResponse", encode(message: EvalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.result !== undefined) { ExprValue.encode(message.result, writer.uint32(10).fork()).ldelim(); @@ -857,6 +1053,37 @@ export const EvalResponse = { obj.issues = []; } return obj; + }, + fromAmino(object: EvalResponseAmino): EvalResponse { + return { + result: object?.result ? ExprValue.fromAmino(object.result) : undefined, + issues: Array.isArray(object?.issues) ? object.issues.map((e: any) => Status.fromAmino(e)) : [] + }; + }, + toAmino(message: EvalResponse): EvalResponseAmino { + const obj: any = {}; + obj.result = message.result ? ExprValue.toAmino(message.result) : undefined; + if (message.issues) { + obj.issues = message.issues.map(e => e ? Status.toAmino(e) : undefined); + } else { + obj.issues = []; + } + return obj; + }, + fromAminoMsg(object: EvalResponseAminoMsg): EvalResponse { + return EvalResponse.fromAmino(object.value); + }, + fromProtoMsg(message: EvalResponseProtoMsg): EvalResponse { + return EvalResponse.decode(message.value); + }, + toProto(message: EvalResponse): Uint8Array { + return EvalResponse.encode(message).finish(); + }, + toProtoMsg(message: EvalResponse): EvalResponseProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.EvalResponse", + value: EvalResponse.encode(message).finish() + }; } }; function createBaseIssueDetails(): IssueDetails { @@ -867,6 +1094,7 @@ function createBaseIssueDetails(): IssueDetails { }; } export const IssueDetails = { + typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails", encode(message: IssueDetails, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.severity !== 0) { writer.uint32(8).int32(message.severity); @@ -943,5 +1171,34 @@ export const IssueDetails = { message.position !== undefined && (obj.position = message.position ? SourcePosition.toSDK(message.position) : undefined); obj.id = message.id; return obj; + }, + fromAmino(object: IssueDetailsAmino): IssueDetails { + return { + severity: isSet(object.severity) ? issueDetails_SeverityFromJSON(object.severity) : -1, + position: object?.position ? SourcePosition.fromAmino(object.position) : undefined, + id: BigInt(object.id) + }; + }, + toAmino(message: IssueDetails): IssueDetailsAmino { + const obj: any = {}; + obj.severity = message.severity; + obj.position = message.position ? SourcePosition.toAmino(message.position) : undefined; + obj.id = message.id ? message.id.toString() : undefined; + return obj; + }, + fromAminoMsg(object: IssueDetailsAminoMsg): IssueDetails { + return IssueDetails.fromAmino(object.value); + }, + fromProtoMsg(message: IssueDetailsProtoMsg): IssueDetails { + return IssueDetails.decode(message.value); + }, + toProto(message: IssueDetails): Uint8Array { + return IssueDetails.encode(message).finish(); + }, + toProtoMsg(message: IssueDetails): IssueDetailsProtoMsg { + return { + typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails", + value: IssueDetails.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/checked.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/checked.ts index 52c44d3f67..c24d5ae88a 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/checked.ts @@ -594,6 +594,27 @@ export const CheckedExpr_ReferenceMapEntry = { obj.key = message.key; message.value !== undefined && (obj.value = message.value ? Reference.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: CheckedExpr_ReferenceMapEntryAmino): CheckedExpr_ReferenceMapEntry { + return { + key: BigInt(object.key), + value: object?.value ? Reference.fromAmino(object.value) : undefined + }; + }, + toAmino(message: CheckedExpr_ReferenceMapEntry): CheckedExpr_ReferenceMapEntryAmino { + const obj: any = {}; + obj.key = message.key ? message.key.toString() : undefined; + obj.value = message.value ? Reference.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: CheckedExpr_ReferenceMapEntryAminoMsg): CheckedExpr_ReferenceMapEntry { + return CheckedExpr_ReferenceMapEntry.fromAmino(object.value); + }, + fromProtoMsg(message: CheckedExpr_ReferenceMapEntryProtoMsg): CheckedExpr_ReferenceMapEntry { + return CheckedExpr_ReferenceMapEntry.decode(message.value); + }, + toProto(message: CheckedExpr_ReferenceMapEntry): Uint8Array { + return CheckedExpr_ReferenceMapEntry.encode(message).finish(); } }; function createBaseCheckedExpr_TypeMapEntry(): CheckedExpr_TypeMapEntry { @@ -667,6 +688,27 @@ export const CheckedExpr_TypeMapEntry = { obj.key = message.key; message.value !== undefined && (obj.value = message.value ? Type.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: CheckedExpr_TypeMapEntryAmino): CheckedExpr_TypeMapEntry { + return { + key: BigInt(object.key), + value: object?.value ? Type.fromAmino(object.value) : undefined + }; + }, + toAmino(message: CheckedExpr_TypeMapEntry): CheckedExpr_TypeMapEntryAmino { + const obj: any = {}; + obj.key = message.key ? message.key.toString() : undefined; + obj.value = message.value ? Type.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: CheckedExpr_TypeMapEntryAminoMsg): CheckedExpr_TypeMapEntry { + return CheckedExpr_TypeMapEntry.fromAmino(object.value); + }, + fromProtoMsg(message: CheckedExpr_TypeMapEntryProtoMsg): CheckedExpr_TypeMapEntry { + return CheckedExpr_TypeMapEntry.decode(message.value); + }, + toProto(message: CheckedExpr_TypeMapEntry): Uint8Array { + return CheckedExpr_TypeMapEntry.encode(message).finish(); } }; function createBaseCheckedExpr(): CheckedExpr { @@ -679,6 +721,7 @@ function createBaseCheckedExpr(): CheckedExpr { }; } export const CheckedExpr = { + typeUrl: "/google.api.expr.v1alpha1.CheckedExpr", encode(message: CheckedExpr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.referenceMap).forEach(([key, value]) => { CheckedExpr_ReferenceMapEntry.encode({ @@ -855,6 +898,59 @@ export const CheckedExpr = { obj.expr_version = message.exprVersion; message.expr !== undefined && (obj.expr = message.expr ? Expr.toSDK(message.expr) : undefined); return obj; + }, + fromAmino(object: CheckedExprAmino): CheckedExpr { + return { + referenceMap: isObject(object.reference_map) ? Object.entries(object.reference_map).reduce<{ + [key: bigint]: Reference; + }>((acc, [key, value]) => { + acc[Number(key)] = Reference.fromAmino(value); + return acc; + }, {}) : {}, + typeMap: isObject(object.type_map) ? Object.entries(object.type_map).reduce<{ + [key: bigint]: Type; + }>((acc, [key, value]) => { + acc[Number(key)] = Type.fromAmino(value); + return acc; + }, {}) : {}, + sourceInfo: object?.source_info ? SourceInfo.fromAmino(object.source_info) : undefined, + exprVersion: object.expr_version, + expr: object?.expr ? Expr.fromAmino(object.expr) : undefined + }; + }, + toAmino(message: CheckedExpr): CheckedExprAmino { + const obj: any = {}; + obj.reference_map = {}; + if (message.referenceMap) { + Object.entries(message.referenceMap).forEach(([k, v]) => { + obj.reference_map[k] = Reference.toAmino(v); + }); + } + obj.type_map = {}; + if (message.typeMap) { + Object.entries(message.typeMap).forEach(([k, v]) => { + obj.type_map[k] = Type.toAmino(v); + }); + } + obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; + obj.expr_version = message.exprVersion; + obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; + return obj; + }, + fromAminoMsg(object: CheckedExprAminoMsg): CheckedExpr { + return CheckedExpr.fromAmino(object.value); + }, + fromProtoMsg(message: CheckedExprProtoMsg): CheckedExpr { + return CheckedExpr.decode(message.value); + }, + toProto(message: CheckedExpr): Uint8Array { + return CheckedExpr.encode(message).finish(); + }, + toProtoMsg(message: CheckedExpr): CheckedExprProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.CheckedExpr", + value: CheckedExpr.encode(message).finish() + }; } }; function createBaseType(): Type { @@ -875,6 +971,7 @@ function createBaseType(): Type { }; } export const Type = { + typeUrl: "/google.api.expr.v1alpha1.Type", encode(message: Type, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.dyn !== undefined) { Empty.encode(message.dyn, writer.uint32(10).fork()).ldelim(); @@ -1071,6 +1168,55 @@ export const Type = { message.error !== undefined && (obj.error = message.error ? Empty.toSDK(message.error) : undefined); message.abstractType !== undefined && (obj.abstract_type = message.abstractType ? Type_AbstractType.toSDK(message.abstractType) : undefined); return obj; + }, + fromAmino(object: TypeAmino): Type { + return { + dyn: object?.dyn ? Empty.fromAmino(object.dyn) : undefined, + null: isSet(object.null) ? nullValueFromJSON(object.null) : undefined, + primitive: isSet(object.primitive) ? type_PrimitiveTypeFromJSON(object.primitive) : undefined, + wrapper: isSet(object.wrapper) ? type_PrimitiveTypeFromJSON(object.wrapper) : undefined, + wellKnown: isSet(object.well_known) ? type_WellKnownTypeFromJSON(object.well_known) : undefined, + listType: object?.list_type ? Type_ListType.fromAmino(object.list_type) : undefined, + mapType: object?.map_type ? Type_MapType.fromAmino(object.map_type) : undefined, + function: object?.function ? Type_FunctionType.fromAmino(object.function) : undefined, + messageType: object?.message_type, + typeParam: object?.type_param, + type: object?.type ? Type.fromAmino(object.type) : undefined, + error: object?.error ? Empty.fromAmino(object.error) : undefined, + abstractType: object?.abstract_type ? Type_AbstractType.fromAmino(object.abstract_type) : undefined + }; + }, + toAmino(message: Type): TypeAmino { + const obj: any = {}; + obj.dyn = message.dyn ? Empty.toAmino(message.dyn) : undefined; + obj.null = message.null; + obj.primitive = message.primitive; + obj.wrapper = message.wrapper; + obj.well_known = message.wellKnown; + obj.list_type = message.listType ? Type_ListType.toAmino(message.listType) : undefined; + obj.map_type = message.mapType ? Type_MapType.toAmino(message.mapType) : undefined; + obj.function = message.function ? Type_FunctionType.toAmino(message.function) : undefined; + obj.message_type = message.messageType; + obj.type_param = message.typeParam; + obj.type = message.type ? Type.toAmino(message.type) : undefined; + obj.error = message.error ? Empty.toAmino(message.error) : undefined; + obj.abstract_type = message.abstractType ? Type_AbstractType.toAmino(message.abstractType) : undefined; + return obj; + }, + fromAminoMsg(object: TypeAminoMsg): Type { + return Type.fromAmino(object.value); + }, + fromProtoMsg(message: TypeProtoMsg): Type { + return Type.decode(message.value); + }, + toProto(message: Type): Uint8Array { + return Type.encode(message).finish(); + }, + toProtoMsg(message: Type): TypeProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Type", + value: Type.encode(message).finish() + }; } }; function createBaseType_ListType(): Type_ListType { @@ -1079,6 +1225,7 @@ function createBaseType_ListType(): Type_ListType { }; } export const Type_ListType = { + typeUrl: "/google.api.expr.v1alpha1.ListType", encode(message: Type_ListType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.elemType !== undefined) { Type.encode(message.elemType, writer.uint32(10).fork()).ldelim(); @@ -1131,6 +1278,31 @@ export const Type_ListType = { const obj: any = {}; message.elemType !== undefined && (obj.elem_type = message.elemType ? Type.toSDK(message.elemType) : undefined); return obj; + }, + fromAmino(object: Type_ListTypeAmino): Type_ListType { + return { + elemType: object?.elem_type ? Type.fromAmino(object.elem_type) : undefined + }; + }, + toAmino(message: Type_ListType): Type_ListTypeAmino { + const obj: any = {}; + obj.elem_type = message.elemType ? Type.toAmino(message.elemType) : undefined; + return obj; + }, + fromAminoMsg(object: Type_ListTypeAminoMsg): Type_ListType { + return Type_ListType.fromAmino(object.value); + }, + fromProtoMsg(message: Type_ListTypeProtoMsg): Type_ListType { + return Type_ListType.decode(message.value); + }, + toProto(message: Type_ListType): Uint8Array { + return Type_ListType.encode(message).finish(); + }, + toProtoMsg(message: Type_ListType): Type_ListTypeProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.ListType", + value: Type_ListType.encode(message).finish() + }; } }; function createBaseType_MapType(): Type_MapType { @@ -1140,6 +1312,7 @@ function createBaseType_MapType(): Type_MapType { }; } export const Type_MapType = { + typeUrl: "/google.api.expr.v1alpha1.MapType", encode(message: Type_MapType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.keyType !== undefined) { Type.encode(message.keyType, writer.uint32(10).fork()).ldelim(); @@ -1204,6 +1377,33 @@ export const Type_MapType = { message.keyType !== undefined && (obj.key_type = message.keyType ? Type.toSDK(message.keyType) : undefined); message.valueType !== undefined && (obj.value_type = message.valueType ? Type.toSDK(message.valueType) : undefined); return obj; + }, + fromAmino(object: Type_MapTypeAmino): Type_MapType { + return { + keyType: object?.key_type ? Type.fromAmino(object.key_type) : undefined, + valueType: object?.value_type ? Type.fromAmino(object.value_type) : undefined + }; + }, + toAmino(message: Type_MapType): Type_MapTypeAmino { + const obj: any = {}; + obj.key_type = message.keyType ? Type.toAmino(message.keyType) : undefined; + obj.value_type = message.valueType ? Type.toAmino(message.valueType) : undefined; + return obj; + }, + fromAminoMsg(object: Type_MapTypeAminoMsg): Type_MapType { + return Type_MapType.fromAmino(object.value); + }, + fromProtoMsg(message: Type_MapTypeProtoMsg): Type_MapType { + return Type_MapType.decode(message.value); + }, + toProto(message: Type_MapType): Uint8Array { + return Type_MapType.encode(message).finish(); + }, + toProtoMsg(message: Type_MapType): Type_MapTypeProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.MapType", + value: Type_MapType.encode(message).finish() + }; } }; function createBaseType_FunctionType(): Type_FunctionType { @@ -1213,6 +1413,7 @@ function createBaseType_FunctionType(): Type_FunctionType { }; } export const Type_FunctionType = { + typeUrl: "/google.api.expr.v1alpha1.FunctionType", encode(message: Type_FunctionType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resultType !== undefined) { Type.encode(message.resultType, writer.uint32(10).fork()).ldelim(); @@ -1285,6 +1486,37 @@ export const Type_FunctionType = { obj.arg_types = []; } return obj; + }, + fromAmino(object: Type_FunctionTypeAmino): Type_FunctionType { + return { + resultType: object?.result_type ? Type.fromAmino(object.result_type) : undefined, + argTypes: Array.isArray(object?.arg_types) ? object.arg_types.map((e: any) => Type.fromAmino(e)) : [] + }; + }, + toAmino(message: Type_FunctionType): Type_FunctionTypeAmino { + const obj: any = {}; + obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; + if (message.argTypes) { + obj.arg_types = message.argTypes.map(e => e ? Type.toAmino(e) : undefined); + } else { + obj.arg_types = []; + } + return obj; + }, + fromAminoMsg(object: Type_FunctionTypeAminoMsg): Type_FunctionType { + return Type_FunctionType.fromAmino(object.value); + }, + fromProtoMsg(message: Type_FunctionTypeProtoMsg): Type_FunctionType { + return Type_FunctionType.decode(message.value); + }, + toProto(message: Type_FunctionType): Uint8Array { + return Type_FunctionType.encode(message).finish(); + }, + toProtoMsg(message: Type_FunctionType): Type_FunctionTypeProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.FunctionType", + value: Type_FunctionType.encode(message).finish() + }; } }; function createBaseType_AbstractType(): Type_AbstractType { @@ -1294,6 +1526,7 @@ function createBaseType_AbstractType(): Type_AbstractType { }; } export const Type_AbstractType = { + typeUrl: "/google.api.expr.v1alpha1.AbstractType", encode(message: Type_AbstractType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1366,6 +1599,37 @@ export const Type_AbstractType = { obj.parameter_types = []; } return obj; + }, + fromAmino(object: Type_AbstractTypeAmino): Type_AbstractType { + return { + name: object.name, + parameterTypes: Array.isArray(object?.parameter_types) ? object.parameter_types.map((e: any) => Type.fromAmino(e)) : [] + }; + }, + toAmino(message: Type_AbstractType): Type_AbstractTypeAmino { + const obj: any = {}; + obj.name = message.name; + if (message.parameterTypes) { + obj.parameter_types = message.parameterTypes.map(e => e ? Type.toAmino(e) : undefined); + } else { + obj.parameter_types = []; + } + return obj; + }, + fromAminoMsg(object: Type_AbstractTypeAminoMsg): Type_AbstractType { + return Type_AbstractType.fromAmino(object.value); + }, + fromProtoMsg(message: Type_AbstractTypeProtoMsg): Type_AbstractType { + return Type_AbstractType.decode(message.value); + }, + toProto(message: Type_AbstractType): Uint8Array { + return Type_AbstractType.encode(message).finish(); + }, + toProtoMsg(message: Type_AbstractType): Type_AbstractTypeProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.AbstractType", + value: Type_AbstractType.encode(message).finish() + }; } }; function createBaseDecl(): Decl { @@ -1376,6 +1640,7 @@ function createBaseDecl(): Decl { }; } export const Decl = { + typeUrl: "/google.api.expr.v1alpha1.Decl", encode(message: Decl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1452,6 +1717,35 @@ export const Decl = { message.ident !== undefined && (obj.ident = message.ident ? Decl_IdentDecl.toSDK(message.ident) : undefined); message.function !== undefined && (obj.function = message.function ? Decl_FunctionDecl.toSDK(message.function) : undefined); return obj; + }, + fromAmino(object: DeclAmino): Decl { + return { + name: object.name, + ident: object?.ident ? Decl_IdentDecl.fromAmino(object.ident) : undefined, + function: object?.function ? Decl_FunctionDecl.fromAmino(object.function) : undefined + }; + }, + toAmino(message: Decl): DeclAmino { + const obj: any = {}; + obj.name = message.name; + obj.ident = message.ident ? Decl_IdentDecl.toAmino(message.ident) : undefined; + obj.function = message.function ? Decl_FunctionDecl.toAmino(message.function) : undefined; + return obj; + }, + fromAminoMsg(object: DeclAminoMsg): Decl { + return Decl.fromAmino(object.value); + }, + fromProtoMsg(message: DeclProtoMsg): Decl { + return Decl.decode(message.value); + }, + toProto(message: Decl): Uint8Array { + return Decl.encode(message).finish(); + }, + toProtoMsg(message: Decl): DeclProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Decl", + value: Decl.encode(message).finish() + }; } }; function createBaseDecl_IdentDecl(): Decl_IdentDecl { @@ -1462,6 +1756,7 @@ function createBaseDecl_IdentDecl(): Decl_IdentDecl { }; } export const Decl_IdentDecl = { + typeUrl: "/google.api.expr.v1alpha1.IdentDecl", encode(message: Decl_IdentDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== undefined) { Type.encode(message.type, writer.uint32(10).fork()).ldelim(); @@ -1538,6 +1833,35 @@ export const Decl_IdentDecl = { message.value !== undefined && (obj.value = message.value ? Constant.toSDK(message.value) : undefined); obj.doc = message.doc; return obj; + }, + fromAmino(object: Decl_IdentDeclAmino): Decl_IdentDecl { + return { + type: object?.type ? Type.fromAmino(object.type) : undefined, + value: object?.value ? Constant.fromAmino(object.value) : undefined, + doc: object.doc + }; + }, + toAmino(message: Decl_IdentDecl): Decl_IdentDeclAmino { + const obj: any = {}; + obj.type = message.type ? Type.toAmino(message.type) : undefined; + obj.value = message.value ? Constant.toAmino(message.value) : undefined; + obj.doc = message.doc; + return obj; + }, + fromAminoMsg(object: Decl_IdentDeclAminoMsg): Decl_IdentDecl { + return Decl_IdentDecl.fromAmino(object.value); + }, + fromProtoMsg(message: Decl_IdentDeclProtoMsg): Decl_IdentDecl { + return Decl_IdentDecl.decode(message.value); + }, + toProto(message: Decl_IdentDecl): Uint8Array { + return Decl_IdentDecl.encode(message).finish(); + }, + toProtoMsg(message: Decl_IdentDecl): Decl_IdentDeclProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.IdentDecl", + value: Decl_IdentDecl.encode(message).finish() + }; } }; function createBaseDecl_FunctionDecl(): Decl_FunctionDecl { @@ -1546,6 +1870,7 @@ function createBaseDecl_FunctionDecl(): Decl_FunctionDecl { }; } export const Decl_FunctionDecl = { + typeUrl: "/google.api.expr.v1alpha1.FunctionDecl", encode(message: Decl_FunctionDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overloads) { Decl_FunctionDecl_Overload.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1606,6 +1931,35 @@ export const Decl_FunctionDecl = { obj.overloads = []; } return obj; + }, + fromAmino(object: Decl_FunctionDeclAmino): Decl_FunctionDecl { + return { + overloads: Array.isArray(object?.overloads) ? object.overloads.map((e: any) => Decl_FunctionDecl_Overload.fromAmino(e)) : [] + }; + }, + toAmino(message: Decl_FunctionDecl): Decl_FunctionDeclAmino { + const obj: any = {}; + if (message.overloads) { + obj.overloads = message.overloads.map(e => e ? Decl_FunctionDecl_Overload.toAmino(e) : undefined); + } else { + obj.overloads = []; + } + return obj; + }, + fromAminoMsg(object: Decl_FunctionDeclAminoMsg): Decl_FunctionDecl { + return Decl_FunctionDecl.fromAmino(object.value); + }, + fromProtoMsg(message: Decl_FunctionDeclProtoMsg): Decl_FunctionDecl { + return Decl_FunctionDecl.decode(message.value); + }, + toProto(message: Decl_FunctionDecl): Uint8Array { + return Decl_FunctionDecl.encode(message).finish(); + }, + toProtoMsg(message: Decl_FunctionDecl): Decl_FunctionDeclProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.FunctionDecl", + value: Decl_FunctionDecl.encode(message).finish() + }; } }; function createBaseDecl_FunctionDecl_Overload(): Decl_FunctionDecl_Overload { @@ -1619,6 +1973,7 @@ function createBaseDecl_FunctionDecl_Overload(): Decl_FunctionDecl_Overload { }; } export const Decl_FunctionDecl_Overload = { + typeUrl: "/google.api.expr.v1alpha1.Overload", encode(message: Decl_FunctionDecl_Overload, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.overloadId !== "") { writer.uint32(10).string(message.overloadId); @@ -1747,6 +2102,49 @@ export const Decl_FunctionDecl_Overload = { obj.is_instance_function = message.isInstanceFunction; obj.doc = message.doc; return obj; + }, + fromAmino(object: Decl_FunctionDecl_OverloadAmino): Decl_FunctionDecl_Overload { + return { + overloadId: object.overload_id, + params: Array.isArray(object?.params) ? object.params.map((e: any) => Type.fromAmino(e)) : [], + typeParams: Array.isArray(object?.type_params) ? object.type_params.map((e: any) => e) : [], + resultType: object?.result_type ? Type.fromAmino(object.result_type) : undefined, + isInstanceFunction: object.is_instance_function, + doc: object.doc + }; + }, + toAmino(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadAmino { + const obj: any = {}; + obj.overload_id = message.overloadId; + if (message.params) { + obj.params = message.params.map(e => e ? Type.toAmino(e) : undefined); + } else { + obj.params = []; + } + if (message.typeParams) { + obj.type_params = message.typeParams.map(e => e); + } else { + obj.type_params = []; + } + obj.result_type = message.resultType ? Type.toAmino(message.resultType) : undefined; + obj.is_instance_function = message.isInstanceFunction; + obj.doc = message.doc; + return obj; + }, + fromAminoMsg(object: Decl_FunctionDecl_OverloadAminoMsg): Decl_FunctionDecl_Overload { + return Decl_FunctionDecl_Overload.fromAmino(object.value); + }, + fromProtoMsg(message: Decl_FunctionDecl_OverloadProtoMsg): Decl_FunctionDecl_Overload { + return Decl_FunctionDecl_Overload.decode(message.value); + }, + toProto(message: Decl_FunctionDecl_Overload): Uint8Array { + return Decl_FunctionDecl_Overload.encode(message).finish(); + }, + toProtoMsg(message: Decl_FunctionDecl_Overload): Decl_FunctionDecl_OverloadProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Overload", + value: Decl_FunctionDecl_Overload.encode(message).finish() + }; } }; function createBaseReference(): Reference { @@ -1757,6 +2155,7 @@ function createBaseReference(): Reference { }; } export const Reference = { + typeUrl: "/google.api.expr.v1alpha1.Reference", encode(message: Reference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1841,5 +2240,38 @@ export const Reference = { } message.value !== undefined && (obj.value = message.value ? Constant.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: ReferenceAmino): Reference { + return { + name: object.name, + overloadId: Array.isArray(object?.overload_id) ? object.overload_id.map((e: any) => e) : [], + value: object?.value ? Constant.fromAmino(object.value) : undefined + }; + }, + toAmino(message: Reference): ReferenceAmino { + const obj: any = {}; + obj.name = message.name; + if (message.overloadId) { + obj.overload_id = message.overloadId.map(e => e); + } else { + obj.overload_id = []; + } + obj.value = message.value ? Constant.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: ReferenceAminoMsg): Reference { + return Reference.fromAmino(object.value); + }, + fromProtoMsg(message: ReferenceProtoMsg): Reference { + return Reference.decode(message.value); + }, + toProto(message: Reference): Uint8Array { + return Reference.encode(message).finish(); + }, + toProtoMsg(message: Reference): ReferenceProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Reference", + value: Reference.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/eval.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/eval.ts index 5797ddd27a..c356c814d5 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/eval.ts @@ -138,6 +138,7 @@ function createBaseEvalState(): EvalState { }; } export const EvalState = { + typeUrl: "/google.api.expr.v1alpha1.EvalState", encode(message: EvalState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { ExprValue.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -218,6 +219,41 @@ export const EvalState = { obj.results = []; } return obj; + }, + fromAmino(object: EvalStateAmino): EvalState { + return { + values: Array.isArray(object?.values) ? object.values.map((e: any) => ExprValue.fromAmino(e)) : [], + results: Array.isArray(object?.results) ? object.results.map((e: any) => EvalState_Result.fromAmino(e)) : [] + }; + }, + toAmino(message: EvalState): EvalStateAmino { + const obj: any = {}; + if (message.values) { + obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); + } else { + obj.values = []; + } + if (message.results) { + obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); + } else { + obj.results = []; + } + return obj; + }, + fromAminoMsg(object: EvalStateAminoMsg): EvalState { + return EvalState.fromAmino(object.value); + }, + fromProtoMsg(message: EvalStateProtoMsg): EvalState { + return EvalState.decode(message.value); + }, + toProto(message: EvalState): Uint8Array { + return EvalState.encode(message).finish(); + }, + toProtoMsg(message: EvalState): EvalStateProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.EvalState", + value: EvalState.encode(message).finish() + }; } }; function createBaseEvalState_Result(): EvalState_Result { @@ -227,6 +263,7 @@ function createBaseEvalState_Result(): EvalState_Result { }; } export const EvalState_Result = { + typeUrl: "/google.api.expr.v1alpha1.Result", encode(message: EvalState_Result, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== BigInt(0)) { writer.uint32(8).int64(message.expr); @@ -291,6 +328,33 @@ export const EvalState_Result = { obj.expr = message.expr; obj.value = message.value; return obj; + }, + fromAmino(object: EvalState_ResultAmino): EvalState_Result { + return { + expr: BigInt(object.expr), + value: BigInt(object.value) + }; + }, + toAmino(message: EvalState_Result): EvalState_ResultAmino { + const obj: any = {}; + obj.expr = message.expr ? message.expr.toString() : undefined; + obj.value = message.value ? message.value.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { + return EvalState_Result.fromAmino(object.value); + }, + fromProtoMsg(message: EvalState_ResultProtoMsg): EvalState_Result { + return EvalState_Result.decode(message.value); + }, + toProto(message: EvalState_Result): Uint8Array { + return EvalState_Result.encode(message).finish(); + }, + toProtoMsg(message: EvalState_Result): EvalState_ResultProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Result", + value: EvalState_Result.encode(message).finish() + }; } }; function createBaseExprValue(): ExprValue { @@ -301,6 +365,7 @@ function createBaseExprValue(): ExprValue { }; } export const ExprValue = { + typeUrl: "/google.api.expr.v1alpha1.ExprValue", encode(message: ExprValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== undefined) { Value.encode(message.value, writer.uint32(10).fork()).ldelim(); @@ -377,6 +442,35 @@ export const ExprValue = { message.error !== undefined && (obj.error = message.error ? ErrorSet.toSDK(message.error) : undefined); message.unknown !== undefined && (obj.unknown = message.unknown ? UnknownSet.toSDK(message.unknown) : undefined); return obj; + }, + fromAmino(object: ExprValueAmino): ExprValue { + return { + value: object?.value ? Value.fromAmino(object.value) : undefined, + error: object?.error ? ErrorSet.fromAmino(object.error) : undefined, + unknown: object?.unknown ? UnknownSet.fromAmino(object.unknown) : undefined + }; + }, + toAmino(message: ExprValue): ExprValueAmino { + const obj: any = {}; + obj.value = message.value ? Value.toAmino(message.value) : undefined; + obj.error = message.error ? ErrorSet.toAmino(message.error) : undefined; + obj.unknown = message.unknown ? UnknownSet.toAmino(message.unknown) : undefined; + return obj; + }, + fromAminoMsg(object: ExprValueAminoMsg): ExprValue { + return ExprValue.fromAmino(object.value); + }, + fromProtoMsg(message: ExprValueProtoMsg): ExprValue { + return ExprValue.decode(message.value); + }, + toProto(message: ExprValue): Uint8Array { + return ExprValue.encode(message).finish(); + }, + toProtoMsg(message: ExprValue): ExprValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.ExprValue", + value: ExprValue.encode(message).finish() + }; } }; function createBaseErrorSet(): ErrorSet { @@ -385,6 +479,7 @@ function createBaseErrorSet(): ErrorSet { }; } export const ErrorSet = { + typeUrl: "/google.api.expr.v1alpha1.ErrorSet", encode(message: ErrorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.errors) { Status.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -445,6 +540,35 @@ export const ErrorSet = { obj.errors = []; } return obj; + }, + fromAmino(object: ErrorSetAmino): ErrorSet { + return { + errors: Array.isArray(object?.errors) ? object.errors.map((e: any) => Status.fromAmino(e)) : [] + }; + }, + toAmino(message: ErrorSet): ErrorSetAmino { + const obj: any = {}; + if (message.errors) { + obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); + } else { + obj.errors = []; + } + return obj; + }, + fromAminoMsg(object: ErrorSetAminoMsg): ErrorSet { + return ErrorSet.fromAmino(object.value); + }, + fromProtoMsg(message: ErrorSetProtoMsg): ErrorSet { + return ErrorSet.decode(message.value); + }, + toProto(message: ErrorSet): Uint8Array { + return ErrorSet.encode(message).finish(); + }, + toProtoMsg(message: ErrorSet): ErrorSetProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.ErrorSet", + value: ErrorSet.encode(message).finish() + }; } }; function createBaseUnknownSet(): UnknownSet { @@ -453,6 +577,7 @@ function createBaseUnknownSet(): UnknownSet { }; } export const UnknownSet = { + typeUrl: "/google.api.expr.v1alpha1.UnknownSet", encode(message: UnknownSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.exprs) { @@ -522,5 +647,34 @@ export const UnknownSet = { obj.exprs = []; } return obj; + }, + fromAmino(object: UnknownSetAmino): UnknownSet { + return { + exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: UnknownSet): UnknownSetAmino { + const obj: any = {}; + if (message.exprs) { + obj.exprs = message.exprs.map(e => e.toString()); + } else { + obj.exprs = []; + } + return obj; + }, + fromAminoMsg(object: UnknownSetAminoMsg): UnknownSet { + return UnknownSet.fromAmino(object.value); + }, + fromProtoMsg(message: UnknownSetProtoMsg): UnknownSet { + return UnknownSet.decode(message.value); + }, + toProto(message: UnknownSet): Uint8Array { + return UnknownSet.encode(message).finish(); + }, + toProtoMsg(message: UnknownSet): UnknownSetProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.UnknownSet", + value: UnknownSet.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/explain.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/explain.ts index 730d883cbc..a1349e6432 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/explain.ts @@ -52,6 +52,7 @@ function createBaseExplain(): Explain { }; } export const Explain = { + typeUrl: "/google.api.expr.v1alpha1.Explain", encode(message: Explain, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -132,6 +133,41 @@ export const Explain = { obj.expr_steps = []; } return obj; + }, + fromAmino(object: ExplainAmino): Explain { + return { + values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromAmino(e)) : [], + exprSteps: Array.isArray(object?.expr_steps) ? object.expr_steps.map((e: any) => Explain_ExprStep.fromAmino(e)) : [] + }; + }, + toAmino(message: Explain): ExplainAmino { + const obj: any = {}; + if (message.values) { + obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); + } else { + obj.values = []; + } + if (message.exprSteps) { + obj.expr_steps = message.exprSteps.map(e => e ? Explain_ExprStep.toAmino(e) : undefined); + } else { + obj.expr_steps = []; + } + return obj; + }, + fromAminoMsg(object: ExplainAminoMsg): Explain { + return Explain.fromAmino(object.value); + }, + fromProtoMsg(message: ExplainProtoMsg): Explain { + return Explain.decode(message.value); + }, + toProto(message: Explain): Uint8Array { + return Explain.encode(message).finish(); + }, + toProtoMsg(message: Explain): ExplainProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Explain", + value: Explain.encode(message).finish() + }; } }; function createBaseExplain_ExprStep(): Explain_ExprStep { @@ -141,6 +177,7 @@ function createBaseExplain_ExprStep(): Explain_ExprStep { }; } export const Explain_ExprStep = { + typeUrl: "/google.api.expr.v1alpha1.ExprStep", encode(message: Explain_ExprStep, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).int64(message.id); @@ -205,5 +242,32 @@ export const Explain_ExprStep = { obj.id = message.id; obj.value_index = message.valueIndex; return obj; + }, + fromAmino(object: Explain_ExprStepAmino): Explain_ExprStep { + return { + id: BigInt(object.id), + valueIndex: object.value_index + }; + }, + toAmino(message: Explain_ExprStep): Explain_ExprStepAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + obj.value_index = message.valueIndex; + return obj; + }, + fromAminoMsg(object: Explain_ExprStepAminoMsg): Explain_ExprStep { + return Explain_ExprStep.fromAmino(object.value); + }, + fromProtoMsg(message: Explain_ExprStepProtoMsg): Explain_ExprStep { + return Explain_ExprStep.decode(message.value); + }, + toProto(message: Explain_ExprStep): Uint8Array { + return Explain_ExprStep.encode(message).finish(); + }, + toProtoMsg(message: Explain_ExprStep): Explain_ExprStepProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.ExprStep", + value: Explain_ExprStep.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/syntax.ts index f8fc129d98..f2f5e770bf 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/syntax.ts @@ -487,6 +487,7 @@ function createBaseParsedExpr(): ParsedExpr { }; } export const ParsedExpr = { + typeUrl: "/google.api.expr.v1alpha1.ParsedExpr", encode(message: ParsedExpr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== undefined) { Expr.encode(message.expr, writer.uint32(18).fork()).ldelim(); @@ -551,6 +552,33 @@ export const ParsedExpr = { message.expr !== undefined && (obj.expr = message.expr ? Expr.toSDK(message.expr) : undefined); message.sourceInfo !== undefined && (obj.source_info = message.sourceInfo ? SourceInfo.toSDK(message.sourceInfo) : undefined); return obj; + }, + fromAmino(object: ParsedExprAmino): ParsedExpr { + return { + expr: object?.expr ? Expr.fromAmino(object.expr) : undefined, + sourceInfo: object?.source_info ? SourceInfo.fromAmino(object.source_info) : undefined + }; + }, + toAmino(message: ParsedExpr): ParsedExprAmino { + const obj: any = {}; + obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; + obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; + return obj; + }, + fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { + return ParsedExpr.fromAmino(object.value); + }, + fromProtoMsg(message: ParsedExprProtoMsg): ParsedExpr { + return ParsedExpr.decode(message.value); + }, + toProto(message: ParsedExpr): Uint8Array { + return ParsedExpr.encode(message).finish(); + }, + toProtoMsg(message: ParsedExpr): ParsedExprProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.ParsedExpr", + value: ParsedExpr.encode(message).finish() + }; } }; function createBaseExpr(): Expr { @@ -566,6 +594,7 @@ function createBaseExpr(): Expr { }; } export const Expr = { + typeUrl: "/google.api.expr.v1alpha1.Expr", encode(message: Expr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(16).int64(message.id); @@ -702,6 +731,45 @@ export const Expr = { message.structExpr !== undefined && (obj.struct_expr = message.structExpr ? Expr_CreateStruct.toSDK(message.structExpr) : undefined); message.comprehensionExpr !== undefined && (obj.comprehension_expr = message.comprehensionExpr ? Expr_Comprehension.toSDK(message.comprehensionExpr) : undefined); return obj; + }, + fromAmino(object: ExprAmino): Expr { + return { + id: BigInt(object.id), + constExpr: object?.const_expr ? Constant.fromAmino(object.const_expr) : undefined, + identExpr: object?.ident_expr ? Expr_Ident.fromAmino(object.ident_expr) : undefined, + selectExpr: object?.select_expr ? Expr_Select.fromAmino(object.select_expr) : undefined, + callExpr: object?.call_expr ? Expr_Call.fromAmino(object.call_expr) : undefined, + listExpr: object?.list_expr ? Expr_CreateList.fromAmino(object.list_expr) : undefined, + structExpr: object?.struct_expr ? Expr_CreateStruct.fromAmino(object.struct_expr) : undefined, + comprehensionExpr: object?.comprehension_expr ? Expr_Comprehension.fromAmino(object.comprehension_expr) : undefined + }; + }, + toAmino(message: Expr): ExprAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + obj.const_expr = message.constExpr ? Constant.toAmino(message.constExpr) : undefined; + obj.ident_expr = message.identExpr ? Expr_Ident.toAmino(message.identExpr) : undefined; + obj.select_expr = message.selectExpr ? Expr_Select.toAmino(message.selectExpr) : undefined; + obj.call_expr = message.callExpr ? Expr_Call.toAmino(message.callExpr) : undefined; + obj.list_expr = message.listExpr ? Expr_CreateList.toAmino(message.listExpr) : undefined; + obj.struct_expr = message.structExpr ? Expr_CreateStruct.toAmino(message.structExpr) : undefined; + obj.comprehension_expr = message.comprehensionExpr ? Expr_Comprehension.toAmino(message.comprehensionExpr) : undefined; + return obj; + }, + fromAminoMsg(object: ExprAminoMsg): Expr { + return Expr.fromAmino(object.value); + }, + fromProtoMsg(message: ExprProtoMsg): Expr { + return Expr.decode(message.value); + }, + toProto(message: Expr): Uint8Array { + return Expr.encode(message).finish(); + }, + toProtoMsg(message: Expr): ExprProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Expr", + value: Expr.encode(message).finish() + }; } }; function createBaseExpr_Ident(): Expr_Ident { @@ -710,6 +778,7 @@ function createBaseExpr_Ident(): Expr_Ident { }; } export const Expr_Ident = { + typeUrl: "/google.api.expr.v1alpha1.Ident", encode(message: Expr_Ident, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -762,6 +831,31 @@ export const Expr_Ident = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: Expr_IdentAmino): Expr_Ident { + return { + name: object.name + }; + }, + toAmino(message: Expr_Ident): Expr_IdentAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { + return Expr_Ident.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_IdentProtoMsg): Expr_Ident { + return Expr_Ident.decode(message.value); + }, + toProto(message: Expr_Ident): Uint8Array { + return Expr_Ident.encode(message).finish(); + }, + toProtoMsg(message: Expr_Ident): Expr_IdentProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Ident", + value: Expr_Ident.encode(message).finish() + }; } }; function createBaseExpr_Select(): Expr_Select { @@ -772,6 +866,7 @@ function createBaseExpr_Select(): Expr_Select { }; } export const Expr_Select = { + typeUrl: "/google.api.expr.v1alpha1.Select", encode(message: Expr_Select, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operand !== undefined) { Expr.encode(message.operand, writer.uint32(10).fork()).ldelim(); @@ -848,6 +943,35 @@ export const Expr_Select = { obj.field = message.field; obj.test_only = message.testOnly; return obj; + }, + fromAmino(object: Expr_SelectAmino): Expr_Select { + return { + operand: object?.operand ? Expr.fromAmino(object.operand) : undefined, + field: object.field, + testOnly: object.test_only + }; + }, + toAmino(message: Expr_Select): Expr_SelectAmino { + const obj: any = {}; + obj.operand = message.operand ? Expr.toAmino(message.operand) : undefined; + obj.field = message.field; + obj.test_only = message.testOnly; + return obj; + }, + fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { + return Expr_Select.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_SelectProtoMsg): Expr_Select { + return Expr_Select.decode(message.value); + }, + toProto(message: Expr_Select): Uint8Array { + return Expr_Select.encode(message).finish(); + }, + toProtoMsg(message: Expr_Select): Expr_SelectProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Select", + value: Expr_Select.encode(message).finish() + }; } }; function createBaseExpr_Call(): Expr_Call { @@ -858,6 +982,7 @@ function createBaseExpr_Call(): Expr_Call { }; } export const Expr_Call = { + typeUrl: "/google.api.expr.v1alpha1.Call", encode(message: Expr_Call, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.target !== undefined) { Expr.encode(message.target, writer.uint32(10).fork()).ldelim(); @@ -942,6 +1067,39 @@ export const Expr_Call = { obj.args = []; } return obj; + }, + fromAmino(object: Expr_CallAmino): Expr_Call { + return { + target: object?.target ? Expr.fromAmino(object.target) : undefined, + function: object.function, + args: Array.isArray(object?.args) ? object.args.map((e: any) => Expr.fromAmino(e)) : [] + }; + }, + toAmino(message: Expr_Call): Expr_CallAmino { + const obj: any = {}; + obj.target = message.target ? Expr.toAmino(message.target) : undefined; + obj.function = message.function; + if (message.args) { + obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); + } else { + obj.args = []; + } + return obj; + }, + fromAminoMsg(object: Expr_CallAminoMsg): Expr_Call { + return Expr_Call.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CallProtoMsg): Expr_Call { + return Expr_Call.decode(message.value); + }, + toProto(message: Expr_Call): Uint8Array { + return Expr_Call.encode(message).finish(); + }, + toProtoMsg(message: Expr_Call): Expr_CallProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Call", + value: Expr_Call.encode(message).finish() + }; } }; function createBaseExpr_CreateList(): Expr_CreateList { @@ -950,6 +1108,7 @@ function createBaseExpr_CreateList(): Expr_CreateList { }; } export const Expr_CreateList = { + typeUrl: "/google.api.expr.v1alpha1.CreateList", encode(message: Expr_CreateList, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.elements) { Expr.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1010,6 +1169,35 @@ export const Expr_CreateList = { obj.elements = []; } return obj; + }, + fromAmino(object: Expr_CreateListAmino): Expr_CreateList { + return { + elements: Array.isArray(object?.elements) ? object.elements.map((e: any) => Expr.fromAmino(e)) : [] + }; + }, + toAmino(message: Expr_CreateList): Expr_CreateListAmino { + const obj: any = {}; + if (message.elements) { + obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); + } else { + obj.elements = []; + } + return obj; + }, + fromAminoMsg(object: Expr_CreateListAminoMsg): Expr_CreateList { + return Expr_CreateList.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CreateListProtoMsg): Expr_CreateList { + return Expr_CreateList.decode(message.value); + }, + toProto(message: Expr_CreateList): Uint8Array { + return Expr_CreateList.encode(message).finish(); + }, + toProtoMsg(message: Expr_CreateList): Expr_CreateListProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.CreateList", + value: Expr_CreateList.encode(message).finish() + }; } }; function createBaseExpr_CreateStruct(): Expr_CreateStruct { @@ -1019,6 +1207,7 @@ function createBaseExpr_CreateStruct(): Expr_CreateStruct { }; } export const Expr_CreateStruct = { + typeUrl: "/google.api.expr.v1alpha1.CreateStruct", encode(message: Expr_CreateStruct, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.messageName !== "") { writer.uint32(10).string(message.messageName); @@ -1091,6 +1280,37 @@ export const Expr_CreateStruct = { obj.entries = []; } return obj; + }, + fromAmino(object: Expr_CreateStructAmino): Expr_CreateStruct { + return { + messageName: object.message_name, + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => Expr_CreateStruct_Entry.fromAmino(e)) : [] + }; + }, + toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { + const obj: any = {}; + obj.message_name = message.messageName; + if (message.entries) { + obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: Expr_CreateStructAminoMsg): Expr_CreateStruct { + return Expr_CreateStruct.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CreateStructProtoMsg): Expr_CreateStruct { + return Expr_CreateStruct.decode(message.value); + }, + toProto(message: Expr_CreateStruct): Uint8Array { + return Expr_CreateStruct.encode(message).finish(); + }, + toProtoMsg(message: Expr_CreateStruct): Expr_CreateStructProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.CreateStruct", + value: Expr_CreateStruct.encode(message).finish() + }; } }; function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { @@ -1102,6 +1322,7 @@ function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { }; } export const Expr_CreateStruct_Entry = { + typeUrl: "/google.api.expr.v1alpha1.Entry", encode(message: Expr_CreateStruct_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).int64(message.id); @@ -1190,6 +1411,37 @@ export const Expr_CreateStruct_Entry = { message.mapKey !== undefined && (obj.map_key = message.mapKey ? Expr.toSDK(message.mapKey) : undefined); message.value !== undefined && (obj.value = message.value ? Expr.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: Expr_CreateStruct_EntryAmino): Expr_CreateStruct_Entry { + return { + id: BigInt(object.id), + fieldKey: object?.field_key, + mapKey: object?.map_key ? Expr.fromAmino(object.map_key) : undefined, + value: object?.value ? Expr.fromAmino(object.value) : undefined + }; + }, + toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + obj.field_key = message.fieldKey; + obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; + obj.value = message.value ? Expr.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: Expr_CreateStruct_EntryAminoMsg): Expr_CreateStruct_Entry { + return Expr_CreateStruct_Entry.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CreateStruct_EntryProtoMsg): Expr_CreateStruct_Entry { + return Expr_CreateStruct_Entry.decode(message.value); + }, + toProto(message: Expr_CreateStruct_Entry): Uint8Array { + return Expr_CreateStruct_Entry.encode(message).finish(); + }, + toProtoMsg(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Entry", + value: Expr_CreateStruct_Entry.encode(message).finish() + }; } }; function createBaseExpr_Comprehension(): Expr_Comprehension { @@ -1204,6 +1456,7 @@ function createBaseExpr_Comprehension(): Expr_Comprehension { }; } export const Expr_Comprehension = { + typeUrl: "/google.api.expr.v1alpha1.Comprehension", encode(message: Expr_Comprehension, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.iterVar !== "") { writer.uint32(10).string(message.iterVar); @@ -1328,6 +1581,43 @@ export const Expr_Comprehension = { message.loopStep !== undefined && (obj.loop_step = message.loopStep ? Expr.toSDK(message.loopStep) : undefined); message.result !== undefined && (obj.result = message.result ? Expr.toSDK(message.result) : undefined); return obj; + }, + fromAmino(object: Expr_ComprehensionAmino): Expr_Comprehension { + return { + iterVar: object.iter_var, + iterRange: object?.iter_range ? Expr.fromAmino(object.iter_range) : undefined, + accuVar: object.accu_var, + accuInit: object?.accu_init ? Expr.fromAmino(object.accu_init) : undefined, + loopCondition: object?.loop_condition ? Expr.fromAmino(object.loop_condition) : undefined, + loopStep: object?.loop_step ? Expr.fromAmino(object.loop_step) : undefined, + result: object?.result ? Expr.fromAmino(object.result) : undefined + }; + }, + toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { + const obj: any = {}; + obj.iter_var = message.iterVar; + obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; + obj.accu_var = message.accuVar; + obj.accu_init = message.accuInit ? Expr.toAmino(message.accuInit) : undefined; + obj.loop_condition = message.loopCondition ? Expr.toAmino(message.loopCondition) : undefined; + obj.loop_step = message.loopStep ? Expr.toAmino(message.loopStep) : undefined; + obj.result = message.result ? Expr.toAmino(message.result) : undefined; + return obj; + }, + fromAminoMsg(object: Expr_ComprehensionAminoMsg): Expr_Comprehension { + return Expr_Comprehension.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_ComprehensionProtoMsg): Expr_Comprehension { + return Expr_Comprehension.decode(message.value); + }, + toProto(message: Expr_Comprehension): Uint8Array { + return Expr_Comprehension.encode(message).finish(); + }, + toProtoMsg(message: Expr_Comprehension): Expr_ComprehensionProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Comprehension", + value: Expr_Comprehension.encode(message).finish() + }; } }; function createBaseConstant(): Constant { @@ -1344,6 +1634,7 @@ function createBaseConstant(): Constant { }; } export const Constant = { + typeUrl: "/google.api.expr.v1alpha1.Constant", encode(message: Constant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); @@ -1492,6 +1783,47 @@ export const Constant = { message.durationValue !== undefined && (obj.duration_value = message.durationValue ? Duration.toSDK(message.durationValue) : undefined); message.timestampValue !== undefined && (obj.timestamp_value = message.timestampValue ?? undefined); return obj; + }, + fromAmino(object: ConstantAmino): Constant { + return { + nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, + boolValue: object?.bool_value, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, + doubleValue: object?.double_value, + stringValue: object?.string_value, + bytesValue: object?.bytes_value, + durationValue: object?.duration_value ? Duration.fromAmino(object.duration_value) : undefined, + timestampValue: object?.timestamp_value + }; + }, + toAmino(message: Constant): ConstantAmino { + const obj: any = {}; + obj.null_value = message.nullValue; + obj.bool_value = message.boolValue; + obj.int64_value = message.int64Value ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue; + obj.string_value = message.stringValue; + obj.bytes_value = message.bytesValue; + obj.duration_value = message.durationValue ? Duration.toAmino(message.durationValue) : undefined; + obj.timestamp_value = message.timestampValue; + return obj; + }, + fromAminoMsg(object: ConstantAminoMsg): Constant { + return Constant.fromAmino(object.value); + }, + fromProtoMsg(message: ConstantProtoMsg): Constant { + return Constant.decode(message.value); + }, + toProto(message: Constant): Uint8Array { + return Constant.encode(message).finish(); + }, + toProtoMsg(message: Constant): ConstantProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Constant", + value: Constant.encode(message).finish() + }; } }; function createBaseSourceInfo_PositionsEntry(): SourceInfo_PositionsEntry { @@ -1565,6 +1897,27 @@ export const SourceInfo_PositionsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: SourceInfo_PositionsEntryAmino): SourceInfo_PositionsEntry { + return { + key: BigInt(object.key), + value: object.value + }; + }, + toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { + const obj: any = {}; + obj.key = message.key ? message.key.toString() : undefined; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { + return SourceInfo_PositionsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: SourceInfo_PositionsEntryProtoMsg): SourceInfo_PositionsEntry { + return SourceInfo_PositionsEntry.decode(message.value); + }, + toProto(message: SourceInfo_PositionsEntry): Uint8Array { + return SourceInfo_PositionsEntry.encode(message).finish(); } }; function createBaseSourceInfo_MacroCallsEntry(): SourceInfo_MacroCallsEntry { @@ -1638,6 +1991,27 @@ export const SourceInfo_MacroCallsEntry = { obj.key = message.key; message.value !== undefined && (obj.value = message.value ? Expr.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: SourceInfo_MacroCallsEntryAmino): SourceInfo_MacroCallsEntry { + return { + key: BigInt(object.key), + value: object?.value ? Expr.fromAmino(object.value) : undefined + }; + }, + toAmino(message: SourceInfo_MacroCallsEntry): SourceInfo_MacroCallsEntryAmino { + const obj: any = {}; + obj.key = message.key ? message.key.toString() : undefined; + obj.value = message.value ? Expr.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: SourceInfo_MacroCallsEntryAminoMsg): SourceInfo_MacroCallsEntry { + return SourceInfo_MacroCallsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: SourceInfo_MacroCallsEntryProtoMsg): SourceInfo_MacroCallsEntry { + return SourceInfo_MacroCallsEntry.decode(message.value); + }, + toProto(message: SourceInfo_MacroCallsEntry): Uint8Array { + return SourceInfo_MacroCallsEntry.encode(message).finish(); } }; function createBaseSourceInfo(): SourceInfo { @@ -1650,6 +2024,7 @@ function createBaseSourceInfo(): SourceInfo { }; } export const SourceInfo = { + typeUrl: "/google.api.expr.v1alpha1.SourceInfo", encode(message: SourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.syntaxVersion !== "") { writer.uint32(10).string(message.syntaxVersion); @@ -1843,6 +2218,63 @@ export const SourceInfo = { }); } return obj; + }, + fromAmino(object: SourceInfoAmino): SourceInfo { + return { + syntaxVersion: object.syntax_version, + location: object.location, + lineOffsets: Array.isArray(object?.line_offsets) ? object.line_offsets.map((e: any) => e) : [], + positions: isObject(object.positions) ? Object.entries(object.positions).reduce<{ + [key: bigint]: number; + }>((acc, [key, value]) => { + acc[Number(key)] = Number(value); + return acc; + }, {}) : {}, + macroCalls: isObject(object.macro_calls) ? Object.entries(object.macro_calls).reduce<{ + [key: bigint]: Expr; + }>((acc, [key, value]) => { + acc[Number(key)] = Expr.fromAmino(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: SourceInfo): SourceInfoAmino { + const obj: any = {}; + obj.syntax_version = message.syntaxVersion; + obj.location = message.location; + if (message.lineOffsets) { + obj.line_offsets = message.lineOffsets.map(e => e); + } else { + obj.line_offsets = []; + } + obj.positions = {}; + if (message.positions) { + Object.entries(message.positions).forEach(([k, v]) => { + obj.positions[k] = Math.round(v); + }); + } + obj.macro_calls = {}; + if (message.macroCalls) { + Object.entries(message.macroCalls).forEach(([k, v]) => { + obj.macro_calls[k] = Expr.toAmino(v); + }); + } + return obj; + }, + fromAminoMsg(object: SourceInfoAminoMsg): SourceInfo { + return SourceInfo.fromAmino(object.value); + }, + fromProtoMsg(message: SourceInfoProtoMsg): SourceInfo { + return SourceInfo.decode(message.value); + }, + toProto(message: SourceInfo): Uint8Array { + return SourceInfo.encode(message).finish(); + }, + toProtoMsg(message: SourceInfo): SourceInfoProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.SourceInfo", + value: SourceInfo.encode(message).finish() + }; } }; function createBaseSourcePosition(): SourcePosition { @@ -1854,6 +2286,7 @@ function createBaseSourcePosition(): SourcePosition { }; } export const SourcePosition = { + typeUrl: "/google.api.expr.v1alpha1.SourcePosition", encode(message: SourcePosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(10).string(message.location); @@ -1942,5 +2375,36 @@ export const SourcePosition = { obj.line = message.line; obj.column = message.column; return obj; + }, + fromAmino(object: SourcePositionAmino): SourcePosition { + return { + location: object.location, + offset: object.offset, + line: object.line, + column: object.column + }; + }, + toAmino(message: SourcePosition): SourcePositionAmino { + const obj: any = {}; + obj.location = message.location; + obj.offset = message.offset; + obj.line = message.line; + obj.column = message.column; + return obj; + }, + fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { + return SourcePosition.fromAmino(object.value); + }, + fromProtoMsg(message: SourcePositionProtoMsg): SourcePosition { + return SourcePosition.decode(message.value); + }, + toProto(message: SourcePosition): Uint8Array { + return SourcePosition.encode(message).finish(); + }, + toProtoMsg(message: SourcePosition): SourcePositionProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.SourcePosition", + value: SourcePosition.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/value.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/value.ts index 260b20df3d..c3d9e73961 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1alpha1/value.ts @@ -144,6 +144,7 @@ function createBaseValue(): Value { }; } export const Value = { + typeUrl: "/google.api.expr.v1alpha1.Value", encode(message: Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); @@ -328,6 +329,53 @@ export const Value = { message.listValue !== undefined && (obj.list_value = message.listValue ? ListValue.toSDK(message.listValue) : undefined); obj.type_value = message.typeValue; return obj; + }, + fromAmino(object: ValueAmino): Value { + return { + nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, + boolValue: object?.bool_value, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, + doubleValue: object?.double_value, + stringValue: object?.string_value, + bytesValue: object?.bytes_value, + enumValue: object?.enum_value ? EnumValue.fromAmino(object.enum_value) : undefined, + objectValue: object?.object_value ? Any.fromAmino(object.object_value) : undefined, + mapValue: object?.map_value ? MapValue.fromAmino(object.map_value) : undefined, + listValue: object?.list_value ? ListValue.fromAmino(object.list_value) : undefined, + typeValue: object?.type_value + }; + }, + toAmino(message: Value): ValueAmino { + const obj: any = {}; + obj.null_value = message.nullValue; + obj.bool_value = message.boolValue; + obj.int64_value = message.int64Value ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue; + obj.string_value = message.stringValue; + obj.bytes_value = message.bytesValue; + obj.enum_value = message.enumValue ? EnumValue.toAmino(message.enumValue) : undefined; + obj.object_value = message.objectValue ? Any.toAmino(message.objectValue) : undefined; + obj.map_value = message.mapValue ? MapValue.toAmino(message.mapValue) : undefined; + obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; + obj.type_value = message.typeValue; + return obj; + }, + fromAminoMsg(object: ValueAminoMsg): Value { + return Value.fromAmino(object.value); + }, + fromProtoMsg(message: ValueProtoMsg): Value { + return Value.decode(message.value); + }, + toProto(message: Value): Uint8Array { + return Value.encode(message).finish(); + }, + toProtoMsg(message: Value): ValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Value", + value: Value.encode(message).finish() + }; } }; function createBaseEnumValue(): EnumValue { @@ -337,6 +385,7 @@ function createBaseEnumValue(): EnumValue { }; } export const EnumValue = { + typeUrl: "/google.api.expr.v1alpha1.EnumValue", encode(message: EnumValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -401,6 +450,33 @@ export const EnumValue = { obj.type = message.type; obj.value = message.value; return obj; + }, + fromAmino(object: EnumValueAmino): EnumValue { + return { + type: object.type, + value: object.value + }; + }, + toAmino(message: EnumValue): EnumValueAmino { + const obj: any = {}; + obj.type = message.type; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: EnumValueAminoMsg): EnumValue { + return EnumValue.fromAmino(object.value); + }, + fromProtoMsg(message: EnumValueProtoMsg): EnumValue { + return EnumValue.decode(message.value); + }, + toProto(message: EnumValue): Uint8Array { + return EnumValue.encode(message).finish(); + }, + toProtoMsg(message: EnumValue): EnumValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.EnumValue", + value: EnumValue.encode(message).finish() + }; } }; function createBaseListValue(): ListValue { @@ -409,6 +485,7 @@ function createBaseListValue(): ListValue { }; } export const ListValue = { + typeUrl: "/google.api.expr.v1alpha1.ListValue", encode(message: ListValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -469,6 +546,35 @@ export const ListValue = { obj.values = []; } return obj; + }, + fromAmino(object: ListValueAmino): ListValue { + return { + values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromAmino(e)) : [] + }; + }, + toAmino(message: ListValue): ListValueAmino { + const obj: any = {}; + if (message.values) { + obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); + } else { + obj.values = []; + } + return obj; + }, + fromAminoMsg(object: ListValueAminoMsg): ListValue { + return ListValue.fromAmino(object.value); + }, + fromProtoMsg(message: ListValueProtoMsg): ListValue { + return ListValue.decode(message.value); + }, + toProto(message: ListValue): Uint8Array { + return ListValue.encode(message).finish(); + }, + toProtoMsg(message: ListValue): ListValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.ListValue", + value: ListValue.encode(message).finish() + }; } }; function createBaseMapValue(): MapValue { @@ -477,6 +583,7 @@ function createBaseMapValue(): MapValue { }; } export const MapValue = { + typeUrl: "/google.api.expr.v1alpha1.MapValue", encode(message: MapValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { MapValue_Entry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -537,6 +644,35 @@ export const MapValue = { obj.entries = []; } return obj; + }, + fromAmino(object: MapValueAmino): MapValue { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => MapValue_Entry.fromAmino(e)) : [] + }; + }, + toAmino(message: MapValue): MapValueAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: MapValueAminoMsg): MapValue { + return MapValue.fromAmino(object.value); + }, + fromProtoMsg(message: MapValueProtoMsg): MapValue { + return MapValue.decode(message.value); + }, + toProto(message: MapValue): Uint8Array { + return MapValue.encode(message).finish(); + }, + toProtoMsg(message: MapValue): MapValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.MapValue", + value: MapValue.encode(message).finish() + }; } }; function createBaseMapValue_Entry(): MapValue_Entry { @@ -546,6 +682,7 @@ function createBaseMapValue_Entry(): MapValue_Entry { }; } export const MapValue_Entry = { + typeUrl: "/google.api.expr.v1alpha1.Entry", encode(message: MapValue_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== undefined) { Value.encode(message.key, writer.uint32(10).fork()).ldelim(); @@ -610,5 +747,32 @@ export const MapValue_Entry = { message.key !== undefined && (obj.key = message.key ? Value.toSDK(message.key) : undefined); message.value !== undefined && (obj.value = message.value ? Value.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: MapValue_EntryAmino): MapValue_Entry { + return { + key: object?.key ? Value.fromAmino(object.key) : undefined, + value: object?.value ? Value.fromAmino(object.value) : undefined + }; + }, + toAmino(message: MapValue_Entry): MapValue_EntryAmino { + const obj: any = {}; + obj.key = message.key ? Value.toAmino(message.key) : undefined; + obj.value = message.value ? Value.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: MapValue_EntryAminoMsg): MapValue_Entry { + return MapValue_Entry.fromAmino(object.value); + }, + fromProtoMsg(message: MapValue_EntryProtoMsg): MapValue_Entry { + return MapValue_Entry.decode(message.value); + }, + toProto(message: MapValue_Entry): Uint8Array { + return MapValue_Entry.encode(message).finish(); + }, + toProtoMsg(message: MapValue_Entry): MapValue_EntryProtoMsg { + return { + typeUrl: "/google.api.expr.v1alpha1.Entry", + value: MapValue_Entry.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/decl.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/decl.ts index 4565734156..e3e282f415 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/decl.ts @@ -88,6 +88,7 @@ function createBaseDecl(): Decl { }; } export const Decl = { + typeUrl: "/google.api.expr.v1beta1.Decl", encode(message: Decl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); @@ -188,6 +189,39 @@ export const Decl = { message.ident !== undefined && (obj.ident = message.ident ? IdentDecl.toSDK(message.ident) : undefined); message.function !== undefined && (obj.function = message.function ? FunctionDecl.toSDK(message.function) : undefined); return obj; + }, + fromAmino(object: DeclAmino): Decl { + return { + id: object.id, + name: object.name, + doc: object.doc, + ident: object?.ident ? IdentDecl.fromAmino(object.ident) : undefined, + function: object?.function ? FunctionDecl.fromAmino(object.function) : undefined + }; + }, + toAmino(message: Decl): DeclAmino { + const obj: any = {}; + obj.id = message.id; + obj.name = message.name; + obj.doc = message.doc; + obj.ident = message.ident ? IdentDecl.toAmino(message.ident) : undefined; + obj.function = message.function ? FunctionDecl.toAmino(message.function) : undefined; + return obj; + }, + fromAminoMsg(object: DeclAminoMsg): Decl { + return Decl.fromAmino(object.value); + }, + fromProtoMsg(message: DeclProtoMsg): Decl { + return Decl.decode(message.value); + }, + toProto(message: Decl): Uint8Array { + return Decl.encode(message).finish(); + }, + toProtoMsg(message: Decl): DeclProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Decl", + value: Decl.encode(message).finish() + }; } }; function createBaseDeclType(): DeclType { @@ -198,6 +232,7 @@ function createBaseDeclType(): DeclType { }; } export const DeclType = { + typeUrl: "/google.api.expr.v1beta1.DeclType", encode(message: DeclType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); @@ -282,6 +317,39 @@ export const DeclType = { obj.type_params = []; } return obj; + }, + fromAmino(object: DeclTypeAmino): DeclType { + return { + id: object.id, + type: object.type, + typeParams: Array.isArray(object?.type_params) ? object.type_params.map((e: any) => DeclType.fromAmino(e)) : [] + }; + }, + toAmino(message: DeclType): DeclTypeAmino { + const obj: any = {}; + obj.id = message.id; + obj.type = message.type; + if (message.typeParams) { + obj.type_params = message.typeParams.map(e => e ? DeclType.toAmino(e) : undefined); + } else { + obj.type_params = []; + } + return obj; + }, + fromAminoMsg(object: DeclTypeAminoMsg): DeclType { + return DeclType.fromAmino(object.value); + }, + fromProtoMsg(message: DeclTypeProtoMsg): DeclType { + return DeclType.decode(message.value); + }, + toProto(message: DeclType): Uint8Array { + return DeclType.encode(message).finish(); + }, + toProtoMsg(message: DeclType): DeclTypeProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.DeclType", + value: DeclType.encode(message).finish() + }; } }; function createBaseIdentDecl(): IdentDecl { @@ -291,6 +359,7 @@ function createBaseIdentDecl(): IdentDecl { }; } export const IdentDecl = { + typeUrl: "/google.api.expr.v1beta1.IdentDecl", encode(message: IdentDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== undefined) { DeclType.encode(message.type, writer.uint32(26).fork()).ldelim(); @@ -355,6 +424,33 @@ export const IdentDecl = { message.type !== undefined && (obj.type = message.type ? DeclType.toSDK(message.type) : undefined); message.value !== undefined && (obj.value = message.value ? Expr.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: IdentDeclAmino): IdentDecl { + return { + type: object?.type ? DeclType.fromAmino(object.type) : undefined, + value: object?.value ? Expr.fromAmino(object.value) : undefined + }; + }, + toAmino(message: IdentDecl): IdentDeclAmino { + const obj: any = {}; + obj.type = message.type ? DeclType.toAmino(message.type) : undefined; + obj.value = message.value ? Expr.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: IdentDeclAminoMsg): IdentDecl { + return IdentDecl.fromAmino(object.value); + }, + fromProtoMsg(message: IdentDeclProtoMsg): IdentDecl { + return IdentDecl.decode(message.value); + }, + toProto(message: IdentDecl): Uint8Array { + return IdentDecl.encode(message).finish(); + }, + toProtoMsg(message: IdentDecl): IdentDeclProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.IdentDecl", + value: IdentDecl.encode(message).finish() + }; } }; function createBaseFunctionDecl(): FunctionDecl { @@ -365,6 +461,7 @@ function createBaseFunctionDecl(): FunctionDecl { }; } export const FunctionDecl = { + typeUrl: "/google.api.expr.v1beta1.FunctionDecl", encode(message: FunctionDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.args) { IdentDecl.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -449,5 +546,38 @@ export const FunctionDecl = { message.returnType !== undefined && (obj.return_type = message.returnType ? DeclType.toSDK(message.returnType) : undefined); obj.receiver_function = message.receiverFunction; return obj; + }, + fromAmino(object: FunctionDeclAmino): FunctionDecl { + return { + args: Array.isArray(object?.args) ? object.args.map((e: any) => IdentDecl.fromAmino(e)) : [], + returnType: object?.return_type ? DeclType.fromAmino(object.return_type) : undefined, + receiverFunction: object.receiver_function + }; + }, + toAmino(message: FunctionDecl): FunctionDeclAmino { + const obj: any = {}; + if (message.args) { + obj.args = message.args.map(e => e ? IdentDecl.toAmino(e) : undefined); + } else { + obj.args = []; + } + obj.return_type = message.returnType ? DeclType.toAmino(message.returnType) : undefined; + obj.receiver_function = message.receiverFunction; + return obj; + }, + fromAminoMsg(object: FunctionDeclAminoMsg): FunctionDecl { + return FunctionDecl.fromAmino(object.value); + }, + fromProtoMsg(message: FunctionDeclProtoMsg): FunctionDecl { + return FunctionDecl.decode(message.value); + }, + toProto(message: FunctionDecl): Uint8Array { + return FunctionDecl.encode(message).finish(); + }, + toProtoMsg(message: FunctionDecl): FunctionDeclProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.FunctionDecl", + value: FunctionDecl.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/eval.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/eval.ts index e30f519d07..ea77000e7a 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/eval.ts @@ -147,6 +147,7 @@ function createBaseEvalState(): EvalState { }; } export const EvalState = { + typeUrl: "/google.api.expr.v1beta1.EvalState", encode(message: EvalState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { ExprValue.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -227,6 +228,41 @@ export const EvalState = { obj.results = []; } return obj; + }, + fromAmino(object: EvalStateAmino): EvalState { + return { + values: Array.isArray(object?.values) ? object.values.map((e: any) => ExprValue.fromAmino(e)) : [], + results: Array.isArray(object?.results) ? object.results.map((e: any) => EvalState_Result.fromAmino(e)) : [] + }; + }, + toAmino(message: EvalState): EvalStateAmino { + const obj: any = {}; + if (message.values) { + obj.values = message.values.map(e => e ? ExprValue.toAmino(e) : undefined); + } else { + obj.values = []; + } + if (message.results) { + obj.results = message.results.map(e => e ? EvalState_Result.toAmino(e) : undefined); + } else { + obj.results = []; + } + return obj; + }, + fromAminoMsg(object: EvalStateAminoMsg): EvalState { + return EvalState.fromAmino(object.value); + }, + fromProtoMsg(message: EvalStateProtoMsg): EvalState { + return EvalState.decode(message.value); + }, + toProto(message: EvalState): Uint8Array { + return EvalState.encode(message).finish(); + }, + toProtoMsg(message: EvalState): EvalStateProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.EvalState", + value: EvalState.encode(message).finish() + }; } }; function createBaseEvalState_Result(): EvalState_Result { @@ -236,6 +272,7 @@ function createBaseEvalState_Result(): EvalState_Result { }; } export const EvalState_Result = { + typeUrl: "/google.api.expr.v1beta1.Result", encode(message: EvalState_Result, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== undefined) { IdRef.encode(message.expr, writer.uint32(10).fork()).ldelim(); @@ -300,6 +337,33 @@ export const EvalState_Result = { message.expr !== undefined && (obj.expr = message.expr ? IdRef.toSDK(message.expr) : undefined); obj.value = message.value; return obj; + }, + fromAmino(object: EvalState_ResultAmino): EvalState_Result { + return { + expr: object?.expr ? IdRef.fromAmino(object.expr) : undefined, + value: object.value + }; + }, + toAmino(message: EvalState_Result): EvalState_ResultAmino { + const obj: any = {}; + obj.expr = message.expr ? IdRef.toAmino(message.expr) : undefined; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: EvalState_ResultAminoMsg): EvalState_Result { + return EvalState_Result.fromAmino(object.value); + }, + fromProtoMsg(message: EvalState_ResultProtoMsg): EvalState_Result { + return EvalState_Result.decode(message.value); + }, + toProto(message: EvalState_Result): Uint8Array { + return EvalState_Result.encode(message).finish(); + }, + toProtoMsg(message: EvalState_Result): EvalState_ResultProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Result", + value: EvalState_Result.encode(message).finish() + }; } }; function createBaseExprValue(): ExprValue { @@ -310,6 +374,7 @@ function createBaseExprValue(): ExprValue { }; } export const ExprValue = { + typeUrl: "/google.api.expr.v1beta1.ExprValue", encode(message: ExprValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== undefined) { Value.encode(message.value, writer.uint32(10).fork()).ldelim(); @@ -386,6 +451,35 @@ export const ExprValue = { message.error !== undefined && (obj.error = message.error ? ErrorSet.toSDK(message.error) : undefined); message.unknown !== undefined && (obj.unknown = message.unknown ? UnknownSet.toSDK(message.unknown) : undefined); return obj; + }, + fromAmino(object: ExprValueAmino): ExprValue { + return { + value: object?.value ? Value.fromAmino(object.value) : undefined, + error: object?.error ? ErrorSet.fromAmino(object.error) : undefined, + unknown: object?.unknown ? UnknownSet.fromAmino(object.unknown) : undefined + }; + }, + toAmino(message: ExprValue): ExprValueAmino { + const obj: any = {}; + obj.value = message.value ? Value.toAmino(message.value) : undefined; + obj.error = message.error ? ErrorSet.toAmino(message.error) : undefined; + obj.unknown = message.unknown ? UnknownSet.toAmino(message.unknown) : undefined; + return obj; + }, + fromAminoMsg(object: ExprValueAminoMsg): ExprValue { + return ExprValue.fromAmino(object.value); + }, + fromProtoMsg(message: ExprValueProtoMsg): ExprValue { + return ExprValue.decode(message.value); + }, + toProto(message: ExprValue): Uint8Array { + return ExprValue.encode(message).finish(); + }, + toProtoMsg(message: ExprValue): ExprValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.ExprValue", + value: ExprValue.encode(message).finish() + }; } }; function createBaseErrorSet(): ErrorSet { @@ -394,6 +488,7 @@ function createBaseErrorSet(): ErrorSet { }; } export const ErrorSet = { + typeUrl: "/google.api.expr.v1beta1.ErrorSet", encode(message: ErrorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.errors) { Status.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -454,6 +549,35 @@ export const ErrorSet = { obj.errors = []; } return obj; + }, + fromAmino(object: ErrorSetAmino): ErrorSet { + return { + errors: Array.isArray(object?.errors) ? object.errors.map((e: any) => Status.fromAmino(e)) : [] + }; + }, + toAmino(message: ErrorSet): ErrorSetAmino { + const obj: any = {}; + if (message.errors) { + obj.errors = message.errors.map(e => e ? Status.toAmino(e) : undefined); + } else { + obj.errors = []; + } + return obj; + }, + fromAminoMsg(object: ErrorSetAminoMsg): ErrorSet { + return ErrorSet.fromAmino(object.value); + }, + fromProtoMsg(message: ErrorSetProtoMsg): ErrorSet { + return ErrorSet.decode(message.value); + }, + toProto(message: ErrorSet): Uint8Array { + return ErrorSet.encode(message).finish(); + }, + toProtoMsg(message: ErrorSet): ErrorSetProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.ErrorSet", + value: ErrorSet.encode(message).finish() + }; } }; function createBaseUnknownSet(): UnknownSet { @@ -462,6 +586,7 @@ function createBaseUnknownSet(): UnknownSet { }; } export const UnknownSet = { + typeUrl: "/google.api.expr.v1beta1.UnknownSet", encode(message: UnknownSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.exprs) { IdRef.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -522,6 +647,35 @@ export const UnknownSet = { obj.exprs = []; } return obj; + }, + fromAmino(object: UnknownSetAmino): UnknownSet { + return { + exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => IdRef.fromAmino(e)) : [] + }; + }, + toAmino(message: UnknownSet): UnknownSetAmino { + const obj: any = {}; + if (message.exprs) { + obj.exprs = message.exprs.map(e => e ? IdRef.toAmino(e) : undefined); + } else { + obj.exprs = []; + } + return obj; + }, + fromAminoMsg(object: UnknownSetAminoMsg): UnknownSet { + return UnknownSet.fromAmino(object.value); + }, + fromProtoMsg(message: UnknownSetProtoMsg): UnknownSet { + return UnknownSet.decode(message.value); + }, + toProto(message: UnknownSet): Uint8Array { + return UnknownSet.encode(message).finish(); + }, + toProtoMsg(message: UnknownSet): UnknownSetProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.UnknownSet", + value: UnknownSet.encode(message).finish() + }; } }; function createBaseIdRef(): IdRef { @@ -530,6 +684,7 @@ function createBaseIdRef(): IdRef { }; } export const IdRef = { + typeUrl: "/google.api.expr.v1beta1.IdRef", encode(message: IdRef, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); @@ -582,5 +737,30 @@ export const IdRef = { const obj: any = {}; obj.id = message.id; return obj; + }, + fromAmino(object: IdRefAmino): IdRef { + return { + id: object.id + }; + }, + toAmino(message: IdRef): IdRefAmino { + const obj: any = {}; + obj.id = message.id; + return obj; + }, + fromAminoMsg(object: IdRefAminoMsg): IdRef { + return IdRef.fromAmino(object.value); + }, + fromProtoMsg(message: IdRefProtoMsg): IdRef { + return IdRef.decode(message.value); + }, + toProto(message: IdRef): Uint8Array { + return IdRef.encode(message).finish(); + }, + toProtoMsg(message: IdRef): IdRefProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.IdRef", + value: IdRef.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/expr.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/expr.ts index 50ecd4fddd..b824d62037 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/expr.ts @@ -374,6 +374,7 @@ function createBaseParsedExpr(): ParsedExpr { }; } export const ParsedExpr = { + typeUrl: "/google.api.expr.v1beta1.ParsedExpr", encode(message: ParsedExpr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== undefined) { Expr.encode(message.expr, writer.uint32(18).fork()).ldelim(); @@ -450,6 +451,35 @@ export const ParsedExpr = { message.sourceInfo !== undefined && (obj.source_info = message.sourceInfo ? SourceInfo.toSDK(message.sourceInfo) : undefined); obj.syntax_version = message.syntaxVersion; return obj; + }, + fromAmino(object: ParsedExprAmino): ParsedExpr { + return { + expr: object?.expr ? Expr.fromAmino(object.expr) : undefined, + sourceInfo: object?.source_info ? SourceInfo.fromAmino(object.source_info) : undefined, + syntaxVersion: object.syntax_version + }; + }, + toAmino(message: ParsedExpr): ParsedExprAmino { + const obj: any = {}; + obj.expr = message.expr ? Expr.toAmino(message.expr) : undefined; + obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; + obj.syntax_version = message.syntaxVersion; + return obj; + }, + fromAminoMsg(object: ParsedExprAminoMsg): ParsedExpr { + return ParsedExpr.fromAmino(object.value); + }, + fromProtoMsg(message: ParsedExprProtoMsg): ParsedExpr { + return ParsedExpr.decode(message.value); + }, + toProto(message: ParsedExpr): Uint8Array { + return ParsedExpr.encode(message).finish(); + }, + toProtoMsg(message: ParsedExpr): ParsedExprProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.ParsedExpr", + value: ParsedExpr.encode(message).finish() + }; } }; function createBaseExpr(): Expr { @@ -465,6 +495,7 @@ function createBaseExpr(): Expr { }; } export const Expr = { + typeUrl: "/google.api.expr.v1beta1.Expr", encode(message: Expr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(16).int32(message.id); @@ -601,6 +632,45 @@ export const Expr = { message.structExpr !== undefined && (obj.struct_expr = message.structExpr ? Expr_CreateStruct.toSDK(message.structExpr) : undefined); message.comprehensionExpr !== undefined && (obj.comprehension_expr = message.comprehensionExpr ? Expr_Comprehension.toSDK(message.comprehensionExpr) : undefined); return obj; + }, + fromAmino(object: ExprAmino): Expr { + return { + id: object.id, + literalExpr: object?.literal_expr ? Literal.fromAmino(object.literal_expr) : undefined, + identExpr: object?.ident_expr ? Expr_Ident.fromAmino(object.ident_expr) : undefined, + selectExpr: object?.select_expr ? Expr_Select.fromAmino(object.select_expr) : undefined, + callExpr: object?.call_expr ? Expr_Call.fromAmino(object.call_expr) : undefined, + listExpr: object?.list_expr ? Expr_CreateList.fromAmino(object.list_expr) : undefined, + structExpr: object?.struct_expr ? Expr_CreateStruct.fromAmino(object.struct_expr) : undefined, + comprehensionExpr: object?.comprehension_expr ? Expr_Comprehension.fromAmino(object.comprehension_expr) : undefined + }; + }, + toAmino(message: Expr): ExprAmino { + const obj: any = {}; + obj.id = message.id; + obj.literal_expr = message.literalExpr ? Literal.toAmino(message.literalExpr) : undefined; + obj.ident_expr = message.identExpr ? Expr_Ident.toAmino(message.identExpr) : undefined; + obj.select_expr = message.selectExpr ? Expr_Select.toAmino(message.selectExpr) : undefined; + obj.call_expr = message.callExpr ? Expr_Call.toAmino(message.callExpr) : undefined; + obj.list_expr = message.listExpr ? Expr_CreateList.toAmino(message.listExpr) : undefined; + obj.struct_expr = message.structExpr ? Expr_CreateStruct.toAmino(message.structExpr) : undefined; + obj.comprehension_expr = message.comprehensionExpr ? Expr_Comprehension.toAmino(message.comprehensionExpr) : undefined; + return obj; + }, + fromAminoMsg(object: ExprAminoMsg): Expr { + return Expr.fromAmino(object.value); + }, + fromProtoMsg(message: ExprProtoMsg): Expr { + return Expr.decode(message.value); + }, + toProto(message: Expr): Uint8Array { + return Expr.encode(message).finish(); + }, + toProtoMsg(message: Expr): ExprProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Expr", + value: Expr.encode(message).finish() + }; } }; function createBaseExpr_Ident(): Expr_Ident { @@ -609,6 +679,7 @@ function createBaseExpr_Ident(): Expr_Ident { }; } export const Expr_Ident = { + typeUrl: "/google.api.expr.v1beta1.Ident", encode(message: Expr_Ident, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -661,6 +732,31 @@ export const Expr_Ident = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: Expr_IdentAmino): Expr_Ident { + return { + name: object.name + }; + }, + toAmino(message: Expr_Ident): Expr_IdentAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: Expr_IdentAminoMsg): Expr_Ident { + return Expr_Ident.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_IdentProtoMsg): Expr_Ident { + return Expr_Ident.decode(message.value); + }, + toProto(message: Expr_Ident): Uint8Array { + return Expr_Ident.encode(message).finish(); + }, + toProtoMsg(message: Expr_Ident): Expr_IdentProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Ident", + value: Expr_Ident.encode(message).finish() + }; } }; function createBaseExpr_Select(): Expr_Select { @@ -671,6 +767,7 @@ function createBaseExpr_Select(): Expr_Select { }; } export const Expr_Select = { + typeUrl: "/google.api.expr.v1beta1.Select", encode(message: Expr_Select, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operand !== undefined) { Expr.encode(message.operand, writer.uint32(10).fork()).ldelim(); @@ -747,6 +844,35 @@ export const Expr_Select = { obj.field = message.field; obj.test_only = message.testOnly; return obj; + }, + fromAmino(object: Expr_SelectAmino): Expr_Select { + return { + operand: object?.operand ? Expr.fromAmino(object.operand) : undefined, + field: object.field, + testOnly: object.test_only + }; + }, + toAmino(message: Expr_Select): Expr_SelectAmino { + const obj: any = {}; + obj.operand = message.operand ? Expr.toAmino(message.operand) : undefined; + obj.field = message.field; + obj.test_only = message.testOnly; + return obj; + }, + fromAminoMsg(object: Expr_SelectAminoMsg): Expr_Select { + return Expr_Select.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_SelectProtoMsg): Expr_Select { + return Expr_Select.decode(message.value); + }, + toProto(message: Expr_Select): Uint8Array { + return Expr_Select.encode(message).finish(); + }, + toProtoMsg(message: Expr_Select): Expr_SelectProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Select", + value: Expr_Select.encode(message).finish() + }; } }; function createBaseExpr_Call(): Expr_Call { @@ -757,6 +883,7 @@ function createBaseExpr_Call(): Expr_Call { }; } export const Expr_Call = { + typeUrl: "/google.api.expr.v1beta1.Call", encode(message: Expr_Call, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.target !== undefined) { Expr.encode(message.target, writer.uint32(10).fork()).ldelim(); @@ -841,6 +968,39 @@ export const Expr_Call = { obj.args = []; } return obj; + }, + fromAmino(object: Expr_CallAmino): Expr_Call { + return { + target: object?.target ? Expr.fromAmino(object.target) : undefined, + function: object.function, + args: Array.isArray(object?.args) ? object.args.map((e: any) => Expr.fromAmino(e)) : [] + }; + }, + toAmino(message: Expr_Call): Expr_CallAmino { + const obj: any = {}; + obj.target = message.target ? Expr.toAmino(message.target) : undefined; + obj.function = message.function; + if (message.args) { + obj.args = message.args.map(e => e ? Expr.toAmino(e) : undefined); + } else { + obj.args = []; + } + return obj; + }, + fromAminoMsg(object: Expr_CallAminoMsg): Expr_Call { + return Expr_Call.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CallProtoMsg): Expr_Call { + return Expr_Call.decode(message.value); + }, + toProto(message: Expr_Call): Uint8Array { + return Expr_Call.encode(message).finish(); + }, + toProtoMsg(message: Expr_Call): Expr_CallProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Call", + value: Expr_Call.encode(message).finish() + }; } }; function createBaseExpr_CreateList(): Expr_CreateList { @@ -849,6 +1009,7 @@ function createBaseExpr_CreateList(): Expr_CreateList { }; } export const Expr_CreateList = { + typeUrl: "/google.api.expr.v1beta1.CreateList", encode(message: Expr_CreateList, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.elements) { Expr.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -909,6 +1070,35 @@ export const Expr_CreateList = { obj.elements = []; } return obj; + }, + fromAmino(object: Expr_CreateListAmino): Expr_CreateList { + return { + elements: Array.isArray(object?.elements) ? object.elements.map((e: any) => Expr.fromAmino(e)) : [] + }; + }, + toAmino(message: Expr_CreateList): Expr_CreateListAmino { + const obj: any = {}; + if (message.elements) { + obj.elements = message.elements.map(e => e ? Expr.toAmino(e) : undefined); + } else { + obj.elements = []; + } + return obj; + }, + fromAminoMsg(object: Expr_CreateListAminoMsg): Expr_CreateList { + return Expr_CreateList.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CreateListProtoMsg): Expr_CreateList { + return Expr_CreateList.decode(message.value); + }, + toProto(message: Expr_CreateList): Uint8Array { + return Expr_CreateList.encode(message).finish(); + }, + toProtoMsg(message: Expr_CreateList): Expr_CreateListProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.CreateList", + value: Expr_CreateList.encode(message).finish() + }; } }; function createBaseExpr_CreateStruct(): Expr_CreateStruct { @@ -918,6 +1108,7 @@ function createBaseExpr_CreateStruct(): Expr_CreateStruct { }; } export const Expr_CreateStruct = { + typeUrl: "/google.api.expr.v1beta1.CreateStruct", encode(message: Expr_CreateStruct, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -990,6 +1181,37 @@ export const Expr_CreateStruct = { obj.entries = []; } return obj; + }, + fromAmino(object: Expr_CreateStructAmino): Expr_CreateStruct { + return { + type: object.type, + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => Expr_CreateStruct_Entry.fromAmino(e)) : [] + }; + }, + toAmino(message: Expr_CreateStruct): Expr_CreateStructAmino { + const obj: any = {}; + obj.type = message.type; + if (message.entries) { + obj.entries = message.entries.map(e => e ? Expr_CreateStruct_Entry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: Expr_CreateStructAminoMsg): Expr_CreateStruct { + return Expr_CreateStruct.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CreateStructProtoMsg): Expr_CreateStruct { + return Expr_CreateStruct.decode(message.value); + }, + toProto(message: Expr_CreateStruct): Uint8Array { + return Expr_CreateStruct.encode(message).finish(); + }, + toProtoMsg(message: Expr_CreateStruct): Expr_CreateStructProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.CreateStruct", + value: Expr_CreateStruct.encode(message).finish() + }; } }; function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { @@ -1001,6 +1223,7 @@ function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { }; } export const Expr_CreateStruct_Entry = { + typeUrl: "/google.api.expr.v1beta1.Entry", encode(message: Expr_CreateStruct_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); @@ -1089,6 +1312,37 @@ export const Expr_CreateStruct_Entry = { message.mapKey !== undefined && (obj.map_key = message.mapKey ? Expr.toSDK(message.mapKey) : undefined); message.value !== undefined && (obj.value = message.value ? Expr.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: Expr_CreateStruct_EntryAmino): Expr_CreateStruct_Entry { + return { + id: object.id, + fieldKey: object?.field_key, + mapKey: object?.map_key ? Expr.fromAmino(object.map_key) : undefined, + value: object?.value ? Expr.fromAmino(object.value) : undefined + }; + }, + toAmino(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryAmino { + const obj: any = {}; + obj.id = message.id; + obj.field_key = message.fieldKey; + obj.map_key = message.mapKey ? Expr.toAmino(message.mapKey) : undefined; + obj.value = message.value ? Expr.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: Expr_CreateStruct_EntryAminoMsg): Expr_CreateStruct_Entry { + return Expr_CreateStruct_Entry.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_CreateStruct_EntryProtoMsg): Expr_CreateStruct_Entry { + return Expr_CreateStruct_Entry.decode(message.value); + }, + toProto(message: Expr_CreateStruct_Entry): Uint8Array { + return Expr_CreateStruct_Entry.encode(message).finish(); + }, + toProtoMsg(message: Expr_CreateStruct_Entry): Expr_CreateStruct_EntryProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Entry", + value: Expr_CreateStruct_Entry.encode(message).finish() + }; } }; function createBaseExpr_Comprehension(): Expr_Comprehension { @@ -1103,6 +1357,7 @@ function createBaseExpr_Comprehension(): Expr_Comprehension { }; } export const Expr_Comprehension = { + typeUrl: "/google.api.expr.v1beta1.Comprehension", encode(message: Expr_Comprehension, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.iterVar !== "") { writer.uint32(10).string(message.iterVar); @@ -1227,6 +1482,43 @@ export const Expr_Comprehension = { message.loopStep !== undefined && (obj.loop_step = message.loopStep ? Expr.toSDK(message.loopStep) : undefined); message.result !== undefined && (obj.result = message.result ? Expr.toSDK(message.result) : undefined); return obj; + }, + fromAmino(object: Expr_ComprehensionAmino): Expr_Comprehension { + return { + iterVar: object.iter_var, + iterRange: object?.iter_range ? Expr.fromAmino(object.iter_range) : undefined, + accuVar: object.accu_var, + accuInit: object?.accu_init ? Expr.fromAmino(object.accu_init) : undefined, + loopCondition: object?.loop_condition ? Expr.fromAmino(object.loop_condition) : undefined, + loopStep: object?.loop_step ? Expr.fromAmino(object.loop_step) : undefined, + result: object?.result ? Expr.fromAmino(object.result) : undefined + }; + }, + toAmino(message: Expr_Comprehension): Expr_ComprehensionAmino { + const obj: any = {}; + obj.iter_var = message.iterVar; + obj.iter_range = message.iterRange ? Expr.toAmino(message.iterRange) : undefined; + obj.accu_var = message.accuVar; + obj.accu_init = message.accuInit ? Expr.toAmino(message.accuInit) : undefined; + obj.loop_condition = message.loopCondition ? Expr.toAmino(message.loopCondition) : undefined; + obj.loop_step = message.loopStep ? Expr.toAmino(message.loopStep) : undefined; + obj.result = message.result ? Expr.toAmino(message.result) : undefined; + return obj; + }, + fromAminoMsg(object: Expr_ComprehensionAminoMsg): Expr_Comprehension { + return Expr_Comprehension.fromAmino(object.value); + }, + fromProtoMsg(message: Expr_ComprehensionProtoMsg): Expr_Comprehension { + return Expr_Comprehension.decode(message.value); + }, + toProto(message: Expr_Comprehension): Uint8Array { + return Expr_Comprehension.encode(message).finish(); + }, + toProtoMsg(message: Expr_Comprehension): Expr_ComprehensionProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Comprehension", + value: Expr_Comprehension.encode(message).finish() + }; } }; function createBaseLiteral(): Literal { @@ -1241,6 +1533,7 @@ function createBaseLiteral(): Literal { }; } export const Literal = { + typeUrl: "/google.api.expr.v1beta1.Literal", encode(message: Literal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); @@ -1365,5 +1658,42 @@ export const Literal = { obj.string_value = message.stringValue; obj.bytes_value = message.bytesValue; return obj; + }, + fromAmino(object: LiteralAmino): Literal { + return { + nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, + boolValue: object?.bool_value, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, + doubleValue: object?.double_value, + stringValue: object?.string_value, + bytesValue: object?.bytes_value + }; + }, + toAmino(message: Literal): LiteralAmino { + const obj: any = {}; + obj.null_value = message.nullValue; + obj.bool_value = message.boolValue; + obj.int64_value = message.int64Value ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue; + obj.string_value = message.stringValue; + obj.bytes_value = message.bytesValue; + return obj; + }, + fromAminoMsg(object: LiteralAminoMsg): Literal { + return Literal.fromAmino(object.value); + }, + fromProtoMsg(message: LiteralProtoMsg): Literal { + return Literal.decode(message.value); + }, + toProto(message: Literal): Uint8Array { + return Literal.encode(message).finish(); + }, + toProtoMsg(message: Literal): LiteralProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Literal", + value: Literal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/source.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/source.ts index 4f1b5811a1..abed1015e8 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/source.ts @@ -138,6 +138,27 @@ export const SourceInfo_PositionsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: SourceInfo_PositionsEntryAmino): SourceInfo_PositionsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: SourceInfo_PositionsEntry): SourceInfo_PositionsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: SourceInfo_PositionsEntryAminoMsg): SourceInfo_PositionsEntry { + return SourceInfo_PositionsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: SourceInfo_PositionsEntryProtoMsg): SourceInfo_PositionsEntry { + return SourceInfo_PositionsEntry.decode(message.value); + }, + toProto(message: SourceInfo_PositionsEntry): Uint8Array { + return SourceInfo_PositionsEntry.encode(message).finish(); } }; function createBaseSourceInfo(): SourceInfo { @@ -148,6 +169,7 @@ function createBaseSourceInfo(): SourceInfo { }; } export const SourceInfo = { + typeUrl: "/google.api.expr.v1beta1.SourceInfo", encode(message: SourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(18).string(message.location); @@ -279,6 +301,49 @@ export const SourceInfo = { }); } return obj; + }, + fromAmino(object: SourceInfoAmino): SourceInfo { + return { + location: object.location, + lineOffsets: Array.isArray(object?.line_offsets) ? object.line_offsets.map((e: any) => e) : [], + positions: isObject(object.positions) ? Object.entries(object.positions).reduce<{ + [key: number]: number; + }>((acc, [key, value]) => { + acc[Number(key)] = Number(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: SourceInfo): SourceInfoAmino { + const obj: any = {}; + obj.location = message.location; + if (message.lineOffsets) { + obj.line_offsets = message.lineOffsets.map(e => e); + } else { + obj.line_offsets = []; + } + obj.positions = {}; + if (message.positions) { + Object.entries(message.positions).forEach(([k, v]) => { + obj.positions[k] = Math.round(v); + }); + } + return obj; + }, + fromAminoMsg(object: SourceInfoAminoMsg): SourceInfo { + return SourceInfo.fromAmino(object.value); + }, + fromProtoMsg(message: SourceInfoProtoMsg): SourceInfo { + return SourceInfo.decode(message.value); + }, + toProto(message: SourceInfo): Uint8Array { + return SourceInfo.encode(message).finish(); + }, + toProtoMsg(message: SourceInfo): SourceInfoProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.SourceInfo", + value: SourceInfo.encode(message).finish() + }; } }; function createBaseSourcePosition(): SourcePosition { @@ -290,6 +355,7 @@ function createBaseSourcePosition(): SourcePosition { }; } export const SourcePosition = { + typeUrl: "/google.api.expr.v1beta1.SourcePosition", encode(message: SourcePosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(10).string(message.location); @@ -378,5 +444,36 @@ export const SourcePosition = { obj.line = message.line; obj.column = message.column; return obj; + }, + fromAmino(object: SourcePositionAmino): SourcePosition { + return { + location: object.location, + offset: object.offset, + line: object.line, + column: object.column + }; + }, + toAmino(message: SourcePosition): SourcePositionAmino { + const obj: any = {}; + obj.location = message.location; + obj.offset = message.offset; + obj.line = message.line; + obj.column = message.column; + return obj; + }, + fromAminoMsg(object: SourcePositionAminoMsg): SourcePosition { + return SourcePosition.fromAmino(object.value); + }, + fromProtoMsg(message: SourcePositionProtoMsg): SourcePosition { + return SourcePosition.decode(message.value); + }, + toProto(message: SourcePosition): Uint8Array { + return SourcePosition.encode(message).finish(); + }, + toProtoMsg(message: SourcePosition): SourcePositionProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.SourcePosition", + value: SourcePosition.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/value.ts b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/value.ts index bb7a04d149..b65bb04227 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/expr/v1beta1/value.ts @@ -144,6 +144,7 @@ function createBaseValue(): Value { }; } export const Value = { + typeUrl: "/google.api.expr.v1beta1.Value", encode(message: Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); @@ -328,6 +329,53 @@ export const Value = { message.listValue !== undefined && (obj.list_value = message.listValue ? ListValue.toSDK(message.listValue) : undefined); obj.type_value = message.typeValue; return obj; + }, + fromAmino(object: ValueAmino): Value { + return { + nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, + boolValue: object?.bool_value, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, + doubleValue: object?.double_value, + stringValue: object?.string_value, + bytesValue: object?.bytes_value, + enumValue: object?.enum_value ? EnumValue.fromAmino(object.enum_value) : undefined, + objectValue: object?.object_value ? Any.fromAmino(object.object_value) : undefined, + mapValue: object?.map_value ? MapValue.fromAmino(object.map_value) : undefined, + listValue: object?.list_value ? ListValue.fromAmino(object.list_value) : undefined, + typeValue: object?.type_value + }; + }, + toAmino(message: Value): ValueAmino { + const obj: any = {}; + obj.null_value = message.nullValue; + obj.bool_value = message.boolValue; + obj.int64_value = message.int64Value ? message.int64Value.toString() : undefined; + obj.uint64_value = message.uint64Value ? message.uint64Value.toString() : undefined; + obj.double_value = message.doubleValue; + obj.string_value = message.stringValue; + obj.bytes_value = message.bytesValue; + obj.enum_value = message.enumValue ? EnumValue.toAmino(message.enumValue) : undefined; + obj.object_value = message.objectValue ? Any.toAmino(message.objectValue) : undefined; + obj.map_value = message.mapValue ? MapValue.toAmino(message.mapValue) : undefined; + obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; + obj.type_value = message.typeValue; + return obj; + }, + fromAminoMsg(object: ValueAminoMsg): Value { + return Value.fromAmino(object.value); + }, + fromProtoMsg(message: ValueProtoMsg): Value { + return Value.decode(message.value); + }, + toProto(message: Value): Uint8Array { + return Value.encode(message).finish(); + }, + toProtoMsg(message: Value): ValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Value", + value: Value.encode(message).finish() + }; } }; function createBaseEnumValue(): EnumValue { @@ -337,6 +385,7 @@ function createBaseEnumValue(): EnumValue { }; } export const EnumValue = { + typeUrl: "/google.api.expr.v1beta1.EnumValue", encode(message: EnumValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -401,6 +450,33 @@ export const EnumValue = { obj.type = message.type; obj.value = message.value; return obj; + }, + fromAmino(object: EnumValueAmino): EnumValue { + return { + type: object.type, + value: object.value + }; + }, + toAmino(message: EnumValue): EnumValueAmino { + const obj: any = {}; + obj.type = message.type; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: EnumValueAminoMsg): EnumValue { + return EnumValue.fromAmino(object.value); + }, + fromProtoMsg(message: EnumValueProtoMsg): EnumValue { + return EnumValue.decode(message.value); + }, + toProto(message: EnumValue): Uint8Array { + return EnumValue.encode(message).finish(); + }, + toProtoMsg(message: EnumValue): EnumValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.EnumValue", + value: EnumValue.encode(message).finish() + }; } }; function createBaseListValue(): ListValue { @@ -409,6 +485,7 @@ function createBaseListValue(): ListValue { }; } export const ListValue = { + typeUrl: "/google.api.expr.v1beta1.ListValue", encode(message: ListValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -469,6 +546,35 @@ export const ListValue = { obj.values = []; } return obj; + }, + fromAmino(object: ListValueAmino): ListValue { + return { + values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromAmino(e)) : [] + }; + }, + toAmino(message: ListValue): ListValueAmino { + const obj: any = {}; + if (message.values) { + obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); + } else { + obj.values = []; + } + return obj; + }, + fromAminoMsg(object: ListValueAminoMsg): ListValue { + return ListValue.fromAmino(object.value); + }, + fromProtoMsg(message: ListValueProtoMsg): ListValue { + return ListValue.decode(message.value); + }, + toProto(message: ListValue): Uint8Array { + return ListValue.encode(message).finish(); + }, + toProtoMsg(message: ListValue): ListValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.ListValue", + value: ListValue.encode(message).finish() + }; } }; function createBaseMapValue(): MapValue { @@ -477,6 +583,7 @@ function createBaseMapValue(): MapValue { }; } export const MapValue = { + typeUrl: "/google.api.expr.v1beta1.MapValue", encode(message: MapValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { MapValue_Entry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -537,6 +644,35 @@ export const MapValue = { obj.entries = []; } return obj; + }, + fromAmino(object: MapValueAmino): MapValue { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => MapValue_Entry.fromAmino(e)) : [] + }; + }, + toAmino(message: MapValue): MapValueAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? MapValue_Entry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + return obj; + }, + fromAminoMsg(object: MapValueAminoMsg): MapValue { + return MapValue.fromAmino(object.value); + }, + fromProtoMsg(message: MapValueProtoMsg): MapValue { + return MapValue.decode(message.value); + }, + toProto(message: MapValue): Uint8Array { + return MapValue.encode(message).finish(); + }, + toProtoMsg(message: MapValue): MapValueProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.MapValue", + value: MapValue.encode(message).finish() + }; } }; function createBaseMapValue_Entry(): MapValue_Entry { @@ -546,6 +682,7 @@ function createBaseMapValue_Entry(): MapValue_Entry { }; } export const MapValue_Entry = { + typeUrl: "/google.api.expr.v1beta1.Entry", encode(message: MapValue_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== undefined) { Value.encode(message.key, writer.uint32(10).fork()).ldelim(); @@ -610,5 +747,32 @@ export const MapValue_Entry = { message.key !== undefined && (obj.key = message.key ? Value.toSDK(message.key) : undefined); message.value !== undefined && (obj.value = message.value ? Value.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: MapValue_EntryAmino): MapValue_Entry { + return { + key: object?.key ? Value.fromAmino(object.key) : undefined, + value: object?.value ? Value.fromAmino(object.value) : undefined + }; + }, + toAmino(message: MapValue_Entry): MapValue_EntryAmino { + const obj: any = {}; + obj.key = message.key ? Value.toAmino(message.key) : undefined; + obj.value = message.value ? Value.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: MapValue_EntryAminoMsg): MapValue_Entry { + return MapValue_Entry.fromAmino(object.value); + }, + fromProtoMsg(message: MapValue_EntryProtoMsg): MapValue_Entry { + return MapValue_Entry.decode(message.value); + }, + toProto(message: MapValue_Entry): Uint8Array { + return MapValue_Entry.encode(message).finish(); + }, + toProtoMsg(message: MapValue_Entry): MapValue_EntryProtoMsg { + return { + typeUrl: "/google.api.expr.v1beta1.Entry", + value: MapValue_Entry.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/http.ts b/__fixtures__/v-next/outputosmojs/google/api/http.ts index 501d811795..fa3c90307c 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/http.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/http.ts @@ -657,6 +657,7 @@ function createBaseHttp(): Http { }; } export const Http = { + typeUrl: "/google.api.Http", encode(message: Http, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { HttpRule.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -729,6 +730,37 @@ export const Http = { } obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; return obj; + }, + fromAmino(object: HttpAmino): Http { + return { + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => HttpRule.fromAmino(e)) : [], + fullyDecodeReservedExpansion: object.fully_decode_reserved_expansion + }; + }, + toAmino(message: Http): HttpAmino { + const obj: any = {}; + if (message.rules) { + obj.rules = message.rules.map(e => e ? HttpRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + obj.fully_decode_reserved_expansion = message.fullyDecodeReservedExpansion; + return obj; + }, + fromAminoMsg(object: HttpAminoMsg): Http { + return Http.fromAmino(object.value); + }, + fromProtoMsg(message: HttpProtoMsg): Http { + return Http.decode(message.value); + }, + toProto(message: Http): Uint8Array { + return Http.encode(message).finish(); + }, + toProtoMsg(message: Http): HttpProtoMsg { + return { + typeUrl: "/google.api.Http", + value: Http.encode(message).finish() + }; } }; function createBaseHttpRule(): HttpRule { @@ -746,6 +778,7 @@ function createBaseHttpRule(): HttpRule { }; } export const HttpRule = { + typeUrl: "/google.api.HttpRule", encode(message: HttpRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -914,6 +947,53 @@ export const HttpRule = { obj.additional_bindings = []; } return obj; + }, + fromAmino(object: HttpRuleAmino): HttpRule { + return { + selector: object.selector, + get: object?.get, + put: object?.put, + post: object?.post, + delete: object?.delete, + patch: object?.patch, + custom: object?.custom ? CustomHttpPattern.fromAmino(object.custom) : undefined, + body: object.body, + responseBody: object.response_body, + additionalBindings: Array.isArray(object?.additional_bindings) ? object.additional_bindings.map((e: any) => HttpRule.fromAmino(e)) : [] + }; + }, + toAmino(message: HttpRule): HttpRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.get = message.get; + obj.put = message.put; + obj.post = message.post; + obj.delete = message.delete; + obj.patch = message.patch; + obj.custom = message.custom ? CustomHttpPattern.toAmino(message.custom) : undefined; + obj.body = message.body; + obj.response_body = message.responseBody; + if (message.additionalBindings) { + obj.additional_bindings = message.additionalBindings.map(e => e ? HttpRule.toAmino(e) : undefined); + } else { + obj.additional_bindings = []; + } + return obj; + }, + fromAminoMsg(object: HttpRuleAminoMsg): HttpRule { + return HttpRule.fromAmino(object.value); + }, + fromProtoMsg(message: HttpRuleProtoMsg): HttpRule { + return HttpRule.decode(message.value); + }, + toProto(message: HttpRule): Uint8Array { + return HttpRule.encode(message).finish(); + }, + toProtoMsg(message: HttpRule): HttpRuleProtoMsg { + return { + typeUrl: "/google.api.HttpRule", + value: HttpRule.encode(message).finish() + }; } }; function createBaseCustomHttpPattern(): CustomHttpPattern { @@ -923,6 +1003,7 @@ function createBaseCustomHttpPattern(): CustomHttpPattern { }; } export const CustomHttpPattern = { + typeUrl: "/google.api.CustomHttpPattern", encode(message: CustomHttpPattern, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== "") { writer.uint32(10).string(message.kind); @@ -987,5 +1068,32 @@ export const CustomHttpPattern = { obj.kind = message.kind; obj.path = message.path; return obj; + }, + fromAmino(object: CustomHttpPatternAmino): CustomHttpPattern { + return { + kind: object.kind, + path: object.path + }; + }, + toAmino(message: CustomHttpPattern): CustomHttpPatternAmino { + const obj: any = {}; + obj.kind = message.kind; + obj.path = message.path; + return obj; + }, + fromAminoMsg(object: CustomHttpPatternAminoMsg): CustomHttpPattern { + return CustomHttpPattern.fromAmino(object.value); + }, + fromProtoMsg(message: CustomHttpPatternProtoMsg): CustomHttpPattern { + return CustomHttpPattern.decode(message.value); + }, + toProto(message: CustomHttpPattern): Uint8Array { + return CustomHttpPattern.encode(message).finish(); + }, + toProtoMsg(message: CustomHttpPattern): CustomHttpPatternProtoMsg { + return { + typeUrl: "/google.api.CustomHttpPattern", + value: CustomHttpPattern.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts b/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts index a8715fc21e..8874270de0 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/httpbody.ts @@ -116,6 +116,7 @@ function createBaseHttpBody(): HttpBody { }; } export const HttpBody = { + typeUrl: "/google.api.HttpBody", encode(message: HttpBody, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contentType !== "") { writer.uint32(10).string(message.contentType); @@ -200,5 +201,38 @@ export const HttpBody = { obj.extensions = []; } return obj; + }, + fromAmino(object: HttpBodyAmino): HttpBody { + return { + contentType: object.content_type, + data: object.data, + extensions: Array.isArray(object?.extensions) ? object.extensions.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: HttpBody): HttpBodyAmino { + const obj: any = {}; + obj.content_type = message.contentType; + obj.data = message.data; + if (message.extensions) { + obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.extensions = []; + } + return obj; + }, + fromAminoMsg(object: HttpBodyAminoMsg): HttpBody { + return HttpBody.fromAmino(object.value); + }, + fromProtoMsg(message: HttpBodyProtoMsg): HttpBody { + return HttpBody.decode(message.value); + }, + toProto(message: HttpBody): Uint8Array { + return HttpBody.encode(message).finish(); + }, + toProtoMsg(message: HttpBody): HttpBodyProtoMsg { + return { + typeUrl: "/google.api.HttpBody", + value: HttpBody.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/label.ts b/__fixtures__/v-next/outputosmojs/google/api/label.ts index 1533ff6361..08bd5635df 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/label.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/label.ts @@ -65,6 +65,7 @@ function createBaseLabelDescriptor(): LabelDescriptor { }; } export const LabelDescriptor = { + typeUrl: "/google.api.LabelDescriptor", encode(message: LabelDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); @@ -141,5 +142,34 @@ export const LabelDescriptor = { message.valueType !== undefined && (obj.value_type = labelDescriptor_ValueTypeToJSON(message.valueType)); obj.description = message.description; return obj; + }, + fromAmino(object: LabelDescriptorAmino): LabelDescriptor { + return { + key: object.key, + valueType: isSet(object.value_type) ? labelDescriptor_ValueTypeFromJSON(object.value_type) : -1, + description: object.description + }; + }, + toAmino(message: LabelDescriptor): LabelDescriptorAmino { + const obj: any = {}; + obj.key = message.key; + obj.value_type = message.valueType; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: LabelDescriptorAminoMsg): LabelDescriptor { + return LabelDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: LabelDescriptorProtoMsg): LabelDescriptor { + return LabelDescriptor.decode(message.value); + }, + toProto(message: LabelDescriptor): Uint8Array { + return LabelDescriptor.encode(message).finish(); + }, + toProtoMsg(message: LabelDescriptor): LabelDescriptorProtoMsg { + return { + typeUrl: "/google.api.LabelDescriptor", + value: LabelDescriptor.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/log.ts b/__fixtures__/v-next/outputosmojs/google/api/log.ts index d1b862b675..cd875e3736 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/log.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/log.ts @@ -62,6 +62,7 @@ function createBaseLogDescriptor(): LogDescriptor { }; } export const LogDescriptor = { + typeUrl: "/google.api.LogDescriptor", encode(message: LogDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -158,5 +159,40 @@ export const LogDescriptor = { obj.description = message.description; obj.display_name = message.displayName; return obj; + }, + fromAmino(object: LogDescriptorAmino): LogDescriptor { + return { + name: object.name, + labels: Array.isArray(object?.labels) ? object.labels.map((e: any) => LabelDescriptor.fromAmino(e)) : [], + description: object.description, + displayName: object.display_name + }; + }, + toAmino(message: LogDescriptor): LogDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + if (message.labels) { + obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); + } else { + obj.labels = []; + } + obj.description = message.description; + obj.display_name = message.displayName; + return obj; + }, + fromAminoMsg(object: LogDescriptorAminoMsg): LogDescriptor { + return LogDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: LogDescriptorProtoMsg): LogDescriptor { + return LogDescriptor.decode(message.value); + }, + toProto(message: LogDescriptor): Uint8Array { + return LogDescriptor.encode(message).finish(); + }, + toProtoMsg(message: LogDescriptor): LogDescriptorProtoMsg { + return { + typeUrl: "/google.api.LogDescriptor", + value: LogDescriptor.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/logging.ts b/__fixtures__/v-next/outputosmojs/google/api/logging.ts index faf769a6be..320c560163 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/logging.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/logging.ts @@ -116,6 +116,7 @@ function createBaseLogging(): Logging { }; } export const Logging = { + typeUrl: "/google.api.Logging", encode(message: Logging, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.producerDestinations) { Logging_LoggingDestination.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -196,6 +197,41 @@ export const Logging = { obj.consumer_destinations = []; } return obj; + }, + fromAmino(object: LoggingAmino): Logging { + return { + producerDestinations: Array.isArray(object?.producer_destinations) ? object.producer_destinations.map((e: any) => Logging_LoggingDestination.fromAmino(e)) : [], + consumerDestinations: Array.isArray(object?.consumer_destinations) ? object.consumer_destinations.map((e: any) => Logging_LoggingDestination.fromAmino(e)) : [] + }; + }, + toAmino(message: Logging): LoggingAmino { + const obj: any = {}; + if (message.producerDestinations) { + obj.producer_destinations = message.producerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); + } else { + obj.producer_destinations = []; + } + if (message.consumerDestinations) { + obj.consumer_destinations = message.consumerDestinations.map(e => e ? Logging_LoggingDestination.toAmino(e) : undefined); + } else { + obj.consumer_destinations = []; + } + return obj; + }, + fromAminoMsg(object: LoggingAminoMsg): Logging { + return Logging.fromAmino(object.value); + }, + fromProtoMsg(message: LoggingProtoMsg): Logging { + return Logging.decode(message.value); + }, + toProto(message: Logging): Uint8Array { + return Logging.encode(message).finish(); + }, + toProtoMsg(message: Logging): LoggingProtoMsg { + return { + typeUrl: "/google.api.Logging", + value: Logging.encode(message).finish() + }; } }; function createBaseLogging_LoggingDestination(): Logging_LoggingDestination { @@ -205,6 +241,7 @@ function createBaseLogging_LoggingDestination(): Logging_LoggingDestination { }; } export const Logging_LoggingDestination = { + typeUrl: "/google.api.LoggingDestination", encode(message: Logging_LoggingDestination, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.monitoredResource !== "") { writer.uint32(26).string(message.monitoredResource); @@ -277,5 +314,36 @@ export const Logging_LoggingDestination = { obj.logs = []; } return obj; + }, + fromAmino(object: Logging_LoggingDestinationAmino): Logging_LoggingDestination { + return { + monitoredResource: object.monitored_resource, + logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => e) : [] + }; + }, + toAmino(message: Logging_LoggingDestination): Logging_LoggingDestinationAmino { + const obj: any = {}; + obj.monitored_resource = message.monitoredResource; + if (message.logs) { + obj.logs = message.logs.map(e => e); + } else { + obj.logs = []; + } + return obj; + }, + fromAminoMsg(object: Logging_LoggingDestinationAminoMsg): Logging_LoggingDestination { + return Logging_LoggingDestination.fromAmino(object.value); + }, + fromProtoMsg(message: Logging_LoggingDestinationProtoMsg): Logging_LoggingDestination { + return Logging_LoggingDestination.decode(message.value); + }, + toProto(message: Logging_LoggingDestination): Uint8Array { + return Logging_LoggingDestination.encode(message).finish(); + }, + toProtoMsg(message: Logging_LoggingDestination): Logging_LoggingDestinationProtoMsg { + return { + typeUrl: "/google.api.LoggingDestination", + value: Logging_LoggingDestination.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/metric.ts b/__fixtures__/v-next/outputosmojs/google/api/metric.ts index 0ad9dddbfb..4bf279c987 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/metric.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/metric.ts @@ -398,6 +398,7 @@ function createBaseMetricDescriptor(): MetricDescriptor { }; } export const MetricDescriptor = { + typeUrl: "/google.api.MetricDescriptor", encode(message: MetricDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -586,6 +587,59 @@ export const MetricDescriptor = { obj.monitored_resource_types = []; } return obj; + }, + fromAmino(object: MetricDescriptorAmino): MetricDescriptor { + return { + name: object.name, + type: object.type, + labels: Array.isArray(object?.labels) ? object.labels.map((e: any) => LabelDescriptor.fromAmino(e)) : [], + metricKind: isSet(object.metric_kind) ? metricDescriptor_MetricKindFromJSON(object.metric_kind) : -1, + valueType: isSet(object.value_type) ? metricDescriptor_ValueTypeFromJSON(object.value_type) : -1, + unit: object.unit, + description: object.description, + displayName: object.display_name, + metadata: object?.metadata ? MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.metadata) : undefined, + launchStage: isSet(object.launch_stage) ? launchStageFromJSON(object.launch_stage) : -1, + monitoredResourceTypes: Array.isArray(object?.monitored_resource_types) ? object.monitored_resource_types.map((e: any) => e) : [] + }; + }, + toAmino(message: MetricDescriptor): MetricDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + obj.type = message.type; + if (message.labels) { + obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); + } else { + obj.labels = []; + } + obj.metric_kind = message.metricKind; + obj.value_type = message.valueType; + obj.unit = message.unit; + obj.description = message.description; + obj.display_name = message.displayName; + obj.metadata = message.metadata ? MetricDescriptor_MetricDescriptorMetadata.toAmino(message.metadata) : undefined; + obj.launch_stage = message.launchStage; + if (message.monitoredResourceTypes) { + obj.monitored_resource_types = message.monitoredResourceTypes.map(e => e); + } else { + obj.monitored_resource_types = []; + } + return obj; + }, + fromAminoMsg(object: MetricDescriptorAminoMsg): MetricDescriptor { + return MetricDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: MetricDescriptorProtoMsg): MetricDescriptor { + return MetricDescriptor.decode(message.value); + }, + toProto(message: MetricDescriptor): Uint8Array { + return MetricDescriptor.encode(message).finish(); + }, + toProtoMsg(message: MetricDescriptor): MetricDescriptorProtoMsg { + return { + typeUrl: "/google.api.MetricDescriptor", + value: MetricDescriptor.encode(message).finish() + }; } }; function createBaseMetricDescriptor_MetricDescriptorMetadata(): MetricDescriptor_MetricDescriptorMetadata { @@ -596,6 +650,7 @@ function createBaseMetricDescriptor_MetricDescriptorMetadata(): MetricDescriptor }; } export const MetricDescriptor_MetricDescriptorMetadata = { + typeUrl: "/google.api.MetricDescriptorMetadata", encode(message: MetricDescriptor_MetricDescriptorMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.launchStage !== 0) { writer.uint32(8).int32(message.launchStage); @@ -672,6 +727,35 @@ export const MetricDescriptor_MetricDescriptorMetadata = { message.samplePeriod !== undefined && (obj.sample_period = message.samplePeriod ? Duration.toSDK(message.samplePeriod) : undefined); message.ingestDelay !== undefined && (obj.ingest_delay = message.ingestDelay ? Duration.toSDK(message.ingestDelay) : undefined); return obj; + }, + fromAmino(object: MetricDescriptor_MetricDescriptorMetadataAmino): MetricDescriptor_MetricDescriptorMetadata { + return { + launchStage: isSet(object.launch_stage) ? launchStageFromJSON(object.launch_stage) : -1, + samplePeriod: object?.sample_period ? Duration.fromAmino(object.sample_period) : undefined, + ingestDelay: object?.ingest_delay ? Duration.fromAmino(object.ingest_delay) : undefined + }; + }, + toAmino(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataAmino { + const obj: any = {}; + obj.launch_stage = message.launchStage; + obj.sample_period = message.samplePeriod ? Duration.toAmino(message.samplePeriod) : undefined; + obj.ingest_delay = message.ingestDelay ? Duration.toAmino(message.ingestDelay) : undefined; + return obj; + }, + fromAminoMsg(object: MetricDescriptor_MetricDescriptorMetadataAminoMsg): MetricDescriptor_MetricDescriptorMetadata { + return MetricDescriptor_MetricDescriptorMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: MetricDescriptor_MetricDescriptorMetadataProtoMsg): MetricDescriptor_MetricDescriptorMetadata { + return MetricDescriptor_MetricDescriptorMetadata.decode(message.value); + }, + toProto(message: MetricDescriptor_MetricDescriptorMetadata): Uint8Array { + return MetricDescriptor_MetricDescriptorMetadata.encode(message).finish(); + }, + toProtoMsg(message: MetricDescriptor_MetricDescriptorMetadata): MetricDescriptor_MetricDescriptorMetadataProtoMsg { + return { + typeUrl: "/google.api.MetricDescriptorMetadata", + value: MetricDescriptor_MetricDescriptorMetadata.encode(message).finish() + }; } }; function createBaseMetric_LabelsEntry(): Metric_LabelsEntry { @@ -745,6 +829,27 @@ export const Metric_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: Metric_LabelsEntryAmino): Metric_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Metric_LabelsEntry): Metric_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: Metric_LabelsEntryAminoMsg): Metric_LabelsEntry { + return Metric_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: Metric_LabelsEntryProtoMsg): Metric_LabelsEntry { + return Metric_LabelsEntry.decode(message.value); + }, + toProto(message: Metric_LabelsEntry): Uint8Array { + return Metric_LabelsEntry.encode(message).finish(); } }; function createBaseMetric(): Metric { @@ -754,6 +859,7 @@ function createBaseMetric(): Metric { }; } export const Metric = { + typeUrl: "/google.api.Metric", encode(message: Metric, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(26).string(message.type); @@ -856,5 +962,42 @@ export const Metric = { }); } return obj; + }, + fromAmino(object: MetricAmino): Metric { + return { + type: object.type, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: Metric): MetricAmino { + const obj: any = {}; + obj.type = message.type; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + return obj; + }, + fromAminoMsg(object: MetricAminoMsg): Metric { + return Metric.fromAmino(object.value); + }, + fromProtoMsg(message: MetricProtoMsg): Metric { + return Metric.decode(message.value); + }, + toProto(message: Metric): Uint8Array { + return Metric.encode(message).finish(); + }, + toProtoMsg(message: Metric): MetricProtoMsg { + return { + typeUrl: "/google.api.Metric", + value: Metric.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts b/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts index 5596f88706..d98ce6eb5a 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/monitored_resource.ts @@ -190,6 +190,7 @@ function createBaseMonitoredResourceDescriptor(): MonitoredResourceDescriptor { }; } export const MonitoredResourceDescriptor = { + typeUrl: "/google.api.MonitoredResourceDescriptor", encode(message: MonitoredResourceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(42).string(message.name); @@ -310,6 +311,45 @@ export const MonitoredResourceDescriptor = { } message.launchStage !== undefined && (obj.launch_stage = launchStageToJSON(message.launchStage)); return obj; + }, + fromAmino(object: MonitoredResourceDescriptorAmino): MonitoredResourceDescriptor { + return { + name: object.name, + type: object.type, + displayName: object.display_name, + description: object.description, + labels: Array.isArray(object?.labels) ? object.labels.map((e: any) => LabelDescriptor.fromAmino(e)) : [], + launchStage: isSet(object.launch_stage) ? launchStageFromJSON(object.launch_stage) : -1 + }; + }, + toAmino(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorAmino { + const obj: any = {}; + obj.name = message.name; + obj.type = message.type; + obj.display_name = message.displayName; + obj.description = message.description; + if (message.labels) { + obj.labels = message.labels.map(e => e ? LabelDescriptor.toAmino(e) : undefined); + } else { + obj.labels = []; + } + obj.launch_stage = message.launchStage; + return obj; + }, + fromAminoMsg(object: MonitoredResourceDescriptorAminoMsg): MonitoredResourceDescriptor { + return MonitoredResourceDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: MonitoredResourceDescriptorProtoMsg): MonitoredResourceDescriptor { + return MonitoredResourceDescriptor.decode(message.value); + }, + toProto(message: MonitoredResourceDescriptor): Uint8Array { + return MonitoredResourceDescriptor.encode(message).finish(); + }, + toProtoMsg(message: MonitoredResourceDescriptor): MonitoredResourceDescriptorProtoMsg { + return { + typeUrl: "/google.api.MonitoredResourceDescriptor", + value: MonitoredResourceDescriptor.encode(message).finish() + }; } }; function createBaseMonitoredResource_LabelsEntry(): MonitoredResource_LabelsEntry { @@ -383,6 +423,27 @@ export const MonitoredResource_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: MonitoredResource_LabelsEntryAmino): MonitoredResource_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: MonitoredResource_LabelsEntry): MonitoredResource_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: MonitoredResource_LabelsEntryAminoMsg): MonitoredResource_LabelsEntry { + return MonitoredResource_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: MonitoredResource_LabelsEntryProtoMsg): MonitoredResource_LabelsEntry { + return MonitoredResource_LabelsEntry.decode(message.value); + }, + toProto(message: MonitoredResource_LabelsEntry): Uint8Array { + return MonitoredResource_LabelsEntry.encode(message).finish(); } }; function createBaseMonitoredResource(): MonitoredResource { @@ -392,6 +453,7 @@ function createBaseMonitoredResource(): MonitoredResource { }; } export const MonitoredResource = { + typeUrl: "/google.api.MonitoredResource", encode(message: MonitoredResource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -494,6 +556,43 @@ export const MonitoredResource = { }); } return obj; + }, + fromAmino(object: MonitoredResourceAmino): MonitoredResource { + return { + type: object.type, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: MonitoredResource): MonitoredResourceAmino { + const obj: any = {}; + obj.type = message.type; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + return obj; + }, + fromAminoMsg(object: MonitoredResourceAminoMsg): MonitoredResource { + return MonitoredResource.fromAmino(object.value); + }, + fromProtoMsg(message: MonitoredResourceProtoMsg): MonitoredResource { + return MonitoredResource.decode(message.value); + }, + toProto(message: MonitoredResource): Uint8Array { + return MonitoredResource.encode(message).finish(); + }, + toProtoMsg(message: MonitoredResource): MonitoredResourceProtoMsg { + return { + typeUrl: "/google.api.MonitoredResource", + value: MonitoredResource.encode(message).finish() + }; } }; function createBaseMonitoredResourceMetadata_UserLabelsEntry(): MonitoredResourceMetadata_UserLabelsEntry { @@ -567,6 +666,27 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: MonitoredResourceMetadata_UserLabelsEntryAmino): MonitoredResourceMetadata_UserLabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: MonitoredResourceMetadata_UserLabelsEntry): MonitoredResourceMetadata_UserLabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: MonitoredResourceMetadata_UserLabelsEntryAminoMsg): MonitoredResourceMetadata_UserLabelsEntry { + return MonitoredResourceMetadata_UserLabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: MonitoredResourceMetadata_UserLabelsEntryProtoMsg): MonitoredResourceMetadata_UserLabelsEntry { + return MonitoredResourceMetadata_UserLabelsEntry.decode(message.value); + }, + toProto(message: MonitoredResourceMetadata_UserLabelsEntry): Uint8Array { + return MonitoredResourceMetadata_UserLabelsEntry.encode(message).finish(); } }; function createBaseMonitoredResourceMetadata(): MonitoredResourceMetadata { @@ -576,6 +696,7 @@ function createBaseMonitoredResourceMetadata(): MonitoredResourceMetadata { }; } export const MonitoredResourceMetadata = { + typeUrl: "/google.api.MonitoredResourceMetadata", encode(message: MonitoredResourceMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.systemLabels !== undefined) { Struct.encode(message.systemLabels, writer.uint32(10).fork()).ldelim(); @@ -678,5 +799,42 @@ export const MonitoredResourceMetadata = { }); } return obj; + }, + fromAmino(object: MonitoredResourceMetadataAmino): MonitoredResourceMetadata { + return { + systemLabels: object?.system_labels ? Struct.fromAmino(object.system_labels) : undefined, + userLabels: isObject(object.user_labels) ? Object.entries(object.user_labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: MonitoredResourceMetadata): MonitoredResourceMetadataAmino { + const obj: any = {}; + obj.system_labels = message.systemLabels ? Struct.toAmino(message.systemLabels) : undefined; + obj.user_labels = {}; + if (message.userLabels) { + Object.entries(message.userLabels).forEach(([k, v]) => { + obj.user_labels[k] = v; + }); + } + return obj; + }, + fromAminoMsg(object: MonitoredResourceMetadataAminoMsg): MonitoredResourceMetadata { + return MonitoredResourceMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: MonitoredResourceMetadataProtoMsg): MonitoredResourceMetadata { + return MonitoredResourceMetadata.decode(message.value); + }, + toProto(message: MonitoredResourceMetadata): Uint8Array { + return MonitoredResourceMetadata.encode(message).finish(); + }, + toProtoMsg(message: MonitoredResourceMetadata): MonitoredResourceMetadataProtoMsg { + return { + typeUrl: "/google.api.MonitoredResourceMetadata", + value: MonitoredResourceMetadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts b/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts index a13727dc51..97d82c1c36 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/monitoring.ts @@ -164,6 +164,7 @@ function createBaseMonitoring(): Monitoring { }; } export const Monitoring = { + typeUrl: "/google.api.Monitoring", encode(message: Monitoring, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.producerDestinations) { Monitoring_MonitoringDestination.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -244,6 +245,41 @@ export const Monitoring = { obj.consumer_destinations = []; } return obj; + }, + fromAmino(object: MonitoringAmino): Monitoring { + return { + producerDestinations: Array.isArray(object?.producer_destinations) ? object.producer_destinations.map((e: any) => Monitoring_MonitoringDestination.fromAmino(e)) : [], + consumerDestinations: Array.isArray(object?.consumer_destinations) ? object.consumer_destinations.map((e: any) => Monitoring_MonitoringDestination.fromAmino(e)) : [] + }; + }, + toAmino(message: Monitoring): MonitoringAmino { + const obj: any = {}; + if (message.producerDestinations) { + obj.producer_destinations = message.producerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); + } else { + obj.producer_destinations = []; + } + if (message.consumerDestinations) { + obj.consumer_destinations = message.consumerDestinations.map(e => e ? Monitoring_MonitoringDestination.toAmino(e) : undefined); + } else { + obj.consumer_destinations = []; + } + return obj; + }, + fromAminoMsg(object: MonitoringAminoMsg): Monitoring { + return Monitoring.fromAmino(object.value); + }, + fromProtoMsg(message: MonitoringProtoMsg): Monitoring { + return Monitoring.decode(message.value); + }, + toProto(message: Monitoring): Uint8Array { + return Monitoring.encode(message).finish(); + }, + toProtoMsg(message: Monitoring): MonitoringProtoMsg { + return { + typeUrl: "/google.api.Monitoring", + value: Monitoring.encode(message).finish() + }; } }; function createBaseMonitoring_MonitoringDestination(): Monitoring_MonitoringDestination { @@ -253,6 +289,7 @@ function createBaseMonitoring_MonitoringDestination(): Monitoring_MonitoringDest }; } export const Monitoring_MonitoringDestination = { + typeUrl: "/google.api.MonitoringDestination", encode(message: Monitoring_MonitoringDestination, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.monitoredResource !== "") { writer.uint32(10).string(message.monitoredResource); @@ -325,5 +362,36 @@ export const Monitoring_MonitoringDestination = { obj.metrics = []; } return obj; + }, + fromAmino(object: Monitoring_MonitoringDestinationAmino): Monitoring_MonitoringDestination { + return { + monitoredResource: object.monitored_resource, + metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => e) : [] + }; + }, + toAmino(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationAmino { + const obj: any = {}; + obj.monitored_resource = message.monitoredResource; + if (message.metrics) { + obj.metrics = message.metrics.map(e => e); + } else { + obj.metrics = []; + } + return obj; + }, + fromAminoMsg(object: Monitoring_MonitoringDestinationAminoMsg): Monitoring_MonitoringDestination { + return Monitoring_MonitoringDestination.fromAmino(object.value); + }, + fromProtoMsg(message: Monitoring_MonitoringDestinationProtoMsg): Monitoring_MonitoringDestination { + return Monitoring_MonitoringDestination.decode(message.value); + }, + toProto(message: Monitoring_MonitoringDestination): Uint8Array { + return Monitoring_MonitoringDestination.encode(message).finish(); + }, + toProtoMsg(message: Monitoring_MonitoringDestination): Monitoring_MonitoringDestinationProtoMsg { + return { + typeUrl: "/google.api.MonitoringDestination", + value: Monitoring_MonitoringDestination.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/quota.ts b/__fixtures__/v-next/outputosmojs/google/api/quota.ts index df36b39c2f..1f31bd3d53 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/quota.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/quota.ts @@ -288,6 +288,7 @@ function createBaseQuota(): Quota { }; } export const Quota = { + typeUrl: "/google.api.Quota", encode(message: Quota, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.limits) { QuotaLimit.encode(v!, writer.uint32(26).fork()).ldelim(); @@ -368,6 +369,41 @@ export const Quota = { obj.metric_rules = []; } return obj; + }, + fromAmino(object: QuotaAmino): Quota { + return { + limits: Array.isArray(object?.limits) ? object.limits.map((e: any) => QuotaLimit.fromAmino(e)) : [], + metricRules: Array.isArray(object?.metric_rules) ? object.metric_rules.map((e: any) => MetricRule.fromAmino(e)) : [] + }; + }, + toAmino(message: Quota): QuotaAmino { + const obj: any = {}; + if (message.limits) { + obj.limits = message.limits.map(e => e ? QuotaLimit.toAmino(e) : undefined); + } else { + obj.limits = []; + } + if (message.metricRules) { + obj.metric_rules = message.metricRules.map(e => e ? MetricRule.toAmino(e) : undefined); + } else { + obj.metric_rules = []; + } + return obj; + }, + fromAminoMsg(object: QuotaAminoMsg): Quota { + return Quota.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaProtoMsg): Quota { + return Quota.decode(message.value); + }, + toProto(message: Quota): Uint8Array { + return Quota.encode(message).finish(); + }, + toProtoMsg(message: Quota): QuotaProtoMsg { + return { + typeUrl: "/google.api.Quota", + value: Quota.encode(message).finish() + }; } }; function createBaseMetricRule_MetricCostsEntry(): MetricRule_MetricCostsEntry { @@ -441,6 +477,27 @@ export const MetricRule_MetricCostsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: MetricRule_MetricCostsEntryAmino): MetricRule_MetricCostsEntry { + return { + key: object.key, + value: BigInt(object.value) + }; + }, + toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value ? message.value.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MetricRule_MetricCostsEntryAminoMsg): MetricRule_MetricCostsEntry { + return MetricRule_MetricCostsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: MetricRule_MetricCostsEntryProtoMsg): MetricRule_MetricCostsEntry { + return MetricRule_MetricCostsEntry.decode(message.value); + }, + toProto(message: MetricRule_MetricCostsEntry): Uint8Array { + return MetricRule_MetricCostsEntry.encode(message).finish(); } }; function createBaseMetricRule(): MetricRule { @@ -450,6 +507,7 @@ function createBaseMetricRule(): MetricRule { }; } export const MetricRule = { + typeUrl: "/google.api.MetricRule", encode(message: MetricRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -552,6 +610,43 @@ export const MetricRule = { }); } return obj; + }, + fromAmino(object: MetricRuleAmino): MetricRule { + return { + selector: object.selector, + metricCosts: isObject(object.metric_costs) ? Object.entries(object.metric_costs).reduce<{ + [key: string]: bigint; + }>((acc, [key, value]) => { + acc[key] = BigInt((value as bigint | string).toString()); + return acc; + }, {}) : {} + }; + }, + toAmino(message: MetricRule): MetricRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.metric_costs = {}; + if (message.metricCosts) { + Object.entries(message.metricCosts).forEach(([k, v]) => { + obj.metric_costs[k] = v.toString(); + }); + } + return obj; + }, + fromAminoMsg(object: MetricRuleAminoMsg): MetricRule { + return MetricRule.fromAmino(object.value); + }, + fromProtoMsg(message: MetricRuleProtoMsg): MetricRule { + return MetricRule.decode(message.value); + }, + toProto(message: MetricRule): Uint8Array { + return MetricRule.encode(message).finish(); + }, + toProtoMsg(message: MetricRule): MetricRuleProtoMsg { + return { + typeUrl: "/google.api.MetricRule", + value: MetricRule.encode(message).finish() + }; } }; function createBaseQuotaLimit_ValuesEntry(): QuotaLimit_ValuesEntry { @@ -625,6 +720,27 @@ export const QuotaLimit_ValuesEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: QuotaLimit_ValuesEntryAmino): QuotaLimit_ValuesEntry { + return { + key: object.key, + value: BigInt(object.value) + }; + }, + toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value ? message.value.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QuotaLimit_ValuesEntryAminoMsg): QuotaLimit_ValuesEntry { + return QuotaLimit_ValuesEntry.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaLimit_ValuesEntryProtoMsg): QuotaLimit_ValuesEntry { + return QuotaLimit_ValuesEntry.decode(message.value); + }, + toProto(message: QuotaLimit_ValuesEntry): Uint8Array { + return QuotaLimit_ValuesEntry.encode(message).finish(); } }; function createBaseQuotaLimit(): QuotaLimit { @@ -642,6 +758,7 @@ function createBaseQuotaLimit(): QuotaLimit { }; } export const QuotaLimit = { + typeUrl: "/google.api.QuotaLimit", encode(message: QuotaLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(50).string(message.name); @@ -840,5 +957,58 @@ export const QuotaLimit = { } obj.display_name = message.displayName; return obj; + }, + fromAmino(object: QuotaLimitAmino): QuotaLimit { + return { + name: object.name, + description: object.description, + defaultLimit: BigInt(object.default_limit), + maxLimit: BigInt(object.max_limit), + freeTier: BigInt(object.free_tier), + duration: object.duration, + metric: object.metric, + unit: object.unit, + values: isObject(object.values) ? Object.entries(object.values).reduce<{ + [key: string]: bigint; + }>((acc, [key, value]) => { + acc[key] = BigInt((value as bigint | string).toString()); + return acc; + }, {}) : {}, + displayName: object.display_name + }; + }, + toAmino(message: QuotaLimit): QuotaLimitAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + obj.default_limit = message.defaultLimit ? message.defaultLimit.toString() : undefined; + obj.max_limit = message.maxLimit ? message.maxLimit.toString() : undefined; + obj.free_tier = message.freeTier ? message.freeTier.toString() : undefined; + obj.duration = message.duration; + obj.metric = message.metric; + obj.unit = message.unit; + obj.values = {}; + if (message.values) { + Object.entries(message.values).forEach(([k, v]) => { + obj.values[k] = v.toString(); + }); + } + obj.display_name = message.displayName; + return obj; + }, + fromAminoMsg(object: QuotaLimitAminoMsg): QuotaLimit { + return QuotaLimit.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaLimitProtoMsg): QuotaLimit { + return QuotaLimit.decode(message.value); + }, + toProto(message: QuotaLimit): Uint8Array { + return QuotaLimit.encode(message).finish(); + }, + toProtoMsg(message: QuotaLimit): QuotaLimitProtoMsg { + return { + typeUrl: "/google.api.QuotaLimit", + value: QuotaLimit.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/resource.ts b/__fixtures__/v-next/outputosmojs/google/api/resource.ts index 9ea5dba2ee..a17b701020 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/resource.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/resource.ts @@ -348,6 +348,7 @@ function createBaseResourceDescriptor(): ResourceDescriptor { }; } export const ResourceDescriptor = { + typeUrl: "/google.api.ResourceDescriptor", encode(message: ResourceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -497,6 +498,51 @@ export const ResourceDescriptor = { obj.style = []; } return obj; + }, + fromAmino(object: ResourceDescriptorAmino): ResourceDescriptor { + return { + type: object.type, + pattern: Array.isArray(object?.pattern) ? object.pattern.map((e: any) => e) : [], + nameField: object.name_field, + history: isSet(object.history) ? resourceDescriptor_HistoryFromJSON(object.history) : -1, + plural: object.plural, + singular: object.singular, + style: Array.isArray(object?.style) ? object.style.map((e: any) => resourceDescriptor_StyleFromJSON(e)) : [] + }; + }, + toAmino(message: ResourceDescriptor): ResourceDescriptorAmino { + const obj: any = {}; + obj.type = message.type; + if (message.pattern) { + obj.pattern = message.pattern.map(e => e); + } else { + obj.pattern = []; + } + obj.name_field = message.nameField; + obj.history = message.history; + obj.plural = message.plural; + obj.singular = message.singular; + if (message.style) { + obj.style = message.style.map(e => resourceDescriptor_StyleToJSON(e)); + } else { + obj.style = []; + } + return obj; + }, + fromAminoMsg(object: ResourceDescriptorAminoMsg): ResourceDescriptor { + return ResourceDescriptor.fromAmino(object.value); + }, + fromProtoMsg(message: ResourceDescriptorProtoMsg): ResourceDescriptor { + return ResourceDescriptor.decode(message.value); + }, + toProto(message: ResourceDescriptor): Uint8Array { + return ResourceDescriptor.encode(message).finish(); + }, + toProtoMsg(message: ResourceDescriptor): ResourceDescriptorProtoMsg { + return { + typeUrl: "/google.api.ResourceDescriptor", + value: ResourceDescriptor.encode(message).finish() + }; } }; function createBaseResourceReference(): ResourceReference { @@ -506,6 +552,7 @@ function createBaseResourceReference(): ResourceReference { }; } export const ResourceReference = { + typeUrl: "/google.api.ResourceReference", encode(message: ResourceReference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -570,5 +617,32 @@ export const ResourceReference = { obj.type = message.type; obj.child_type = message.childType; return obj; + }, + fromAmino(object: ResourceReferenceAmino): ResourceReference { + return { + type: object.type, + childType: object.child_type + }; + }, + toAmino(message: ResourceReference): ResourceReferenceAmino { + const obj: any = {}; + obj.type = message.type; + obj.child_type = message.childType; + return obj; + }, + fromAminoMsg(object: ResourceReferenceAminoMsg): ResourceReference { + return ResourceReference.fromAmino(object.value); + }, + fromProtoMsg(message: ResourceReferenceProtoMsg): ResourceReference { + return ResourceReference.decode(message.value); + }, + toProto(message: ResourceReference): Uint8Array { + return ResourceReference.encode(message).finish(); + }, + toProtoMsg(message: ResourceReference): ResourceReferenceProtoMsg { + return { + typeUrl: "/google.api.ResourceReference", + value: ResourceReference.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/routing.ts b/__fixtures__/v-next/outputosmojs/google/api/routing.ts index 353a26c87b..ecd714d53b 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/routing.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/routing.ts @@ -810,6 +810,7 @@ function createBaseRoutingRule(): RoutingRule { }; } export const RoutingRule = { + typeUrl: "/google.api.RoutingRule", encode(message: RoutingRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.routingParameters) { RoutingParameter.encode(v!, writer.uint32(18).fork()).ldelim(); @@ -870,6 +871,35 @@ export const RoutingRule = { obj.routing_parameters = []; } return obj; + }, + fromAmino(object: RoutingRuleAmino): RoutingRule { + return { + routingParameters: Array.isArray(object?.routing_parameters) ? object.routing_parameters.map((e: any) => RoutingParameter.fromAmino(e)) : [] + }; + }, + toAmino(message: RoutingRule): RoutingRuleAmino { + const obj: any = {}; + if (message.routingParameters) { + obj.routing_parameters = message.routingParameters.map(e => e ? RoutingParameter.toAmino(e) : undefined); + } else { + obj.routing_parameters = []; + } + return obj; + }, + fromAminoMsg(object: RoutingRuleAminoMsg): RoutingRule { + return RoutingRule.fromAmino(object.value); + }, + fromProtoMsg(message: RoutingRuleProtoMsg): RoutingRule { + return RoutingRule.decode(message.value); + }, + toProto(message: RoutingRule): Uint8Array { + return RoutingRule.encode(message).finish(); + }, + toProtoMsg(message: RoutingRule): RoutingRuleProtoMsg { + return { + typeUrl: "/google.api.RoutingRule", + value: RoutingRule.encode(message).finish() + }; } }; function createBaseRoutingParameter(): RoutingParameter { @@ -879,6 +909,7 @@ function createBaseRoutingParameter(): RoutingParameter { }; } export const RoutingParameter = { + typeUrl: "/google.api.RoutingParameter", encode(message: RoutingParameter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.field !== "") { writer.uint32(10).string(message.field); @@ -943,5 +974,32 @@ export const RoutingParameter = { obj.field = message.field; obj.path_template = message.pathTemplate; return obj; + }, + fromAmino(object: RoutingParameterAmino): RoutingParameter { + return { + field: object.field, + pathTemplate: object.path_template + }; + }, + toAmino(message: RoutingParameter): RoutingParameterAmino { + const obj: any = {}; + obj.field = message.field; + obj.path_template = message.pathTemplate; + return obj; + }, + fromAminoMsg(object: RoutingParameterAminoMsg): RoutingParameter { + return RoutingParameter.fromAmino(object.value); + }, + fromProtoMsg(message: RoutingParameterProtoMsg): RoutingParameter { + return RoutingParameter.decode(message.value); + }, + toProto(message: RoutingParameter): Uint8Array { + return RoutingParameter.encode(message).finish(); + }, + toProtoMsg(message: RoutingParameter): RoutingParameterProtoMsg { + return { + typeUrl: "/google.api.RoutingParameter", + value: RoutingParameter.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/service.ts b/__fixtures__/v-next/outputosmojs/google/api/service.ts index 64ab64f384..b80c3792db 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/service.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/service.ts @@ -225,6 +225,7 @@ function createBaseService(): Service { }; } export const Service = { + typeUrl: "/google.api.Service", encode(message: Service, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -621,5 +622,106 @@ export const Service = { message.sourceInfo !== undefined && (obj.source_info = message.sourceInfo ? SourceInfo.toSDK(message.sourceInfo) : undefined); message.configVersion !== undefined && (obj.config_version = message.configVersion ? UInt32Value.toSDK(message.configVersion) : undefined); return obj; + }, + fromAmino(object: ServiceAmino): Service { + return { + name: object.name, + title: object.title, + producerProjectId: object.producer_project_id, + id: object.id, + apis: Array.isArray(object?.apis) ? object.apis.map((e: any) => Api.fromAmino(e)) : [], + types: Array.isArray(object?.types) ? object.types.map((e: any) => Type.fromAmino(e)) : [], + enums: Array.isArray(object?.enums) ? object.enums.map((e: any) => Enum.fromAmino(e)) : [], + documentation: object?.documentation ? Documentation.fromAmino(object.documentation) : undefined, + backend: object?.backend ? Backend.fromAmino(object.backend) : undefined, + http: object?.http ? Http.fromAmino(object.http) : undefined, + quota: object?.quota ? Quota.fromAmino(object.quota) : undefined, + authentication: object?.authentication ? Authentication.fromAmino(object.authentication) : undefined, + context: object?.context ? Context.fromAmino(object.context) : undefined, + usage: object?.usage ? Usage.fromAmino(object.usage) : undefined, + endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromAmino(e)) : [], + control: object?.control ? Control.fromAmino(object.control) : undefined, + logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => LogDescriptor.fromAmino(e)) : [], + metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => MetricDescriptor.fromAmino(e)) : [], + monitoredResources: Array.isArray(object?.monitored_resources) ? object.monitored_resources.map((e: any) => MonitoredResourceDescriptor.fromAmino(e)) : [], + billing: object?.billing ? Billing.fromAmino(object.billing) : undefined, + logging: object?.logging ? Logging.fromAmino(object.logging) : undefined, + monitoring: object?.monitoring ? Monitoring.fromAmino(object.monitoring) : undefined, + systemParameters: object?.system_parameters ? SystemParameters.fromAmino(object.system_parameters) : undefined, + sourceInfo: object?.source_info ? SourceInfo.fromAmino(object.source_info) : undefined, + configVersion: object?.config_version ? UInt32Value.fromAmino(object.config_version) : undefined + }; + }, + toAmino(message: Service): ServiceAmino { + const obj: any = {}; + obj.name = message.name; + obj.title = message.title; + obj.producer_project_id = message.producerProjectId; + obj.id = message.id; + if (message.apis) { + obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); + } else { + obj.apis = []; + } + if (message.types) { + obj.types = message.types.map(e => e ? Type.toAmino(e) : undefined); + } else { + obj.types = []; + } + if (message.enums) { + obj.enums = message.enums.map(e => e ? Enum.toAmino(e) : undefined); + } else { + obj.enums = []; + } + obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; + obj.backend = message.backend ? Backend.toAmino(message.backend) : undefined; + obj.http = message.http ? Http.toAmino(message.http) : undefined; + obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; + obj.authentication = message.authentication ? Authentication.toAmino(message.authentication) : undefined; + obj.context = message.context ? Context.toAmino(message.context) : undefined; + obj.usage = message.usage ? Usage.toAmino(message.usage) : undefined; + if (message.endpoints) { + obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); + } else { + obj.endpoints = []; + } + obj.control = message.control ? Control.toAmino(message.control) : undefined; + if (message.logs) { + obj.logs = message.logs.map(e => e ? LogDescriptor.toAmino(e) : undefined); + } else { + obj.logs = []; + } + if (message.metrics) { + obj.metrics = message.metrics.map(e => e ? MetricDescriptor.toAmino(e) : undefined); + } else { + obj.metrics = []; + } + if (message.monitoredResources) { + obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); + } else { + obj.monitored_resources = []; + } + obj.billing = message.billing ? Billing.toAmino(message.billing) : undefined; + obj.logging = message.logging ? Logging.toAmino(message.logging) : undefined; + obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; + obj.system_parameters = message.systemParameters ? SystemParameters.toAmino(message.systemParameters) : undefined; + obj.source_info = message.sourceInfo ? SourceInfo.toAmino(message.sourceInfo) : undefined; + obj.config_version = message.configVersion ? UInt32Value.toAmino(message.configVersion) : undefined; + return obj; + }, + fromAminoMsg(object: ServiceAminoMsg): Service { + return Service.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceProtoMsg): Service { + return Service.decode(message.value); + }, + toProto(message: Service): Uint8Array { + return Service.encode(message).finish(); + }, + toProtoMsg(message: Service): ServiceProtoMsg { + return { + typeUrl: "/google.api.Service", + value: Service.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/check_error.ts index 7fa3932f0c..53fa7d0921 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/check_error.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/check_error.ts @@ -234,6 +234,7 @@ function createBaseCheckError(): CheckError { }; } export const CheckError = { + typeUrl: "/google.api.servicecontrol.v1.CheckError", encode(message: CheckError, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).int32(message.code); @@ -322,5 +323,36 @@ export const CheckError = { obj.detail = message.detail; message.status !== undefined && (obj.status = message.status ? Status.toSDK(message.status) : undefined); return obj; + }, + fromAmino(object: CheckErrorAmino): CheckError { + return { + code: isSet(object.code) ? checkError_CodeFromJSON(object.code) : -1, + subject: object.subject, + detail: object.detail, + status: object?.status ? Status.fromAmino(object.status) : undefined + }; + }, + toAmino(message: CheckError): CheckErrorAmino { + const obj: any = {}; + obj.code = message.code; + obj.subject = message.subject; + obj.detail = message.detail; + obj.status = message.status ? Status.toAmino(message.status) : undefined; + return obj; + }, + fromAminoMsg(object: CheckErrorAminoMsg): CheckError { + return CheckError.fromAmino(object.value); + }, + fromProtoMsg(message: CheckErrorProtoMsg): CheckError { + return CheckError.decode(message.value); + }, + toProto(message: CheckError): Uint8Array { + return CheckError.encode(message).finish(); + }, + toProtoMsg(message: CheckError): CheckErrorProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.CheckError", + value: CheckError.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/distribution.ts index f66cdac5af..a4ee4cbada 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/distribution.ts @@ -173,6 +173,7 @@ function createBaseDistribution(): Distribution { }; } export const Distribution = { + typeUrl: "/google.api.servicecontrol.v1.Distribution", encode(message: Distribution, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.count !== BigInt(0)) { writer.uint32(8).int64(message.count); @@ -358,6 +359,57 @@ export const Distribution = { obj.exemplars = []; } return obj; + }, + fromAmino(object: DistributionAmino): Distribution { + return { + count: BigInt(object.count), + mean: object.mean, + minimum: object.minimum, + maximum: object.maximum, + sumOfSquaredDeviation: object.sum_of_squared_deviation, + bucketCounts: Array.isArray(object?.bucket_counts) ? object.bucket_counts.map((e: any) => BigInt(e)) : [], + linearBuckets: object?.linear_buckets ? Distribution_LinearBuckets.fromAmino(object.linear_buckets) : undefined, + exponentialBuckets: object?.exponential_buckets ? Distribution_ExponentialBuckets.fromAmino(object.exponential_buckets) : undefined, + explicitBuckets: object?.explicit_buckets ? Distribution_ExplicitBuckets.fromAmino(object.explicit_buckets) : undefined, + exemplars: Array.isArray(object?.exemplars) ? object.exemplars.map((e: any) => Distribution_Exemplar.fromAmino(e)) : [] + }; + }, + toAmino(message: Distribution): DistributionAmino { + const obj: any = {}; + obj.count = message.count ? message.count.toString() : undefined; + obj.mean = message.mean; + obj.minimum = message.minimum; + obj.maximum = message.maximum; + obj.sum_of_squared_deviation = message.sumOfSquaredDeviation; + if (message.bucketCounts) { + obj.bucket_counts = message.bucketCounts.map(e => e.toString()); + } else { + obj.bucket_counts = []; + } + obj.linear_buckets = message.linearBuckets ? Distribution_LinearBuckets.toAmino(message.linearBuckets) : undefined; + obj.exponential_buckets = message.exponentialBuckets ? Distribution_ExponentialBuckets.toAmino(message.exponentialBuckets) : undefined; + obj.explicit_buckets = message.explicitBuckets ? Distribution_ExplicitBuckets.toAmino(message.explicitBuckets) : undefined; + if (message.exemplars) { + obj.exemplars = message.exemplars.map(e => e ? Distribution_Exemplar.toAmino(e) : undefined); + } else { + obj.exemplars = []; + } + return obj; + }, + fromAminoMsg(object: DistributionAminoMsg): Distribution { + return Distribution.fromAmino(object.value); + }, + fromProtoMsg(message: DistributionProtoMsg): Distribution { + return Distribution.decode(message.value); + }, + toProto(message: Distribution): Uint8Array { + return Distribution.encode(message).finish(); + }, + toProtoMsg(message: Distribution): DistributionProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.Distribution", + value: Distribution.encode(message).finish() + }; } }; function createBaseDistribution_LinearBuckets(): Distribution_LinearBuckets { @@ -368,6 +420,7 @@ function createBaseDistribution_LinearBuckets(): Distribution_LinearBuckets { }; } export const Distribution_LinearBuckets = { + typeUrl: "/google.api.servicecontrol.v1.LinearBuckets", encode(message: Distribution_LinearBuckets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); @@ -444,6 +497,35 @@ export const Distribution_LinearBuckets = { obj.width = message.width; obj.offset = message.offset; return obj; + }, + fromAmino(object: Distribution_LinearBucketsAmino): Distribution_LinearBuckets { + return { + numFiniteBuckets: object.num_finite_buckets, + width: object.width, + offset: object.offset + }; + }, + toAmino(message: Distribution_LinearBuckets): Distribution_LinearBucketsAmino { + const obj: any = {}; + obj.num_finite_buckets = message.numFiniteBuckets; + obj.width = message.width; + obj.offset = message.offset; + return obj; + }, + fromAminoMsg(object: Distribution_LinearBucketsAminoMsg): Distribution_LinearBuckets { + return Distribution_LinearBuckets.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_LinearBucketsProtoMsg): Distribution_LinearBuckets { + return Distribution_LinearBuckets.decode(message.value); + }, + toProto(message: Distribution_LinearBuckets): Uint8Array { + return Distribution_LinearBuckets.encode(message).finish(); + }, + toProtoMsg(message: Distribution_LinearBuckets): Distribution_LinearBucketsProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.LinearBuckets", + value: Distribution_LinearBuckets.encode(message).finish() + }; } }; function createBaseDistribution_ExponentialBuckets(): Distribution_ExponentialBuckets { @@ -454,6 +536,7 @@ function createBaseDistribution_ExponentialBuckets(): Distribution_ExponentialBu }; } export const Distribution_ExponentialBuckets = { + typeUrl: "/google.api.servicecontrol.v1.ExponentialBuckets", encode(message: Distribution_ExponentialBuckets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); @@ -530,6 +613,35 @@ export const Distribution_ExponentialBuckets = { obj.growth_factor = message.growthFactor; obj.scale = message.scale; return obj; + }, + fromAmino(object: Distribution_ExponentialBucketsAmino): Distribution_ExponentialBuckets { + return { + numFiniteBuckets: object.num_finite_buckets, + growthFactor: object.growth_factor, + scale: object.scale + }; + }, + toAmino(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsAmino { + const obj: any = {}; + obj.num_finite_buckets = message.numFiniteBuckets; + obj.growth_factor = message.growthFactor; + obj.scale = message.scale; + return obj; + }, + fromAminoMsg(object: Distribution_ExponentialBucketsAminoMsg): Distribution_ExponentialBuckets { + return Distribution_ExponentialBuckets.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_ExponentialBucketsProtoMsg): Distribution_ExponentialBuckets { + return Distribution_ExponentialBuckets.decode(message.value); + }, + toProto(message: Distribution_ExponentialBuckets): Uint8Array { + return Distribution_ExponentialBuckets.encode(message).finish(); + }, + toProtoMsg(message: Distribution_ExponentialBuckets): Distribution_ExponentialBucketsProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.ExponentialBuckets", + value: Distribution_ExponentialBuckets.encode(message).finish() + }; } }; function createBaseDistribution_ExplicitBuckets(): Distribution_ExplicitBuckets { @@ -538,6 +650,7 @@ function createBaseDistribution_ExplicitBuckets(): Distribution_ExplicitBuckets }; } export const Distribution_ExplicitBuckets = { + typeUrl: "/google.api.servicecontrol.v1.ExplicitBuckets", encode(message: Distribution_ExplicitBuckets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.bounds) { @@ -607,5 +720,34 @@ export const Distribution_ExplicitBuckets = { obj.bounds = []; } return obj; + }, + fromAmino(object: Distribution_ExplicitBucketsAmino): Distribution_ExplicitBuckets { + return { + bounds: Array.isArray(object?.bounds) ? object.bounds.map((e: any) => e) : [] + }; + }, + toAmino(message: Distribution_ExplicitBuckets): Distribution_ExplicitBucketsAmino { + const obj: any = {}; + if (message.bounds) { + obj.bounds = message.bounds.map(e => e); + } else { + obj.bounds = []; + } + return obj; + }, + fromAminoMsg(object: Distribution_ExplicitBucketsAminoMsg): Distribution_ExplicitBuckets { + return Distribution_ExplicitBuckets.fromAmino(object.value); + }, + fromProtoMsg(message: Distribution_ExplicitBucketsProtoMsg): Distribution_ExplicitBuckets { + return Distribution_ExplicitBuckets.decode(message.value); + }, + toProto(message: Distribution_ExplicitBuckets): Uint8Array { + return Distribution_ExplicitBuckets.encode(message).finish(); + }, + toProtoMsg(message: Distribution_ExplicitBuckets): Distribution_ExplicitBucketsProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.ExplicitBuckets", + value: Distribution_ExplicitBuckets.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/http_request.ts index 6e149dab8c..3d1d7f00ed 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/http_request.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/http_request.ts @@ -121,6 +121,7 @@ function createBaseHttpRequest(): HttpRequest { }; } export const HttpRequest = { + typeUrl: "/google.api.servicecontrol.v1.HttpRequest", encode(message: HttpRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.requestMethod !== "") { writer.uint32(10).string(message.requestMethod); @@ -341,5 +342,58 @@ export const HttpRequest = { obj.cache_fill_bytes = message.cacheFillBytes; obj.protocol = message.protocol; return obj; + }, + fromAmino(object: HttpRequestAmino): HttpRequest { + return { + requestMethod: object.request_method, + requestUrl: object.request_url, + requestSize: BigInt(object.request_size), + status: object.status, + responseSize: BigInt(object.response_size), + userAgent: object.user_agent, + remoteIp: object.remote_ip, + serverIp: object.server_ip, + referer: object.referer, + latency: object?.latency ? Duration.fromAmino(object.latency) : undefined, + cacheLookup: object.cache_lookup, + cacheHit: object.cache_hit, + cacheValidatedWithOriginServer: object.cache_validated_with_origin_server, + cacheFillBytes: BigInt(object.cache_fill_bytes), + protocol: object.protocol + }; + }, + toAmino(message: HttpRequest): HttpRequestAmino { + const obj: any = {}; + obj.request_method = message.requestMethod; + obj.request_url = message.requestUrl; + obj.request_size = message.requestSize ? message.requestSize.toString() : undefined; + obj.status = message.status; + obj.response_size = message.responseSize ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent; + obj.remote_ip = message.remoteIp; + obj.server_ip = message.serverIp; + obj.referer = message.referer; + obj.latency = message.latency ? Duration.toAmino(message.latency) : undefined; + obj.cache_lookup = message.cacheLookup; + obj.cache_hit = message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol; + return obj; + }, + fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { + return HttpRequest.fromAmino(object.value); + }, + fromProtoMsg(message: HttpRequestProtoMsg): HttpRequest { + return HttpRequest.decode(message.value); + }, + toProto(message: HttpRequest): Uint8Array { + return HttpRequest.encode(message).finish(); + }, + toProtoMsg(message: HttpRequest): HttpRequestProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.HttpRequest", + value: HttpRequest.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/log_entry.ts index fe8ab61023..e09eb4480e 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/log_entry.ts @@ -232,6 +232,27 @@ export const LogEntry_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: LogEntry_LabelsEntryAmino): LogEntry_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { + return LogEntry_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntry_LabelsEntryProtoMsg): LogEntry_LabelsEntry { + return LogEntry_LabelsEntry.decode(message.value); + }, + toProto(message: LogEntry_LabelsEntry): Uint8Array { + return LogEntry_LabelsEntry.encode(message).finish(); } }; function createBaseLogEntry(): LogEntry { @@ -251,6 +272,7 @@ function createBaseLogEntry(): LogEntry { }; } export const LogEntry = { + typeUrl: "/google.api.servicecontrol.v1.LogEntry", encode(message: LogEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(82).string(message.name); @@ -473,6 +495,63 @@ export const LogEntry = { message.operation !== undefined && (obj.operation = message.operation ? LogEntryOperation.toSDK(message.operation) : undefined); message.sourceLocation !== undefined && (obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toSDK(message.sourceLocation) : undefined); return obj; + }, + fromAmino(object: LogEntryAmino): LogEntry { + return { + name: object.name, + timestamp: object.timestamp, + severity: isSet(object.severity) ? logSeverityFromJSON(object.severity) : -1, + httpRequest: object?.http_request ? HttpRequest.fromAmino(object.http_request) : undefined, + trace: object.trace, + insertId: object.insert_id, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + protoPayload: object?.proto_payload ? Any.fromAmino(object.proto_payload) : undefined, + textPayload: object?.text_payload, + structPayload: object?.struct_payload ? Struct.fromAmino(object.struct_payload) : undefined, + operation: object?.operation ? LogEntryOperation.fromAmino(object.operation) : undefined, + sourceLocation: object?.source_location ? LogEntrySourceLocation.fromAmino(object.source_location) : undefined + }; + }, + toAmino(message: LogEntry): LogEntryAmino { + const obj: any = {}; + obj.name = message.name; + obj.timestamp = message.timestamp; + obj.severity = message.severity; + obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; + obj.trace = message.trace; + obj.insert_id = message.insertId; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; + obj.text_payload = message.textPayload; + obj.struct_payload = message.structPayload ? Struct.toAmino(message.structPayload) : undefined; + obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; + obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; + return obj; + }, + fromAminoMsg(object: LogEntryAminoMsg): LogEntry { + return LogEntry.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntryProtoMsg): LogEntry { + return LogEntry.decode(message.value); + }, + toProto(message: LogEntry): Uint8Array { + return LogEntry.encode(message).finish(); + }, + toProtoMsg(message: LogEntry): LogEntryProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.LogEntry", + value: LogEntry.encode(message).finish() + }; } }; function createBaseLogEntryOperation(): LogEntryOperation { @@ -484,6 +563,7 @@ function createBaseLogEntryOperation(): LogEntryOperation { }; } export const LogEntryOperation = { + typeUrl: "/google.api.servicecontrol.v1.LogEntryOperation", encode(message: LogEntryOperation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -572,6 +652,37 @@ export const LogEntryOperation = { obj.first = message.first; obj.last = message.last; return obj; + }, + fromAmino(object: LogEntryOperationAmino): LogEntryOperation { + return { + id: object.id, + producer: object.producer, + first: object.first, + last: object.last + }; + }, + toAmino(message: LogEntryOperation): LogEntryOperationAmino { + const obj: any = {}; + obj.id = message.id; + obj.producer = message.producer; + obj.first = message.first; + obj.last = message.last; + return obj; + }, + fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { + return LogEntryOperation.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntryOperationProtoMsg): LogEntryOperation { + return LogEntryOperation.decode(message.value); + }, + toProto(message: LogEntryOperation): Uint8Array { + return LogEntryOperation.encode(message).finish(); + }, + toProtoMsg(message: LogEntryOperation): LogEntryOperationProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.LogEntryOperation", + value: LogEntryOperation.encode(message).finish() + }; } }; function createBaseLogEntrySourceLocation(): LogEntrySourceLocation { @@ -582,6 +693,7 @@ function createBaseLogEntrySourceLocation(): LogEntrySourceLocation { }; } export const LogEntrySourceLocation = { + typeUrl: "/google.api.servicecontrol.v1.LogEntrySourceLocation", encode(message: LogEntrySourceLocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.file !== "") { writer.uint32(10).string(message.file); @@ -658,5 +770,34 @@ export const LogEntrySourceLocation = { obj.line = message.line; obj.function = message.function; return obj; + }, + fromAmino(object: LogEntrySourceLocationAmino): LogEntrySourceLocation { + return { + file: object.file, + line: BigInt(object.line), + function: object.function + }; + }, + toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { + const obj: any = {}; + obj.file = message.file; + obj.line = message.line ? message.line.toString() : undefined; + obj.function = message.function; + return obj; + }, + fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { + return LogEntrySourceLocation.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntrySourceLocationProtoMsg): LogEntrySourceLocation { + return LogEntrySourceLocation.decode(message.value); + }, + toProto(message: LogEntrySourceLocation): Uint8Array { + return LogEntrySourceLocation.encode(message).finish(); + }, + toProtoMsg(message: LogEntrySourceLocation): LogEntrySourceLocationProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.LogEntrySourceLocation", + value: LogEntrySourceLocation.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/metric_value.ts index f38f544daa..b66671ac62 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/metric_value.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/metric_value.ts @@ -151,6 +151,27 @@ export const MetricValue_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: MetricValue_LabelsEntryAmino): MetricValue_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: MetricValue_LabelsEntry): MetricValue_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: MetricValue_LabelsEntryAminoMsg): MetricValue_LabelsEntry { + return MetricValue_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: MetricValue_LabelsEntryProtoMsg): MetricValue_LabelsEntry { + return MetricValue_LabelsEntry.decode(message.value); + }, + toProto(message: MetricValue_LabelsEntry): Uint8Array { + return MetricValue_LabelsEntry.encode(message).finish(); } }; function createBaseMetricValue(): MetricValue { @@ -166,6 +187,7 @@ function createBaseMetricValue(): MetricValue { }; } export const MetricValue = { + typeUrl: "/google.api.servicecontrol.v1.MetricValue", encode(message: MetricValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.labels).forEach(([key, value]) => { MetricValue_LabelsEntry.encode({ @@ -340,6 +362,55 @@ export const MetricValue = { obj.string_value = message.stringValue; message.distributionValue !== undefined && (obj.distribution_value = message.distributionValue ? Distribution.toSDK(message.distributionValue) : undefined); return obj; + }, + fromAmino(object: MetricValueAmino): MetricValue { + return { + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + startTime: object.start_time, + endTime: object.end_time, + boolValue: object?.bool_value, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + doubleValue: object?.double_value, + stringValue: object?.string_value, + distributionValue: object?.distribution_value ? Distribution.fromAmino(object.distribution_value) : undefined + }; + }, + toAmino(message: MetricValue): MetricValueAmino { + const obj: any = {}; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + obj.start_time = message.startTime; + obj.end_time = message.endTime; + obj.bool_value = message.boolValue; + obj.int64_value = message.int64Value ? message.int64Value.toString() : undefined; + obj.double_value = message.doubleValue; + obj.string_value = message.stringValue; + obj.distribution_value = message.distributionValue ? Distribution.toAmino(message.distributionValue) : undefined; + return obj; + }, + fromAminoMsg(object: MetricValueAminoMsg): MetricValue { + return MetricValue.fromAmino(object.value); + }, + fromProtoMsg(message: MetricValueProtoMsg): MetricValue { + return MetricValue.decode(message.value); + }, + toProto(message: MetricValue): Uint8Array { + return MetricValue.encode(message).finish(); + }, + toProtoMsg(message: MetricValue): MetricValueProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.MetricValue", + value: MetricValue.encode(message).finish() + }; } }; function createBaseMetricValueSet(): MetricValueSet { @@ -349,6 +420,7 @@ function createBaseMetricValueSet(): MetricValueSet { }; } export const MetricValueSet = { + typeUrl: "/google.api.servicecontrol.v1.MetricValueSet", encode(message: MetricValueSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); @@ -421,5 +493,36 @@ export const MetricValueSet = { obj.metric_values = []; } return obj; + }, + fromAmino(object: MetricValueSetAmino): MetricValueSet { + return { + metricName: object.metric_name, + metricValues: Array.isArray(object?.metric_values) ? object.metric_values.map((e: any) => MetricValue.fromAmino(e)) : [] + }; + }, + toAmino(message: MetricValueSet): MetricValueSetAmino { + const obj: any = {}; + obj.metric_name = message.metricName; + if (message.metricValues) { + obj.metric_values = message.metricValues.map(e => e ? MetricValue.toAmino(e) : undefined); + } else { + obj.metric_values = []; + } + return obj; + }, + fromAminoMsg(object: MetricValueSetAminoMsg): MetricValueSet { + return MetricValueSet.fromAmino(object.value); + }, + fromProtoMsg(message: MetricValueSetProtoMsg): MetricValueSet { + return MetricValueSet.decode(message.value); + }, + toProto(message: MetricValueSet): Uint8Array { + return MetricValueSet.encode(message).finish(); + }, + toProtoMsg(message: MetricValueSet): MetricValueSetProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.MetricValueSet", + value: MetricValueSet.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/operation.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/operation.ts index 2c0f7f1a1e..f0be1cccba 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/operation.ts @@ -222,6 +222,27 @@ export const Operation_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: Operation_LabelsEntryAmino): Operation_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Operation_LabelsEntry): Operation_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: Operation_LabelsEntryAminoMsg): Operation_LabelsEntry { + return Operation_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: Operation_LabelsEntryProtoMsg): Operation_LabelsEntry { + return Operation_LabelsEntry.decode(message.value); + }, + toProto(message: Operation_LabelsEntry): Uint8Array { + return Operation_LabelsEntry.encode(message).finish(); } }; function createBaseOperation(): Operation { @@ -239,6 +260,7 @@ function createBaseOperation(): Operation { }; } export const Operation = { + typeUrl: "/google.api.servicecontrol.v1.Operation", encode(message: Operation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); @@ -461,5 +483,70 @@ export const Operation = { obj.extensions = []; } return obj; + }, + fromAmino(object: OperationAmino): Operation { + return { + operationId: object.operation_id, + operationName: object.operation_name, + consumerId: object.consumer_id, + startTime: object.start_time, + endTime: object.end_time, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + metricValueSets: Array.isArray(object?.metric_value_sets) ? object.metric_value_sets.map((e: any) => MetricValueSet.fromAmino(e)) : [], + logEntries: Array.isArray(object?.log_entries) ? object.log_entries.map((e: any) => LogEntry.fromAmino(e)) : [], + importance: isSet(object.importance) ? operation_ImportanceFromJSON(object.importance) : -1, + extensions: Array.isArray(object?.extensions) ? object.extensions.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: Operation): OperationAmino { + const obj: any = {}; + obj.operation_id = message.operationId; + obj.operation_name = message.operationName; + obj.consumer_id = message.consumerId; + obj.start_time = message.startTime; + obj.end_time = message.endTime; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + if (message.metricValueSets) { + obj.metric_value_sets = message.metricValueSets.map(e => e ? MetricValueSet.toAmino(e) : undefined); + } else { + obj.metric_value_sets = []; + } + if (message.logEntries) { + obj.log_entries = message.logEntries.map(e => e ? LogEntry.toAmino(e) : undefined); + } else { + obj.log_entries = []; + } + obj.importance = message.importance; + if (message.extensions) { + obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.extensions = []; + } + return obj; + }, + fromAminoMsg(object: OperationAminoMsg): Operation { + return Operation.fromAmino(object.value); + }, + fromProtoMsg(message: OperationProtoMsg): Operation { + return Operation.decode(message.value); + }, + toProto(message: Operation): Uint8Array { + return Operation.encode(message).finish(); + }, + toProtoMsg(message: Operation): OperationProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.Operation", + value: Operation.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/quota_controller.ts index 0e4de23507..8ccf5b15ba 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/quota_controller.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/quota_controller.ts @@ -338,6 +338,7 @@ function createBaseAllocateQuotaRequest(): AllocateQuotaRequest { }; } export const AllocateQuotaRequest = { + typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaRequest", encode(message: AllocateQuotaRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -414,6 +415,35 @@ export const AllocateQuotaRequest = { message.allocateOperation !== undefined && (obj.allocate_operation = message.allocateOperation ? QuotaOperation.toSDK(message.allocateOperation) : undefined); obj.service_config_id = message.serviceConfigId; return obj; + }, + fromAmino(object: AllocateQuotaRequestAmino): AllocateQuotaRequest { + return { + serviceName: object.service_name, + allocateOperation: object?.allocate_operation ? QuotaOperation.fromAmino(object.allocate_operation) : undefined, + serviceConfigId: object.service_config_id + }; + }, + toAmino(message: AllocateQuotaRequest): AllocateQuotaRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.allocate_operation = message.allocateOperation ? QuotaOperation.toAmino(message.allocateOperation) : undefined; + obj.service_config_id = message.serviceConfigId; + return obj; + }, + fromAminoMsg(object: AllocateQuotaRequestAminoMsg): AllocateQuotaRequest { + return AllocateQuotaRequest.fromAmino(object.value); + }, + fromProtoMsg(message: AllocateQuotaRequestProtoMsg): AllocateQuotaRequest { + return AllocateQuotaRequest.decode(message.value); + }, + toProto(message: AllocateQuotaRequest): Uint8Array { + return AllocateQuotaRequest.encode(message).finish(); + }, + toProtoMsg(message: AllocateQuotaRequest): AllocateQuotaRequestProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaRequest", + value: AllocateQuotaRequest.encode(message).finish() + }; } }; function createBaseQuotaOperation_LabelsEntry(): QuotaOperation_LabelsEntry { @@ -487,6 +517,27 @@ export const QuotaOperation_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: QuotaOperation_LabelsEntryAmino): QuotaOperation_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: QuotaOperation_LabelsEntry): QuotaOperation_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: QuotaOperation_LabelsEntryAminoMsg): QuotaOperation_LabelsEntry { + return QuotaOperation_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaOperation_LabelsEntryProtoMsg): QuotaOperation_LabelsEntry { + return QuotaOperation_LabelsEntry.decode(message.value); + }, + toProto(message: QuotaOperation_LabelsEntry): Uint8Array { + return QuotaOperation_LabelsEntry.encode(message).finish(); } }; function createBaseQuotaOperation(): QuotaOperation { @@ -500,6 +551,7 @@ function createBaseQuotaOperation(): QuotaOperation { }; } export const QuotaOperation = { + typeUrl: "/google.api.servicecontrol.v1.QuotaOperation", encode(message: QuotaOperation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); @@ -658,6 +710,55 @@ export const QuotaOperation = { } message.quotaMode !== undefined && (obj.quota_mode = quotaOperation_QuotaModeToJSON(message.quotaMode)); return obj; + }, + fromAmino(object: QuotaOperationAmino): QuotaOperation { + return { + operationId: object.operation_id, + methodName: object.method_name, + consumerId: object.consumer_id, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + quotaMetrics: Array.isArray(object?.quota_metrics) ? object.quota_metrics.map((e: any) => MetricValueSet.fromAmino(e)) : [], + quotaMode: isSet(object.quota_mode) ? quotaOperation_QuotaModeFromJSON(object.quota_mode) : -1 + }; + }, + toAmino(message: QuotaOperation): QuotaOperationAmino { + const obj: any = {}; + obj.operation_id = message.operationId; + obj.method_name = message.methodName; + obj.consumer_id = message.consumerId; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + if (message.quotaMetrics) { + obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); + } else { + obj.quota_metrics = []; + } + obj.quota_mode = message.quotaMode; + return obj; + }, + fromAminoMsg(object: QuotaOperationAminoMsg): QuotaOperation { + return QuotaOperation.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaOperationProtoMsg): QuotaOperation { + return QuotaOperation.decode(message.value); + }, + toProto(message: QuotaOperation): Uint8Array { + return QuotaOperation.encode(message).finish(); + }, + toProtoMsg(message: QuotaOperation): QuotaOperationProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.QuotaOperation", + value: QuotaOperation.encode(message).finish() + }; } }; function createBaseAllocateQuotaResponse(): AllocateQuotaResponse { @@ -669,6 +770,7 @@ function createBaseAllocateQuotaResponse(): AllocateQuotaResponse { }; } export const AllocateQuotaResponse = { + typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaResponse", encode(message: AllocateQuotaResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); @@ -773,6 +875,45 @@ export const AllocateQuotaResponse = { } obj.service_config_id = message.serviceConfigId; return obj; + }, + fromAmino(object: AllocateQuotaResponseAmino): AllocateQuotaResponse { + return { + operationId: object.operation_id, + allocateErrors: Array.isArray(object?.allocate_errors) ? object.allocate_errors.map((e: any) => QuotaError.fromAmino(e)) : [], + quotaMetrics: Array.isArray(object?.quota_metrics) ? object.quota_metrics.map((e: any) => MetricValueSet.fromAmino(e)) : [], + serviceConfigId: object.service_config_id + }; + }, + toAmino(message: AllocateQuotaResponse): AllocateQuotaResponseAmino { + const obj: any = {}; + obj.operation_id = message.operationId; + if (message.allocateErrors) { + obj.allocate_errors = message.allocateErrors.map(e => e ? QuotaError.toAmino(e) : undefined); + } else { + obj.allocate_errors = []; + } + if (message.quotaMetrics) { + obj.quota_metrics = message.quotaMetrics.map(e => e ? MetricValueSet.toAmino(e) : undefined); + } else { + obj.quota_metrics = []; + } + obj.service_config_id = message.serviceConfigId; + return obj; + }, + fromAminoMsg(object: AllocateQuotaResponseAminoMsg): AllocateQuotaResponse { + return AllocateQuotaResponse.fromAmino(object.value); + }, + fromProtoMsg(message: AllocateQuotaResponseProtoMsg): AllocateQuotaResponse { + return AllocateQuotaResponse.decode(message.value); + }, + toProto(message: AllocateQuotaResponse): Uint8Array { + return AllocateQuotaResponse.encode(message).finish(); + }, + toProtoMsg(message: AllocateQuotaResponse): AllocateQuotaResponseProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaResponse", + value: AllocateQuotaResponse.encode(message).finish() + }; } }; function createBaseQuotaError(): QuotaError { @@ -784,6 +925,7 @@ function createBaseQuotaError(): QuotaError { }; } export const QuotaError = { + typeUrl: "/google.api.servicecontrol.v1.QuotaError", encode(message: QuotaError, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).int32(message.code); @@ -872,5 +1014,36 @@ export const QuotaError = { obj.description = message.description; message.status !== undefined && (obj.status = message.status ? Status.toSDK(message.status) : undefined); return obj; + }, + fromAmino(object: QuotaErrorAmino): QuotaError { + return { + code: isSet(object.code) ? quotaError_CodeFromJSON(object.code) : -1, + subject: object.subject, + description: object.description, + status: object?.status ? Status.fromAmino(object.status) : undefined + }; + }, + toAmino(message: QuotaError): QuotaErrorAmino { + const obj: any = {}; + obj.code = message.code; + obj.subject = message.subject; + obj.description = message.description; + obj.status = message.status ? Status.toAmino(message.status) : undefined; + return obj; + }, + fromAminoMsg(object: QuotaErrorAminoMsg): QuotaError { + return QuotaError.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaErrorProtoMsg): QuotaError { + return QuotaError.decode(message.value); + }, + toProto(message: QuotaError): Uint8Array { + return QuotaError.encode(message).finish(); + }, + toProtoMsg(message: QuotaError): QuotaErrorProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.QuotaError", + value: QuotaError.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/service_controller.ts index e12ecc174f..d4c036b22a 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/service_controller.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v1/service_controller.ts @@ -272,6 +272,7 @@ function createBaseCheckRequest(): CheckRequest { }; } export const CheckRequest = { + typeUrl: "/google.api.servicecontrol.v1.CheckRequest", encode(message: CheckRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -348,6 +349,35 @@ export const CheckRequest = { message.operation !== undefined && (obj.operation = message.operation ? Operation.toSDK(message.operation) : undefined); obj.service_config_id = message.serviceConfigId; return obj; + }, + fromAmino(object: CheckRequestAmino): CheckRequest { + return { + serviceName: object.service_name, + operation: object?.operation ? Operation.fromAmino(object.operation) : undefined, + serviceConfigId: object.service_config_id + }; + }, + toAmino(message: CheckRequest): CheckRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.operation = message.operation ? Operation.toAmino(message.operation) : undefined; + obj.service_config_id = message.serviceConfigId; + return obj; + }, + fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { + return CheckRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CheckRequestProtoMsg): CheckRequest { + return CheckRequest.decode(message.value); + }, + toProto(message: CheckRequest): Uint8Array { + return CheckRequest.encode(message).finish(); + }, + toProtoMsg(message: CheckRequest): CheckRequestProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.CheckRequest", + value: CheckRequest.encode(message).finish() + }; } }; function createBaseCheckResponse(): CheckResponse { @@ -360,6 +390,7 @@ function createBaseCheckResponse(): CheckResponse { }; } export const CheckResponse = { + typeUrl: "/google.api.servicecontrol.v1.CheckResponse", encode(message: CheckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); @@ -468,6 +499,43 @@ export const CheckResponse = { obj.service_rollout_id = message.serviceRolloutId; message.checkInfo !== undefined && (obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toSDK(message.checkInfo) : undefined); return obj; + }, + fromAmino(object: CheckResponseAmino): CheckResponse { + return { + operationId: object.operation_id, + checkErrors: Array.isArray(object?.check_errors) ? object.check_errors.map((e: any) => CheckError.fromAmino(e)) : [], + serviceConfigId: object.service_config_id, + serviceRolloutId: object.service_rollout_id, + checkInfo: object?.check_info ? CheckResponse_CheckInfo.fromAmino(object.check_info) : undefined + }; + }, + toAmino(message: CheckResponse): CheckResponseAmino { + const obj: any = {}; + obj.operation_id = message.operationId; + if (message.checkErrors) { + obj.check_errors = message.checkErrors.map(e => e ? CheckError.toAmino(e) : undefined); + } else { + obj.check_errors = []; + } + obj.service_config_id = message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId; + obj.check_info = message.checkInfo ? CheckResponse_CheckInfo.toAmino(message.checkInfo) : undefined; + return obj; + }, + fromAminoMsg(object: CheckResponseAminoMsg): CheckResponse { + return CheckResponse.fromAmino(object.value); + }, + fromProtoMsg(message: CheckResponseProtoMsg): CheckResponse { + return CheckResponse.decode(message.value); + }, + toProto(message: CheckResponse): Uint8Array { + return CheckResponse.encode(message).finish(); + }, + toProtoMsg(message: CheckResponse): CheckResponseProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.CheckResponse", + value: CheckResponse.encode(message).finish() + }; } }; function createBaseCheckResponse_CheckInfo(): CheckResponse_CheckInfo { @@ -477,6 +545,7 @@ function createBaseCheckResponse_CheckInfo(): CheckResponse_CheckInfo { }; } export const CheckResponse_CheckInfo = { + typeUrl: "/google.api.servicecontrol.v1.CheckInfo", encode(message: CheckResponse_CheckInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unusedArguments) { writer.uint32(10).string(v!); @@ -549,6 +618,37 @@ export const CheckResponse_CheckInfo = { } message.consumerInfo !== undefined && (obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toSDK(message.consumerInfo) : undefined); return obj; + }, + fromAmino(object: CheckResponse_CheckInfoAmino): CheckResponse_CheckInfo { + return { + unusedArguments: Array.isArray(object?.unused_arguments) ? object.unused_arguments.map((e: any) => e) : [], + consumerInfo: object?.consumer_info ? CheckResponse_ConsumerInfo.fromAmino(object.consumer_info) : undefined + }; + }, + toAmino(message: CheckResponse_CheckInfo): CheckResponse_CheckInfoAmino { + const obj: any = {}; + if (message.unusedArguments) { + obj.unused_arguments = message.unusedArguments.map(e => e); + } else { + obj.unused_arguments = []; + } + obj.consumer_info = message.consumerInfo ? CheckResponse_ConsumerInfo.toAmino(message.consumerInfo) : undefined; + return obj; + }, + fromAminoMsg(object: CheckResponse_CheckInfoAminoMsg): CheckResponse_CheckInfo { + return CheckResponse_CheckInfo.fromAmino(object.value); + }, + fromProtoMsg(message: CheckResponse_CheckInfoProtoMsg): CheckResponse_CheckInfo { + return CheckResponse_CheckInfo.decode(message.value); + }, + toProto(message: CheckResponse_CheckInfo): Uint8Array { + return CheckResponse_CheckInfo.encode(message).finish(); + }, + toProtoMsg(message: CheckResponse_CheckInfo): CheckResponse_CheckInfoProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.CheckInfo", + value: CheckResponse_CheckInfo.encode(message).finish() + }; } }; function createBaseCheckResponse_ConsumerInfo(): CheckResponse_ConsumerInfo { @@ -559,6 +659,7 @@ function createBaseCheckResponse_ConsumerInfo(): CheckResponse_ConsumerInfo { }; } export const CheckResponse_ConsumerInfo = { + typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo", encode(message: CheckResponse_ConsumerInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.projectNumber !== BigInt(0)) { writer.uint32(8).int64(message.projectNumber); @@ -635,6 +736,35 @@ export const CheckResponse_ConsumerInfo = { message.type !== undefined && (obj.type = checkResponse_ConsumerInfo_ConsumerTypeToJSON(message.type)); obj.consumer_number = message.consumerNumber; return obj; + }, + fromAmino(object: CheckResponse_ConsumerInfoAmino): CheckResponse_ConsumerInfo { + return { + projectNumber: BigInt(object.project_number), + type: isSet(object.type) ? checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type) : -1, + consumerNumber: BigInt(object.consumer_number) + }; + }, + toAmino(message: CheckResponse_ConsumerInfo): CheckResponse_ConsumerInfoAmino { + const obj: any = {}; + obj.project_number = message.projectNumber ? message.projectNumber.toString() : undefined; + obj.type = message.type; + obj.consumer_number = message.consumerNumber ? message.consumerNumber.toString() : undefined; + return obj; + }, + fromAminoMsg(object: CheckResponse_ConsumerInfoAminoMsg): CheckResponse_ConsumerInfo { + return CheckResponse_ConsumerInfo.fromAmino(object.value); + }, + fromProtoMsg(message: CheckResponse_ConsumerInfoProtoMsg): CheckResponse_ConsumerInfo { + return CheckResponse_ConsumerInfo.decode(message.value); + }, + toProto(message: CheckResponse_ConsumerInfo): Uint8Array { + return CheckResponse_ConsumerInfo.encode(message).finish(); + }, + toProtoMsg(message: CheckResponse_ConsumerInfo): CheckResponse_ConsumerInfoProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo", + value: CheckResponse_ConsumerInfo.encode(message).finish() + }; } }; function createBaseReportRequest(): ReportRequest { @@ -645,6 +775,7 @@ function createBaseReportRequest(): ReportRequest { }; } export const ReportRequest = { + typeUrl: "/google.api.servicecontrol.v1.ReportRequest", encode(message: ReportRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -729,6 +860,39 @@ export const ReportRequest = { } obj.service_config_id = message.serviceConfigId; return obj; + }, + fromAmino(object: ReportRequestAmino): ReportRequest { + return { + serviceName: object.service_name, + operations: Array.isArray(object?.operations) ? object.operations.map((e: any) => Operation.fromAmino(e)) : [], + serviceConfigId: object.service_config_id + }; + }, + toAmino(message: ReportRequest): ReportRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + if (message.operations) { + obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); + } else { + obj.operations = []; + } + obj.service_config_id = message.serviceConfigId; + return obj; + }, + fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { + return ReportRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ReportRequestProtoMsg): ReportRequest { + return ReportRequest.decode(message.value); + }, + toProto(message: ReportRequest): Uint8Array { + return ReportRequest.encode(message).finish(); + }, + toProtoMsg(message: ReportRequest): ReportRequestProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.ReportRequest", + value: ReportRequest.encode(message).finish() + }; } }; function createBaseReportResponse(): ReportResponse { @@ -739,6 +903,7 @@ function createBaseReportResponse(): ReportResponse { }; } export const ReportResponse = { + typeUrl: "/google.api.servicecontrol.v1.ReportResponse", encode(message: ReportResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.reportErrors) { ReportResponse_ReportError.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -823,6 +988,39 @@ export const ReportResponse = { obj.service_config_id = message.serviceConfigId; obj.service_rollout_id = message.serviceRolloutId; return obj; + }, + fromAmino(object: ReportResponseAmino): ReportResponse { + return { + reportErrors: Array.isArray(object?.report_errors) ? object.report_errors.map((e: any) => ReportResponse_ReportError.fromAmino(e)) : [], + serviceConfigId: object.service_config_id, + serviceRolloutId: object.service_rollout_id + }; + }, + toAmino(message: ReportResponse): ReportResponseAmino { + const obj: any = {}; + if (message.reportErrors) { + obj.report_errors = message.reportErrors.map(e => e ? ReportResponse_ReportError.toAmino(e) : undefined); + } else { + obj.report_errors = []; + } + obj.service_config_id = message.serviceConfigId; + obj.service_rollout_id = message.serviceRolloutId; + return obj; + }, + fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { + return ReportResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ReportResponseProtoMsg): ReportResponse { + return ReportResponse.decode(message.value); + }, + toProto(message: ReportResponse): Uint8Array { + return ReportResponse.encode(message).finish(); + }, + toProtoMsg(message: ReportResponse): ReportResponseProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.ReportResponse", + value: ReportResponse.encode(message).finish() + }; } }; function createBaseReportResponse_ReportError(): ReportResponse_ReportError { @@ -832,6 +1030,7 @@ function createBaseReportResponse_ReportError(): ReportResponse_ReportError { }; } export const ReportResponse_ReportError = { + typeUrl: "/google.api.servicecontrol.v1.ReportError", encode(message: ReportResponse_ReportError, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); @@ -896,5 +1095,32 @@ export const ReportResponse_ReportError = { obj.operation_id = message.operationId; message.status !== undefined && (obj.status = message.status ? Status.toSDK(message.status) : undefined); return obj; + }, + fromAmino(object: ReportResponse_ReportErrorAmino): ReportResponse_ReportError { + return { + operationId: object.operation_id, + status: object?.status ? Status.fromAmino(object.status) : undefined + }; + }, + toAmino(message: ReportResponse_ReportError): ReportResponse_ReportErrorAmino { + const obj: any = {}; + obj.operation_id = message.operationId; + obj.status = message.status ? Status.toAmino(message.status) : undefined; + return obj; + }, + fromAminoMsg(object: ReportResponse_ReportErrorAminoMsg): ReportResponse_ReportError { + return ReportResponse_ReportError.fromAmino(object.value); + }, + fromProtoMsg(message: ReportResponse_ReportErrorProtoMsg): ReportResponse_ReportError { + return ReportResponse_ReportError.decode(message.value); + }, + toProto(message: ReportResponse_ReportError): Uint8Array { + return ReportResponse_ReportError.encode(message).finish(); + }, + toProtoMsg(message: ReportResponse_ReportError): ReportResponse_ReportErrorProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v1.ReportError", + value: ReportResponse_ReportError.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v2/service_controller.ts index 0cdd5f44b5..1ea813abfe 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v2/service_controller.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicecontrol/v2/service_controller.ts @@ -150,6 +150,7 @@ function createBaseCheckRequest(): CheckRequest { }; } export const CheckRequest = { + typeUrl: "/google.api.servicecontrol.v2.CheckRequest", encode(message: CheckRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -258,6 +259,43 @@ export const CheckRequest = { } obj.flags = message.flags; return obj; + }, + fromAmino(object: CheckRequestAmino): CheckRequest { + return { + serviceName: object.service_name, + serviceConfigId: object.service_config_id, + attributes: object?.attributes ? AttributeContext.fromAmino(object.attributes) : undefined, + resources: Array.isArray(object?.resources) ? object.resources.map((e: any) => ResourceInfo.fromAmino(e)) : [], + flags: object.flags + }; + }, + toAmino(message: CheckRequest): CheckRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.service_config_id = message.serviceConfigId; + obj.attributes = message.attributes ? AttributeContext.toAmino(message.attributes) : undefined; + if (message.resources) { + obj.resources = message.resources.map(e => e ? ResourceInfo.toAmino(e) : undefined); + } else { + obj.resources = []; + } + obj.flags = message.flags; + return obj; + }, + fromAminoMsg(object: CheckRequestAminoMsg): CheckRequest { + return CheckRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CheckRequestProtoMsg): CheckRequest { + return CheckRequest.decode(message.value); + }, + toProto(message: CheckRequest): Uint8Array { + return CheckRequest.encode(message).finish(); + }, + toProtoMsg(message: CheckRequest): CheckRequestProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v2.CheckRequest", + value: CheckRequest.encode(message).finish() + }; } }; function createBaseResourceInfo(): ResourceInfo { @@ -270,6 +308,7 @@ function createBaseResourceInfo(): ResourceInfo { }; } export const ResourceInfo = { + typeUrl: "/google.api.servicecontrol.v2.ResourceInfo", encode(message: ResourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -370,6 +409,39 @@ export const ResourceInfo = { obj.container = message.container; obj.location = message.location; return obj; + }, + fromAmino(object: ResourceInfoAmino): ResourceInfo { + return { + name: object.name, + type: object.type, + permission: object.permission, + container: object.container, + location: object.location + }; + }, + toAmino(message: ResourceInfo): ResourceInfoAmino { + const obj: any = {}; + obj.name = message.name; + obj.type = message.type; + obj.permission = message.permission; + obj.container = message.container; + obj.location = message.location; + return obj; + }, + fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { + return ResourceInfo.fromAmino(object.value); + }, + fromProtoMsg(message: ResourceInfoProtoMsg): ResourceInfo { + return ResourceInfo.decode(message.value); + }, + toProto(message: ResourceInfo): Uint8Array { + return ResourceInfo.encode(message).finish(); + }, + toProtoMsg(message: ResourceInfo): ResourceInfoProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v2.ResourceInfo", + value: ResourceInfo.encode(message).finish() + }; } }; function createBaseCheckResponse_HeadersEntry(): CheckResponse_HeadersEntry { @@ -443,6 +515,27 @@ export const CheckResponse_HeadersEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: CheckResponse_HeadersEntryAmino): CheckResponse_HeadersEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: CheckResponse_HeadersEntry): CheckResponse_HeadersEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: CheckResponse_HeadersEntryAminoMsg): CheckResponse_HeadersEntry { + return CheckResponse_HeadersEntry.fromAmino(object.value); + }, + fromProtoMsg(message: CheckResponse_HeadersEntryProtoMsg): CheckResponse_HeadersEntry { + return CheckResponse_HeadersEntry.decode(message.value); + }, + toProto(message: CheckResponse_HeadersEntry): Uint8Array { + return CheckResponse_HeadersEntry.encode(message).finish(); } }; function createBaseCheckResponse(): CheckResponse { @@ -452,6 +545,7 @@ function createBaseCheckResponse(): CheckResponse { }; } export const CheckResponse = { + typeUrl: "/google.api.servicecontrol.v2.CheckResponse", encode(message: CheckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.status !== undefined) { Status.encode(message.status, writer.uint32(10).fork()).ldelim(); @@ -554,6 +648,43 @@ export const CheckResponse = { }); } return obj; + }, + fromAmino(object: CheckResponseAmino): CheckResponse { + return { + status: object?.status ? Status.fromAmino(object.status) : undefined, + headers: isObject(object.headers) ? Object.entries(object.headers).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: CheckResponse): CheckResponseAmino { + const obj: any = {}; + obj.status = message.status ? Status.toAmino(message.status) : undefined; + obj.headers = {}; + if (message.headers) { + Object.entries(message.headers).forEach(([k, v]) => { + obj.headers[k] = v; + }); + } + return obj; + }, + fromAminoMsg(object: CheckResponseAminoMsg): CheckResponse { + return CheckResponse.fromAmino(object.value); + }, + fromProtoMsg(message: CheckResponseProtoMsg): CheckResponse { + return CheckResponse.decode(message.value); + }, + toProto(message: CheckResponse): Uint8Array { + return CheckResponse.encode(message).finish(); + }, + toProtoMsg(message: CheckResponse): CheckResponseProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v2.CheckResponse", + value: CheckResponse.encode(message).finish() + }; } }; function createBaseReportRequest(): ReportRequest { @@ -564,6 +695,7 @@ function createBaseReportRequest(): ReportRequest { }; } export const ReportRequest = { + typeUrl: "/google.api.servicecontrol.v2.ReportRequest", encode(message: ReportRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -648,12 +780,46 @@ export const ReportRequest = { obj.operations = []; } return obj; + }, + fromAmino(object: ReportRequestAmino): ReportRequest { + return { + serviceName: object.service_name, + serviceConfigId: object.service_config_id, + operations: Array.isArray(object?.operations) ? object.operations.map((e: any) => AttributeContext.fromAmino(e)) : [] + }; + }, + toAmino(message: ReportRequest): ReportRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.service_config_id = message.serviceConfigId; + if (message.operations) { + obj.operations = message.operations.map(e => e ? AttributeContext.toAmino(e) : undefined); + } else { + obj.operations = []; + } + return obj; + }, + fromAminoMsg(object: ReportRequestAminoMsg): ReportRequest { + return ReportRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ReportRequestProtoMsg): ReportRequest { + return ReportRequest.decode(message.value); + }, + toProto(message: ReportRequest): Uint8Array { + return ReportRequest.encode(message).finish(); + }, + toProtoMsg(message: ReportRequest): ReportRequestProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v2.ReportRequest", + value: ReportRequest.encode(message).finish() + }; } }; function createBaseReportResponse(): ReportResponse { return {}; } export const ReportResponse = { + typeUrl: "/google.api.servicecontrol.v2.ReportResponse", encode(_: ReportResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -691,5 +857,27 @@ export const ReportResponse = { toSDK(_: ReportResponse): ReportResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ReportResponseAmino): ReportResponse { + return {}; + }, + toAmino(_: ReportResponse): ReportResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ReportResponseAminoMsg): ReportResponse { + return ReportResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ReportResponseProtoMsg): ReportResponse { + return ReportResponse.decode(message.value); + }, + toProto(message: ReportResponse): Uint8Array { + return ReportResponse.encode(message).finish(); + }, + toProtoMsg(message: ReportResponse): ReportResponseProtoMsg { + return { + typeUrl: "/google.api.servicecontrol.v2.ReportResponse", + value: ReportResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/resources.ts b/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/resources.ts index 6d5391ff61..915f918ae9 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/resources.ts @@ -556,6 +556,7 @@ function createBaseManagedService(): ManagedService { }; } export const ManagedService = { + typeUrl: "/google.api.servicemanagement.v1.ManagedService", encode(message: ManagedService, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(18).string(message.serviceName); @@ -620,6 +621,33 @@ export const ManagedService = { obj.service_name = message.serviceName; obj.producer_project_id = message.producerProjectId; return obj; + }, + fromAmino(object: ManagedServiceAmino): ManagedService { + return { + serviceName: object.service_name, + producerProjectId: object.producer_project_id + }; + }, + toAmino(message: ManagedService): ManagedServiceAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.producer_project_id = message.producerProjectId; + return obj; + }, + fromAminoMsg(object: ManagedServiceAminoMsg): ManagedService { + return ManagedService.fromAmino(object.value); + }, + fromProtoMsg(message: ManagedServiceProtoMsg): ManagedService { + return ManagedService.decode(message.value); + }, + toProto(message: ManagedService): Uint8Array { + return ManagedService.encode(message).finish(); + }, + toProtoMsg(message: ManagedService): ManagedServiceProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ManagedService", + value: ManagedService.encode(message).finish() + }; } }; function createBaseOperationMetadata(): OperationMetadata { @@ -631,6 +659,7 @@ function createBaseOperationMetadata(): OperationMetadata { }; } export const OperationMetadata = { + typeUrl: "/google.api.servicemanagement.v1.OperationMetadata", encode(message: OperationMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(10).string(v!); @@ -735,6 +764,45 @@ export const OperationMetadata = { obj.progress_percentage = message.progressPercentage; message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); return obj; + }, + fromAmino(object: OperationMetadataAmino): OperationMetadata { + return { + resourceNames: Array.isArray(object?.resource_names) ? object.resource_names.map((e: any) => e) : [], + steps: Array.isArray(object?.steps) ? object.steps.map((e: any) => OperationMetadata_Step.fromAmino(e)) : [], + progressPercentage: object.progress_percentage, + startTime: object.start_time + }; + }, + toAmino(message: OperationMetadata): OperationMetadataAmino { + const obj: any = {}; + if (message.resourceNames) { + obj.resource_names = message.resourceNames.map(e => e); + } else { + obj.resource_names = []; + } + if (message.steps) { + obj.steps = message.steps.map(e => e ? OperationMetadata_Step.toAmino(e) : undefined); + } else { + obj.steps = []; + } + obj.progress_percentage = message.progressPercentage; + obj.start_time = message.startTime; + return obj; + }, + fromAminoMsg(object: OperationMetadataAminoMsg): OperationMetadata { + return OperationMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: OperationMetadataProtoMsg): OperationMetadata { + return OperationMetadata.decode(message.value); + }, + toProto(message: OperationMetadata): Uint8Array { + return OperationMetadata.encode(message).finish(); + }, + toProtoMsg(message: OperationMetadata): OperationMetadataProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.OperationMetadata", + value: OperationMetadata.encode(message).finish() + }; } }; function createBaseOperationMetadata_Step(): OperationMetadata_Step { @@ -744,6 +812,7 @@ function createBaseOperationMetadata_Step(): OperationMetadata_Step { }; } export const OperationMetadata_Step = { + typeUrl: "/google.api.servicemanagement.v1.Step", encode(message: OperationMetadata_Step, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(18).string(message.description); @@ -808,6 +877,33 @@ export const OperationMetadata_Step = { obj.description = message.description; message.status !== undefined && (obj.status = operationMetadata_StatusToJSON(message.status)); return obj; + }, + fromAmino(object: OperationMetadata_StepAmino): OperationMetadata_Step { + return { + description: object.description, + status: isSet(object.status) ? operationMetadata_StatusFromJSON(object.status) : -1 + }; + }, + toAmino(message: OperationMetadata_Step): OperationMetadata_StepAmino { + const obj: any = {}; + obj.description = message.description; + obj.status = message.status; + return obj; + }, + fromAminoMsg(object: OperationMetadata_StepAminoMsg): OperationMetadata_Step { + return OperationMetadata_Step.fromAmino(object.value); + }, + fromProtoMsg(message: OperationMetadata_StepProtoMsg): OperationMetadata_Step { + return OperationMetadata_Step.decode(message.value); + }, + toProto(message: OperationMetadata_Step): Uint8Array { + return OperationMetadata_Step.encode(message).finish(); + }, + toProtoMsg(message: OperationMetadata_Step): OperationMetadata_StepProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.Step", + value: OperationMetadata_Step.encode(message).finish() + }; } }; function createBaseDiagnostic(): Diagnostic { @@ -818,6 +914,7 @@ function createBaseDiagnostic(): Diagnostic { }; } export const Diagnostic = { + typeUrl: "/google.api.servicemanagement.v1.Diagnostic", encode(message: Diagnostic, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(10).string(message.location); @@ -894,6 +991,35 @@ export const Diagnostic = { message.kind !== undefined && (obj.kind = diagnostic_KindToJSON(message.kind)); obj.message = message.message; return obj; + }, + fromAmino(object: DiagnosticAmino): Diagnostic { + return { + location: object.location, + kind: isSet(object.kind) ? diagnostic_KindFromJSON(object.kind) : -1, + message: object.message + }; + }, + toAmino(message: Diagnostic): DiagnosticAmino { + const obj: any = {}; + obj.location = message.location; + obj.kind = message.kind; + obj.message = message.message; + return obj; + }, + fromAminoMsg(object: DiagnosticAminoMsg): Diagnostic { + return Diagnostic.fromAmino(object.value); + }, + fromProtoMsg(message: DiagnosticProtoMsg): Diagnostic { + return Diagnostic.decode(message.value); + }, + toProto(message: Diagnostic): Uint8Array { + return Diagnostic.encode(message).finish(); + }, + toProtoMsg(message: Diagnostic): DiagnosticProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.Diagnostic", + value: Diagnostic.encode(message).finish() + }; } }; function createBaseConfigSource(): ConfigSource { @@ -903,6 +1029,7 @@ function createBaseConfigSource(): ConfigSource { }; } export const ConfigSource = { + typeUrl: "/google.api.servicemanagement.v1.ConfigSource", encode(message: ConfigSource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(42).string(message.id); @@ -975,6 +1102,37 @@ export const ConfigSource = { obj.files = []; } return obj; + }, + fromAmino(object: ConfigSourceAmino): ConfigSource { + return { + id: object.id, + files: Array.isArray(object?.files) ? object.files.map((e: any) => ConfigFile.fromAmino(e)) : [] + }; + }, + toAmino(message: ConfigSource): ConfigSourceAmino { + const obj: any = {}; + obj.id = message.id; + if (message.files) { + obj.files = message.files.map(e => e ? ConfigFile.toAmino(e) : undefined); + } else { + obj.files = []; + } + return obj; + }, + fromAminoMsg(object: ConfigSourceAminoMsg): ConfigSource { + return ConfigSource.fromAmino(object.value); + }, + fromProtoMsg(message: ConfigSourceProtoMsg): ConfigSource { + return ConfigSource.decode(message.value); + }, + toProto(message: ConfigSource): Uint8Array { + return ConfigSource.encode(message).finish(); + }, + toProtoMsg(message: ConfigSource): ConfigSourceProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ConfigSource", + value: ConfigSource.encode(message).finish() + }; } }; function createBaseConfigFile(): ConfigFile { @@ -985,6 +1143,7 @@ function createBaseConfigFile(): ConfigFile { }; } export const ConfigFile = { + typeUrl: "/google.api.servicemanagement.v1.ConfigFile", encode(message: ConfigFile, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filePath !== "") { writer.uint32(10).string(message.filePath); @@ -1061,6 +1220,35 @@ export const ConfigFile = { obj.file_contents = message.fileContents; message.fileType !== undefined && (obj.file_type = configFile_FileTypeToJSON(message.fileType)); return obj; + }, + fromAmino(object: ConfigFileAmino): ConfigFile { + return { + filePath: object.file_path, + fileContents: object.file_contents, + fileType: isSet(object.file_type) ? configFile_FileTypeFromJSON(object.file_type) : -1 + }; + }, + toAmino(message: ConfigFile): ConfigFileAmino { + const obj: any = {}; + obj.file_path = message.filePath; + obj.file_contents = message.fileContents; + obj.file_type = message.fileType; + return obj; + }, + fromAminoMsg(object: ConfigFileAminoMsg): ConfigFile { + return ConfigFile.fromAmino(object.value); + }, + fromProtoMsg(message: ConfigFileProtoMsg): ConfigFile { + return ConfigFile.decode(message.value); + }, + toProto(message: ConfigFile): Uint8Array { + return ConfigFile.encode(message).finish(); + }, + toProtoMsg(message: ConfigFile): ConfigFileProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ConfigFile", + value: ConfigFile.encode(message).finish() + }; } }; function createBaseConfigRef(): ConfigRef { @@ -1069,6 +1257,7 @@ function createBaseConfigRef(): ConfigRef { }; } export const ConfigRef = { + typeUrl: "/google.api.servicemanagement.v1.ConfigRef", encode(message: ConfigRef, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1121,6 +1310,31 @@ export const ConfigRef = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: ConfigRefAmino): ConfigRef { + return { + name: object.name + }; + }, + toAmino(message: ConfigRef): ConfigRefAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: ConfigRefAminoMsg): ConfigRef { + return ConfigRef.fromAmino(object.value); + }, + fromProtoMsg(message: ConfigRefProtoMsg): ConfigRef { + return ConfigRef.decode(message.value); + }, + toProto(message: ConfigRef): Uint8Array { + return ConfigRef.encode(message).finish(); + }, + toProtoMsg(message: ConfigRef): ConfigRefProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ConfigRef", + value: ConfigRef.encode(message).finish() + }; } }; function createBaseChangeReport(): ChangeReport { @@ -1129,6 +1343,7 @@ function createBaseChangeReport(): ChangeReport { }; } export const ChangeReport = { + typeUrl: "/google.api.servicemanagement.v1.ChangeReport", encode(message: ChangeReport, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.configChanges) { ConfigChange.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1189,6 +1404,35 @@ export const ChangeReport = { obj.config_changes = []; } return obj; + }, + fromAmino(object: ChangeReportAmino): ChangeReport { + return { + configChanges: Array.isArray(object?.config_changes) ? object.config_changes.map((e: any) => ConfigChange.fromAmino(e)) : [] + }; + }, + toAmino(message: ChangeReport): ChangeReportAmino { + const obj: any = {}; + if (message.configChanges) { + obj.config_changes = message.configChanges.map(e => e ? ConfigChange.toAmino(e) : undefined); + } else { + obj.config_changes = []; + } + return obj; + }, + fromAminoMsg(object: ChangeReportAminoMsg): ChangeReport { + return ChangeReport.fromAmino(object.value); + }, + fromProtoMsg(message: ChangeReportProtoMsg): ChangeReport { + return ChangeReport.decode(message.value); + }, + toProto(message: ChangeReport): Uint8Array { + return ChangeReport.encode(message).finish(); + }, + toProtoMsg(message: ChangeReport): ChangeReportProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ChangeReport", + value: ChangeReport.encode(message).finish() + }; } }; function createBaseRollout(): Rollout { @@ -1203,6 +1447,7 @@ function createBaseRollout(): Rollout { }; } export const Rollout = { + typeUrl: "/google.api.servicemanagement.v1.Rollout", encode(message: Rollout, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rolloutId !== "") { writer.uint32(10).string(message.rolloutId); @@ -1327,6 +1572,43 @@ export const Rollout = { message.deleteServiceStrategy !== undefined && (obj.delete_service_strategy = message.deleteServiceStrategy ? Rollout_DeleteServiceStrategy.toSDK(message.deleteServiceStrategy) : undefined); obj.service_name = message.serviceName; return obj; + }, + fromAmino(object: RolloutAmino): Rollout { + return { + rolloutId: object.rollout_id, + createTime: object.create_time, + createdBy: object.created_by, + status: isSet(object.status) ? rollout_RolloutStatusFromJSON(object.status) : -1, + trafficPercentStrategy: object?.traffic_percent_strategy ? Rollout_TrafficPercentStrategy.fromAmino(object.traffic_percent_strategy) : undefined, + deleteServiceStrategy: object?.delete_service_strategy ? Rollout_DeleteServiceStrategy.fromAmino(object.delete_service_strategy) : undefined, + serviceName: object.service_name + }; + }, + toAmino(message: Rollout): RolloutAmino { + const obj: any = {}; + obj.rollout_id = message.rolloutId; + obj.create_time = message.createTime; + obj.created_by = message.createdBy; + obj.status = message.status; + obj.traffic_percent_strategy = message.trafficPercentStrategy ? Rollout_TrafficPercentStrategy.toAmino(message.trafficPercentStrategy) : undefined; + obj.delete_service_strategy = message.deleteServiceStrategy ? Rollout_DeleteServiceStrategy.toAmino(message.deleteServiceStrategy) : undefined; + obj.service_name = message.serviceName; + return obj; + }, + fromAminoMsg(object: RolloutAminoMsg): Rollout { + return Rollout.fromAmino(object.value); + }, + fromProtoMsg(message: RolloutProtoMsg): Rollout { + return Rollout.decode(message.value); + }, + toProto(message: Rollout): Uint8Array { + return Rollout.encode(message).finish(); + }, + toProtoMsg(message: Rollout): RolloutProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.Rollout", + value: Rollout.encode(message).finish() + }; } }; function createBaseRollout_TrafficPercentStrategy_PercentagesEntry(): Rollout_TrafficPercentStrategy_PercentagesEntry { @@ -1400,6 +1682,27 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: Rollout_TrafficPercentStrategy_PercentagesEntryAmino): Rollout_TrafficPercentStrategy_PercentagesEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Rollout_TrafficPercentStrategy_PercentagesEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: Rollout_TrafficPercentStrategy_PercentagesEntryAminoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { + return Rollout_TrafficPercentStrategy_PercentagesEntry.fromAmino(object.value); + }, + fromProtoMsg(message: Rollout_TrafficPercentStrategy_PercentagesEntryProtoMsg): Rollout_TrafficPercentStrategy_PercentagesEntry { + return Rollout_TrafficPercentStrategy_PercentagesEntry.decode(message.value); + }, + toProto(message: Rollout_TrafficPercentStrategy_PercentagesEntry): Uint8Array { + return Rollout_TrafficPercentStrategy_PercentagesEntry.encode(message).finish(); } }; function createBaseRollout_TrafficPercentStrategy(): Rollout_TrafficPercentStrategy { @@ -1408,6 +1711,7 @@ function createBaseRollout_TrafficPercentStrategy(): Rollout_TrafficPercentStrat }; } export const Rollout_TrafficPercentStrategy = { + typeUrl: "/google.api.servicemanagement.v1.TrafficPercentStrategy", encode(message: Rollout_TrafficPercentStrategy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.percentages).forEach(([key, value]) => { Rollout_TrafficPercentStrategy_PercentagesEntry.encode({ @@ -1498,12 +1802,48 @@ export const Rollout_TrafficPercentStrategy = { }); } return obj; + }, + fromAmino(object: Rollout_TrafficPercentStrategyAmino): Rollout_TrafficPercentStrategy { + return { + percentages: isObject(object.percentages) ? Object.entries(object.percentages).reduce<{ + [key: string]: double; + }>((acc, [key, value]) => { + acc[key] = double.fromAmino(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: Rollout_TrafficPercentStrategy): Rollout_TrafficPercentStrategyAmino { + const obj: any = {}; + obj.percentages = {}; + if (message.percentages) { + Object.entries(message.percentages).forEach(([k, v]) => { + obj.percentages[k] = double.toAmino(v); + }); + } + return obj; + }, + fromAminoMsg(object: Rollout_TrafficPercentStrategyAminoMsg): Rollout_TrafficPercentStrategy { + return Rollout_TrafficPercentStrategy.fromAmino(object.value); + }, + fromProtoMsg(message: Rollout_TrafficPercentStrategyProtoMsg): Rollout_TrafficPercentStrategy { + return Rollout_TrafficPercentStrategy.decode(message.value); + }, + toProto(message: Rollout_TrafficPercentStrategy): Uint8Array { + return Rollout_TrafficPercentStrategy.encode(message).finish(); + }, + toProtoMsg(message: Rollout_TrafficPercentStrategy): Rollout_TrafficPercentStrategyProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.TrafficPercentStrategy", + value: Rollout_TrafficPercentStrategy.encode(message).finish() + }; } }; function createBaseRollout_DeleteServiceStrategy(): Rollout_DeleteServiceStrategy { return {}; } export const Rollout_DeleteServiceStrategy = { + typeUrl: "/google.api.servicemanagement.v1.DeleteServiceStrategy", encode(_: Rollout_DeleteServiceStrategy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1541,5 +1881,27 @@ export const Rollout_DeleteServiceStrategy = { toSDK(_: Rollout_DeleteServiceStrategy): Rollout_DeleteServiceStrategySDKType { const obj: any = {}; return obj; + }, + fromAmino(_: Rollout_DeleteServiceStrategyAmino): Rollout_DeleteServiceStrategy { + return {}; + }, + toAmino(_: Rollout_DeleteServiceStrategy): Rollout_DeleteServiceStrategyAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: Rollout_DeleteServiceStrategyAminoMsg): Rollout_DeleteServiceStrategy { + return Rollout_DeleteServiceStrategy.fromAmino(object.value); + }, + fromProtoMsg(message: Rollout_DeleteServiceStrategyProtoMsg): Rollout_DeleteServiceStrategy { + return Rollout_DeleteServiceStrategy.decode(message.value); + }, + toProto(message: Rollout_DeleteServiceStrategy): Uint8Array { + return Rollout_DeleteServiceStrategy.encode(message).finish(); + }, + toProtoMsg(message: Rollout_DeleteServiceStrategy): Rollout_DeleteServiceStrategyProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.DeleteServiceStrategy", + value: Rollout_DeleteServiceStrategy.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/servicemanager.ts index 6186e930ba..610b269559 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/servicemanagement/v1/servicemanager.ts @@ -378,6 +378,7 @@ function createBaseListServicesRequest(): ListServicesRequest { }; } export const ListServicesRequest = { + typeUrl: "/google.api.servicemanagement.v1.ListServicesRequest", encode(message: ListServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.producerProjectId !== "") { writer.uint32(10).string(message.producerProjectId); @@ -466,6 +467,37 @@ export const ListServicesRequest = { obj.page_token = message.pageToken; obj.consumer_id = message.consumerId; return obj; + }, + fromAmino(object: ListServicesRequestAmino): ListServicesRequest { + return { + producerProjectId: object.producer_project_id, + pageSize: object.page_size, + pageToken: object.page_token, + consumerId: object.consumer_id + }; + }, + toAmino(message: ListServicesRequest): ListServicesRequestAmino { + const obj: any = {}; + obj.producer_project_id = message.producerProjectId; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + obj.consumer_id = message.consumerId; + return obj; + }, + fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { + return ListServicesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListServicesRequestProtoMsg): ListServicesRequest { + return ListServicesRequest.decode(message.value); + }, + toProto(message: ListServicesRequest): Uint8Array { + return ListServicesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListServicesRequest): ListServicesRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ListServicesRequest", + value: ListServicesRequest.encode(message).finish() + }; } }; function createBaseListServicesResponse(): ListServicesResponse { @@ -475,6 +507,7 @@ function createBaseListServicesResponse(): ListServicesResponse { }; } export const ListServicesResponse = { + typeUrl: "/google.api.servicemanagement.v1.ListServicesResponse", encode(message: ListServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { ManagedService.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -547,6 +580,37 @@ export const ListServicesResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListServicesResponseAmino): ListServicesResponse { + return { + services: Array.isArray(object?.services) ? object.services.map((e: any) => ManagedService.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListServicesResponse): ListServicesResponseAmino { + const obj: any = {}; + if (message.services) { + obj.services = message.services.map(e => e ? ManagedService.toAmino(e) : undefined); + } else { + obj.services = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { + return ListServicesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListServicesResponseProtoMsg): ListServicesResponse { + return ListServicesResponse.decode(message.value); + }, + toProto(message: ListServicesResponse): Uint8Array { + return ListServicesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListServicesResponse): ListServicesResponseProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ListServicesResponse", + value: ListServicesResponse.encode(message).finish() + }; } }; function createBaseGetServiceRequest(): GetServiceRequest { @@ -555,6 +619,7 @@ function createBaseGetServiceRequest(): GetServiceRequest { }; } export const GetServiceRequest = { + typeUrl: "/google.api.servicemanagement.v1.GetServiceRequest", encode(message: GetServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -607,6 +672,31 @@ export const GetServiceRequest = { const obj: any = {}; obj.service_name = message.serviceName; return obj; + }, + fromAmino(object: GetServiceRequestAmino): GetServiceRequest { + return { + serviceName: object.service_name + }; + }, + toAmino(message: GetServiceRequest): GetServiceRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + return obj; + }, + fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { + return GetServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceRequestProtoMsg): GetServiceRequest { + return GetServiceRequest.decode(message.value); + }, + toProto(message: GetServiceRequest): Uint8Array { + return GetServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: GetServiceRequest): GetServiceRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.GetServiceRequest", + value: GetServiceRequest.encode(message).finish() + }; } }; function createBaseCreateServiceRequest(): CreateServiceRequest { @@ -615,6 +705,7 @@ function createBaseCreateServiceRequest(): CreateServiceRequest { }; } export const CreateServiceRequest = { + typeUrl: "/google.api.servicemanagement.v1.CreateServiceRequest", encode(message: CreateServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { ManagedService.encode(message.service, writer.uint32(10).fork()).ldelim(); @@ -667,6 +758,31 @@ export const CreateServiceRequest = { const obj: any = {}; message.service !== undefined && (obj.service = message.service ? ManagedService.toSDK(message.service) : undefined); return obj; + }, + fromAmino(object: CreateServiceRequestAmino): CreateServiceRequest { + return { + service: object?.service ? ManagedService.fromAmino(object.service) : undefined + }; + }, + toAmino(message: CreateServiceRequest): CreateServiceRequestAmino { + const obj: any = {}; + obj.service = message.service ? ManagedService.toAmino(message.service) : undefined; + return obj; + }, + fromAminoMsg(object: CreateServiceRequestAminoMsg): CreateServiceRequest { + return CreateServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateServiceRequestProtoMsg): CreateServiceRequest { + return CreateServiceRequest.decode(message.value); + }, + toProto(message: CreateServiceRequest): Uint8Array { + return CreateServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateServiceRequest): CreateServiceRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.CreateServiceRequest", + value: CreateServiceRequest.encode(message).finish() + }; } }; function createBaseDeleteServiceRequest(): DeleteServiceRequest { @@ -675,6 +791,7 @@ function createBaseDeleteServiceRequest(): DeleteServiceRequest { }; } export const DeleteServiceRequest = { + typeUrl: "/google.api.servicemanagement.v1.DeleteServiceRequest", encode(message: DeleteServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -727,6 +844,31 @@ export const DeleteServiceRequest = { const obj: any = {}; obj.service_name = message.serviceName; return obj; + }, + fromAmino(object: DeleteServiceRequestAmino): DeleteServiceRequest { + return { + serviceName: object.service_name + }; + }, + toAmino(message: DeleteServiceRequest): DeleteServiceRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + return obj; + }, + fromAminoMsg(object: DeleteServiceRequestAminoMsg): DeleteServiceRequest { + return DeleteServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteServiceRequestProtoMsg): DeleteServiceRequest { + return DeleteServiceRequest.decode(message.value); + }, + toProto(message: DeleteServiceRequest): Uint8Array { + return DeleteServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteServiceRequest): DeleteServiceRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.DeleteServiceRequest", + value: DeleteServiceRequest.encode(message).finish() + }; } }; function createBaseUndeleteServiceRequest(): UndeleteServiceRequest { @@ -735,6 +877,7 @@ function createBaseUndeleteServiceRequest(): UndeleteServiceRequest { }; } export const UndeleteServiceRequest = { + typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceRequest", encode(message: UndeleteServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -787,6 +930,31 @@ export const UndeleteServiceRequest = { const obj: any = {}; obj.service_name = message.serviceName; return obj; + }, + fromAmino(object: UndeleteServiceRequestAmino): UndeleteServiceRequest { + return { + serviceName: object.service_name + }; + }, + toAmino(message: UndeleteServiceRequest): UndeleteServiceRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + return obj; + }, + fromAminoMsg(object: UndeleteServiceRequestAminoMsg): UndeleteServiceRequest { + return UndeleteServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UndeleteServiceRequestProtoMsg): UndeleteServiceRequest { + return UndeleteServiceRequest.decode(message.value); + }, + toProto(message: UndeleteServiceRequest): Uint8Array { + return UndeleteServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: UndeleteServiceRequest): UndeleteServiceRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceRequest", + value: UndeleteServiceRequest.encode(message).finish() + }; } }; function createBaseUndeleteServiceResponse(): UndeleteServiceResponse { @@ -795,6 +963,7 @@ function createBaseUndeleteServiceResponse(): UndeleteServiceResponse { }; } export const UndeleteServiceResponse = { + typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceResponse", encode(message: UndeleteServiceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { ManagedService.encode(message.service, writer.uint32(10).fork()).ldelim(); @@ -847,6 +1016,31 @@ export const UndeleteServiceResponse = { const obj: any = {}; message.service !== undefined && (obj.service = message.service ? ManagedService.toSDK(message.service) : undefined); return obj; + }, + fromAmino(object: UndeleteServiceResponseAmino): UndeleteServiceResponse { + return { + service: object?.service ? ManagedService.fromAmino(object.service) : undefined + }; + }, + toAmino(message: UndeleteServiceResponse): UndeleteServiceResponseAmino { + const obj: any = {}; + obj.service = message.service ? ManagedService.toAmino(message.service) : undefined; + return obj; + }, + fromAminoMsg(object: UndeleteServiceResponseAminoMsg): UndeleteServiceResponse { + return UndeleteServiceResponse.fromAmino(object.value); + }, + fromProtoMsg(message: UndeleteServiceResponseProtoMsg): UndeleteServiceResponse { + return UndeleteServiceResponse.decode(message.value); + }, + toProto(message: UndeleteServiceResponse): Uint8Array { + return UndeleteServiceResponse.encode(message).finish(); + }, + toProtoMsg(message: UndeleteServiceResponse): UndeleteServiceResponseProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceResponse", + value: UndeleteServiceResponse.encode(message).finish() + }; } }; function createBaseGetServiceConfigRequest(): GetServiceConfigRequest { @@ -857,6 +1051,7 @@ function createBaseGetServiceConfigRequest(): GetServiceConfigRequest { }; } export const GetServiceConfigRequest = { + typeUrl: "/google.api.servicemanagement.v1.GetServiceConfigRequest", encode(message: GetServiceConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -933,6 +1128,35 @@ export const GetServiceConfigRequest = { obj.config_id = message.configId; message.view !== undefined && (obj.view = getServiceConfigRequest_ConfigViewToJSON(message.view)); return obj; + }, + fromAmino(object: GetServiceConfigRequestAmino): GetServiceConfigRequest { + return { + serviceName: object.service_name, + configId: object.config_id, + view: isSet(object.view) ? getServiceConfigRequest_ConfigViewFromJSON(object.view) : -1 + }; + }, + toAmino(message: GetServiceConfigRequest): GetServiceConfigRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.config_id = message.configId; + obj.view = message.view; + return obj; + }, + fromAminoMsg(object: GetServiceConfigRequestAminoMsg): GetServiceConfigRequest { + return GetServiceConfigRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceConfigRequestProtoMsg): GetServiceConfigRequest { + return GetServiceConfigRequest.decode(message.value); + }, + toProto(message: GetServiceConfigRequest): Uint8Array { + return GetServiceConfigRequest.encode(message).finish(); + }, + toProtoMsg(message: GetServiceConfigRequest): GetServiceConfigRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.GetServiceConfigRequest", + value: GetServiceConfigRequest.encode(message).finish() + }; } }; function createBaseListServiceConfigsRequest(): ListServiceConfigsRequest { @@ -943,6 +1167,7 @@ function createBaseListServiceConfigsRequest(): ListServiceConfigsRequest { }; } export const ListServiceConfigsRequest = { + typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsRequest", encode(message: ListServiceConfigsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1019,6 +1244,35 @@ export const ListServiceConfigsRequest = { obj.page_token = message.pageToken; obj.page_size = message.pageSize; return obj; + }, + fromAmino(object: ListServiceConfigsRequestAmino): ListServiceConfigsRequest { + return { + serviceName: object.service_name, + pageToken: object.page_token, + pageSize: object.page_size + }; + }, + toAmino(message: ListServiceConfigsRequest): ListServiceConfigsRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + return obj; + }, + fromAminoMsg(object: ListServiceConfigsRequestAminoMsg): ListServiceConfigsRequest { + return ListServiceConfigsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListServiceConfigsRequestProtoMsg): ListServiceConfigsRequest { + return ListServiceConfigsRequest.decode(message.value); + }, + toProto(message: ListServiceConfigsRequest): Uint8Array { + return ListServiceConfigsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListServiceConfigsRequest): ListServiceConfigsRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsRequest", + value: ListServiceConfigsRequest.encode(message).finish() + }; } }; function createBaseListServiceConfigsResponse(): ListServiceConfigsResponse { @@ -1028,6 +1282,7 @@ function createBaseListServiceConfigsResponse(): ListServiceConfigsResponse { }; } export const ListServiceConfigsResponse = { + typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsResponse", encode(message: ListServiceConfigsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.serviceConfigs) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1100,6 +1355,37 @@ export const ListServiceConfigsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListServiceConfigsResponseAmino): ListServiceConfigsResponse { + return { + serviceConfigs: Array.isArray(object?.service_configs) ? object.service_configs.map((e: any) => Service.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListServiceConfigsResponse): ListServiceConfigsResponseAmino { + const obj: any = {}; + if (message.serviceConfigs) { + obj.service_configs = message.serviceConfigs.map(e => e ? Service.toAmino(e) : undefined); + } else { + obj.service_configs = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListServiceConfigsResponseAminoMsg): ListServiceConfigsResponse { + return ListServiceConfigsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListServiceConfigsResponseProtoMsg): ListServiceConfigsResponse { + return ListServiceConfigsResponse.decode(message.value); + }, + toProto(message: ListServiceConfigsResponse): Uint8Array { + return ListServiceConfigsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListServiceConfigsResponse): ListServiceConfigsResponseProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsResponse", + value: ListServiceConfigsResponse.encode(message).finish() + }; } }; function createBaseCreateServiceConfigRequest(): CreateServiceConfigRequest { @@ -1109,6 +1395,7 @@ function createBaseCreateServiceConfigRequest(): CreateServiceConfigRequest { }; } export const CreateServiceConfigRequest = { + typeUrl: "/google.api.servicemanagement.v1.CreateServiceConfigRequest", encode(message: CreateServiceConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1173,6 +1460,33 @@ export const CreateServiceConfigRequest = { obj.service_name = message.serviceName; message.serviceConfig !== undefined && (obj.service_config = message.serviceConfig ? Service.toSDK(message.serviceConfig) : undefined); return obj; + }, + fromAmino(object: CreateServiceConfigRequestAmino): CreateServiceConfigRequest { + return { + serviceName: object.service_name, + serviceConfig: object?.service_config ? Service.fromAmino(object.service_config) : undefined + }; + }, + toAmino(message: CreateServiceConfigRequest): CreateServiceConfigRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; + return obj; + }, + fromAminoMsg(object: CreateServiceConfigRequestAminoMsg): CreateServiceConfigRequest { + return CreateServiceConfigRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateServiceConfigRequestProtoMsg): CreateServiceConfigRequest { + return CreateServiceConfigRequest.decode(message.value); + }, + toProto(message: CreateServiceConfigRequest): Uint8Array { + return CreateServiceConfigRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateServiceConfigRequest): CreateServiceConfigRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.CreateServiceConfigRequest", + value: CreateServiceConfigRequest.encode(message).finish() + }; } }; function createBaseSubmitConfigSourceRequest(): SubmitConfigSourceRequest { @@ -1183,6 +1497,7 @@ function createBaseSubmitConfigSourceRequest(): SubmitConfigSourceRequest { }; } export const SubmitConfigSourceRequest = { + typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest", encode(message: SubmitConfigSourceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1259,6 +1574,35 @@ export const SubmitConfigSourceRequest = { message.configSource !== undefined && (obj.config_source = message.configSource ? ConfigSource.toSDK(message.configSource) : undefined); obj.validate_only = message.validateOnly; return obj; + }, + fromAmino(object: SubmitConfigSourceRequestAmino): SubmitConfigSourceRequest { + return { + serviceName: object.service_name, + configSource: object?.config_source ? ConfigSource.fromAmino(object.config_source) : undefined, + validateOnly: object.validate_only + }; + }, + toAmino(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.config_source = message.configSource ? ConfigSource.toAmino(message.configSource) : undefined; + obj.validate_only = message.validateOnly; + return obj; + }, + fromAminoMsg(object: SubmitConfigSourceRequestAminoMsg): SubmitConfigSourceRequest { + return SubmitConfigSourceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: SubmitConfigSourceRequestProtoMsg): SubmitConfigSourceRequest { + return SubmitConfigSourceRequest.decode(message.value); + }, + toProto(message: SubmitConfigSourceRequest): Uint8Array { + return SubmitConfigSourceRequest.encode(message).finish(); + }, + toProtoMsg(message: SubmitConfigSourceRequest): SubmitConfigSourceRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest", + value: SubmitConfigSourceRequest.encode(message).finish() + }; } }; function createBaseSubmitConfigSourceResponse(): SubmitConfigSourceResponse { @@ -1267,6 +1611,7 @@ function createBaseSubmitConfigSourceResponse(): SubmitConfigSourceResponse { }; } export const SubmitConfigSourceResponse = { + typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse", encode(message: SubmitConfigSourceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceConfig !== undefined) { Service.encode(message.serviceConfig, writer.uint32(10).fork()).ldelim(); @@ -1319,6 +1664,31 @@ export const SubmitConfigSourceResponse = { const obj: any = {}; message.serviceConfig !== undefined && (obj.service_config = message.serviceConfig ? Service.toSDK(message.serviceConfig) : undefined); return obj; + }, + fromAmino(object: SubmitConfigSourceResponseAmino): SubmitConfigSourceResponse { + return { + serviceConfig: object?.service_config ? Service.fromAmino(object.service_config) : undefined + }; + }, + toAmino(message: SubmitConfigSourceResponse): SubmitConfigSourceResponseAmino { + const obj: any = {}; + obj.service_config = message.serviceConfig ? Service.toAmino(message.serviceConfig) : undefined; + return obj; + }, + fromAminoMsg(object: SubmitConfigSourceResponseAminoMsg): SubmitConfigSourceResponse { + return SubmitConfigSourceResponse.fromAmino(object.value); + }, + fromProtoMsg(message: SubmitConfigSourceResponseProtoMsg): SubmitConfigSourceResponse { + return SubmitConfigSourceResponse.decode(message.value); + }, + toProto(message: SubmitConfigSourceResponse): Uint8Array { + return SubmitConfigSourceResponse.encode(message).finish(); + }, + toProtoMsg(message: SubmitConfigSourceResponse): SubmitConfigSourceResponseProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse", + value: SubmitConfigSourceResponse.encode(message).finish() + }; } }; function createBaseCreateServiceRolloutRequest(): CreateServiceRolloutRequest { @@ -1328,6 +1698,7 @@ function createBaseCreateServiceRolloutRequest(): CreateServiceRolloutRequest { }; } export const CreateServiceRolloutRequest = { + typeUrl: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest", encode(message: CreateServiceRolloutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1392,6 +1763,33 @@ export const CreateServiceRolloutRequest = { obj.service_name = message.serviceName; message.rollout !== undefined && (obj.rollout = message.rollout ? Rollout.toSDK(message.rollout) : undefined); return obj; + }, + fromAmino(object: CreateServiceRolloutRequestAmino): CreateServiceRolloutRequest { + return { + serviceName: object.service_name, + rollout: object?.rollout ? Rollout.fromAmino(object.rollout) : undefined + }; + }, + toAmino(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.rollout = message.rollout ? Rollout.toAmino(message.rollout) : undefined; + return obj; + }, + fromAminoMsg(object: CreateServiceRolloutRequestAminoMsg): CreateServiceRolloutRequest { + return CreateServiceRolloutRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateServiceRolloutRequestProtoMsg): CreateServiceRolloutRequest { + return CreateServiceRolloutRequest.decode(message.value); + }, + toProto(message: CreateServiceRolloutRequest): Uint8Array { + return CreateServiceRolloutRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateServiceRolloutRequest): CreateServiceRolloutRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest", + value: CreateServiceRolloutRequest.encode(message).finish() + }; } }; function createBaseListServiceRolloutsRequest(): ListServiceRolloutsRequest { @@ -1403,6 +1801,7 @@ function createBaseListServiceRolloutsRequest(): ListServiceRolloutsRequest { }; } export const ListServiceRolloutsRequest = { + typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest", encode(message: ListServiceRolloutsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1491,6 +1890,37 @@ export const ListServiceRolloutsRequest = { obj.page_size = message.pageSize; obj.filter = message.filter; return obj; + }, + fromAmino(object: ListServiceRolloutsRequestAmino): ListServiceRolloutsRequest { + return { + serviceName: object.service_name, + pageToken: object.page_token, + pageSize: object.page_size, + filter: object.filter + }; + }, + toAmino(message: ListServiceRolloutsRequest): ListServiceRolloutsRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + obj.filter = message.filter; + return obj; + }, + fromAminoMsg(object: ListServiceRolloutsRequestAminoMsg): ListServiceRolloutsRequest { + return ListServiceRolloutsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListServiceRolloutsRequestProtoMsg): ListServiceRolloutsRequest { + return ListServiceRolloutsRequest.decode(message.value); + }, + toProto(message: ListServiceRolloutsRequest): Uint8Array { + return ListServiceRolloutsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListServiceRolloutsRequest): ListServiceRolloutsRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest", + value: ListServiceRolloutsRequest.encode(message).finish() + }; } }; function createBaseListServiceRolloutsResponse(): ListServiceRolloutsResponse { @@ -1500,6 +1930,7 @@ function createBaseListServiceRolloutsResponse(): ListServiceRolloutsResponse { }; } export const ListServiceRolloutsResponse = { + typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse", encode(message: ListServiceRolloutsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rollouts) { Rollout.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1572,6 +2003,37 @@ export const ListServiceRolloutsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListServiceRolloutsResponseAmino): ListServiceRolloutsResponse { + return { + rollouts: Array.isArray(object?.rollouts) ? object.rollouts.map((e: any) => Rollout.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListServiceRolloutsResponse): ListServiceRolloutsResponseAmino { + const obj: any = {}; + if (message.rollouts) { + obj.rollouts = message.rollouts.map(e => e ? Rollout.toAmino(e) : undefined); + } else { + obj.rollouts = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListServiceRolloutsResponseAminoMsg): ListServiceRolloutsResponse { + return ListServiceRolloutsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListServiceRolloutsResponseProtoMsg): ListServiceRolloutsResponse { + return ListServiceRolloutsResponse.decode(message.value); + }, + toProto(message: ListServiceRolloutsResponse): Uint8Array { + return ListServiceRolloutsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListServiceRolloutsResponse): ListServiceRolloutsResponseProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse", + value: ListServiceRolloutsResponse.encode(message).finish() + }; } }; function createBaseGetServiceRolloutRequest(): GetServiceRolloutRequest { @@ -1581,6 +2043,7 @@ function createBaseGetServiceRolloutRequest(): GetServiceRolloutRequest { }; } export const GetServiceRolloutRequest = { + typeUrl: "/google.api.servicemanagement.v1.GetServiceRolloutRequest", encode(message: GetServiceRolloutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1645,6 +2108,33 @@ export const GetServiceRolloutRequest = { obj.service_name = message.serviceName; obj.rollout_id = message.rolloutId; return obj; + }, + fromAmino(object: GetServiceRolloutRequestAmino): GetServiceRolloutRequest { + return { + serviceName: object.service_name, + rolloutId: object.rollout_id + }; + }, + toAmino(message: GetServiceRolloutRequest): GetServiceRolloutRequestAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.rollout_id = message.rolloutId; + return obj; + }, + fromAminoMsg(object: GetServiceRolloutRequestAminoMsg): GetServiceRolloutRequest { + return GetServiceRolloutRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceRolloutRequestProtoMsg): GetServiceRolloutRequest { + return GetServiceRolloutRequest.decode(message.value); + }, + toProto(message: GetServiceRolloutRequest): Uint8Array { + return GetServiceRolloutRequest.encode(message).finish(); + }, + toProtoMsg(message: GetServiceRolloutRequest): GetServiceRolloutRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.GetServiceRolloutRequest", + value: GetServiceRolloutRequest.encode(message).finish() + }; } }; function createBaseGenerateConfigReportRequest(): GenerateConfigReportRequest { @@ -1654,6 +2144,7 @@ function createBaseGenerateConfigReportRequest(): GenerateConfigReportRequest { }; } export const GenerateConfigReportRequest = { + typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportRequest", encode(message: GenerateConfigReportRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newConfig !== undefined) { Any.encode(message.newConfig, writer.uint32(10).fork()).ldelim(); @@ -1718,6 +2209,33 @@ export const GenerateConfigReportRequest = { message.newConfig !== undefined && (obj.new_config = message.newConfig ? Any.toSDK(message.newConfig) : undefined); message.oldConfig !== undefined && (obj.old_config = message.oldConfig ? Any.toSDK(message.oldConfig) : undefined); return obj; + }, + fromAmino(object: GenerateConfigReportRequestAmino): GenerateConfigReportRequest { + return { + newConfig: object?.new_config ? Any.fromAmino(object.new_config) : undefined, + oldConfig: object?.old_config ? Any.fromAmino(object.old_config) : undefined + }; + }, + toAmino(message: GenerateConfigReportRequest): GenerateConfigReportRequestAmino { + const obj: any = {}; + obj.new_config = message.newConfig ? Any.toAmino(message.newConfig) : undefined; + obj.old_config = message.oldConfig ? Any.toAmino(message.oldConfig) : undefined; + return obj; + }, + fromAminoMsg(object: GenerateConfigReportRequestAminoMsg): GenerateConfigReportRequest { + return GenerateConfigReportRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GenerateConfigReportRequestProtoMsg): GenerateConfigReportRequest { + return GenerateConfigReportRequest.decode(message.value); + }, + toProto(message: GenerateConfigReportRequest): Uint8Array { + return GenerateConfigReportRequest.encode(message).finish(); + }, + toProtoMsg(message: GenerateConfigReportRequest): GenerateConfigReportRequestProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportRequest", + value: GenerateConfigReportRequest.encode(message).finish() + }; } }; function createBaseGenerateConfigReportResponse(): GenerateConfigReportResponse { @@ -1729,6 +2247,7 @@ function createBaseGenerateConfigReportResponse(): GenerateConfigReportResponse }; } export const GenerateConfigReportResponse = { + typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportResponse", encode(message: GenerateConfigReportResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); @@ -1833,5 +2352,44 @@ export const GenerateConfigReportResponse = { obj.diagnostics = []; } return obj; + }, + fromAmino(object: GenerateConfigReportResponseAmino): GenerateConfigReportResponse { + return { + serviceName: object.service_name, + id: object.id, + changeReports: Array.isArray(object?.change_reports) ? object.change_reports.map((e: any) => ChangeReport.fromAmino(e)) : [], + diagnostics: Array.isArray(object?.diagnostics) ? object.diagnostics.map((e: any) => Diagnostic.fromAmino(e)) : [] + }; + }, + toAmino(message: GenerateConfigReportResponse): GenerateConfigReportResponseAmino { + const obj: any = {}; + obj.service_name = message.serviceName; + obj.id = message.id; + if (message.changeReports) { + obj.change_reports = message.changeReports.map(e => e ? ChangeReport.toAmino(e) : undefined); + } else { + obj.change_reports = []; + } + if (message.diagnostics) { + obj.diagnostics = message.diagnostics.map(e => e ? Diagnostic.toAmino(e) : undefined); + } else { + obj.diagnostics = []; + } + return obj; + }, + fromAminoMsg(object: GenerateConfigReportResponseAminoMsg): GenerateConfigReportResponse { + return GenerateConfigReportResponse.fromAmino(object.value); + }, + fromProtoMsg(message: GenerateConfigReportResponseProtoMsg): GenerateConfigReportResponse { + return GenerateConfigReportResponse.decode(message.value); + }, + toProto(message: GenerateConfigReportResponse): Uint8Array { + return GenerateConfigReportResponse.encode(message).finish(); + }, + toProtoMsg(message: GenerateConfigReportResponse): GenerateConfigReportResponseProtoMsg { + return { + typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportResponse", + value: GenerateConfigReportResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/resources.ts b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/resources.ts index 853cfc4062..f4e7d84ce6 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/resources.ts @@ -167,6 +167,7 @@ function createBaseService(): Service { }; } export const Service = { + typeUrl: "/google.api.serviceusage.v1.Service", encode(message: Service, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -255,6 +256,37 @@ export const Service = { message.config !== undefined && (obj.config = message.config ? ServiceConfig.toSDK(message.config) : undefined); message.state !== undefined && (obj.state = stateToJSON(message.state)); return obj; + }, + fromAmino(object: ServiceAmino): Service { + return { + name: object.name, + parent: object.parent, + config: object?.config ? ServiceConfig.fromAmino(object.config) : undefined, + state: isSet(object.state) ? stateFromJSON(object.state) : -1 + }; + }, + toAmino(message: Service): ServiceAmino { + const obj: any = {}; + obj.name = message.name; + obj.parent = message.parent; + obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: ServiceAminoMsg): Service { + return Service.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceProtoMsg): Service { + return Service.decode(message.value); + }, + toProto(message: Service): Uint8Array { + return Service.encode(message).finish(); + }, + toProtoMsg(message: Service): ServiceProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.Service", + value: Service.encode(message).finish() + }; } }; function createBaseServiceConfig(): ServiceConfig { @@ -272,6 +304,7 @@ function createBaseServiceConfig(): ServiceConfig { }; } export const ServiceConfig = { + typeUrl: "/google.api.serviceusage.v1.ServiceConfig", encode(message: ServiceConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -456,6 +489,61 @@ export const ServiceConfig = { } message.monitoring !== undefined && (obj.monitoring = message.monitoring ? Monitoring.toSDK(message.monitoring) : undefined); return obj; + }, + fromAmino(object: ServiceConfigAmino): ServiceConfig { + return { + name: object.name, + title: object.title, + apis: Array.isArray(object?.apis) ? object.apis.map((e: any) => Api.fromAmino(e)) : [], + documentation: object?.documentation ? Documentation.fromAmino(object.documentation) : undefined, + quota: object?.quota ? Quota.fromAmino(object.quota) : undefined, + authentication: object?.authentication ? Authentication.fromAmino(object.authentication) : undefined, + usage: object?.usage ? Usage.fromAmino(object.usage) : undefined, + endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromAmino(e)) : [], + monitoredResources: Array.isArray(object?.monitored_resources) ? object.monitored_resources.map((e: any) => MonitoredResourceDescriptor.fromAmino(e)) : [], + monitoring: object?.monitoring ? Monitoring.fromAmino(object.monitoring) : undefined + }; + }, + toAmino(message: ServiceConfig): ServiceConfigAmino { + const obj: any = {}; + obj.name = message.name; + obj.title = message.title; + if (message.apis) { + obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); + } else { + obj.apis = []; + } + obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; + obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; + obj.authentication = message.authentication ? Authentication.toAmino(message.authentication) : undefined; + obj.usage = message.usage ? Usage.toAmino(message.usage) : undefined; + if (message.endpoints) { + obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); + } else { + obj.endpoints = []; + } + if (message.monitoredResources) { + obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); + } else { + obj.monitored_resources = []; + } + obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; + return obj; + }, + fromAminoMsg(object: ServiceConfigAminoMsg): ServiceConfig { + return ServiceConfig.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceConfigProtoMsg): ServiceConfig { + return ServiceConfig.decode(message.value); + }, + toProto(message: ServiceConfig): Uint8Array { + return ServiceConfig.encode(message).finish(); + }, + toProtoMsg(message: ServiceConfig): ServiceConfigProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.ServiceConfig", + value: ServiceConfig.encode(message).finish() + }; } }; function createBaseOperationMetadata(): OperationMetadata { @@ -464,6 +552,7 @@ function createBaseOperationMetadata(): OperationMetadata { }; } export const OperationMetadata = { + typeUrl: "/google.api.serviceusage.v1.OperationMetadata", encode(message: OperationMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(18).string(v!); @@ -524,5 +613,34 @@ export const OperationMetadata = { obj.resource_names = []; } return obj; + }, + fromAmino(object: OperationMetadataAmino): OperationMetadata { + return { + resourceNames: Array.isArray(object?.resource_names) ? object.resource_names.map((e: any) => e) : [] + }; + }, + toAmino(message: OperationMetadata): OperationMetadataAmino { + const obj: any = {}; + if (message.resourceNames) { + obj.resource_names = message.resourceNames.map(e => e); + } else { + obj.resource_names = []; + } + return obj; + }, + fromAminoMsg(object: OperationMetadataAminoMsg): OperationMetadata { + return OperationMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: OperationMetadataProtoMsg): OperationMetadata { + return OperationMetadata.decode(message.value); + }, + toProto(message: OperationMetadata): Uint8Array { + return OperationMetadata.encode(message).finish(); + }, + toProtoMsg(message: OperationMetadata): OperationMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.OperationMetadata", + value: OperationMetadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/serviceusage.ts index 5a75eaaf4b..f24c314b88 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1/serviceusage.ts @@ -303,6 +303,7 @@ function createBaseEnableServiceRequest(): EnableServiceRequest { }; } export const EnableServiceRequest = { + typeUrl: "/google.api.serviceusage.v1.EnableServiceRequest", encode(message: EnableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -355,6 +356,31 @@ export const EnableServiceRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: EnableServiceRequestAmino): EnableServiceRequest { + return { + name: object.name + }; + }, + toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { + return EnableServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: EnableServiceRequestProtoMsg): EnableServiceRequest { + return EnableServiceRequest.decode(message.value); + }, + toProto(message: EnableServiceRequest): Uint8Array { + return EnableServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: EnableServiceRequest): EnableServiceRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.EnableServiceRequest", + value: EnableServiceRequest.encode(message).finish() + }; } }; function createBaseEnableServiceResponse(): EnableServiceResponse { @@ -363,6 +389,7 @@ function createBaseEnableServiceResponse(): EnableServiceResponse { }; } export const EnableServiceResponse = { + typeUrl: "/google.api.serviceusage.v1.EnableServiceResponse", encode(message: EnableServiceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { Service.encode(message.service, writer.uint32(10).fork()).ldelim(); @@ -415,6 +442,31 @@ export const EnableServiceResponse = { const obj: any = {}; message.service !== undefined && (obj.service = message.service ? Service.toSDK(message.service) : undefined); return obj; + }, + fromAmino(object: EnableServiceResponseAmino): EnableServiceResponse { + return { + service: object?.service ? Service.fromAmino(object.service) : undefined + }; + }, + toAmino(message: EnableServiceResponse): EnableServiceResponseAmino { + const obj: any = {}; + obj.service = message.service ? Service.toAmino(message.service) : undefined; + return obj; + }, + fromAminoMsg(object: EnableServiceResponseAminoMsg): EnableServiceResponse { + return EnableServiceResponse.fromAmino(object.value); + }, + fromProtoMsg(message: EnableServiceResponseProtoMsg): EnableServiceResponse { + return EnableServiceResponse.decode(message.value); + }, + toProto(message: EnableServiceResponse): Uint8Array { + return EnableServiceResponse.encode(message).finish(); + }, + toProtoMsg(message: EnableServiceResponse): EnableServiceResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.EnableServiceResponse", + value: EnableServiceResponse.encode(message).finish() + }; } }; function createBaseDisableServiceRequest(): DisableServiceRequest { @@ -425,6 +477,7 @@ function createBaseDisableServiceRequest(): DisableServiceRequest { }; } export const DisableServiceRequest = { + typeUrl: "/google.api.serviceusage.v1.DisableServiceRequest", encode(message: DisableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -501,6 +554,35 @@ export const DisableServiceRequest = { obj.disable_dependent_services = message.disableDependentServices; message.checkIfServiceHasUsage !== undefined && (obj.check_if_service_has_usage = disableServiceRequest_CheckIfServiceHasUsageToJSON(message.checkIfServiceHasUsage)); return obj; + }, + fromAmino(object: DisableServiceRequestAmino): DisableServiceRequest { + return { + name: object.name, + disableDependentServices: object.disable_dependent_services, + checkIfServiceHasUsage: isSet(object.check_if_service_has_usage) ? disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.check_if_service_has_usage) : -1 + }; + }, + toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.disable_dependent_services = message.disableDependentServices; + obj.check_if_service_has_usage = message.checkIfServiceHasUsage; + return obj; + }, + fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { + return DisableServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DisableServiceRequestProtoMsg): DisableServiceRequest { + return DisableServiceRequest.decode(message.value); + }, + toProto(message: DisableServiceRequest): Uint8Array { + return DisableServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: DisableServiceRequest): DisableServiceRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.DisableServiceRequest", + value: DisableServiceRequest.encode(message).finish() + }; } }; function createBaseDisableServiceResponse(): DisableServiceResponse { @@ -509,6 +591,7 @@ function createBaseDisableServiceResponse(): DisableServiceResponse { }; } export const DisableServiceResponse = { + typeUrl: "/google.api.serviceusage.v1.DisableServiceResponse", encode(message: DisableServiceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { Service.encode(message.service, writer.uint32(10).fork()).ldelim(); @@ -561,6 +644,31 @@ export const DisableServiceResponse = { const obj: any = {}; message.service !== undefined && (obj.service = message.service ? Service.toSDK(message.service) : undefined); return obj; + }, + fromAmino(object: DisableServiceResponseAmino): DisableServiceResponse { + return { + service: object?.service ? Service.fromAmino(object.service) : undefined + }; + }, + toAmino(message: DisableServiceResponse): DisableServiceResponseAmino { + const obj: any = {}; + obj.service = message.service ? Service.toAmino(message.service) : undefined; + return obj; + }, + fromAminoMsg(object: DisableServiceResponseAminoMsg): DisableServiceResponse { + return DisableServiceResponse.fromAmino(object.value); + }, + fromProtoMsg(message: DisableServiceResponseProtoMsg): DisableServiceResponse { + return DisableServiceResponse.decode(message.value); + }, + toProto(message: DisableServiceResponse): Uint8Array { + return DisableServiceResponse.encode(message).finish(); + }, + toProtoMsg(message: DisableServiceResponse): DisableServiceResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.DisableServiceResponse", + value: DisableServiceResponse.encode(message).finish() + }; } }; function createBaseGetServiceRequest(): GetServiceRequest { @@ -569,6 +677,7 @@ function createBaseGetServiceRequest(): GetServiceRequest { }; } export const GetServiceRequest = { + typeUrl: "/google.api.serviceusage.v1.GetServiceRequest", encode(message: GetServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -621,6 +730,31 @@ export const GetServiceRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetServiceRequestAmino): GetServiceRequest { + return { + name: object.name + }; + }, + toAmino(message: GetServiceRequest): GetServiceRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { + return GetServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceRequestProtoMsg): GetServiceRequest { + return GetServiceRequest.decode(message.value); + }, + toProto(message: GetServiceRequest): Uint8Array { + return GetServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: GetServiceRequest): GetServiceRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.GetServiceRequest", + value: GetServiceRequest.encode(message).finish() + }; } }; function createBaseListServicesRequest(): ListServicesRequest { @@ -632,6 +766,7 @@ function createBaseListServicesRequest(): ListServicesRequest { }; } export const ListServicesRequest = { + typeUrl: "/google.api.serviceusage.v1.ListServicesRequest", encode(message: ListServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -720,6 +855,37 @@ export const ListServicesRequest = { obj.page_token = message.pageToken; obj.filter = message.filter; return obj; + }, + fromAmino(object: ListServicesRequestAmino): ListServicesRequest { + return { + parent: object.parent, + pageSize: object.page_size, + pageToken: object.page_token, + filter: object.filter + }; + }, + toAmino(message: ListServicesRequest): ListServicesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + obj.filter = message.filter; + return obj; + }, + fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { + return ListServicesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListServicesRequestProtoMsg): ListServicesRequest { + return ListServicesRequest.decode(message.value); + }, + toProto(message: ListServicesRequest): Uint8Array { + return ListServicesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListServicesRequest): ListServicesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.ListServicesRequest", + value: ListServicesRequest.encode(message).finish() + }; } }; function createBaseListServicesResponse(): ListServicesResponse { @@ -729,6 +895,7 @@ function createBaseListServicesResponse(): ListServicesResponse { }; } export const ListServicesResponse = { + typeUrl: "/google.api.serviceusage.v1.ListServicesResponse", encode(message: ListServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -801,6 +968,37 @@ export const ListServicesResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListServicesResponseAmino): ListServicesResponse { + return { + services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListServicesResponse): ListServicesResponseAmino { + const obj: any = {}; + if (message.services) { + obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); + } else { + obj.services = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { + return ListServicesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListServicesResponseProtoMsg): ListServicesResponse { + return ListServicesResponse.decode(message.value); + }, + toProto(message: ListServicesResponse): Uint8Array { + return ListServicesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListServicesResponse): ListServicesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.ListServicesResponse", + value: ListServicesResponse.encode(message).finish() + }; } }; function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest { @@ -810,6 +1008,7 @@ function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest { }; } export const BatchEnableServicesRequest = { + typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesRequest", encode(message: BatchEnableServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -882,6 +1081,37 @@ export const BatchEnableServicesRequest = { obj.service_ids = []; } return obj; + }, + fromAmino(object: BatchEnableServicesRequestAmino): BatchEnableServicesRequest { + return { + parent: object.parent, + serviceIds: Array.isArray(object?.service_ids) ? object.service_ids.map((e: any) => e) : [] + }; + }, + toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + if (message.serviceIds) { + obj.service_ids = message.serviceIds.map(e => e); + } else { + obj.service_ids = []; + } + return obj; + }, + fromAminoMsg(object: BatchEnableServicesRequestAminoMsg): BatchEnableServicesRequest { + return BatchEnableServicesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: BatchEnableServicesRequestProtoMsg): BatchEnableServicesRequest { + return BatchEnableServicesRequest.decode(message.value); + }, + toProto(message: BatchEnableServicesRequest): Uint8Array { + return BatchEnableServicesRequest.encode(message).finish(); + }, + toProtoMsg(message: BatchEnableServicesRequest): BatchEnableServicesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesRequest", + value: BatchEnableServicesRequest.encode(message).finish() + }; } }; function createBaseBatchEnableServicesResponse(): BatchEnableServicesResponse { @@ -891,6 +1121,7 @@ function createBaseBatchEnableServicesResponse(): BatchEnableServicesResponse { }; } export const BatchEnableServicesResponse = { + typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesResponse", encode(message: BatchEnableServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -971,6 +1202,41 @@ export const BatchEnableServicesResponse = { obj.failures = []; } return obj; + }, + fromAmino(object: BatchEnableServicesResponseAmino): BatchEnableServicesResponse { + return { + services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromAmino(e)) : [], + failures: Array.isArray(object?.failures) ? object.failures.map((e: any) => BatchEnableServicesResponse_EnableFailure.fromAmino(e)) : [] + }; + }, + toAmino(message: BatchEnableServicesResponse): BatchEnableServicesResponseAmino { + const obj: any = {}; + if (message.services) { + obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); + } else { + obj.services = []; + } + if (message.failures) { + obj.failures = message.failures.map(e => e ? BatchEnableServicesResponse_EnableFailure.toAmino(e) : undefined); + } else { + obj.failures = []; + } + return obj; + }, + fromAminoMsg(object: BatchEnableServicesResponseAminoMsg): BatchEnableServicesResponse { + return BatchEnableServicesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: BatchEnableServicesResponseProtoMsg): BatchEnableServicesResponse { + return BatchEnableServicesResponse.decode(message.value); + }, + toProto(message: BatchEnableServicesResponse): Uint8Array { + return BatchEnableServicesResponse.encode(message).finish(); + }, + toProtoMsg(message: BatchEnableServicesResponse): BatchEnableServicesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesResponse", + value: BatchEnableServicesResponse.encode(message).finish() + }; } }; function createBaseBatchEnableServicesResponse_EnableFailure(): BatchEnableServicesResponse_EnableFailure { @@ -980,6 +1246,7 @@ function createBaseBatchEnableServicesResponse_EnableFailure(): BatchEnableServi }; } export const BatchEnableServicesResponse_EnableFailure = { + typeUrl: "/google.api.serviceusage.v1.EnableFailure", encode(message: BatchEnableServicesResponse_EnableFailure, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceId !== "") { writer.uint32(10).string(message.serviceId); @@ -1044,6 +1311,33 @@ export const BatchEnableServicesResponse_EnableFailure = { obj.service_id = message.serviceId; obj.error_message = message.errorMessage; return obj; + }, + fromAmino(object: BatchEnableServicesResponse_EnableFailureAmino): BatchEnableServicesResponse_EnableFailure { + return { + serviceId: object.service_id, + errorMessage: object.error_message + }; + }, + toAmino(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureAmino { + const obj: any = {}; + obj.service_id = message.serviceId; + obj.error_message = message.errorMessage; + return obj; + }, + fromAminoMsg(object: BatchEnableServicesResponse_EnableFailureAminoMsg): BatchEnableServicesResponse_EnableFailure { + return BatchEnableServicesResponse_EnableFailure.fromAmino(object.value); + }, + fromProtoMsg(message: BatchEnableServicesResponse_EnableFailureProtoMsg): BatchEnableServicesResponse_EnableFailure { + return BatchEnableServicesResponse_EnableFailure.decode(message.value); + }, + toProto(message: BatchEnableServicesResponse_EnableFailure): Uint8Array { + return BatchEnableServicesResponse_EnableFailure.encode(message).finish(); + }, + toProtoMsg(message: BatchEnableServicesResponse_EnableFailure): BatchEnableServicesResponse_EnableFailureProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.EnableFailure", + value: BatchEnableServicesResponse_EnableFailure.encode(message).finish() + }; } }; function createBaseBatchGetServicesRequest(): BatchGetServicesRequest { @@ -1053,6 +1347,7 @@ function createBaseBatchGetServicesRequest(): BatchGetServicesRequest { }; } export const BatchGetServicesRequest = { + typeUrl: "/google.api.serviceusage.v1.BatchGetServicesRequest", encode(message: BatchGetServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1125,6 +1420,37 @@ export const BatchGetServicesRequest = { obj.names = []; } return obj; + }, + fromAmino(object: BatchGetServicesRequestAmino): BatchGetServicesRequest { + return { + parent: object.parent, + names: Array.isArray(object?.names) ? object.names.map((e: any) => e) : [] + }; + }, + toAmino(message: BatchGetServicesRequest): BatchGetServicesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + if (message.names) { + obj.names = message.names.map(e => e); + } else { + obj.names = []; + } + return obj; + }, + fromAminoMsg(object: BatchGetServicesRequestAminoMsg): BatchGetServicesRequest { + return BatchGetServicesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: BatchGetServicesRequestProtoMsg): BatchGetServicesRequest { + return BatchGetServicesRequest.decode(message.value); + }, + toProto(message: BatchGetServicesRequest): Uint8Array { + return BatchGetServicesRequest.encode(message).finish(); + }, + toProtoMsg(message: BatchGetServicesRequest): BatchGetServicesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.BatchGetServicesRequest", + value: BatchGetServicesRequest.encode(message).finish() + }; } }; function createBaseBatchGetServicesResponse(): BatchGetServicesResponse { @@ -1133,6 +1459,7 @@ function createBaseBatchGetServicesResponse(): BatchGetServicesResponse { }; } export const BatchGetServicesResponse = { + typeUrl: "/google.api.serviceusage.v1.BatchGetServicesResponse", encode(message: BatchGetServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1193,5 +1520,34 @@ export const BatchGetServicesResponse = { obj.services = []; } return obj; + }, + fromAmino(object: BatchGetServicesResponseAmino): BatchGetServicesResponse { + return { + services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromAmino(e)) : [] + }; + }, + toAmino(message: BatchGetServicesResponse): BatchGetServicesResponseAmino { + const obj: any = {}; + if (message.services) { + obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); + } else { + obj.services = []; + } + return obj; + }, + fromAminoMsg(object: BatchGetServicesResponseAminoMsg): BatchGetServicesResponse { + return BatchGetServicesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: BatchGetServicesResponseProtoMsg): BatchGetServicesResponse { + return BatchGetServicesResponse.decode(message.value); + }, + toProto(message: BatchGetServicesResponse): Uint8Array { + return BatchGetServicesResponse.encode(message).finish(); + }, + toProtoMsg(message: BatchGetServicesResponse): BatchGetServicesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1.BatchGetServicesResponse", + value: BatchGetServicesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/resources.ts index 29e9096801..9151c989f4 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/resources.ts @@ -621,6 +621,7 @@ function createBaseService(): Service { }; } export const Service = { + typeUrl: "/google.api.serviceusage.v1beta1.Service", encode(message: Service, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -709,6 +710,37 @@ export const Service = { message.config !== undefined && (obj.config = message.config ? ServiceConfig.toSDK(message.config) : undefined); message.state !== undefined && (obj.state = stateToJSON(message.state)); return obj; + }, + fromAmino(object: ServiceAmino): Service { + return { + name: object.name, + parent: object.parent, + config: object?.config ? ServiceConfig.fromAmino(object.config) : undefined, + state: isSet(object.state) ? stateFromJSON(object.state) : -1 + }; + }, + toAmino(message: Service): ServiceAmino { + const obj: any = {}; + obj.name = message.name; + obj.parent = message.parent; + obj.config = message.config ? ServiceConfig.toAmino(message.config) : undefined; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: ServiceAminoMsg): Service { + return Service.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceProtoMsg): Service { + return Service.decode(message.value); + }, + toProto(message: Service): Uint8Array { + return Service.encode(message).finish(); + }, + toProtoMsg(message: Service): ServiceProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.Service", + value: Service.encode(message).finish() + }; } }; function createBaseServiceConfig(): ServiceConfig { @@ -726,6 +758,7 @@ function createBaseServiceConfig(): ServiceConfig { }; } export const ServiceConfig = { + typeUrl: "/google.api.serviceusage.v1beta1.ServiceConfig", encode(message: ServiceConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -910,6 +943,61 @@ export const ServiceConfig = { } message.monitoring !== undefined && (obj.monitoring = message.monitoring ? Monitoring.toSDK(message.monitoring) : undefined); return obj; + }, + fromAmino(object: ServiceConfigAmino): ServiceConfig { + return { + name: object.name, + title: object.title, + apis: Array.isArray(object?.apis) ? object.apis.map((e: any) => Api.fromAmino(e)) : [], + documentation: object?.documentation ? Documentation.fromAmino(object.documentation) : undefined, + quota: object?.quota ? Quota.fromAmino(object.quota) : undefined, + authentication: object?.authentication ? Authentication.fromAmino(object.authentication) : undefined, + usage: object?.usage ? Usage.fromAmino(object.usage) : undefined, + endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromAmino(e)) : [], + monitoredResources: Array.isArray(object?.monitored_resources) ? object.monitored_resources.map((e: any) => MonitoredResourceDescriptor.fromAmino(e)) : [], + monitoring: object?.monitoring ? Monitoring.fromAmino(object.monitoring) : undefined + }; + }, + toAmino(message: ServiceConfig): ServiceConfigAmino { + const obj: any = {}; + obj.name = message.name; + obj.title = message.title; + if (message.apis) { + obj.apis = message.apis.map(e => e ? Api.toAmino(e) : undefined); + } else { + obj.apis = []; + } + obj.documentation = message.documentation ? Documentation.toAmino(message.documentation) : undefined; + obj.quota = message.quota ? Quota.toAmino(message.quota) : undefined; + obj.authentication = message.authentication ? Authentication.toAmino(message.authentication) : undefined; + obj.usage = message.usage ? Usage.toAmino(message.usage) : undefined; + if (message.endpoints) { + obj.endpoints = message.endpoints.map(e => e ? Endpoint.toAmino(e) : undefined); + } else { + obj.endpoints = []; + } + if (message.monitoredResources) { + obj.monitored_resources = message.monitoredResources.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); + } else { + obj.monitored_resources = []; + } + obj.monitoring = message.monitoring ? Monitoring.toAmino(message.monitoring) : undefined; + return obj; + }, + fromAminoMsg(object: ServiceConfigAminoMsg): ServiceConfig { + return ServiceConfig.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceConfigProtoMsg): ServiceConfig { + return ServiceConfig.decode(message.value); + }, + toProto(message: ServiceConfig): Uint8Array { + return ServiceConfig.encode(message).finish(); + }, + toProtoMsg(message: ServiceConfig): ServiceConfigProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ServiceConfig", + value: ServiceConfig.encode(message).finish() + }; } }; function createBaseOperationMetadata(): OperationMetadata { @@ -918,6 +1006,7 @@ function createBaseOperationMetadata(): OperationMetadata { }; } export const OperationMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.OperationMetadata", encode(message: OperationMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(18).string(v!); @@ -978,6 +1067,35 @@ export const OperationMetadata = { obj.resource_names = []; } return obj; + }, + fromAmino(object: OperationMetadataAmino): OperationMetadata { + return { + resourceNames: Array.isArray(object?.resource_names) ? object.resource_names.map((e: any) => e) : [] + }; + }, + toAmino(message: OperationMetadata): OperationMetadataAmino { + const obj: any = {}; + if (message.resourceNames) { + obj.resource_names = message.resourceNames.map(e => e); + } else { + obj.resource_names = []; + } + return obj; + }, + fromAminoMsg(object: OperationMetadataAminoMsg): OperationMetadata { + return OperationMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: OperationMetadataProtoMsg): OperationMetadata { + return OperationMetadata.decode(message.value); + }, + toProto(message: OperationMetadata): Uint8Array { + return OperationMetadata.encode(message).finish(); + }, + toProtoMsg(message: OperationMetadata): OperationMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.OperationMetadata", + value: OperationMetadata.encode(message).finish() + }; } }; function createBaseConsumerQuotaMetric(): ConsumerQuotaMetric { @@ -991,6 +1109,7 @@ function createBaseConsumerQuotaMetric(): ConsumerQuotaMetric { }; } export const ConsumerQuotaMetric = { + typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric", encode(message: ConsumerQuotaMetric, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1119,6 +1238,49 @@ export const ConsumerQuotaMetric = { } obj.unit = message.unit; return obj; + }, + fromAmino(object: ConsumerQuotaMetricAmino): ConsumerQuotaMetric { + return { + name: object.name, + metric: object.metric, + displayName: object.display_name, + consumerQuotaLimits: Array.isArray(object?.consumer_quota_limits) ? object.consumer_quota_limits.map((e: any) => ConsumerQuotaLimit.fromAmino(e)) : [], + descendantConsumerQuotaLimits: Array.isArray(object?.descendant_consumer_quota_limits) ? object.descendant_consumer_quota_limits.map((e: any) => ConsumerQuotaLimit.fromAmino(e)) : [], + unit: object.unit + }; + }, + toAmino(message: ConsumerQuotaMetric): ConsumerQuotaMetricAmino { + const obj: any = {}; + obj.name = message.name; + obj.metric = message.metric; + obj.display_name = message.displayName; + if (message.consumerQuotaLimits) { + obj.consumer_quota_limits = message.consumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); + } else { + obj.consumer_quota_limits = []; + } + if (message.descendantConsumerQuotaLimits) { + obj.descendant_consumer_quota_limits = message.descendantConsumerQuotaLimits.map(e => e ? ConsumerQuotaLimit.toAmino(e) : undefined); + } else { + obj.descendant_consumer_quota_limits = []; + } + obj.unit = message.unit; + return obj; + }, + fromAminoMsg(object: ConsumerQuotaMetricAminoMsg): ConsumerQuotaMetric { + return ConsumerQuotaMetric.fromAmino(object.value); + }, + fromProtoMsg(message: ConsumerQuotaMetricProtoMsg): ConsumerQuotaMetric { + return ConsumerQuotaMetric.decode(message.value); + }, + toProto(message: ConsumerQuotaMetric): Uint8Array { + return ConsumerQuotaMetric.encode(message).finish(); + }, + toProtoMsg(message: ConsumerQuotaMetric): ConsumerQuotaMetricProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric", + value: ConsumerQuotaMetric.encode(message).finish() + }; } }; function createBaseConsumerQuotaLimit(): ConsumerQuotaLimit { @@ -1132,6 +1294,7 @@ function createBaseConsumerQuotaLimit(): ConsumerQuotaLimit { }; } export const ConsumerQuotaLimit = { + typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit", encode(message: ConsumerQuotaLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1252,6 +1415,45 @@ export const ConsumerQuotaLimit = { obj.quota_buckets = []; } return obj; + }, + fromAmino(object: ConsumerQuotaLimitAmino): ConsumerQuotaLimit { + return { + name: object.name, + metric: object.metric, + unit: object.unit, + isPrecise: object.is_precise, + allowsAdminOverrides: object.allows_admin_overrides, + quotaBuckets: Array.isArray(object?.quota_buckets) ? object.quota_buckets.map((e: any) => QuotaBucket.fromAmino(e)) : [] + }; + }, + toAmino(message: ConsumerQuotaLimit): ConsumerQuotaLimitAmino { + const obj: any = {}; + obj.name = message.name; + obj.metric = message.metric; + obj.unit = message.unit; + obj.is_precise = message.isPrecise; + obj.allows_admin_overrides = message.allowsAdminOverrides; + if (message.quotaBuckets) { + obj.quota_buckets = message.quotaBuckets.map(e => e ? QuotaBucket.toAmino(e) : undefined); + } else { + obj.quota_buckets = []; + } + return obj; + }, + fromAminoMsg(object: ConsumerQuotaLimitAminoMsg): ConsumerQuotaLimit { + return ConsumerQuotaLimit.fromAmino(object.value); + }, + fromProtoMsg(message: ConsumerQuotaLimitProtoMsg): ConsumerQuotaLimit { + return ConsumerQuotaLimit.decode(message.value); + }, + toProto(message: ConsumerQuotaLimit): Uint8Array { + return ConsumerQuotaLimit.encode(message).finish(); + }, + toProtoMsg(message: ConsumerQuotaLimit): ConsumerQuotaLimitProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit", + value: ConsumerQuotaLimit.encode(message).finish() + }; } }; function createBaseQuotaBucket_DimensionsEntry(): QuotaBucket_DimensionsEntry { @@ -1325,6 +1527,27 @@ export const QuotaBucket_DimensionsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: QuotaBucket_DimensionsEntryAmino): QuotaBucket_DimensionsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: QuotaBucket_DimensionsEntry): QuotaBucket_DimensionsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: QuotaBucket_DimensionsEntryAminoMsg): QuotaBucket_DimensionsEntry { + return QuotaBucket_DimensionsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaBucket_DimensionsEntryProtoMsg): QuotaBucket_DimensionsEntry { + return QuotaBucket_DimensionsEntry.decode(message.value); + }, + toProto(message: QuotaBucket_DimensionsEntry): Uint8Array { + return QuotaBucket_DimensionsEntry.encode(message).finish(); } }; function createBaseQuotaBucket(): QuotaBucket { @@ -1338,6 +1561,7 @@ function createBaseQuotaBucket(): QuotaBucket { }; } export const QuotaBucket = { + typeUrl: "/google.api.serviceusage.v1beta1.QuotaBucket", encode(message: QuotaBucket, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.effectiveLimit !== BigInt(0)) { writer.uint32(8).int64(message.effectiveLimit); @@ -1488,6 +1712,51 @@ export const QuotaBucket = { }); } return obj; + }, + fromAmino(object: QuotaBucketAmino): QuotaBucket { + return { + effectiveLimit: BigInt(object.effective_limit), + defaultLimit: BigInt(object.default_limit), + producerOverride: object?.producer_override ? QuotaOverride.fromAmino(object.producer_override) : undefined, + consumerOverride: object?.consumer_override ? QuotaOverride.fromAmino(object.consumer_override) : undefined, + adminOverride: object?.admin_override ? QuotaOverride.fromAmino(object.admin_override) : undefined, + dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: QuotaBucket): QuotaBucketAmino { + const obj: any = {}; + obj.effective_limit = message.effectiveLimit ? message.effectiveLimit.toString() : undefined; + obj.default_limit = message.defaultLimit ? message.defaultLimit.toString() : undefined; + obj.producer_override = message.producerOverride ? QuotaOverride.toAmino(message.producerOverride) : undefined; + obj.consumer_override = message.consumerOverride ? QuotaOverride.toAmino(message.consumerOverride) : undefined; + obj.admin_override = message.adminOverride ? QuotaOverride.toAmino(message.adminOverride) : undefined; + obj.dimensions = {}; + if (message.dimensions) { + Object.entries(message.dimensions).forEach(([k, v]) => { + obj.dimensions[k] = v; + }); + } + return obj; + }, + fromAminoMsg(object: QuotaBucketAminoMsg): QuotaBucket { + return QuotaBucket.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaBucketProtoMsg): QuotaBucket { + return QuotaBucket.decode(message.value); + }, + toProto(message: QuotaBucket): Uint8Array { + return QuotaBucket.encode(message).finish(); + }, + toProtoMsg(message: QuotaBucket): QuotaBucketProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.QuotaBucket", + value: QuotaBucket.encode(message).finish() + }; } }; function createBaseQuotaOverride_DimensionsEntry(): QuotaOverride_DimensionsEntry { @@ -1561,6 +1830,27 @@ export const QuotaOverride_DimensionsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: QuotaOverride_DimensionsEntryAmino): QuotaOverride_DimensionsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: QuotaOverride_DimensionsEntry): QuotaOverride_DimensionsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: QuotaOverride_DimensionsEntryAminoMsg): QuotaOverride_DimensionsEntry { + return QuotaOverride_DimensionsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaOverride_DimensionsEntryProtoMsg): QuotaOverride_DimensionsEntry { + return QuotaOverride_DimensionsEntry.decode(message.value); + }, + toProto(message: QuotaOverride_DimensionsEntry): Uint8Array { + return QuotaOverride_DimensionsEntry.encode(message).finish(); } }; function createBaseQuotaOverride(): QuotaOverride { @@ -1574,6 +1864,7 @@ function createBaseQuotaOverride(): QuotaOverride { }; } export const QuotaOverride = { + typeUrl: "/google.api.serviceusage.v1beta1.QuotaOverride", encode(message: QuotaOverride, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1724,6 +2015,51 @@ export const QuotaOverride = { obj.unit = message.unit; obj.admin_override_ancestor = message.adminOverrideAncestor; return obj; + }, + fromAmino(object: QuotaOverrideAmino): QuotaOverride { + return { + name: object.name, + overrideValue: BigInt(object.override_value), + dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + metric: object.metric, + unit: object.unit, + adminOverrideAncestor: object.admin_override_ancestor + }; + }, + toAmino(message: QuotaOverride): QuotaOverrideAmino { + const obj: any = {}; + obj.name = message.name; + obj.override_value = message.overrideValue ? message.overrideValue.toString() : undefined; + obj.dimensions = {}; + if (message.dimensions) { + Object.entries(message.dimensions).forEach(([k, v]) => { + obj.dimensions[k] = v; + }); + } + obj.metric = message.metric; + obj.unit = message.unit; + obj.admin_override_ancestor = message.adminOverrideAncestor; + return obj; + }, + fromAminoMsg(object: QuotaOverrideAminoMsg): QuotaOverride { + return QuotaOverride.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaOverrideProtoMsg): QuotaOverride { + return QuotaOverride.decode(message.value); + }, + toProto(message: QuotaOverride): Uint8Array { + return QuotaOverride.encode(message).finish(); + }, + toProtoMsg(message: QuotaOverride): QuotaOverrideProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.QuotaOverride", + value: QuotaOverride.encode(message).finish() + }; } }; function createBaseOverrideInlineSource(): OverrideInlineSource { @@ -1732,6 +2068,7 @@ function createBaseOverrideInlineSource(): OverrideInlineSource { }; } export const OverrideInlineSource = { + typeUrl: "/google.api.serviceusage.v1beta1.OverrideInlineSource", encode(message: OverrideInlineSource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1792,6 +2129,35 @@ export const OverrideInlineSource = { obj.overrides = []; } return obj; + }, + fromAmino(object: OverrideInlineSourceAmino): OverrideInlineSource { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [] + }; + }, + toAmino(message: OverrideInlineSource): OverrideInlineSourceAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + return obj; + }, + fromAminoMsg(object: OverrideInlineSourceAminoMsg): OverrideInlineSource { + return OverrideInlineSource.fromAmino(object.value); + }, + fromProtoMsg(message: OverrideInlineSourceProtoMsg): OverrideInlineSource { + return OverrideInlineSource.decode(message.value); + }, + toProto(message: OverrideInlineSource): Uint8Array { + return OverrideInlineSource.encode(message).finish(); + }, + toProtoMsg(message: OverrideInlineSource): OverrideInlineSourceProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.OverrideInlineSource", + value: OverrideInlineSource.encode(message).finish() + }; } }; function createBaseAdminQuotaPolicy_DimensionsEntry(): AdminQuotaPolicy_DimensionsEntry { @@ -1865,6 +2231,27 @@ export const AdminQuotaPolicy_DimensionsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AdminQuotaPolicy_DimensionsEntryAmino): AdminQuotaPolicy_DimensionsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: AdminQuotaPolicy_DimensionsEntry): AdminQuotaPolicy_DimensionsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AdminQuotaPolicy_DimensionsEntryAminoMsg): AdminQuotaPolicy_DimensionsEntry { + return AdminQuotaPolicy_DimensionsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: AdminQuotaPolicy_DimensionsEntryProtoMsg): AdminQuotaPolicy_DimensionsEntry { + return AdminQuotaPolicy_DimensionsEntry.decode(message.value); + }, + toProto(message: AdminQuotaPolicy_DimensionsEntry): Uint8Array { + return AdminQuotaPolicy_DimensionsEntry.encode(message).finish(); } }; function createBaseAdminQuotaPolicy(): AdminQuotaPolicy { @@ -1878,6 +2265,7 @@ function createBaseAdminQuotaPolicy(): AdminQuotaPolicy { }; } export const AdminQuotaPolicy = { + typeUrl: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy", encode(message: AdminQuotaPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2028,6 +2416,51 @@ export const AdminQuotaPolicy = { obj.unit = message.unit; obj.container = message.container; return obj; + }, + fromAmino(object: AdminQuotaPolicyAmino): AdminQuotaPolicy { + return { + name: object.name, + policyValue: BigInt(object.policy_value), + dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + metric: object.metric, + unit: object.unit, + container: object.container + }; + }, + toAmino(message: AdminQuotaPolicy): AdminQuotaPolicyAmino { + const obj: any = {}; + obj.name = message.name; + obj.policy_value = message.policyValue ? message.policyValue.toString() : undefined; + obj.dimensions = {}; + if (message.dimensions) { + Object.entries(message.dimensions).forEach(([k, v]) => { + obj.dimensions[k] = v; + }); + } + obj.metric = message.metric; + obj.unit = message.unit; + obj.container = message.container; + return obj; + }, + fromAminoMsg(object: AdminQuotaPolicyAminoMsg): AdminQuotaPolicy { + return AdminQuotaPolicy.fromAmino(object.value); + }, + fromProtoMsg(message: AdminQuotaPolicyProtoMsg): AdminQuotaPolicy { + return AdminQuotaPolicy.decode(message.value); + }, + toProto(message: AdminQuotaPolicy): Uint8Array { + return AdminQuotaPolicy.encode(message).finish(); + }, + toProtoMsg(message: AdminQuotaPolicy): AdminQuotaPolicyProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy", + value: AdminQuotaPolicy.encode(message).finish() + }; } }; function createBaseServiceIdentity(): ServiceIdentity { @@ -2037,6 +2470,7 @@ function createBaseServiceIdentity(): ServiceIdentity { }; } export const ServiceIdentity = { + typeUrl: "/google.api.serviceusage.v1beta1.ServiceIdentity", encode(message: ServiceIdentity, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.email !== "") { writer.uint32(10).string(message.email); @@ -2101,5 +2535,32 @@ export const ServiceIdentity = { obj.email = message.email; obj.unique_id = message.uniqueId; return obj; + }, + fromAmino(object: ServiceIdentityAmino): ServiceIdentity { + return { + email: object.email, + uniqueId: object.unique_id + }; + }, + toAmino(message: ServiceIdentity): ServiceIdentityAmino { + const obj: any = {}; + obj.email = message.email; + obj.unique_id = message.uniqueId; + return obj; + }, + fromAminoMsg(object: ServiceIdentityAminoMsg): ServiceIdentity { + return ServiceIdentity.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceIdentityProtoMsg): ServiceIdentity { + return ServiceIdentity.decode(message.value); + }, + toProto(message: ServiceIdentity): Uint8Array { + return ServiceIdentity.encode(message).finish(); + }, + toProtoMsg(message: ServiceIdentity): ServiceIdentityProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ServiceIdentity", + value: ServiceIdentity.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/serviceusage.ts index 46315c0306..8a74fe6b90 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/serviceusage/v1beta1/serviceusage.ts @@ -762,6 +762,7 @@ function createBaseEnableServiceRequest(): EnableServiceRequest { }; } export const EnableServiceRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.EnableServiceRequest", encode(message: EnableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -814,6 +815,31 @@ export const EnableServiceRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: EnableServiceRequestAmino): EnableServiceRequest { + return { + name: object.name + }; + }, + toAmino(message: EnableServiceRequest): EnableServiceRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: EnableServiceRequestAminoMsg): EnableServiceRequest { + return EnableServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: EnableServiceRequestProtoMsg): EnableServiceRequest { + return EnableServiceRequest.decode(message.value); + }, + toProto(message: EnableServiceRequest): Uint8Array { + return EnableServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: EnableServiceRequest): EnableServiceRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.EnableServiceRequest", + value: EnableServiceRequest.encode(message).finish() + }; } }; function createBaseDisableServiceRequest(): DisableServiceRequest { @@ -822,6 +848,7 @@ function createBaseDisableServiceRequest(): DisableServiceRequest { }; } export const DisableServiceRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.DisableServiceRequest", encode(message: DisableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -874,6 +901,31 @@ export const DisableServiceRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: DisableServiceRequestAmino): DisableServiceRequest { + return { + name: object.name + }; + }, + toAmino(message: DisableServiceRequest): DisableServiceRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: DisableServiceRequestAminoMsg): DisableServiceRequest { + return DisableServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DisableServiceRequestProtoMsg): DisableServiceRequest { + return DisableServiceRequest.decode(message.value); + }, + toProto(message: DisableServiceRequest): Uint8Array { + return DisableServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: DisableServiceRequest): DisableServiceRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.DisableServiceRequest", + value: DisableServiceRequest.encode(message).finish() + }; } }; function createBaseGetServiceRequest(): GetServiceRequest { @@ -882,6 +934,7 @@ function createBaseGetServiceRequest(): GetServiceRequest { }; } export const GetServiceRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.GetServiceRequest", encode(message: GetServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -934,6 +987,31 @@ export const GetServiceRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetServiceRequestAmino): GetServiceRequest { + return { + name: object.name + }; + }, + toAmino(message: GetServiceRequest): GetServiceRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetServiceRequestAminoMsg): GetServiceRequest { + return GetServiceRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceRequestProtoMsg): GetServiceRequest { + return GetServiceRequest.decode(message.value); + }, + toProto(message: GetServiceRequest): Uint8Array { + return GetServiceRequest.encode(message).finish(); + }, + toProtoMsg(message: GetServiceRequest): GetServiceRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.GetServiceRequest", + value: GetServiceRequest.encode(message).finish() + }; } }; function createBaseListServicesRequest(): ListServicesRequest { @@ -945,6 +1023,7 @@ function createBaseListServicesRequest(): ListServicesRequest { }; } export const ListServicesRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.ListServicesRequest", encode(message: ListServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1033,6 +1112,37 @@ export const ListServicesRequest = { obj.page_token = message.pageToken; obj.filter = message.filter; return obj; + }, + fromAmino(object: ListServicesRequestAmino): ListServicesRequest { + return { + parent: object.parent, + pageSize: object.page_size, + pageToken: object.page_token, + filter: object.filter + }; + }, + toAmino(message: ListServicesRequest): ListServicesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + obj.filter = message.filter; + return obj; + }, + fromAminoMsg(object: ListServicesRequestAminoMsg): ListServicesRequest { + return ListServicesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListServicesRequestProtoMsg): ListServicesRequest { + return ListServicesRequest.decode(message.value); + }, + toProto(message: ListServicesRequest): Uint8Array { + return ListServicesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListServicesRequest): ListServicesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListServicesRequest", + value: ListServicesRequest.encode(message).finish() + }; } }; function createBaseListServicesResponse(): ListServicesResponse { @@ -1042,6 +1152,7 @@ function createBaseListServicesResponse(): ListServicesResponse { }; } export const ListServicesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ListServicesResponse", encode(message: ListServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1114,6 +1225,37 @@ export const ListServicesResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListServicesResponseAmino): ListServicesResponse { + return { + services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListServicesResponse): ListServicesResponseAmino { + const obj: any = {}; + if (message.services) { + obj.services = message.services.map(e => e ? Service.toAmino(e) : undefined); + } else { + obj.services = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListServicesResponseAminoMsg): ListServicesResponse { + return ListServicesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListServicesResponseProtoMsg): ListServicesResponse { + return ListServicesResponse.decode(message.value); + }, + toProto(message: ListServicesResponse): Uint8Array { + return ListServicesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListServicesResponse): ListServicesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListServicesResponse", + value: ListServicesResponse.encode(message).finish() + }; } }; function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest { @@ -1123,6 +1265,7 @@ function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest { }; } export const BatchEnableServicesRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest", encode(message: BatchEnableServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1195,6 +1338,37 @@ export const BatchEnableServicesRequest = { obj.service_ids = []; } return obj; + }, + fromAmino(object: BatchEnableServicesRequestAmino): BatchEnableServicesRequest { + return { + parent: object.parent, + serviceIds: Array.isArray(object?.service_ids) ? object.service_ids.map((e: any) => e) : [] + }; + }, + toAmino(message: BatchEnableServicesRequest): BatchEnableServicesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + if (message.serviceIds) { + obj.service_ids = message.serviceIds.map(e => e); + } else { + obj.service_ids = []; + } + return obj; + }, + fromAminoMsg(object: BatchEnableServicesRequestAminoMsg): BatchEnableServicesRequest { + return BatchEnableServicesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: BatchEnableServicesRequestProtoMsg): BatchEnableServicesRequest { + return BatchEnableServicesRequest.decode(message.value); + }, + toProto(message: BatchEnableServicesRequest): Uint8Array { + return BatchEnableServicesRequest.encode(message).finish(); + }, + toProtoMsg(message: BatchEnableServicesRequest): BatchEnableServicesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest", + value: BatchEnableServicesRequest.encode(message).finish() + }; } }; function createBaseListConsumerQuotaMetricsRequest(): ListConsumerQuotaMetricsRequest { @@ -1206,6 +1380,7 @@ function createBaseListConsumerQuotaMetricsRequest(): ListConsumerQuotaMetricsRe }; } export const ListConsumerQuotaMetricsRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest", encode(message: ListConsumerQuotaMetricsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1294,6 +1469,37 @@ export const ListConsumerQuotaMetricsRequest = { obj.page_token = message.pageToken; message.view !== undefined && (obj.view = quotaViewToJSON(message.view)); return obj; + }, + fromAmino(object: ListConsumerQuotaMetricsRequestAmino): ListConsumerQuotaMetricsRequest { + return { + parent: object.parent, + pageSize: object.page_size, + pageToken: object.page_token, + view: isSet(object.view) ? quotaViewFromJSON(object.view) : -1 + }; + }, + toAmino(message: ListConsumerQuotaMetricsRequest): ListConsumerQuotaMetricsRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + obj.view = message.view; + return obj; + }, + fromAminoMsg(object: ListConsumerQuotaMetricsRequestAminoMsg): ListConsumerQuotaMetricsRequest { + return ListConsumerQuotaMetricsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListConsumerQuotaMetricsRequestProtoMsg): ListConsumerQuotaMetricsRequest { + return ListConsumerQuotaMetricsRequest.decode(message.value); + }, + toProto(message: ListConsumerQuotaMetricsRequest): Uint8Array { + return ListConsumerQuotaMetricsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListConsumerQuotaMetricsRequest): ListConsumerQuotaMetricsRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest", + value: ListConsumerQuotaMetricsRequest.encode(message).finish() + }; } }; function createBaseListConsumerQuotaMetricsResponse(): ListConsumerQuotaMetricsResponse { @@ -1303,6 +1509,7 @@ function createBaseListConsumerQuotaMetricsResponse(): ListConsumerQuotaMetricsR }; } export const ListConsumerQuotaMetricsResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse", encode(message: ListConsumerQuotaMetricsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.metrics) { ConsumerQuotaMetric.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1375,6 +1582,37 @@ export const ListConsumerQuotaMetricsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListConsumerQuotaMetricsResponseAmino): ListConsumerQuotaMetricsResponse { + return { + metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => ConsumerQuotaMetric.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListConsumerQuotaMetricsResponse): ListConsumerQuotaMetricsResponseAmino { + const obj: any = {}; + if (message.metrics) { + obj.metrics = message.metrics.map(e => e ? ConsumerQuotaMetric.toAmino(e) : undefined); + } else { + obj.metrics = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListConsumerQuotaMetricsResponseAminoMsg): ListConsumerQuotaMetricsResponse { + return ListConsumerQuotaMetricsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListConsumerQuotaMetricsResponseProtoMsg): ListConsumerQuotaMetricsResponse { + return ListConsumerQuotaMetricsResponse.decode(message.value); + }, + toProto(message: ListConsumerQuotaMetricsResponse): Uint8Array { + return ListConsumerQuotaMetricsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListConsumerQuotaMetricsResponse): ListConsumerQuotaMetricsResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse", + value: ListConsumerQuotaMetricsResponse.encode(message).finish() + }; } }; function createBaseGetConsumerQuotaMetricRequest(): GetConsumerQuotaMetricRequest { @@ -1384,6 +1622,7 @@ function createBaseGetConsumerQuotaMetricRequest(): GetConsumerQuotaMetricReques }; } export const GetConsumerQuotaMetricRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest", encode(message: GetConsumerQuotaMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1448,6 +1687,33 @@ export const GetConsumerQuotaMetricRequest = { obj.name = message.name; message.view !== undefined && (obj.view = quotaViewToJSON(message.view)); return obj; + }, + fromAmino(object: GetConsumerQuotaMetricRequestAmino): GetConsumerQuotaMetricRequest { + return { + name: object.name, + view: isSet(object.view) ? quotaViewFromJSON(object.view) : -1 + }; + }, + toAmino(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.view = message.view; + return obj; + }, + fromAminoMsg(object: GetConsumerQuotaMetricRequestAminoMsg): GetConsumerQuotaMetricRequest { + return GetConsumerQuotaMetricRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetConsumerQuotaMetricRequestProtoMsg): GetConsumerQuotaMetricRequest { + return GetConsumerQuotaMetricRequest.decode(message.value); + }, + toProto(message: GetConsumerQuotaMetricRequest): Uint8Array { + return GetConsumerQuotaMetricRequest.encode(message).finish(); + }, + toProtoMsg(message: GetConsumerQuotaMetricRequest): GetConsumerQuotaMetricRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest", + value: GetConsumerQuotaMetricRequest.encode(message).finish() + }; } }; function createBaseGetConsumerQuotaLimitRequest(): GetConsumerQuotaLimitRequest { @@ -1457,6 +1723,7 @@ function createBaseGetConsumerQuotaLimitRequest(): GetConsumerQuotaLimitRequest }; } export const GetConsumerQuotaLimitRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest", encode(message: GetConsumerQuotaLimitRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1521,6 +1788,33 @@ export const GetConsumerQuotaLimitRequest = { obj.name = message.name; message.view !== undefined && (obj.view = quotaViewToJSON(message.view)); return obj; + }, + fromAmino(object: GetConsumerQuotaLimitRequestAmino): GetConsumerQuotaLimitRequest { + return { + name: object.name, + view: isSet(object.view) ? quotaViewFromJSON(object.view) : -1 + }; + }, + toAmino(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.view = message.view; + return obj; + }, + fromAminoMsg(object: GetConsumerQuotaLimitRequestAminoMsg): GetConsumerQuotaLimitRequest { + return GetConsumerQuotaLimitRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetConsumerQuotaLimitRequestProtoMsg): GetConsumerQuotaLimitRequest { + return GetConsumerQuotaLimitRequest.decode(message.value); + }, + toProto(message: GetConsumerQuotaLimitRequest): Uint8Array { + return GetConsumerQuotaLimitRequest.encode(message).finish(); + }, + toProtoMsg(message: GetConsumerQuotaLimitRequest): GetConsumerQuotaLimitRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest", + value: GetConsumerQuotaLimitRequest.encode(message).finish() + }; } }; function createBaseCreateAdminOverrideRequest(): CreateAdminOverrideRequest { @@ -1532,6 +1826,7 @@ function createBaseCreateAdminOverrideRequest(): CreateAdminOverrideRequest { }; } export const CreateAdminOverrideRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest", encode(message: CreateAdminOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1637,6 +1932,41 @@ export const CreateAdminOverrideRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: CreateAdminOverrideRequestAmino): CreateAdminOverrideRequest { + return { + parent: object.parent, + override: object?.override ? QuotaOverride.fromAmino(object.override) : undefined, + force: object.force, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; + obj.force = message.force; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: CreateAdminOverrideRequestAminoMsg): CreateAdminOverrideRequest { + return CreateAdminOverrideRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateAdminOverrideRequestProtoMsg): CreateAdminOverrideRequest { + return CreateAdminOverrideRequest.decode(message.value); + }, + toProto(message: CreateAdminOverrideRequest): Uint8Array { + return CreateAdminOverrideRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateAdminOverrideRequest): CreateAdminOverrideRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest", + value: CreateAdminOverrideRequest.encode(message).finish() + }; } }; function createBaseUpdateAdminOverrideRequest(): UpdateAdminOverrideRequest { @@ -1649,6 +1979,7 @@ function createBaseUpdateAdminOverrideRequest(): UpdateAdminOverrideRequest { }; } export const UpdateAdminOverrideRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest", encode(message: UpdateAdminOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1766,6 +2097,43 @@ export const UpdateAdminOverrideRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: UpdateAdminOverrideRequestAmino): UpdateAdminOverrideRequest { + return { + name: object.name, + override: object?.override ? QuotaOverride.fromAmino(object.override) : undefined, + force: object.force, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; + obj.force = message.force; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: UpdateAdminOverrideRequestAminoMsg): UpdateAdminOverrideRequest { + return UpdateAdminOverrideRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateAdminOverrideRequestProtoMsg): UpdateAdminOverrideRequest { + return UpdateAdminOverrideRequest.decode(message.value); + }, + toProto(message: UpdateAdminOverrideRequest): Uint8Array { + return UpdateAdminOverrideRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateAdminOverrideRequest): UpdateAdminOverrideRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest", + value: UpdateAdminOverrideRequest.encode(message).finish() + }; } }; function createBaseDeleteAdminOverrideRequest(): DeleteAdminOverrideRequest { @@ -1776,6 +2144,7 @@ function createBaseDeleteAdminOverrideRequest(): DeleteAdminOverrideRequest { }; } export const DeleteAdminOverrideRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest", encode(message: DeleteAdminOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1869,6 +2238,39 @@ export const DeleteAdminOverrideRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: DeleteAdminOverrideRequestAmino): DeleteAdminOverrideRequest { + return { + name: object.name, + force: object.force, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.force = message.force; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: DeleteAdminOverrideRequestAminoMsg): DeleteAdminOverrideRequest { + return DeleteAdminOverrideRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteAdminOverrideRequestProtoMsg): DeleteAdminOverrideRequest { + return DeleteAdminOverrideRequest.decode(message.value); + }, + toProto(message: DeleteAdminOverrideRequest): Uint8Array { + return DeleteAdminOverrideRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteAdminOverrideRequest): DeleteAdminOverrideRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest", + value: DeleteAdminOverrideRequest.encode(message).finish() + }; } }; function createBaseListAdminOverridesRequest(): ListAdminOverridesRequest { @@ -1879,6 +2281,7 @@ function createBaseListAdminOverridesRequest(): ListAdminOverridesRequest { }; } export const ListAdminOverridesRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest", encode(message: ListAdminOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1955,6 +2358,35 @@ export const ListAdminOverridesRequest = { obj.page_size = message.pageSize; obj.page_token = message.pageToken; return obj; + }, + fromAmino(object: ListAdminOverridesRequestAmino): ListAdminOverridesRequest { + return { + parent: object.parent, + pageSize: object.page_size, + pageToken: object.page_token + }; + }, + toAmino(message: ListAdminOverridesRequest): ListAdminOverridesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + return obj; + }, + fromAminoMsg(object: ListAdminOverridesRequestAminoMsg): ListAdminOverridesRequest { + return ListAdminOverridesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListAdminOverridesRequestProtoMsg): ListAdminOverridesRequest { + return ListAdminOverridesRequest.decode(message.value); + }, + toProto(message: ListAdminOverridesRequest): Uint8Array { + return ListAdminOverridesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListAdminOverridesRequest): ListAdminOverridesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest", + value: ListAdminOverridesRequest.encode(message).finish() + }; } }; function createBaseListAdminOverridesResponse(): ListAdminOverridesResponse { @@ -1964,6 +2396,7 @@ function createBaseListAdminOverridesResponse(): ListAdminOverridesResponse { }; } export const ListAdminOverridesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse", encode(message: ListAdminOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2036,6 +2469,37 @@ export const ListAdminOverridesResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListAdminOverridesResponseAmino): ListAdminOverridesResponse { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListAdminOverridesResponse): ListAdminOverridesResponseAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListAdminOverridesResponseAminoMsg): ListAdminOverridesResponse { + return ListAdminOverridesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListAdminOverridesResponseProtoMsg): ListAdminOverridesResponse { + return ListAdminOverridesResponse.decode(message.value); + }, + toProto(message: ListAdminOverridesResponse): Uint8Array { + return ListAdminOverridesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListAdminOverridesResponse): ListAdminOverridesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse", + value: ListAdminOverridesResponse.encode(message).finish() + }; } }; function createBaseBatchCreateAdminOverridesResponse(): BatchCreateAdminOverridesResponse { @@ -2044,6 +2508,7 @@ function createBaseBatchCreateAdminOverridesResponse(): BatchCreateAdminOverride }; } export const BatchCreateAdminOverridesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse", encode(message: BatchCreateAdminOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2104,18 +2569,48 @@ export const BatchCreateAdminOverridesResponse = { obj.overrides = []; } return obj; - } -}; -function createBaseImportAdminOverridesRequest(): ImportAdminOverridesRequest { - return { - parent: "", - inlineSource: undefined, - force: false, - forceOnly: [] - }; -} -export const ImportAdminOverridesRequest = { - encode(message: ImportAdminOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + }, + fromAmino(object: BatchCreateAdminOverridesResponseAmino): BatchCreateAdminOverridesResponse { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [] + }; + }, + toAmino(message: BatchCreateAdminOverridesResponse): BatchCreateAdminOverridesResponseAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + return obj; + }, + fromAminoMsg(object: BatchCreateAdminOverridesResponseAminoMsg): BatchCreateAdminOverridesResponse { + return BatchCreateAdminOverridesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: BatchCreateAdminOverridesResponseProtoMsg): BatchCreateAdminOverridesResponse { + return BatchCreateAdminOverridesResponse.decode(message.value); + }, + toProto(message: BatchCreateAdminOverridesResponse): Uint8Array { + return BatchCreateAdminOverridesResponse.encode(message).finish(); + }, + toProtoMsg(message: BatchCreateAdminOverridesResponse): BatchCreateAdminOverridesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse", + value: BatchCreateAdminOverridesResponse.encode(message).finish() + }; + } +}; +function createBaseImportAdminOverridesRequest(): ImportAdminOverridesRequest { + return { + parent: "", + inlineSource: undefined, + force: false, + forceOnly: [] + }; +} +export const ImportAdminOverridesRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest", + encode(message: ImportAdminOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -2220,6 +2715,41 @@ export const ImportAdminOverridesRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: ImportAdminOverridesRequestAmino): ImportAdminOverridesRequest { + return { + parent: object.parent, + inlineSource: object?.inline_source ? OverrideInlineSource.fromAmino(object.inline_source) : undefined, + force: object.force, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; + obj.force = message.force; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: ImportAdminOverridesRequestAminoMsg): ImportAdminOverridesRequest { + return ImportAdminOverridesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ImportAdminOverridesRequestProtoMsg): ImportAdminOverridesRequest { + return ImportAdminOverridesRequest.decode(message.value); + }, + toProto(message: ImportAdminOverridesRequest): Uint8Array { + return ImportAdminOverridesRequest.encode(message).finish(); + }, + toProtoMsg(message: ImportAdminOverridesRequest): ImportAdminOverridesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest", + value: ImportAdminOverridesRequest.encode(message).finish() + }; } }; function createBaseImportAdminOverridesResponse(): ImportAdminOverridesResponse { @@ -2228,6 +2758,7 @@ function createBaseImportAdminOverridesResponse(): ImportAdminOverridesResponse }; } export const ImportAdminOverridesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse", encode(message: ImportAdminOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2288,12 +2819,42 @@ export const ImportAdminOverridesResponse = { obj.overrides = []; } return obj; + }, + fromAmino(object: ImportAdminOverridesResponseAmino): ImportAdminOverridesResponse { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [] + }; + }, + toAmino(message: ImportAdminOverridesResponse): ImportAdminOverridesResponseAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + return obj; + }, + fromAminoMsg(object: ImportAdminOverridesResponseAminoMsg): ImportAdminOverridesResponse { + return ImportAdminOverridesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ImportAdminOverridesResponseProtoMsg): ImportAdminOverridesResponse { + return ImportAdminOverridesResponse.decode(message.value); + }, + toProto(message: ImportAdminOverridesResponse): Uint8Array { + return ImportAdminOverridesResponse.encode(message).finish(); + }, + toProtoMsg(message: ImportAdminOverridesResponse): ImportAdminOverridesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse", + value: ImportAdminOverridesResponse.encode(message).finish() + }; } }; function createBaseImportAdminOverridesMetadata(): ImportAdminOverridesMetadata { return {}; } export const ImportAdminOverridesMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata", encode(_: ImportAdminOverridesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2331,6 +2892,28 @@ export const ImportAdminOverridesMetadata = { toSDK(_: ImportAdminOverridesMetadata): ImportAdminOverridesMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ImportAdminOverridesMetadataAmino): ImportAdminOverridesMetadata { + return {}; + }, + toAmino(_: ImportAdminOverridesMetadata): ImportAdminOverridesMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ImportAdminOverridesMetadataAminoMsg): ImportAdminOverridesMetadata { + return ImportAdminOverridesMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: ImportAdminOverridesMetadataProtoMsg): ImportAdminOverridesMetadata { + return ImportAdminOverridesMetadata.decode(message.value); + }, + toProto(message: ImportAdminOverridesMetadata): Uint8Array { + return ImportAdminOverridesMetadata.encode(message).finish(); + }, + toProtoMsg(message: ImportAdminOverridesMetadata): ImportAdminOverridesMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata", + value: ImportAdminOverridesMetadata.encode(message).finish() + }; } }; function createBaseCreateConsumerOverrideRequest(): CreateConsumerOverrideRequest { @@ -2342,6 +2925,7 @@ function createBaseCreateConsumerOverrideRequest(): CreateConsumerOverrideReques }; } export const CreateConsumerOverrideRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest", encode(message: CreateConsumerOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -2447,6 +3031,41 @@ export const CreateConsumerOverrideRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: CreateConsumerOverrideRequestAmino): CreateConsumerOverrideRequest { + return { + parent: object.parent, + override: object?.override ? QuotaOverride.fromAmino(object.override) : undefined, + force: object.force, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; + obj.force = message.force; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: CreateConsumerOverrideRequestAminoMsg): CreateConsumerOverrideRequest { + return CreateConsumerOverrideRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateConsumerOverrideRequestProtoMsg): CreateConsumerOverrideRequest { + return CreateConsumerOverrideRequest.decode(message.value); + }, + toProto(message: CreateConsumerOverrideRequest): Uint8Array { + return CreateConsumerOverrideRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateConsumerOverrideRequest): CreateConsumerOverrideRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest", + value: CreateConsumerOverrideRequest.encode(message).finish() + }; } }; function createBaseUpdateConsumerOverrideRequest(): UpdateConsumerOverrideRequest { @@ -2459,6 +3078,7 @@ function createBaseUpdateConsumerOverrideRequest(): UpdateConsumerOverrideReques }; } export const UpdateConsumerOverrideRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest", encode(message: UpdateConsumerOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2576,6 +3196,43 @@ export const UpdateConsumerOverrideRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: UpdateConsumerOverrideRequestAmino): UpdateConsumerOverrideRequest { + return { + name: object.name, + override: object?.override ? QuotaOverride.fromAmino(object.override) : undefined, + force: object.force, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.override = message.override ? QuotaOverride.toAmino(message.override) : undefined; + obj.force = message.force; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: UpdateConsumerOverrideRequestAminoMsg): UpdateConsumerOverrideRequest { + return UpdateConsumerOverrideRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateConsumerOverrideRequestProtoMsg): UpdateConsumerOverrideRequest { + return UpdateConsumerOverrideRequest.decode(message.value); + }, + toProto(message: UpdateConsumerOverrideRequest): Uint8Array { + return UpdateConsumerOverrideRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateConsumerOverrideRequest): UpdateConsumerOverrideRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest", + value: UpdateConsumerOverrideRequest.encode(message).finish() + }; } }; function createBaseDeleteConsumerOverrideRequest(): DeleteConsumerOverrideRequest { @@ -2586,6 +3243,7 @@ function createBaseDeleteConsumerOverrideRequest(): DeleteConsumerOverrideReques }; } export const DeleteConsumerOverrideRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest", encode(message: DeleteConsumerOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2679,6 +3337,39 @@ export const DeleteConsumerOverrideRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: DeleteConsumerOverrideRequestAmino): DeleteConsumerOverrideRequest { + return { + name: object.name, + force: object.force, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.force = message.force; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: DeleteConsumerOverrideRequestAminoMsg): DeleteConsumerOverrideRequest { + return DeleteConsumerOverrideRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteConsumerOverrideRequestProtoMsg): DeleteConsumerOverrideRequest { + return DeleteConsumerOverrideRequest.decode(message.value); + }, + toProto(message: DeleteConsumerOverrideRequest): Uint8Array { + return DeleteConsumerOverrideRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteConsumerOverrideRequest): DeleteConsumerOverrideRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest", + value: DeleteConsumerOverrideRequest.encode(message).finish() + }; } }; function createBaseListConsumerOverridesRequest(): ListConsumerOverridesRequest { @@ -2689,6 +3380,7 @@ function createBaseListConsumerOverridesRequest(): ListConsumerOverridesRequest }; } export const ListConsumerOverridesRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest", encode(message: ListConsumerOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -2765,6 +3457,35 @@ export const ListConsumerOverridesRequest = { obj.page_size = message.pageSize; obj.page_token = message.pageToken; return obj; + }, + fromAmino(object: ListConsumerOverridesRequestAmino): ListConsumerOverridesRequest { + return { + parent: object.parent, + pageSize: object.page_size, + pageToken: object.page_token + }; + }, + toAmino(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + return obj; + }, + fromAminoMsg(object: ListConsumerOverridesRequestAminoMsg): ListConsumerOverridesRequest { + return ListConsumerOverridesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListConsumerOverridesRequestProtoMsg): ListConsumerOverridesRequest { + return ListConsumerOverridesRequest.decode(message.value); + }, + toProto(message: ListConsumerOverridesRequest): Uint8Array { + return ListConsumerOverridesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListConsumerOverridesRequest): ListConsumerOverridesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest", + value: ListConsumerOverridesRequest.encode(message).finish() + }; } }; function createBaseListConsumerOverridesResponse(): ListConsumerOverridesResponse { @@ -2774,6 +3495,7 @@ function createBaseListConsumerOverridesResponse(): ListConsumerOverridesRespons }; } export const ListConsumerOverridesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse", encode(message: ListConsumerOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2846,6 +3568,37 @@ export const ListConsumerOverridesResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListConsumerOverridesResponseAmino): ListConsumerOverridesResponse { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListConsumerOverridesResponse): ListConsumerOverridesResponseAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListConsumerOverridesResponseAminoMsg): ListConsumerOverridesResponse { + return ListConsumerOverridesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListConsumerOverridesResponseProtoMsg): ListConsumerOverridesResponse { + return ListConsumerOverridesResponse.decode(message.value); + }, + toProto(message: ListConsumerOverridesResponse): Uint8Array { + return ListConsumerOverridesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListConsumerOverridesResponse): ListConsumerOverridesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse", + value: ListConsumerOverridesResponse.encode(message).finish() + }; } }; function createBaseBatchCreateConsumerOverridesResponse(): BatchCreateConsumerOverridesResponse { @@ -2854,6 +3607,7 @@ function createBaseBatchCreateConsumerOverridesResponse(): BatchCreateConsumerOv }; } export const BatchCreateConsumerOverridesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse", encode(message: BatchCreateConsumerOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2914,6 +3668,35 @@ export const BatchCreateConsumerOverridesResponse = { obj.overrides = []; } return obj; + }, + fromAmino(object: BatchCreateConsumerOverridesResponseAmino): BatchCreateConsumerOverridesResponse { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [] + }; + }, + toAmino(message: BatchCreateConsumerOverridesResponse): BatchCreateConsumerOverridesResponseAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + return obj; + }, + fromAminoMsg(object: BatchCreateConsumerOverridesResponseAminoMsg): BatchCreateConsumerOverridesResponse { + return BatchCreateConsumerOverridesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: BatchCreateConsumerOverridesResponseProtoMsg): BatchCreateConsumerOverridesResponse { + return BatchCreateConsumerOverridesResponse.decode(message.value); + }, + toProto(message: BatchCreateConsumerOverridesResponse): Uint8Array { + return BatchCreateConsumerOverridesResponse.encode(message).finish(); + }, + toProtoMsg(message: BatchCreateConsumerOverridesResponse): BatchCreateConsumerOverridesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse", + value: BatchCreateConsumerOverridesResponse.encode(message).finish() + }; } }; function createBaseImportConsumerOverridesRequest(): ImportConsumerOverridesRequest { @@ -2925,6 +3708,7 @@ function createBaseImportConsumerOverridesRequest(): ImportConsumerOverridesRequ }; } export const ImportConsumerOverridesRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest", encode(message: ImportConsumerOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -3030,6 +3814,41 @@ export const ImportConsumerOverridesRequest = { obj.force_only = []; } return obj; + }, + fromAmino(object: ImportConsumerOverridesRequestAmino): ImportConsumerOverridesRequest { + return { + parent: object.parent, + inlineSource: object?.inline_source ? OverrideInlineSource.fromAmino(object.inline_source) : undefined, + force: object.force, + forceOnly: Array.isArray(object?.force_only) ? object.force_only.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] + }; + }, + toAmino(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.inline_source = message.inlineSource ? OverrideInlineSource.toAmino(message.inlineSource) : undefined; + obj.force = message.force; + if (message.forceOnly) { + obj.force_only = message.forceOnly.map(e => quotaSafetyCheckToJSON(e)); + } else { + obj.force_only = []; + } + return obj; + }, + fromAminoMsg(object: ImportConsumerOverridesRequestAminoMsg): ImportConsumerOverridesRequest { + return ImportConsumerOverridesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ImportConsumerOverridesRequestProtoMsg): ImportConsumerOverridesRequest { + return ImportConsumerOverridesRequest.decode(message.value); + }, + toProto(message: ImportConsumerOverridesRequest): Uint8Array { + return ImportConsumerOverridesRequest.encode(message).finish(); + }, + toProtoMsg(message: ImportConsumerOverridesRequest): ImportConsumerOverridesRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest", + value: ImportConsumerOverridesRequest.encode(message).finish() + }; } }; function createBaseImportConsumerOverridesResponse(): ImportConsumerOverridesResponse { @@ -3038,6 +3857,7 @@ function createBaseImportConsumerOverridesResponse(): ImportConsumerOverridesRes }; } export const ImportConsumerOverridesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse", encode(message: ImportConsumerOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3098,12 +3918,42 @@ export const ImportConsumerOverridesResponse = { obj.overrides = []; } return obj; + }, + fromAmino(object: ImportConsumerOverridesResponseAmino): ImportConsumerOverridesResponse { + return { + overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromAmino(e)) : [] + }; + }, + toAmino(message: ImportConsumerOverridesResponse): ImportConsumerOverridesResponseAmino { + const obj: any = {}; + if (message.overrides) { + obj.overrides = message.overrides.map(e => e ? QuotaOverride.toAmino(e) : undefined); + } else { + obj.overrides = []; + } + return obj; + }, + fromAminoMsg(object: ImportConsumerOverridesResponseAminoMsg): ImportConsumerOverridesResponse { + return ImportConsumerOverridesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ImportConsumerOverridesResponseProtoMsg): ImportConsumerOverridesResponse { + return ImportConsumerOverridesResponse.decode(message.value); + }, + toProto(message: ImportConsumerOverridesResponse): Uint8Array { + return ImportConsumerOverridesResponse.encode(message).finish(); + }, + toProtoMsg(message: ImportConsumerOverridesResponse): ImportConsumerOverridesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse", + value: ImportConsumerOverridesResponse.encode(message).finish() + }; } }; function createBaseImportConsumerOverridesMetadata(): ImportConsumerOverridesMetadata { return {}; } export const ImportConsumerOverridesMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata", encode(_: ImportConsumerOverridesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -3141,6 +3991,28 @@ export const ImportConsumerOverridesMetadata = { toSDK(_: ImportConsumerOverridesMetadata): ImportConsumerOverridesMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ImportConsumerOverridesMetadataAmino): ImportConsumerOverridesMetadata { + return {}; + }, + toAmino(_: ImportConsumerOverridesMetadata): ImportConsumerOverridesMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ImportConsumerOverridesMetadataAminoMsg): ImportConsumerOverridesMetadata { + return ImportConsumerOverridesMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: ImportConsumerOverridesMetadataProtoMsg): ImportConsumerOverridesMetadata { + return ImportConsumerOverridesMetadata.decode(message.value); + }, + toProto(message: ImportConsumerOverridesMetadata): Uint8Array { + return ImportConsumerOverridesMetadata.encode(message).finish(); + }, + toProtoMsg(message: ImportConsumerOverridesMetadata): ImportConsumerOverridesMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata", + value: ImportConsumerOverridesMetadata.encode(message).finish() + }; } }; function createBaseImportAdminQuotaPoliciesResponse(): ImportAdminQuotaPoliciesResponse { @@ -3149,6 +4021,7 @@ function createBaseImportAdminQuotaPoliciesResponse(): ImportAdminQuotaPoliciesR }; } export const ImportAdminQuotaPoliciesResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse", encode(message: ImportAdminQuotaPoliciesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.policies) { AdminQuotaPolicy.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3209,12 +4082,42 @@ export const ImportAdminQuotaPoliciesResponse = { obj.policies = []; } return obj; + }, + fromAmino(object: ImportAdminQuotaPoliciesResponseAmino): ImportAdminQuotaPoliciesResponse { + return { + policies: Array.isArray(object?.policies) ? object.policies.map((e: any) => AdminQuotaPolicy.fromAmino(e)) : [] + }; + }, + toAmino(message: ImportAdminQuotaPoliciesResponse): ImportAdminQuotaPoliciesResponseAmino { + const obj: any = {}; + if (message.policies) { + obj.policies = message.policies.map(e => e ? AdminQuotaPolicy.toAmino(e) : undefined); + } else { + obj.policies = []; + } + return obj; + }, + fromAminoMsg(object: ImportAdminQuotaPoliciesResponseAminoMsg): ImportAdminQuotaPoliciesResponse { + return ImportAdminQuotaPoliciesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ImportAdminQuotaPoliciesResponseProtoMsg): ImportAdminQuotaPoliciesResponse { + return ImportAdminQuotaPoliciesResponse.decode(message.value); + }, + toProto(message: ImportAdminQuotaPoliciesResponse): Uint8Array { + return ImportAdminQuotaPoliciesResponse.encode(message).finish(); + }, + toProtoMsg(message: ImportAdminQuotaPoliciesResponse): ImportAdminQuotaPoliciesResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse", + value: ImportAdminQuotaPoliciesResponse.encode(message).finish() + }; } }; function createBaseImportAdminQuotaPoliciesMetadata(): ImportAdminQuotaPoliciesMetadata { return {}; } export const ImportAdminQuotaPoliciesMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata", encode(_: ImportAdminQuotaPoliciesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -3252,12 +4155,35 @@ export const ImportAdminQuotaPoliciesMetadata = { toSDK(_: ImportAdminQuotaPoliciesMetadata): ImportAdminQuotaPoliciesMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ImportAdminQuotaPoliciesMetadataAmino): ImportAdminQuotaPoliciesMetadata { + return {}; + }, + toAmino(_: ImportAdminQuotaPoliciesMetadata): ImportAdminQuotaPoliciesMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ImportAdminQuotaPoliciesMetadataAminoMsg): ImportAdminQuotaPoliciesMetadata { + return ImportAdminQuotaPoliciesMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: ImportAdminQuotaPoliciesMetadataProtoMsg): ImportAdminQuotaPoliciesMetadata { + return ImportAdminQuotaPoliciesMetadata.decode(message.value); + }, + toProto(message: ImportAdminQuotaPoliciesMetadata): Uint8Array { + return ImportAdminQuotaPoliciesMetadata.encode(message).finish(); + }, + toProtoMsg(message: ImportAdminQuotaPoliciesMetadata): ImportAdminQuotaPoliciesMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata", + value: ImportAdminQuotaPoliciesMetadata.encode(message).finish() + }; } }; function createBaseCreateAdminQuotaPolicyMetadata(): CreateAdminQuotaPolicyMetadata { return {}; } export const CreateAdminQuotaPolicyMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata", encode(_: CreateAdminQuotaPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -3295,12 +4221,35 @@ export const CreateAdminQuotaPolicyMetadata = { toSDK(_: CreateAdminQuotaPolicyMetadata): CreateAdminQuotaPolicyMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: CreateAdminQuotaPolicyMetadataAmino): CreateAdminQuotaPolicyMetadata { + return {}; + }, + toAmino(_: CreateAdminQuotaPolicyMetadata): CreateAdminQuotaPolicyMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: CreateAdminQuotaPolicyMetadataAminoMsg): CreateAdminQuotaPolicyMetadata { + return CreateAdminQuotaPolicyMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: CreateAdminQuotaPolicyMetadataProtoMsg): CreateAdminQuotaPolicyMetadata { + return CreateAdminQuotaPolicyMetadata.decode(message.value); + }, + toProto(message: CreateAdminQuotaPolicyMetadata): Uint8Array { + return CreateAdminQuotaPolicyMetadata.encode(message).finish(); + }, + toProtoMsg(message: CreateAdminQuotaPolicyMetadata): CreateAdminQuotaPolicyMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata", + value: CreateAdminQuotaPolicyMetadata.encode(message).finish() + }; } }; function createBaseUpdateAdminQuotaPolicyMetadata(): UpdateAdminQuotaPolicyMetadata { return {}; } export const UpdateAdminQuotaPolicyMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata", encode(_: UpdateAdminQuotaPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -3338,12 +4287,35 @@ export const UpdateAdminQuotaPolicyMetadata = { toSDK(_: UpdateAdminQuotaPolicyMetadata): UpdateAdminQuotaPolicyMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: UpdateAdminQuotaPolicyMetadataAmino): UpdateAdminQuotaPolicyMetadata { + return {}; + }, + toAmino(_: UpdateAdminQuotaPolicyMetadata): UpdateAdminQuotaPolicyMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: UpdateAdminQuotaPolicyMetadataAminoMsg): UpdateAdminQuotaPolicyMetadata { + return UpdateAdminQuotaPolicyMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateAdminQuotaPolicyMetadataProtoMsg): UpdateAdminQuotaPolicyMetadata { + return UpdateAdminQuotaPolicyMetadata.decode(message.value); + }, + toProto(message: UpdateAdminQuotaPolicyMetadata): Uint8Array { + return UpdateAdminQuotaPolicyMetadata.encode(message).finish(); + }, + toProtoMsg(message: UpdateAdminQuotaPolicyMetadata): UpdateAdminQuotaPolicyMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata", + value: UpdateAdminQuotaPolicyMetadata.encode(message).finish() + }; } }; function createBaseDeleteAdminQuotaPolicyMetadata(): DeleteAdminQuotaPolicyMetadata { return {}; } export const DeleteAdminQuotaPolicyMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata", encode(_: DeleteAdminQuotaPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -3381,6 +4353,28 @@ export const DeleteAdminQuotaPolicyMetadata = { toSDK(_: DeleteAdminQuotaPolicyMetadata): DeleteAdminQuotaPolicyMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: DeleteAdminQuotaPolicyMetadataAmino): DeleteAdminQuotaPolicyMetadata { + return {}; + }, + toAmino(_: DeleteAdminQuotaPolicyMetadata): DeleteAdminQuotaPolicyMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: DeleteAdminQuotaPolicyMetadataAminoMsg): DeleteAdminQuotaPolicyMetadata { + return DeleteAdminQuotaPolicyMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteAdminQuotaPolicyMetadataProtoMsg): DeleteAdminQuotaPolicyMetadata { + return DeleteAdminQuotaPolicyMetadata.decode(message.value); + }, + toProto(message: DeleteAdminQuotaPolicyMetadata): Uint8Array { + return DeleteAdminQuotaPolicyMetadata.encode(message).finish(); + }, + toProtoMsg(message: DeleteAdminQuotaPolicyMetadata): DeleteAdminQuotaPolicyMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata", + value: DeleteAdminQuotaPolicyMetadata.encode(message).finish() + }; } }; function createBaseGenerateServiceIdentityRequest(): GenerateServiceIdentityRequest { @@ -3389,6 +4383,7 @@ function createBaseGenerateServiceIdentityRequest(): GenerateServiceIdentityRequ }; } export const GenerateServiceIdentityRequest = { + typeUrl: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest", encode(message: GenerateServiceIdentityRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -3441,6 +4436,31 @@ export const GenerateServiceIdentityRequest = { const obj: any = {}; obj.parent = message.parent; return obj; + }, + fromAmino(object: GenerateServiceIdentityRequestAmino): GenerateServiceIdentityRequest { + return { + parent: object.parent + }; + }, + toAmino(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + return obj; + }, + fromAminoMsg(object: GenerateServiceIdentityRequestAminoMsg): GenerateServiceIdentityRequest { + return GenerateServiceIdentityRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GenerateServiceIdentityRequestProtoMsg): GenerateServiceIdentityRequest { + return GenerateServiceIdentityRequest.decode(message.value); + }, + toProto(message: GenerateServiceIdentityRequest): Uint8Array { + return GenerateServiceIdentityRequest.encode(message).finish(); + }, + toProtoMsg(message: GenerateServiceIdentityRequest): GenerateServiceIdentityRequestProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest", + value: GenerateServiceIdentityRequest.encode(message).finish() + }; } }; function createBaseGetServiceIdentityResponse(): GetServiceIdentityResponse { @@ -3450,6 +4470,7 @@ function createBaseGetServiceIdentityResponse(): GetServiceIdentityResponse { }; } export const GetServiceIdentityResponse = { + typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse", encode(message: GetServiceIdentityResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identity !== undefined) { ServiceIdentity.encode(message.identity, writer.uint32(10).fork()).ldelim(); @@ -3514,12 +4535,40 @@ export const GetServiceIdentityResponse = { message.identity !== undefined && (obj.identity = message.identity ? ServiceIdentity.toSDK(message.identity) : undefined); message.state !== undefined && (obj.state = getServiceIdentityResponse_IdentityStateToJSON(message.state)); return obj; + }, + fromAmino(object: GetServiceIdentityResponseAmino): GetServiceIdentityResponse { + return { + identity: object?.identity ? ServiceIdentity.fromAmino(object.identity) : undefined, + state: isSet(object.state) ? getServiceIdentityResponse_IdentityStateFromJSON(object.state) : -1 + }; + }, + toAmino(message: GetServiceIdentityResponse): GetServiceIdentityResponseAmino { + const obj: any = {}; + obj.identity = message.identity ? ServiceIdentity.toAmino(message.identity) : undefined; + obj.state = message.state; + return obj; + }, + fromAminoMsg(object: GetServiceIdentityResponseAminoMsg): GetServiceIdentityResponse { + return GetServiceIdentityResponse.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceIdentityResponseProtoMsg): GetServiceIdentityResponse { + return GetServiceIdentityResponse.decode(message.value); + }, + toProto(message: GetServiceIdentityResponse): Uint8Array { + return GetServiceIdentityResponse.encode(message).finish(); + }, + toProtoMsg(message: GetServiceIdentityResponse): GetServiceIdentityResponseProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse", + value: GetServiceIdentityResponse.encode(message).finish() + }; } }; function createBaseGetServiceIdentityMetadata(): GetServiceIdentityMetadata { return {}; } export const GetServiceIdentityMetadata = { + typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata", encode(_: GetServiceIdentityMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -3557,5 +4606,27 @@ export const GetServiceIdentityMetadata = { toSDK(_: GetServiceIdentityMetadata): GetServiceIdentityMetadataSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: GetServiceIdentityMetadataAmino): GetServiceIdentityMetadata { + return {}; + }, + toAmino(_: GetServiceIdentityMetadata): GetServiceIdentityMetadataAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: GetServiceIdentityMetadataAminoMsg): GetServiceIdentityMetadata { + return GetServiceIdentityMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: GetServiceIdentityMetadataProtoMsg): GetServiceIdentityMetadata { + return GetServiceIdentityMetadata.decode(message.value); + }, + toProto(message: GetServiceIdentityMetadata): Uint8Array { + return GetServiceIdentityMetadata.encode(message).finish(); + }, + toProtoMsg(message: GetServiceIdentityMetadata): GetServiceIdentityMetadataProtoMsg { + return { + typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata", + value: GetServiceIdentityMetadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/source_info.ts b/__fixtures__/v-next/outputosmojs/google/api/source_info.ts index c65b1bd3db..8ff96a91c2 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/source_info.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/source_info.ts @@ -17,6 +17,7 @@ function createBaseSourceInfo(): SourceInfo { }; } export const SourceInfo = { + typeUrl: "/google.api.SourceInfo", encode(message: SourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.sourceFiles) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -77,5 +78,34 @@ export const SourceInfo = { obj.source_files = []; } return obj; + }, + fromAmino(object: SourceInfoAmino): SourceInfo { + return { + sourceFiles: Array.isArray(object?.source_files) ? object.source_files.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: SourceInfo): SourceInfoAmino { + const obj: any = {}; + if (message.sourceFiles) { + obj.source_files = message.sourceFiles.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.source_files = []; + } + return obj; + }, + fromAminoMsg(object: SourceInfoAminoMsg): SourceInfo { + return SourceInfo.fromAmino(object.value); + }, + fromProtoMsg(message: SourceInfoProtoMsg): SourceInfo { + return SourceInfo.decode(message.value); + }, + toProto(message: SourceInfo): Uint8Array { + return SourceInfo.encode(message).finish(); + }, + toProtoMsg(message: SourceInfo): SourceInfoProtoMsg { + return { + typeUrl: "/google.api.SourceInfo", + value: SourceInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts b/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts index 264b661908..2e4357b210 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/system_parameter.ts @@ -118,6 +118,7 @@ function createBaseSystemParameters(): SystemParameters { }; } export const SystemParameters = { + typeUrl: "/google.api.SystemParameters", encode(message: SystemParameters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { SystemParameterRule.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -178,6 +179,35 @@ export const SystemParameters = { obj.rules = []; } return obj; + }, + fromAmino(object: SystemParametersAmino): SystemParameters { + return { + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => SystemParameterRule.fromAmino(e)) : [] + }; + }, + toAmino(message: SystemParameters): SystemParametersAmino { + const obj: any = {}; + if (message.rules) { + obj.rules = message.rules.map(e => e ? SystemParameterRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + return obj; + }, + fromAminoMsg(object: SystemParametersAminoMsg): SystemParameters { + return SystemParameters.fromAmino(object.value); + }, + fromProtoMsg(message: SystemParametersProtoMsg): SystemParameters { + return SystemParameters.decode(message.value); + }, + toProto(message: SystemParameters): Uint8Array { + return SystemParameters.encode(message).finish(); + }, + toProtoMsg(message: SystemParameters): SystemParametersProtoMsg { + return { + typeUrl: "/google.api.SystemParameters", + value: SystemParameters.encode(message).finish() + }; } }; function createBaseSystemParameterRule(): SystemParameterRule { @@ -187,6 +217,7 @@ function createBaseSystemParameterRule(): SystemParameterRule { }; } export const SystemParameterRule = { + typeUrl: "/google.api.SystemParameterRule", encode(message: SystemParameterRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -259,6 +290,37 @@ export const SystemParameterRule = { obj.parameters = []; } return obj; + }, + fromAmino(object: SystemParameterRuleAmino): SystemParameterRule { + return { + selector: object.selector, + parameters: Array.isArray(object?.parameters) ? object.parameters.map((e: any) => SystemParameter.fromAmino(e)) : [] + }; + }, + toAmino(message: SystemParameterRule): SystemParameterRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + if (message.parameters) { + obj.parameters = message.parameters.map(e => e ? SystemParameter.toAmino(e) : undefined); + } else { + obj.parameters = []; + } + return obj; + }, + fromAminoMsg(object: SystemParameterRuleAminoMsg): SystemParameterRule { + return SystemParameterRule.fromAmino(object.value); + }, + fromProtoMsg(message: SystemParameterRuleProtoMsg): SystemParameterRule { + return SystemParameterRule.decode(message.value); + }, + toProto(message: SystemParameterRule): Uint8Array { + return SystemParameterRule.encode(message).finish(); + }, + toProtoMsg(message: SystemParameterRule): SystemParameterRuleProtoMsg { + return { + typeUrl: "/google.api.SystemParameterRule", + value: SystemParameterRule.encode(message).finish() + }; } }; function createBaseSystemParameter(): SystemParameter { @@ -269,6 +331,7 @@ function createBaseSystemParameter(): SystemParameter { }; } export const SystemParameter = { + typeUrl: "/google.api.SystemParameter", encode(message: SystemParameter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -345,5 +408,34 @@ export const SystemParameter = { obj.http_header = message.httpHeader; obj.url_query_parameter = message.urlQueryParameter; return obj; + }, + fromAmino(object: SystemParameterAmino): SystemParameter { + return { + name: object.name, + httpHeader: object.http_header, + urlQueryParameter: object.url_query_parameter + }; + }, + toAmino(message: SystemParameter): SystemParameterAmino { + const obj: any = {}; + obj.name = message.name; + obj.http_header = message.httpHeader; + obj.url_query_parameter = message.urlQueryParameter; + return obj; + }, + fromAminoMsg(object: SystemParameterAminoMsg): SystemParameter { + return SystemParameter.fromAmino(object.value); + }, + fromProtoMsg(message: SystemParameterProtoMsg): SystemParameter { + return SystemParameter.decode(message.value); + }, + toProto(message: SystemParameter): Uint8Array { + return SystemParameter.encode(message).finish(); + }, + toProtoMsg(message: SystemParameter): SystemParameterProtoMsg { + return { + typeUrl: "/google.api.SystemParameter", + value: SystemParameter.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/usage.ts b/__fixtures__/v-next/outputosmojs/google/api/usage.ts index 68b7079371..f506786eda 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/usage.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/usage.ts @@ -127,6 +127,7 @@ function createBaseUsage(): Usage { }; } export const Usage = { + typeUrl: "/google.api.Usage", encode(message: Usage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.requirements) { writer.uint32(10).string(v!); @@ -219,6 +220,43 @@ export const Usage = { } obj.producer_notification_channel = message.producerNotificationChannel; return obj; + }, + fromAmino(object: UsageAmino): Usage { + return { + requirements: Array.isArray(object?.requirements) ? object.requirements.map((e: any) => e) : [], + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => UsageRule.fromAmino(e)) : [], + producerNotificationChannel: object.producer_notification_channel + }; + }, + toAmino(message: Usage): UsageAmino { + const obj: any = {}; + if (message.requirements) { + obj.requirements = message.requirements.map(e => e); + } else { + obj.requirements = []; + } + if (message.rules) { + obj.rules = message.rules.map(e => e ? UsageRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + obj.producer_notification_channel = message.producerNotificationChannel; + return obj; + }, + fromAminoMsg(object: UsageAminoMsg): Usage { + return Usage.fromAmino(object.value); + }, + fromProtoMsg(message: UsageProtoMsg): Usage { + return Usage.decode(message.value); + }, + toProto(message: Usage): Uint8Array { + return Usage.encode(message).finish(); + }, + toProtoMsg(message: Usage): UsageProtoMsg { + return { + typeUrl: "/google.api.Usage", + value: Usage.encode(message).finish() + }; } }; function createBaseUsageRule(): UsageRule { @@ -229,6 +267,7 @@ function createBaseUsageRule(): UsageRule { }; } export const UsageRule = { + typeUrl: "/google.api.UsageRule", encode(message: UsageRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -305,5 +344,34 @@ export const UsageRule = { obj.allow_unregistered_calls = message.allowUnregisteredCalls; obj.skip_service_control = message.skipServiceControl; return obj; + }, + fromAmino(object: UsageRuleAmino): UsageRule { + return { + selector: object.selector, + allowUnregisteredCalls: object.allow_unregistered_calls, + skipServiceControl: object.skip_service_control + }; + }, + toAmino(message: UsageRule): UsageRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.allow_unregistered_calls = message.allowUnregisteredCalls; + obj.skip_service_control = message.skipServiceControl; + return obj; + }, + fromAminoMsg(object: UsageRuleAminoMsg): UsageRule { + return UsageRule.fromAmino(object.value); + }, + fromProtoMsg(message: UsageRuleProtoMsg): UsageRule { + return UsageRule.decode(message.value); + }, + toProto(message: UsageRule): Uint8Array { + return UsageRule.encode(message).finish(); + }, + toProtoMsg(message: UsageRule): UsageRuleProtoMsg { + return { + typeUrl: "/google.api.UsageRule", + value: UsageRule.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/api/visibility.ts b/__fixtures__/v-next/outputosmojs/google/api/visibility.ts index e2d7ac2863..47680155c8 100644 --- a/__fixtures__/v-next/outputosmojs/google/api/visibility.ts +++ b/__fixtures__/v-next/outputosmojs/google/api/visibility.ts @@ -104,6 +104,7 @@ function createBaseVisibility(): Visibility { }; } export const Visibility = { + typeUrl: "/google.api.Visibility", encode(message: Visibility, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { VisibilityRule.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -164,6 +165,35 @@ export const Visibility = { obj.rules = []; } return obj; + }, + fromAmino(object: VisibilityAmino): Visibility { + return { + rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => VisibilityRule.fromAmino(e)) : [] + }; + }, + toAmino(message: Visibility): VisibilityAmino { + const obj: any = {}; + if (message.rules) { + obj.rules = message.rules.map(e => e ? VisibilityRule.toAmino(e) : undefined); + } else { + obj.rules = []; + } + return obj; + }, + fromAminoMsg(object: VisibilityAminoMsg): Visibility { + return Visibility.fromAmino(object.value); + }, + fromProtoMsg(message: VisibilityProtoMsg): Visibility { + return Visibility.decode(message.value); + }, + toProto(message: Visibility): Uint8Array { + return Visibility.encode(message).finish(); + }, + toProtoMsg(message: Visibility): VisibilityProtoMsg { + return { + typeUrl: "/google.api.Visibility", + value: Visibility.encode(message).finish() + }; } }; function createBaseVisibilityRule(): VisibilityRule { @@ -173,6 +203,7 @@ function createBaseVisibilityRule(): VisibilityRule { }; } export const VisibilityRule = { + typeUrl: "/google.api.VisibilityRule", encode(message: VisibilityRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); @@ -237,5 +268,32 @@ export const VisibilityRule = { obj.selector = message.selector; obj.restriction = message.restriction; return obj; + }, + fromAmino(object: VisibilityRuleAmino): VisibilityRule { + return { + selector: object.selector, + restriction: object.restriction + }; + }, + toAmino(message: VisibilityRule): VisibilityRuleAmino { + const obj: any = {}; + obj.selector = message.selector; + obj.restriction = message.restriction; + return obj; + }, + fromAminoMsg(object: VisibilityRuleAminoMsg): VisibilityRule { + return VisibilityRule.fromAmino(object.value); + }, + fromProtoMsg(message: VisibilityRuleProtoMsg): VisibilityRule { + return VisibilityRule.decode(message.value); + }, + toProto(message: VisibilityRule): Uint8Array { + return VisibilityRule.encode(message).finish(); + }, + toProtoMsg(message: VisibilityRule): VisibilityRuleProtoMsg { + return { + typeUrl: "/google.api.VisibilityRule", + value: VisibilityRule.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/logging/type/http_request.ts b/__fixtures__/v-next/outputosmojs/google/logging/type/http_request.ts index 2f20c019d0..b82c744f97 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/type/http_request.ts @@ -123,6 +123,7 @@ function createBaseHttpRequest(): HttpRequest { }; } export const HttpRequest = { + typeUrl: "/google.logging.type.HttpRequest", encode(message: HttpRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.requestMethod !== "") { writer.uint32(10).string(message.requestMethod); @@ -343,5 +344,58 @@ export const HttpRequest = { obj.cache_fill_bytes = message.cacheFillBytes; obj.protocol = message.protocol; return obj; + }, + fromAmino(object: HttpRequestAmino): HttpRequest { + return { + requestMethod: object.request_method, + requestUrl: object.request_url, + requestSize: BigInt(object.request_size), + status: object.status, + responseSize: BigInt(object.response_size), + userAgent: object.user_agent, + remoteIp: object.remote_ip, + serverIp: object.server_ip, + referer: object.referer, + latency: object?.latency ? Duration.fromAmino(object.latency) : undefined, + cacheLookup: object.cache_lookup, + cacheHit: object.cache_hit, + cacheValidatedWithOriginServer: object.cache_validated_with_origin_server, + cacheFillBytes: BigInt(object.cache_fill_bytes), + protocol: object.protocol + }; + }, + toAmino(message: HttpRequest): HttpRequestAmino { + const obj: any = {}; + obj.request_method = message.requestMethod; + obj.request_url = message.requestUrl; + obj.request_size = message.requestSize ? message.requestSize.toString() : undefined; + obj.status = message.status; + obj.response_size = message.responseSize ? message.responseSize.toString() : undefined; + obj.user_agent = message.userAgent; + obj.remote_ip = message.remoteIp; + obj.server_ip = message.serverIp; + obj.referer = message.referer; + obj.latency = message.latency ? Duration.toAmino(message.latency) : undefined; + obj.cache_lookup = message.cacheLookup; + obj.cache_hit = message.cacheHit; + obj.cache_validated_with_origin_server = message.cacheValidatedWithOriginServer; + obj.cache_fill_bytes = message.cacheFillBytes ? message.cacheFillBytes.toString() : undefined; + obj.protocol = message.protocol; + return obj; + }, + fromAminoMsg(object: HttpRequestAminoMsg): HttpRequest { + return HttpRequest.fromAmino(object.value); + }, + fromProtoMsg(message: HttpRequestProtoMsg): HttpRequest { + return HttpRequest.decode(message.value); + }, + toProto(message: HttpRequest): Uint8Array { + return HttpRequest.encode(message).finish(); + }, + toProtoMsg(message: HttpRequest): HttpRequestProtoMsg { + return { + typeUrl: "/google.logging.type.HttpRequest", + value: HttpRequest.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/logging/v2/log_entry.ts b/__fixtures__/v-next/outputosmojs/google/logging/v2/log_entry.ts index e72cb28809..785223e144 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/log_entry.ts @@ -352,6 +352,27 @@ export const LogEntry_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: LogEntry_LabelsEntryAmino): LogEntry_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: LogEntry_LabelsEntry): LogEntry_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: LogEntry_LabelsEntryAminoMsg): LogEntry_LabelsEntry { + return LogEntry_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntry_LabelsEntryProtoMsg): LogEntry_LabelsEntry { + return LogEntry_LabelsEntry.decode(message.value); + }, + toProto(message: LogEntry_LabelsEntry): Uint8Array { + return LogEntry_LabelsEntry.encode(message).finish(); } }; function createBaseLogEntry(): LogEntry { @@ -376,6 +397,7 @@ function createBaseLogEntry(): LogEntry { }; } export const LogEntry = { + typeUrl: "/google.logging.v2.LogEntry", encode(message: LogEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logName !== "") { writer.uint32(98).string(message.logName); @@ -658,6 +680,73 @@ export const LogEntry = { message.sourceLocation !== undefined && (obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toSDK(message.sourceLocation) : undefined); message.split !== undefined && (obj.split = message.split ? LogSplit.toSDK(message.split) : undefined); return obj; + }, + fromAmino(object: LogEntryAmino): LogEntry { + return { + logName: object.log_name, + resource: object?.resource ? MonitoredResource.fromAmino(object.resource) : undefined, + protoPayload: object?.proto_payload ? Any.fromAmino(object.proto_payload) : undefined, + textPayload: object?.text_payload, + jsonPayload: object?.json_payload ? Struct.fromAmino(object.json_payload) : undefined, + timestamp: object.timestamp, + receiveTimestamp: object.receive_timestamp, + severity: isSet(object.severity) ? logSeverityFromJSON(object.severity) : -1, + insertId: object.insert_id, + httpRequest: object?.http_request ? HttpRequest.fromAmino(object.http_request) : undefined, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + operation: object?.operation ? LogEntryOperation.fromAmino(object.operation) : undefined, + trace: object.trace, + spanId: object.span_id, + traceSampled: object.trace_sampled, + sourceLocation: object?.source_location ? LogEntrySourceLocation.fromAmino(object.source_location) : undefined, + split: object?.split ? LogSplit.fromAmino(object.split) : undefined + }; + }, + toAmino(message: LogEntry): LogEntryAmino { + const obj: any = {}; + obj.log_name = message.logName; + obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; + obj.proto_payload = message.protoPayload ? Any.toAmino(message.protoPayload) : undefined; + obj.text_payload = message.textPayload; + obj.json_payload = message.jsonPayload ? Struct.toAmino(message.jsonPayload) : undefined; + obj.timestamp = message.timestamp; + obj.receive_timestamp = message.receiveTimestamp; + obj.severity = message.severity; + obj.insert_id = message.insertId; + obj.http_request = message.httpRequest ? HttpRequest.toAmino(message.httpRequest) : undefined; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + obj.operation = message.operation ? LogEntryOperation.toAmino(message.operation) : undefined; + obj.trace = message.trace; + obj.span_id = message.spanId; + obj.trace_sampled = message.traceSampled; + obj.source_location = message.sourceLocation ? LogEntrySourceLocation.toAmino(message.sourceLocation) : undefined; + obj.split = message.split ? LogSplit.toAmino(message.split) : undefined; + return obj; + }, + fromAminoMsg(object: LogEntryAminoMsg): LogEntry { + return LogEntry.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntryProtoMsg): LogEntry { + return LogEntry.decode(message.value); + }, + toProto(message: LogEntry): Uint8Array { + return LogEntry.encode(message).finish(); + }, + toProtoMsg(message: LogEntry): LogEntryProtoMsg { + return { + typeUrl: "/google.logging.v2.LogEntry", + value: LogEntry.encode(message).finish() + }; } }; function createBaseLogEntryOperation(): LogEntryOperation { @@ -669,6 +758,7 @@ function createBaseLogEntryOperation(): LogEntryOperation { }; } export const LogEntryOperation = { + typeUrl: "/google.logging.v2.LogEntryOperation", encode(message: LogEntryOperation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -757,6 +847,37 @@ export const LogEntryOperation = { obj.first = message.first; obj.last = message.last; return obj; + }, + fromAmino(object: LogEntryOperationAmino): LogEntryOperation { + return { + id: object.id, + producer: object.producer, + first: object.first, + last: object.last + }; + }, + toAmino(message: LogEntryOperation): LogEntryOperationAmino { + const obj: any = {}; + obj.id = message.id; + obj.producer = message.producer; + obj.first = message.first; + obj.last = message.last; + return obj; + }, + fromAminoMsg(object: LogEntryOperationAminoMsg): LogEntryOperation { + return LogEntryOperation.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntryOperationProtoMsg): LogEntryOperation { + return LogEntryOperation.decode(message.value); + }, + toProto(message: LogEntryOperation): Uint8Array { + return LogEntryOperation.encode(message).finish(); + }, + toProtoMsg(message: LogEntryOperation): LogEntryOperationProtoMsg { + return { + typeUrl: "/google.logging.v2.LogEntryOperation", + value: LogEntryOperation.encode(message).finish() + }; } }; function createBaseLogEntrySourceLocation(): LogEntrySourceLocation { @@ -767,6 +888,7 @@ function createBaseLogEntrySourceLocation(): LogEntrySourceLocation { }; } export const LogEntrySourceLocation = { + typeUrl: "/google.logging.v2.LogEntrySourceLocation", encode(message: LogEntrySourceLocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.file !== "") { writer.uint32(10).string(message.file); @@ -843,6 +965,35 @@ export const LogEntrySourceLocation = { obj.line = message.line; obj.function = message.function; return obj; + }, + fromAmino(object: LogEntrySourceLocationAmino): LogEntrySourceLocation { + return { + file: object.file, + line: BigInt(object.line), + function: object.function + }; + }, + toAmino(message: LogEntrySourceLocation): LogEntrySourceLocationAmino { + const obj: any = {}; + obj.file = message.file; + obj.line = message.line ? message.line.toString() : undefined; + obj.function = message.function; + return obj; + }, + fromAminoMsg(object: LogEntrySourceLocationAminoMsg): LogEntrySourceLocation { + return LogEntrySourceLocation.fromAmino(object.value); + }, + fromProtoMsg(message: LogEntrySourceLocationProtoMsg): LogEntrySourceLocation { + return LogEntrySourceLocation.decode(message.value); + }, + toProto(message: LogEntrySourceLocation): Uint8Array { + return LogEntrySourceLocation.encode(message).finish(); + }, + toProtoMsg(message: LogEntrySourceLocation): LogEntrySourceLocationProtoMsg { + return { + typeUrl: "/google.logging.v2.LogEntrySourceLocation", + value: LogEntrySourceLocation.encode(message).finish() + }; } }; function createBaseLogSplit(): LogSplit { @@ -853,6 +1004,7 @@ function createBaseLogSplit(): LogSplit { }; } export const LogSplit = { + typeUrl: "/google.logging.v2.LogSplit", encode(message: LogSplit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.uid !== "") { writer.uint32(10).string(message.uid); @@ -929,5 +1081,34 @@ export const LogSplit = { obj.index = message.index; obj.total_splits = message.totalSplits; return obj; + }, + fromAmino(object: LogSplitAmino): LogSplit { + return { + uid: object.uid, + index: object.index, + totalSplits: object.total_splits + }; + }, + toAmino(message: LogSplit): LogSplitAmino { + const obj: any = {}; + obj.uid = message.uid; + obj.index = message.index; + obj.total_splits = message.totalSplits; + return obj; + }, + fromAminoMsg(object: LogSplitAminoMsg): LogSplit { + return LogSplit.fromAmino(object.value); + }, + fromProtoMsg(message: LogSplitProtoMsg): LogSplit { + return LogSplit.decode(message.value); + }, + toProto(message: LogSplit): Uint8Array { + return LogSplit.encode(message).finish(); + }, + toProtoMsg(message: LogSplit): LogSplitProtoMsg { + return { + typeUrl: "/google.logging.v2.LogSplit", + value: LogSplit.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts index d90a379fd4..f89275065f 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging.ts @@ -489,6 +489,7 @@ function createBaseDeleteLogRequest(): DeleteLogRequest { }; } export const DeleteLogRequest = { + typeUrl: "/google.logging.v2.DeleteLogRequest", encode(message: DeleteLogRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logName !== "") { writer.uint32(10).string(message.logName); @@ -541,6 +542,31 @@ export const DeleteLogRequest = { const obj: any = {}; obj.log_name = message.logName; return obj; + }, + fromAmino(object: DeleteLogRequestAmino): DeleteLogRequest { + return { + logName: object.log_name + }; + }, + toAmino(message: DeleteLogRequest): DeleteLogRequestAmino { + const obj: any = {}; + obj.log_name = message.logName; + return obj; + }, + fromAminoMsg(object: DeleteLogRequestAminoMsg): DeleteLogRequest { + return DeleteLogRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteLogRequestProtoMsg): DeleteLogRequest { + return DeleteLogRequest.decode(message.value); + }, + toProto(message: DeleteLogRequest): Uint8Array { + return DeleteLogRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteLogRequest): DeleteLogRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.DeleteLogRequest", + value: DeleteLogRequest.encode(message).finish() + }; } }; function createBaseWriteLogEntriesRequest_LabelsEntry(): WriteLogEntriesRequest_LabelsEntry { @@ -614,6 +640,27 @@ export const WriteLogEntriesRequest_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: WriteLogEntriesRequest_LabelsEntryAmino): WriteLogEntriesRequest_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: WriteLogEntriesRequest_LabelsEntry): WriteLogEntriesRequest_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: WriteLogEntriesRequest_LabelsEntryAminoMsg): WriteLogEntriesRequest_LabelsEntry { + return WriteLogEntriesRequest_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: WriteLogEntriesRequest_LabelsEntryProtoMsg): WriteLogEntriesRequest_LabelsEntry { + return WriteLogEntriesRequest_LabelsEntry.decode(message.value); + }, + toProto(message: WriteLogEntriesRequest_LabelsEntry): Uint8Array { + return WriteLogEntriesRequest_LabelsEntry.encode(message).finish(); } }; function createBaseWriteLogEntriesRequest(): WriteLogEntriesRequest { @@ -627,6 +674,7 @@ function createBaseWriteLogEntriesRequest(): WriteLogEntriesRequest { }; } export const WriteLogEntriesRequest = { + typeUrl: "/google.logging.v2.WriteLogEntriesRequest", encode(message: WriteLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logName !== "") { writer.uint32(10).string(message.logName); @@ -785,12 +833,62 @@ export const WriteLogEntriesRequest = { obj.partial_success = message.partialSuccess; obj.dry_run = message.dryRun; return obj; + }, + fromAmino(object: WriteLogEntriesRequestAmino): WriteLogEntriesRequest { + return { + logName: object.log_name, + resource: object?.resource ? MonitoredResource.fromAmino(object.resource) : undefined, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => LogEntry.fromAmino(e)) : [], + partialSuccess: object.partial_success, + dryRun: object.dry_run + }; + }, + toAmino(message: WriteLogEntriesRequest): WriteLogEntriesRequestAmino { + const obj: any = {}; + obj.log_name = message.logName; + obj.resource = message.resource ? MonitoredResource.toAmino(message.resource) : undefined; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + if (message.entries) { + obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + obj.partial_success = message.partialSuccess; + obj.dry_run = message.dryRun; + return obj; + }, + fromAminoMsg(object: WriteLogEntriesRequestAminoMsg): WriteLogEntriesRequest { + return WriteLogEntriesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: WriteLogEntriesRequestProtoMsg): WriteLogEntriesRequest { + return WriteLogEntriesRequest.decode(message.value); + }, + toProto(message: WriteLogEntriesRequest): Uint8Array { + return WriteLogEntriesRequest.encode(message).finish(); + }, + toProtoMsg(message: WriteLogEntriesRequest): WriteLogEntriesRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.WriteLogEntriesRequest", + value: WriteLogEntriesRequest.encode(message).finish() + }; } }; function createBaseWriteLogEntriesResponse(): WriteLogEntriesResponse { return {}; } export const WriteLogEntriesResponse = { + typeUrl: "/google.logging.v2.WriteLogEntriesResponse", encode(_: WriteLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -828,6 +926,28 @@ export const WriteLogEntriesResponse = { toSDK(_: WriteLogEntriesResponse): WriteLogEntriesResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: WriteLogEntriesResponseAmino): WriteLogEntriesResponse { + return {}; + }, + toAmino(_: WriteLogEntriesResponse): WriteLogEntriesResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: WriteLogEntriesResponseAminoMsg): WriteLogEntriesResponse { + return WriteLogEntriesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: WriteLogEntriesResponseProtoMsg): WriteLogEntriesResponse { + return WriteLogEntriesResponse.decode(message.value); + }, + toProto(message: WriteLogEntriesResponse): Uint8Array { + return WriteLogEntriesResponse.encode(message).finish(); + }, + toProtoMsg(message: WriteLogEntriesResponse): WriteLogEntriesResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.WriteLogEntriesResponse", + value: WriteLogEntriesResponse.encode(message).finish() + }; } }; function createBaseWriteLogEntriesPartialErrors_LogEntryErrorsEntry(): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { @@ -901,6 +1021,27 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { obj.key = message.key; message.value !== undefined && (obj.value = message.value ? Status.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { + return { + key: object.key, + value: object?.value ? Status.fromAmino(object.value) : undefined + }; + }, + toAmino(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): WriteLogEntriesPartialErrors_LogEntryErrorsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value ? Status.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: WriteLogEntriesPartialErrors_LogEntryErrorsEntryAminoMsg): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { + return WriteLogEntriesPartialErrors_LogEntryErrorsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntryProtoMsg): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { + return WriteLogEntriesPartialErrors_LogEntryErrorsEntry.decode(message.value); + }, + toProto(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): Uint8Array { + return WriteLogEntriesPartialErrors_LogEntryErrorsEntry.encode(message).finish(); } }; function createBaseWriteLogEntriesPartialErrors(): WriteLogEntriesPartialErrors { @@ -909,6 +1050,7 @@ function createBaseWriteLogEntriesPartialErrors(): WriteLogEntriesPartialErrors }; } export const WriteLogEntriesPartialErrors = { + typeUrl: "/google.logging.v2.WriteLogEntriesPartialErrors", encode(message: WriteLogEntriesPartialErrors, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.logEntryErrors).forEach(([key, value]) => { WriteLogEntriesPartialErrors_LogEntryErrorsEntry.encode({ @@ -999,6 +1141,41 @@ export const WriteLogEntriesPartialErrors = { }); } return obj; + }, + fromAmino(object: WriteLogEntriesPartialErrorsAmino): WriteLogEntriesPartialErrors { + return { + logEntryErrors: isObject(object.log_entry_errors) ? Object.entries(object.log_entry_errors).reduce<{ + [key: number]: Status; + }>((acc, [key, value]) => { + acc[Number(key)] = Status.fromAmino(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: WriteLogEntriesPartialErrors): WriteLogEntriesPartialErrorsAmino { + const obj: any = {}; + obj.log_entry_errors = {}; + if (message.logEntryErrors) { + Object.entries(message.logEntryErrors).forEach(([k, v]) => { + obj.log_entry_errors[k] = Status.toAmino(v); + }); + } + return obj; + }, + fromAminoMsg(object: WriteLogEntriesPartialErrorsAminoMsg): WriteLogEntriesPartialErrors { + return WriteLogEntriesPartialErrors.fromAmino(object.value); + }, + fromProtoMsg(message: WriteLogEntriesPartialErrorsProtoMsg): WriteLogEntriesPartialErrors { + return WriteLogEntriesPartialErrors.decode(message.value); + }, + toProto(message: WriteLogEntriesPartialErrors): Uint8Array { + return WriteLogEntriesPartialErrors.encode(message).finish(); + }, + toProtoMsg(message: WriteLogEntriesPartialErrors): WriteLogEntriesPartialErrorsProtoMsg { + return { + typeUrl: "/google.logging.v2.WriteLogEntriesPartialErrors", + value: WriteLogEntriesPartialErrors.encode(message).finish() + }; } }; function createBaseListLogEntriesRequest(): ListLogEntriesRequest { @@ -1011,6 +1188,7 @@ function createBaseListLogEntriesRequest(): ListLogEntriesRequest { }; } export const ListLogEntriesRequest = { + typeUrl: "/google.logging.v2.ListLogEntriesRequest", encode(message: ListLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(66).string(v!); @@ -1119,6 +1297,43 @@ export const ListLogEntriesRequest = { obj.page_size = message.pageSize; obj.page_token = message.pageToken; return obj; + }, + fromAmino(object: ListLogEntriesRequestAmino): ListLogEntriesRequest { + return { + resourceNames: Array.isArray(object?.resource_names) ? object.resource_names.map((e: any) => e) : [], + filter: object.filter, + orderBy: object.order_by, + pageSize: object.page_size, + pageToken: object.page_token + }; + }, + toAmino(message: ListLogEntriesRequest): ListLogEntriesRequestAmino { + const obj: any = {}; + if (message.resourceNames) { + obj.resource_names = message.resourceNames.map(e => e); + } else { + obj.resource_names = []; + } + obj.filter = message.filter; + obj.order_by = message.orderBy; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + return obj; + }, + fromAminoMsg(object: ListLogEntriesRequestAminoMsg): ListLogEntriesRequest { + return ListLogEntriesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListLogEntriesRequestProtoMsg): ListLogEntriesRequest { + return ListLogEntriesRequest.decode(message.value); + }, + toProto(message: ListLogEntriesRequest): Uint8Array { + return ListLogEntriesRequest.encode(message).finish(); + }, + toProtoMsg(message: ListLogEntriesRequest): ListLogEntriesRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListLogEntriesRequest", + value: ListLogEntriesRequest.encode(message).finish() + }; } }; function createBaseListLogEntriesResponse(): ListLogEntriesResponse { @@ -1128,6 +1343,7 @@ function createBaseListLogEntriesResponse(): ListLogEntriesResponse { }; } export const ListLogEntriesResponse = { + typeUrl: "/google.logging.v2.ListLogEntriesResponse", encode(message: ListLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { LogEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1200,6 +1416,37 @@ export const ListLogEntriesResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListLogEntriesResponseAmino): ListLogEntriesResponse { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => LogEntry.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListLogEntriesResponse): ListLogEntriesResponseAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListLogEntriesResponseAminoMsg): ListLogEntriesResponse { + return ListLogEntriesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListLogEntriesResponseProtoMsg): ListLogEntriesResponse { + return ListLogEntriesResponse.decode(message.value); + }, + toProto(message: ListLogEntriesResponse): Uint8Array { + return ListLogEntriesResponse.encode(message).finish(); + }, + toProtoMsg(message: ListLogEntriesResponse): ListLogEntriesResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListLogEntriesResponse", + value: ListLogEntriesResponse.encode(message).finish() + }; } }; function createBaseListMonitoredResourceDescriptorsRequest(): ListMonitoredResourceDescriptorsRequest { @@ -1209,6 +1456,7 @@ function createBaseListMonitoredResourceDescriptorsRequest(): ListMonitoredResou }; } export const ListMonitoredResourceDescriptorsRequest = { + typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest", encode(message: ListMonitoredResourceDescriptorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pageSize !== 0) { writer.uint32(8).int32(message.pageSize); @@ -1273,6 +1521,33 @@ export const ListMonitoredResourceDescriptorsRequest = { obj.page_size = message.pageSize; obj.page_token = message.pageToken; return obj; + }, + fromAmino(object: ListMonitoredResourceDescriptorsRequestAmino): ListMonitoredResourceDescriptorsRequest { + return { + pageSize: object.page_size, + pageToken: object.page_token + }; + }, + toAmino(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestAmino { + const obj: any = {}; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + return obj; + }, + fromAminoMsg(object: ListMonitoredResourceDescriptorsRequestAminoMsg): ListMonitoredResourceDescriptorsRequest { + return ListMonitoredResourceDescriptorsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListMonitoredResourceDescriptorsRequestProtoMsg): ListMonitoredResourceDescriptorsRequest { + return ListMonitoredResourceDescriptorsRequest.decode(message.value); + }, + toProto(message: ListMonitoredResourceDescriptorsRequest): Uint8Array { + return ListMonitoredResourceDescriptorsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListMonitoredResourceDescriptorsRequest): ListMonitoredResourceDescriptorsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest", + value: ListMonitoredResourceDescriptorsRequest.encode(message).finish() + }; } }; function createBaseListMonitoredResourceDescriptorsResponse(): ListMonitoredResourceDescriptorsResponse { @@ -1282,6 +1557,7 @@ function createBaseListMonitoredResourceDescriptorsResponse(): ListMonitoredReso }; } export const ListMonitoredResourceDescriptorsResponse = { + typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse", encode(message: ListMonitoredResourceDescriptorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceDescriptors) { MonitoredResourceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1354,6 +1630,37 @@ export const ListMonitoredResourceDescriptorsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListMonitoredResourceDescriptorsResponseAmino): ListMonitoredResourceDescriptorsResponse { + return { + resourceDescriptors: Array.isArray(object?.resource_descriptors) ? object.resource_descriptors.map((e: any) => MonitoredResourceDescriptor.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListMonitoredResourceDescriptorsResponse): ListMonitoredResourceDescriptorsResponseAmino { + const obj: any = {}; + if (message.resourceDescriptors) { + obj.resource_descriptors = message.resourceDescriptors.map(e => e ? MonitoredResourceDescriptor.toAmino(e) : undefined); + } else { + obj.resource_descriptors = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListMonitoredResourceDescriptorsResponseAminoMsg): ListMonitoredResourceDescriptorsResponse { + return ListMonitoredResourceDescriptorsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListMonitoredResourceDescriptorsResponseProtoMsg): ListMonitoredResourceDescriptorsResponse { + return ListMonitoredResourceDescriptorsResponse.decode(message.value); + }, + toProto(message: ListMonitoredResourceDescriptorsResponse): Uint8Array { + return ListMonitoredResourceDescriptorsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListMonitoredResourceDescriptorsResponse): ListMonitoredResourceDescriptorsResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse", + value: ListMonitoredResourceDescriptorsResponse.encode(message).finish() + }; } }; function createBaseListLogsRequest(): ListLogsRequest { @@ -1365,6 +1672,7 @@ function createBaseListLogsRequest(): ListLogsRequest { }; } export const ListLogsRequest = { + typeUrl: "/google.logging.v2.ListLogsRequest", encode(message: ListLogsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -1461,6 +1769,41 @@ export const ListLogsRequest = { obj.resource_names = []; } return obj; + }, + fromAmino(object: ListLogsRequestAmino): ListLogsRequest { + return { + parent: object.parent, + pageSize: object.page_size, + pageToken: object.page_token, + resourceNames: Array.isArray(object?.resource_names) ? object.resource_names.map((e: any) => e) : [] + }; + }, + toAmino(message: ListLogsRequest): ListLogsRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + if (message.resourceNames) { + obj.resource_names = message.resourceNames.map(e => e); + } else { + obj.resource_names = []; + } + return obj; + }, + fromAminoMsg(object: ListLogsRequestAminoMsg): ListLogsRequest { + return ListLogsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListLogsRequestProtoMsg): ListLogsRequest { + return ListLogsRequest.decode(message.value); + }, + toProto(message: ListLogsRequest): Uint8Array { + return ListLogsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListLogsRequest): ListLogsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListLogsRequest", + value: ListLogsRequest.encode(message).finish() + }; } }; function createBaseListLogsResponse(): ListLogsResponse { @@ -1470,6 +1813,7 @@ function createBaseListLogsResponse(): ListLogsResponse { }; } export const ListLogsResponse = { + typeUrl: "/google.logging.v2.ListLogsResponse", encode(message: ListLogsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.logNames) { writer.uint32(26).string(v!); @@ -1542,6 +1886,37 @@ export const ListLogsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListLogsResponseAmino): ListLogsResponse { + return { + logNames: Array.isArray(object?.log_names) ? object.log_names.map((e: any) => e) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListLogsResponse): ListLogsResponseAmino { + const obj: any = {}; + if (message.logNames) { + obj.log_names = message.logNames.map(e => e); + } else { + obj.log_names = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListLogsResponseAminoMsg): ListLogsResponse { + return ListLogsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListLogsResponseProtoMsg): ListLogsResponse { + return ListLogsResponse.decode(message.value); + }, + toProto(message: ListLogsResponse): Uint8Array { + return ListLogsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListLogsResponse): ListLogsResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListLogsResponse", + value: ListLogsResponse.encode(message).finish() + }; } }; function createBaseTailLogEntriesRequest(): TailLogEntriesRequest { @@ -1552,6 +1927,7 @@ function createBaseTailLogEntriesRequest(): TailLogEntriesRequest { }; } export const TailLogEntriesRequest = { + typeUrl: "/google.logging.v2.TailLogEntriesRequest", encode(message: TailLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(10).string(v!); @@ -1636,6 +2012,39 @@ export const TailLogEntriesRequest = { obj.filter = message.filter; message.bufferWindow !== undefined && (obj.buffer_window = message.bufferWindow ? Duration.toSDK(message.bufferWindow) : undefined); return obj; + }, + fromAmino(object: TailLogEntriesRequestAmino): TailLogEntriesRequest { + return { + resourceNames: Array.isArray(object?.resource_names) ? object.resource_names.map((e: any) => e) : [], + filter: object.filter, + bufferWindow: object?.buffer_window ? Duration.fromAmino(object.buffer_window) : undefined + }; + }, + toAmino(message: TailLogEntriesRequest): TailLogEntriesRequestAmino { + const obj: any = {}; + if (message.resourceNames) { + obj.resource_names = message.resourceNames.map(e => e); + } else { + obj.resource_names = []; + } + obj.filter = message.filter; + obj.buffer_window = message.bufferWindow ? Duration.toAmino(message.bufferWindow) : undefined; + return obj; + }, + fromAminoMsg(object: TailLogEntriesRequestAminoMsg): TailLogEntriesRequest { + return TailLogEntriesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: TailLogEntriesRequestProtoMsg): TailLogEntriesRequest { + return TailLogEntriesRequest.decode(message.value); + }, + toProto(message: TailLogEntriesRequest): Uint8Array { + return TailLogEntriesRequest.encode(message).finish(); + }, + toProtoMsg(message: TailLogEntriesRequest): TailLogEntriesRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.TailLogEntriesRequest", + value: TailLogEntriesRequest.encode(message).finish() + }; } }; function createBaseTailLogEntriesResponse(): TailLogEntriesResponse { @@ -1645,6 +2054,7 @@ function createBaseTailLogEntriesResponse(): TailLogEntriesResponse { }; } export const TailLogEntriesResponse = { + typeUrl: "/google.logging.v2.TailLogEntriesResponse", encode(message: TailLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { LogEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1725,6 +2135,41 @@ export const TailLogEntriesResponse = { obj.suppression_info = []; } return obj; + }, + fromAmino(object: TailLogEntriesResponseAmino): TailLogEntriesResponse { + return { + entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => LogEntry.fromAmino(e)) : [], + suppressionInfo: Array.isArray(object?.suppression_info) ? object.suppression_info.map((e: any) => TailLogEntriesResponse_SuppressionInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: TailLogEntriesResponse): TailLogEntriesResponseAmino { + const obj: any = {}; + if (message.entries) { + obj.entries = message.entries.map(e => e ? LogEntry.toAmino(e) : undefined); + } else { + obj.entries = []; + } + if (message.suppressionInfo) { + obj.suppression_info = message.suppressionInfo.map(e => e ? TailLogEntriesResponse_SuppressionInfo.toAmino(e) : undefined); + } else { + obj.suppression_info = []; + } + return obj; + }, + fromAminoMsg(object: TailLogEntriesResponseAminoMsg): TailLogEntriesResponse { + return TailLogEntriesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: TailLogEntriesResponseProtoMsg): TailLogEntriesResponse { + return TailLogEntriesResponse.decode(message.value); + }, + toProto(message: TailLogEntriesResponse): Uint8Array { + return TailLogEntriesResponse.encode(message).finish(); + }, + toProtoMsg(message: TailLogEntriesResponse): TailLogEntriesResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.TailLogEntriesResponse", + value: TailLogEntriesResponse.encode(message).finish() + }; } }; function createBaseTailLogEntriesResponse_SuppressionInfo(): TailLogEntriesResponse_SuppressionInfo { @@ -1734,6 +2179,7 @@ function createBaseTailLogEntriesResponse_SuppressionInfo(): TailLogEntriesRespo }; } export const TailLogEntriesResponse_SuppressionInfo = { + typeUrl: "/google.logging.v2.SuppressionInfo", encode(message: TailLogEntriesResponse_SuppressionInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.reason !== 0) { writer.uint32(8).int32(message.reason); @@ -1798,5 +2244,32 @@ export const TailLogEntriesResponse_SuppressionInfo = { message.reason !== undefined && (obj.reason = tailLogEntriesResponse_SuppressionInfo_ReasonToJSON(message.reason)); obj.suppressed_count = message.suppressedCount; return obj; + }, + fromAmino(object: TailLogEntriesResponse_SuppressionInfoAmino): TailLogEntriesResponse_SuppressionInfo { + return { + reason: isSet(object.reason) ? tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason) : -1, + suppressedCount: object.suppressed_count + }; + }, + toAmino(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoAmino { + const obj: any = {}; + obj.reason = message.reason; + obj.suppressed_count = message.suppressedCount; + return obj; + }, + fromAminoMsg(object: TailLogEntriesResponse_SuppressionInfoAminoMsg): TailLogEntriesResponse_SuppressionInfo { + return TailLogEntriesResponse_SuppressionInfo.fromAmino(object.value); + }, + fromProtoMsg(message: TailLogEntriesResponse_SuppressionInfoProtoMsg): TailLogEntriesResponse_SuppressionInfo { + return TailLogEntriesResponse_SuppressionInfo.decode(message.value); + }, + toProto(message: TailLogEntriesResponse_SuppressionInfo): Uint8Array { + return TailLogEntriesResponse_SuppressionInfo.encode(message).finish(); + }, + toProtoMsg(message: TailLogEntriesResponse_SuppressionInfo): TailLogEntriesResponse_SuppressionInfoProtoMsg { + return { + typeUrl: "/google.logging.v2.SuppressionInfo", + value: TailLogEntriesResponse_SuppressionInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_config.ts b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_config.ts index fd056c6308..33fdd9b5eb 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_config.ts @@ -1599,6 +1599,7 @@ function createBaseLogBucket(): LogBucket { }; } export const LogBucket = { + typeUrl: "/google.logging.v2.LogBucket", encode(message: LogBucket, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1755,6 +1756,51 @@ export const LogBucket = { } message.cmekSettings !== undefined && (obj.cmek_settings = message.cmekSettings ? CmekSettings.toSDK(message.cmekSettings) : undefined); return obj; + }, + fromAmino(object: LogBucketAmino): LogBucket { + return { + name: object.name, + description: object.description, + createTime: object.create_time, + updateTime: object.update_time, + retentionDays: object.retention_days, + locked: object.locked, + lifecycleState: isSet(object.lifecycle_state) ? lifecycleStateFromJSON(object.lifecycle_state) : -1, + restrictedFields: Array.isArray(object?.restricted_fields) ? object.restricted_fields.map((e: any) => e) : [], + cmekSettings: object?.cmek_settings ? CmekSettings.fromAmino(object.cmek_settings) : undefined + }; + }, + toAmino(message: LogBucket): LogBucketAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + obj.create_time = message.createTime; + obj.update_time = message.updateTime; + obj.retention_days = message.retentionDays; + obj.locked = message.locked; + obj.lifecycle_state = message.lifecycleState; + if (message.restrictedFields) { + obj.restricted_fields = message.restrictedFields.map(e => e); + } else { + obj.restricted_fields = []; + } + obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; + return obj; + }, + fromAminoMsg(object: LogBucketAminoMsg): LogBucket { + return LogBucket.fromAmino(object.value); + }, + fromProtoMsg(message: LogBucketProtoMsg): LogBucket { + return LogBucket.decode(message.value); + }, + toProto(message: LogBucket): Uint8Array { + return LogBucket.encode(message).finish(); + }, + toProtoMsg(message: LogBucket): LogBucketProtoMsg { + return { + typeUrl: "/google.logging.v2.LogBucket", + value: LogBucket.encode(message).finish() + }; } }; function createBaseLogView(): LogView { @@ -1767,6 +1813,7 @@ function createBaseLogView(): LogView { }; } export const LogView = { + typeUrl: "/google.logging.v2.LogView", encode(message: LogView, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1867,6 +1914,39 @@ export const LogView = { message.updateTime !== undefined && (obj.update_time = message.updateTime ?? undefined); obj.filter = message.filter; return obj; + }, + fromAmino(object: LogViewAmino): LogView { + return { + name: object.name, + description: object.description, + createTime: object.create_time, + updateTime: object.update_time, + filter: object.filter + }; + }, + toAmino(message: LogView): LogViewAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + obj.create_time = message.createTime; + obj.update_time = message.updateTime; + obj.filter = message.filter; + return obj; + }, + fromAminoMsg(object: LogViewAminoMsg): LogView { + return LogView.fromAmino(object.value); + }, + fromProtoMsg(message: LogViewProtoMsg): LogView { + return LogView.decode(message.value); + }, + toProto(message: LogView): Uint8Array { + return LogView.encode(message).finish(); + }, + toProtoMsg(message: LogView): LogViewProtoMsg { + return { + typeUrl: "/google.logging.v2.LogView", + value: LogView.encode(message).finish() + }; } }; function createBaseLogSink(): LogSink { @@ -1886,6 +1966,7 @@ function createBaseLogSink(): LogSink { }; } export const LogSink = { + typeUrl: "/google.logging.v2.LogSink", encode(message: LogSink, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2078,6 +2159,57 @@ export const LogSink = { message.createTime !== undefined && (obj.create_time = message.createTime ?? undefined); message.updateTime !== undefined && (obj.update_time = message.updateTime ?? undefined); return obj; + }, + fromAmino(object: LogSinkAmino): LogSink { + return { + name: object.name, + destination: object.destination, + filter: object.filter, + description: object.description, + disabled: object.disabled, + exclusions: Array.isArray(object?.exclusions) ? object.exclusions.map((e: any) => LogExclusion.fromAmino(e)) : [], + outputVersionFormat: isSet(object.output_version_format) ? logSink_VersionFormatFromJSON(object.output_version_format) : -1, + writerIdentity: object.writer_identity, + includeChildren: object.include_children, + bigqueryOptions: object?.bigquery_options ? BigQueryOptions.fromAmino(object.bigquery_options) : undefined, + createTime: object.create_time, + updateTime: object.update_time + }; + }, + toAmino(message: LogSink): LogSinkAmino { + const obj: any = {}; + obj.name = message.name; + obj.destination = message.destination; + obj.filter = message.filter; + obj.description = message.description; + obj.disabled = message.disabled; + if (message.exclusions) { + obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); + } else { + obj.exclusions = []; + } + obj.output_version_format = message.outputVersionFormat; + obj.writer_identity = message.writerIdentity; + obj.include_children = message.includeChildren; + obj.bigquery_options = message.bigqueryOptions ? BigQueryOptions.toAmino(message.bigqueryOptions) : undefined; + obj.create_time = message.createTime; + obj.update_time = message.updateTime; + return obj; + }, + fromAminoMsg(object: LogSinkAminoMsg): LogSink { + return LogSink.fromAmino(object.value); + }, + fromProtoMsg(message: LogSinkProtoMsg): LogSink { + return LogSink.decode(message.value); + }, + toProto(message: LogSink): Uint8Array { + return LogSink.encode(message).finish(); + }, + toProtoMsg(message: LogSink): LogSinkProtoMsg { + return { + typeUrl: "/google.logging.v2.LogSink", + value: LogSink.encode(message).finish() + }; } }; function createBaseBigQueryOptions(): BigQueryOptions { @@ -2087,6 +2219,7 @@ function createBaseBigQueryOptions(): BigQueryOptions { }; } export const BigQueryOptions = { + typeUrl: "/google.logging.v2.BigQueryOptions", encode(message: BigQueryOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.usePartitionedTables === true) { writer.uint32(8).bool(message.usePartitionedTables); @@ -2151,6 +2284,33 @@ export const BigQueryOptions = { obj.use_partitioned_tables = message.usePartitionedTables; obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; return obj; + }, + fromAmino(object: BigQueryOptionsAmino): BigQueryOptions { + return { + usePartitionedTables: object.use_partitioned_tables, + usesTimestampColumnPartitioning: object.uses_timestamp_column_partitioning + }; + }, + toAmino(message: BigQueryOptions): BigQueryOptionsAmino { + const obj: any = {}; + obj.use_partitioned_tables = message.usePartitionedTables; + obj.uses_timestamp_column_partitioning = message.usesTimestampColumnPartitioning; + return obj; + }, + fromAminoMsg(object: BigQueryOptionsAminoMsg): BigQueryOptions { + return BigQueryOptions.fromAmino(object.value); + }, + fromProtoMsg(message: BigQueryOptionsProtoMsg): BigQueryOptions { + return BigQueryOptions.decode(message.value); + }, + toProto(message: BigQueryOptions): Uint8Array { + return BigQueryOptions.encode(message).finish(); + }, + toProtoMsg(message: BigQueryOptions): BigQueryOptionsProtoMsg { + return { + typeUrl: "/google.logging.v2.BigQueryOptions", + value: BigQueryOptions.encode(message).finish() + }; } }; function createBaseListBucketsRequest(): ListBucketsRequest { @@ -2161,6 +2321,7 @@ function createBaseListBucketsRequest(): ListBucketsRequest { }; } export const ListBucketsRequest = { + typeUrl: "/google.logging.v2.ListBucketsRequest", encode(message: ListBucketsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -2237,6 +2398,35 @@ export const ListBucketsRequest = { obj.page_token = message.pageToken; obj.page_size = message.pageSize; return obj; + }, + fromAmino(object: ListBucketsRequestAmino): ListBucketsRequest { + return { + parent: object.parent, + pageToken: object.page_token, + pageSize: object.page_size + }; + }, + toAmino(message: ListBucketsRequest): ListBucketsRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + return obj; + }, + fromAminoMsg(object: ListBucketsRequestAminoMsg): ListBucketsRequest { + return ListBucketsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListBucketsRequestProtoMsg): ListBucketsRequest { + return ListBucketsRequest.decode(message.value); + }, + toProto(message: ListBucketsRequest): Uint8Array { + return ListBucketsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListBucketsRequest): ListBucketsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListBucketsRequest", + value: ListBucketsRequest.encode(message).finish() + }; } }; function createBaseListBucketsResponse(): ListBucketsResponse { @@ -2246,6 +2436,7 @@ function createBaseListBucketsResponse(): ListBucketsResponse { }; } export const ListBucketsResponse = { + typeUrl: "/google.logging.v2.ListBucketsResponse", encode(message: ListBucketsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.buckets) { LogBucket.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2318,6 +2509,37 @@ export const ListBucketsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListBucketsResponseAmino): ListBucketsResponse { + return { + buckets: Array.isArray(object?.buckets) ? object.buckets.map((e: any) => LogBucket.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListBucketsResponse): ListBucketsResponseAmino { + const obj: any = {}; + if (message.buckets) { + obj.buckets = message.buckets.map(e => e ? LogBucket.toAmino(e) : undefined); + } else { + obj.buckets = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListBucketsResponseAminoMsg): ListBucketsResponse { + return ListBucketsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListBucketsResponseProtoMsg): ListBucketsResponse { + return ListBucketsResponse.decode(message.value); + }, + toProto(message: ListBucketsResponse): Uint8Array { + return ListBucketsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListBucketsResponse): ListBucketsResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListBucketsResponse", + value: ListBucketsResponse.encode(message).finish() + }; } }; function createBaseCreateBucketRequest(): CreateBucketRequest { @@ -2328,6 +2550,7 @@ function createBaseCreateBucketRequest(): CreateBucketRequest { }; } export const CreateBucketRequest = { + typeUrl: "/google.logging.v2.CreateBucketRequest", encode(message: CreateBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -2404,6 +2627,35 @@ export const CreateBucketRequest = { obj.bucket_id = message.bucketId; message.bucket !== undefined && (obj.bucket = message.bucket ? LogBucket.toSDK(message.bucket) : undefined); return obj; + }, + fromAmino(object: CreateBucketRequestAmino): CreateBucketRequest { + return { + parent: object.parent, + bucketId: object.bucket_id, + bucket: object?.bucket ? LogBucket.fromAmino(object.bucket) : undefined + }; + }, + toAmino(message: CreateBucketRequest): CreateBucketRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.bucket_id = message.bucketId; + obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; + return obj; + }, + fromAminoMsg(object: CreateBucketRequestAminoMsg): CreateBucketRequest { + return CreateBucketRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateBucketRequestProtoMsg): CreateBucketRequest { + return CreateBucketRequest.decode(message.value); + }, + toProto(message: CreateBucketRequest): Uint8Array { + return CreateBucketRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateBucketRequest): CreateBucketRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.CreateBucketRequest", + value: CreateBucketRequest.encode(message).finish() + }; } }; function createBaseUpdateBucketRequest(): UpdateBucketRequest { @@ -2414,6 +2666,7 @@ function createBaseUpdateBucketRequest(): UpdateBucketRequest { }; } export const UpdateBucketRequest = { + typeUrl: "/google.logging.v2.UpdateBucketRequest", encode(message: UpdateBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2490,6 +2743,35 @@ export const UpdateBucketRequest = { message.bucket !== undefined && (obj.bucket = message.bucket ? LogBucket.toSDK(message.bucket) : undefined); message.updateMask !== undefined && (obj.update_mask = message.updateMask ? FieldMask.toSDK(message.updateMask) : undefined); return obj; + }, + fromAmino(object: UpdateBucketRequestAmino): UpdateBucketRequest { + return { + name: object.name, + bucket: object?.bucket ? LogBucket.fromAmino(object.bucket) : undefined, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined + }; + }, + toAmino(message: UpdateBucketRequest): UpdateBucketRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.bucket = message.bucket ? LogBucket.toAmino(message.bucket) : undefined; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateBucketRequestAminoMsg): UpdateBucketRequest { + return UpdateBucketRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateBucketRequestProtoMsg): UpdateBucketRequest { + return UpdateBucketRequest.decode(message.value); + }, + toProto(message: UpdateBucketRequest): Uint8Array { + return UpdateBucketRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateBucketRequest): UpdateBucketRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateBucketRequest", + value: UpdateBucketRequest.encode(message).finish() + }; } }; function createBaseGetBucketRequest(): GetBucketRequest { @@ -2498,6 +2780,7 @@ function createBaseGetBucketRequest(): GetBucketRequest { }; } export const GetBucketRequest = { + typeUrl: "/google.logging.v2.GetBucketRequest", encode(message: GetBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2550,6 +2833,31 @@ export const GetBucketRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetBucketRequestAmino): GetBucketRequest { + return { + name: object.name + }; + }, + toAmino(message: GetBucketRequest): GetBucketRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetBucketRequestAminoMsg): GetBucketRequest { + return GetBucketRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetBucketRequestProtoMsg): GetBucketRequest { + return GetBucketRequest.decode(message.value); + }, + toProto(message: GetBucketRequest): Uint8Array { + return GetBucketRequest.encode(message).finish(); + }, + toProtoMsg(message: GetBucketRequest): GetBucketRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetBucketRequest", + value: GetBucketRequest.encode(message).finish() + }; } }; function createBaseDeleteBucketRequest(): DeleteBucketRequest { @@ -2558,6 +2866,7 @@ function createBaseDeleteBucketRequest(): DeleteBucketRequest { }; } export const DeleteBucketRequest = { + typeUrl: "/google.logging.v2.DeleteBucketRequest", encode(message: DeleteBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2610,6 +2919,31 @@ export const DeleteBucketRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: DeleteBucketRequestAmino): DeleteBucketRequest { + return { + name: object.name + }; + }, + toAmino(message: DeleteBucketRequest): DeleteBucketRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: DeleteBucketRequestAminoMsg): DeleteBucketRequest { + return DeleteBucketRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteBucketRequestProtoMsg): DeleteBucketRequest { + return DeleteBucketRequest.decode(message.value); + }, + toProto(message: DeleteBucketRequest): Uint8Array { + return DeleteBucketRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteBucketRequest): DeleteBucketRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.DeleteBucketRequest", + value: DeleteBucketRequest.encode(message).finish() + }; } }; function createBaseUndeleteBucketRequest(): UndeleteBucketRequest { @@ -2618,6 +2952,7 @@ function createBaseUndeleteBucketRequest(): UndeleteBucketRequest { }; } export const UndeleteBucketRequest = { + typeUrl: "/google.logging.v2.UndeleteBucketRequest", encode(message: UndeleteBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2670,6 +3005,31 @@ export const UndeleteBucketRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: UndeleteBucketRequestAmino): UndeleteBucketRequest { + return { + name: object.name + }; + }, + toAmino(message: UndeleteBucketRequest): UndeleteBucketRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: UndeleteBucketRequestAminoMsg): UndeleteBucketRequest { + return UndeleteBucketRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UndeleteBucketRequestProtoMsg): UndeleteBucketRequest { + return UndeleteBucketRequest.decode(message.value); + }, + toProto(message: UndeleteBucketRequest): Uint8Array { + return UndeleteBucketRequest.encode(message).finish(); + }, + toProtoMsg(message: UndeleteBucketRequest): UndeleteBucketRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UndeleteBucketRequest", + value: UndeleteBucketRequest.encode(message).finish() + }; } }; function createBaseListViewsRequest(): ListViewsRequest { @@ -2680,6 +3040,7 @@ function createBaseListViewsRequest(): ListViewsRequest { }; } export const ListViewsRequest = { + typeUrl: "/google.logging.v2.ListViewsRequest", encode(message: ListViewsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -2756,6 +3117,35 @@ export const ListViewsRequest = { obj.page_token = message.pageToken; obj.page_size = message.pageSize; return obj; + }, + fromAmino(object: ListViewsRequestAmino): ListViewsRequest { + return { + parent: object.parent, + pageToken: object.page_token, + pageSize: object.page_size + }; + }, + toAmino(message: ListViewsRequest): ListViewsRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + return obj; + }, + fromAminoMsg(object: ListViewsRequestAminoMsg): ListViewsRequest { + return ListViewsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListViewsRequestProtoMsg): ListViewsRequest { + return ListViewsRequest.decode(message.value); + }, + toProto(message: ListViewsRequest): Uint8Array { + return ListViewsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListViewsRequest): ListViewsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListViewsRequest", + value: ListViewsRequest.encode(message).finish() + }; } }; function createBaseListViewsResponse(): ListViewsResponse { @@ -2765,6 +3155,7 @@ function createBaseListViewsResponse(): ListViewsResponse { }; } export const ListViewsResponse = { + typeUrl: "/google.logging.v2.ListViewsResponse", encode(message: ListViewsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.views) { LogView.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2837,6 +3228,37 @@ export const ListViewsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListViewsResponseAmino): ListViewsResponse { + return { + views: Array.isArray(object?.views) ? object.views.map((e: any) => LogView.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListViewsResponse): ListViewsResponseAmino { + const obj: any = {}; + if (message.views) { + obj.views = message.views.map(e => e ? LogView.toAmino(e) : undefined); + } else { + obj.views = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListViewsResponseAminoMsg): ListViewsResponse { + return ListViewsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListViewsResponseProtoMsg): ListViewsResponse { + return ListViewsResponse.decode(message.value); + }, + toProto(message: ListViewsResponse): Uint8Array { + return ListViewsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListViewsResponse): ListViewsResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListViewsResponse", + value: ListViewsResponse.encode(message).finish() + }; } }; function createBaseCreateViewRequest(): CreateViewRequest { @@ -2847,6 +3269,7 @@ function createBaseCreateViewRequest(): CreateViewRequest { }; } export const CreateViewRequest = { + typeUrl: "/google.logging.v2.CreateViewRequest", encode(message: CreateViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -2923,6 +3346,35 @@ export const CreateViewRequest = { obj.view_id = message.viewId; message.view !== undefined && (obj.view = message.view ? LogView.toSDK(message.view) : undefined); return obj; + }, + fromAmino(object: CreateViewRequestAmino): CreateViewRequest { + return { + parent: object.parent, + viewId: object.view_id, + view: object?.view ? LogView.fromAmino(object.view) : undefined + }; + }, + toAmino(message: CreateViewRequest): CreateViewRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.view_id = message.viewId; + obj.view = message.view ? LogView.toAmino(message.view) : undefined; + return obj; + }, + fromAminoMsg(object: CreateViewRequestAminoMsg): CreateViewRequest { + return CreateViewRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateViewRequestProtoMsg): CreateViewRequest { + return CreateViewRequest.decode(message.value); + }, + toProto(message: CreateViewRequest): Uint8Array { + return CreateViewRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateViewRequest): CreateViewRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.CreateViewRequest", + value: CreateViewRequest.encode(message).finish() + }; } }; function createBaseUpdateViewRequest(): UpdateViewRequest { @@ -2933,6 +3385,7 @@ function createBaseUpdateViewRequest(): UpdateViewRequest { }; } export const UpdateViewRequest = { + typeUrl: "/google.logging.v2.UpdateViewRequest", encode(message: UpdateViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -3009,6 +3462,35 @@ export const UpdateViewRequest = { message.view !== undefined && (obj.view = message.view ? LogView.toSDK(message.view) : undefined); message.updateMask !== undefined && (obj.update_mask = message.updateMask ? FieldMask.toSDK(message.updateMask) : undefined); return obj; + }, + fromAmino(object: UpdateViewRequestAmino): UpdateViewRequest { + return { + name: object.name, + view: object?.view ? LogView.fromAmino(object.view) : undefined, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined + }; + }, + toAmino(message: UpdateViewRequest): UpdateViewRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.view = message.view ? LogView.toAmino(message.view) : undefined; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateViewRequestAminoMsg): UpdateViewRequest { + return UpdateViewRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateViewRequestProtoMsg): UpdateViewRequest { + return UpdateViewRequest.decode(message.value); + }, + toProto(message: UpdateViewRequest): Uint8Array { + return UpdateViewRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateViewRequest): UpdateViewRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateViewRequest", + value: UpdateViewRequest.encode(message).finish() + }; } }; function createBaseGetViewRequest(): GetViewRequest { @@ -3017,6 +3499,7 @@ function createBaseGetViewRequest(): GetViewRequest { }; } export const GetViewRequest = { + typeUrl: "/google.logging.v2.GetViewRequest", encode(message: GetViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -3069,6 +3552,31 @@ export const GetViewRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetViewRequestAmino): GetViewRequest { + return { + name: object.name + }; + }, + toAmino(message: GetViewRequest): GetViewRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetViewRequestAminoMsg): GetViewRequest { + return GetViewRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetViewRequestProtoMsg): GetViewRequest { + return GetViewRequest.decode(message.value); + }, + toProto(message: GetViewRequest): Uint8Array { + return GetViewRequest.encode(message).finish(); + }, + toProtoMsg(message: GetViewRequest): GetViewRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetViewRequest", + value: GetViewRequest.encode(message).finish() + }; } }; function createBaseDeleteViewRequest(): DeleteViewRequest { @@ -3077,6 +3585,7 @@ function createBaseDeleteViewRequest(): DeleteViewRequest { }; } export const DeleteViewRequest = { + typeUrl: "/google.logging.v2.DeleteViewRequest", encode(message: DeleteViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -3129,6 +3638,31 @@ export const DeleteViewRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: DeleteViewRequestAmino): DeleteViewRequest { + return { + name: object.name + }; + }, + toAmino(message: DeleteViewRequest): DeleteViewRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: DeleteViewRequestAminoMsg): DeleteViewRequest { + return DeleteViewRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteViewRequestProtoMsg): DeleteViewRequest { + return DeleteViewRequest.decode(message.value); + }, + toProto(message: DeleteViewRequest): Uint8Array { + return DeleteViewRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteViewRequest): DeleteViewRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.DeleteViewRequest", + value: DeleteViewRequest.encode(message).finish() + }; } }; function createBaseListSinksRequest(): ListSinksRequest { @@ -3139,6 +3673,7 @@ function createBaseListSinksRequest(): ListSinksRequest { }; } export const ListSinksRequest = { + typeUrl: "/google.logging.v2.ListSinksRequest", encode(message: ListSinksRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -3215,6 +3750,35 @@ export const ListSinksRequest = { obj.page_token = message.pageToken; obj.page_size = message.pageSize; return obj; + }, + fromAmino(object: ListSinksRequestAmino): ListSinksRequest { + return { + parent: object.parent, + pageToken: object.page_token, + pageSize: object.page_size + }; + }, + toAmino(message: ListSinksRequest): ListSinksRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + return obj; + }, + fromAminoMsg(object: ListSinksRequestAminoMsg): ListSinksRequest { + return ListSinksRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListSinksRequestProtoMsg): ListSinksRequest { + return ListSinksRequest.decode(message.value); + }, + toProto(message: ListSinksRequest): Uint8Array { + return ListSinksRequest.encode(message).finish(); + }, + toProtoMsg(message: ListSinksRequest): ListSinksRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListSinksRequest", + value: ListSinksRequest.encode(message).finish() + }; } }; function createBaseListSinksResponse(): ListSinksResponse { @@ -3224,6 +3788,7 @@ function createBaseListSinksResponse(): ListSinksResponse { }; } export const ListSinksResponse = { + typeUrl: "/google.logging.v2.ListSinksResponse", encode(message: ListSinksResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.sinks) { LogSink.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3296,6 +3861,37 @@ export const ListSinksResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListSinksResponseAmino): ListSinksResponse { + return { + sinks: Array.isArray(object?.sinks) ? object.sinks.map((e: any) => LogSink.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListSinksResponse): ListSinksResponseAmino { + const obj: any = {}; + if (message.sinks) { + obj.sinks = message.sinks.map(e => e ? LogSink.toAmino(e) : undefined); + } else { + obj.sinks = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListSinksResponseAminoMsg): ListSinksResponse { + return ListSinksResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListSinksResponseProtoMsg): ListSinksResponse { + return ListSinksResponse.decode(message.value); + }, + toProto(message: ListSinksResponse): Uint8Array { + return ListSinksResponse.encode(message).finish(); + }, + toProtoMsg(message: ListSinksResponse): ListSinksResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListSinksResponse", + value: ListSinksResponse.encode(message).finish() + }; } }; function createBaseGetSinkRequest(): GetSinkRequest { @@ -3304,6 +3900,7 @@ function createBaseGetSinkRequest(): GetSinkRequest { }; } export const GetSinkRequest = { + typeUrl: "/google.logging.v2.GetSinkRequest", encode(message: GetSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sinkName !== "") { writer.uint32(10).string(message.sinkName); @@ -3356,6 +3953,31 @@ export const GetSinkRequest = { const obj: any = {}; obj.sink_name = message.sinkName; return obj; + }, + fromAmino(object: GetSinkRequestAmino): GetSinkRequest { + return { + sinkName: object.sink_name + }; + }, + toAmino(message: GetSinkRequest): GetSinkRequestAmino { + const obj: any = {}; + obj.sink_name = message.sinkName; + return obj; + }, + fromAminoMsg(object: GetSinkRequestAminoMsg): GetSinkRequest { + return GetSinkRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetSinkRequestProtoMsg): GetSinkRequest { + return GetSinkRequest.decode(message.value); + }, + toProto(message: GetSinkRequest): Uint8Array { + return GetSinkRequest.encode(message).finish(); + }, + toProtoMsg(message: GetSinkRequest): GetSinkRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetSinkRequest", + value: GetSinkRequest.encode(message).finish() + }; } }; function createBaseCreateSinkRequest(): CreateSinkRequest { @@ -3366,6 +3988,7 @@ function createBaseCreateSinkRequest(): CreateSinkRequest { }; } export const CreateSinkRequest = { + typeUrl: "/google.logging.v2.CreateSinkRequest", encode(message: CreateSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -3442,6 +4065,35 @@ export const CreateSinkRequest = { message.sink !== undefined && (obj.sink = message.sink ? LogSink.toSDK(message.sink) : undefined); obj.unique_writer_identity = message.uniqueWriterIdentity; return obj; + }, + fromAmino(object: CreateSinkRequestAmino): CreateSinkRequest { + return { + parent: object.parent, + sink: object?.sink ? LogSink.fromAmino(object.sink) : undefined, + uniqueWriterIdentity: object.unique_writer_identity + }; + }, + toAmino(message: CreateSinkRequest): CreateSinkRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; + obj.unique_writer_identity = message.uniqueWriterIdentity; + return obj; + }, + fromAminoMsg(object: CreateSinkRequestAminoMsg): CreateSinkRequest { + return CreateSinkRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateSinkRequestProtoMsg): CreateSinkRequest { + return CreateSinkRequest.decode(message.value); + }, + toProto(message: CreateSinkRequest): Uint8Array { + return CreateSinkRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateSinkRequest): CreateSinkRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.CreateSinkRequest", + value: CreateSinkRequest.encode(message).finish() + }; } }; function createBaseUpdateSinkRequest(): UpdateSinkRequest { @@ -3453,6 +4105,7 @@ function createBaseUpdateSinkRequest(): UpdateSinkRequest { }; } export const UpdateSinkRequest = { + typeUrl: "/google.logging.v2.UpdateSinkRequest", encode(message: UpdateSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sinkName !== "") { writer.uint32(10).string(message.sinkName); @@ -3541,6 +4194,37 @@ export const UpdateSinkRequest = { obj.unique_writer_identity = message.uniqueWriterIdentity; message.updateMask !== undefined && (obj.update_mask = message.updateMask ? FieldMask.toSDK(message.updateMask) : undefined); return obj; + }, + fromAmino(object: UpdateSinkRequestAmino): UpdateSinkRequest { + return { + sinkName: object.sink_name, + sink: object?.sink ? LogSink.fromAmino(object.sink) : undefined, + uniqueWriterIdentity: object.unique_writer_identity, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined + }; + }, + toAmino(message: UpdateSinkRequest): UpdateSinkRequestAmino { + const obj: any = {}; + obj.sink_name = message.sinkName; + obj.sink = message.sink ? LogSink.toAmino(message.sink) : undefined; + obj.unique_writer_identity = message.uniqueWriterIdentity; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateSinkRequestAminoMsg): UpdateSinkRequest { + return UpdateSinkRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateSinkRequestProtoMsg): UpdateSinkRequest { + return UpdateSinkRequest.decode(message.value); + }, + toProto(message: UpdateSinkRequest): Uint8Array { + return UpdateSinkRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateSinkRequest): UpdateSinkRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateSinkRequest", + value: UpdateSinkRequest.encode(message).finish() + }; } }; function createBaseDeleteSinkRequest(): DeleteSinkRequest { @@ -3549,6 +4233,7 @@ function createBaseDeleteSinkRequest(): DeleteSinkRequest { }; } export const DeleteSinkRequest = { + typeUrl: "/google.logging.v2.DeleteSinkRequest", encode(message: DeleteSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sinkName !== "") { writer.uint32(10).string(message.sinkName); @@ -3601,6 +4286,31 @@ export const DeleteSinkRequest = { const obj: any = {}; obj.sink_name = message.sinkName; return obj; + }, + fromAmino(object: DeleteSinkRequestAmino): DeleteSinkRequest { + return { + sinkName: object.sink_name + }; + }, + toAmino(message: DeleteSinkRequest): DeleteSinkRequestAmino { + const obj: any = {}; + obj.sink_name = message.sinkName; + return obj; + }, + fromAminoMsg(object: DeleteSinkRequestAminoMsg): DeleteSinkRequest { + return DeleteSinkRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteSinkRequestProtoMsg): DeleteSinkRequest { + return DeleteSinkRequest.decode(message.value); + }, + toProto(message: DeleteSinkRequest): Uint8Array { + return DeleteSinkRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteSinkRequest): DeleteSinkRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.DeleteSinkRequest", + value: DeleteSinkRequest.encode(message).finish() + }; } }; function createBaseLogExclusion(): LogExclusion { @@ -3614,6 +4324,7 @@ function createBaseLogExclusion(): LogExclusion { }; } export const LogExclusion = { + typeUrl: "/google.logging.v2.LogExclusion", encode(message: LogExclusion, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -3726,6 +4437,41 @@ export const LogExclusion = { message.createTime !== undefined && (obj.create_time = message.createTime ?? undefined); message.updateTime !== undefined && (obj.update_time = message.updateTime ?? undefined); return obj; + }, + fromAmino(object: LogExclusionAmino): LogExclusion { + return { + name: object.name, + description: object.description, + filter: object.filter, + disabled: object.disabled, + createTime: object.create_time, + updateTime: object.update_time + }; + }, + toAmino(message: LogExclusion): LogExclusionAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + obj.filter = message.filter; + obj.disabled = message.disabled; + obj.create_time = message.createTime; + obj.update_time = message.updateTime; + return obj; + }, + fromAminoMsg(object: LogExclusionAminoMsg): LogExclusion { + return LogExclusion.fromAmino(object.value); + }, + fromProtoMsg(message: LogExclusionProtoMsg): LogExclusion { + return LogExclusion.decode(message.value); + }, + toProto(message: LogExclusion): Uint8Array { + return LogExclusion.encode(message).finish(); + }, + toProtoMsg(message: LogExclusion): LogExclusionProtoMsg { + return { + typeUrl: "/google.logging.v2.LogExclusion", + value: LogExclusion.encode(message).finish() + }; } }; function createBaseListExclusionsRequest(): ListExclusionsRequest { @@ -3736,6 +4482,7 @@ function createBaseListExclusionsRequest(): ListExclusionsRequest { }; } export const ListExclusionsRequest = { + typeUrl: "/google.logging.v2.ListExclusionsRequest", encode(message: ListExclusionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -3812,6 +4559,35 @@ export const ListExclusionsRequest = { obj.page_token = message.pageToken; obj.page_size = message.pageSize; return obj; + }, + fromAmino(object: ListExclusionsRequestAmino): ListExclusionsRequest { + return { + parent: object.parent, + pageToken: object.page_token, + pageSize: object.page_size + }; + }, + toAmino(message: ListExclusionsRequest): ListExclusionsRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + return obj; + }, + fromAminoMsg(object: ListExclusionsRequestAminoMsg): ListExclusionsRequest { + return ListExclusionsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListExclusionsRequestProtoMsg): ListExclusionsRequest { + return ListExclusionsRequest.decode(message.value); + }, + toProto(message: ListExclusionsRequest): Uint8Array { + return ListExclusionsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListExclusionsRequest): ListExclusionsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListExclusionsRequest", + value: ListExclusionsRequest.encode(message).finish() + }; } }; function createBaseListExclusionsResponse(): ListExclusionsResponse { @@ -3821,6 +4597,7 @@ function createBaseListExclusionsResponse(): ListExclusionsResponse { }; } export const ListExclusionsResponse = { + typeUrl: "/google.logging.v2.ListExclusionsResponse", encode(message: ListExclusionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.exclusions) { LogExclusion.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3893,6 +4670,37 @@ export const ListExclusionsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListExclusionsResponseAmino): ListExclusionsResponse { + return { + exclusions: Array.isArray(object?.exclusions) ? object.exclusions.map((e: any) => LogExclusion.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListExclusionsResponse): ListExclusionsResponseAmino { + const obj: any = {}; + if (message.exclusions) { + obj.exclusions = message.exclusions.map(e => e ? LogExclusion.toAmino(e) : undefined); + } else { + obj.exclusions = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListExclusionsResponseAminoMsg): ListExclusionsResponse { + return ListExclusionsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListExclusionsResponseProtoMsg): ListExclusionsResponse { + return ListExclusionsResponse.decode(message.value); + }, + toProto(message: ListExclusionsResponse): Uint8Array { + return ListExclusionsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListExclusionsResponse): ListExclusionsResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListExclusionsResponse", + value: ListExclusionsResponse.encode(message).finish() + }; } }; function createBaseGetExclusionRequest(): GetExclusionRequest { @@ -3901,6 +4709,7 @@ function createBaseGetExclusionRequest(): GetExclusionRequest { }; } export const GetExclusionRequest = { + typeUrl: "/google.logging.v2.GetExclusionRequest", encode(message: GetExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -3953,6 +4762,31 @@ export const GetExclusionRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetExclusionRequestAmino): GetExclusionRequest { + return { + name: object.name + }; + }, + toAmino(message: GetExclusionRequest): GetExclusionRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetExclusionRequestAminoMsg): GetExclusionRequest { + return GetExclusionRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetExclusionRequestProtoMsg): GetExclusionRequest { + return GetExclusionRequest.decode(message.value); + }, + toProto(message: GetExclusionRequest): Uint8Array { + return GetExclusionRequest.encode(message).finish(); + }, + toProtoMsg(message: GetExclusionRequest): GetExclusionRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetExclusionRequest", + value: GetExclusionRequest.encode(message).finish() + }; } }; function createBaseCreateExclusionRequest(): CreateExclusionRequest { @@ -3962,6 +4796,7 @@ function createBaseCreateExclusionRequest(): CreateExclusionRequest { }; } export const CreateExclusionRequest = { + typeUrl: "/google.logging.v2.CreateExclusionRequest", encode(message: CreateExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -4026,6 +4861,33 @@ export const CreateExclusionRequest = { obj.parent = message.parent; message.exclusion !== undefined && (obj.exclusion = message.exclusion ? LogExclusion.toSDK(message.exclusion) : undefined); return obj; + }, + fromAmino(object: CreateExclusionRequestAmino): CreateExclusionRequest { + return { + parent: object.parent, + exclusion: object?.exclusion ? LogExclusion.fromAmino(object.exclusion) : undefined + }; + }, + toAmino(message: CreateExclusionRequest): CreateExclusionRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; + return obj; + }, + fromAminoMsg(object: CreateExclusionRequestAminoMsg): CreateExclusionRequest { + return CreateExclusionRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateExclusionRequestProtoMsg): CreateExclusionRequest { + return CreateExclusionRequest.decode(message.value); + }, + toProto(message: CreateExclusionRequest): Uint8Array { + return CreateExclusionRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateExclusionRequest): CreateExclusionRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.CreateExclusionRequest", + value: CreateExclusionRequest.encode(message).finish() + }; } }; function createBaseUpdateExclusionRequest(): UpdateExclusionRequest { @@ -4036,6 +4898,7 @@ function createBaseUpdateExclusionRequest(): UpdateExclusionRequest { }; } export const UpdateExclusionRequest = { + typeUrl: "/google.logging.v2.UpdateExclusionRequest", encode(message: UpdateExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4112,6 +4975,35 @@ export const UpdateExclusionRequest = { message.exclusion !== undefined && (obj.exclusion = message.exclusion ? LogExclusion.toSDK(message.exclusion) : undefined); message.updateMask !== undefined && (obj.update_mask = message.updateMask ? FieldMask.toSDK(message.updateMask) : undefined); return obj; + }, + fromAmino(object: UpdateExclusionRequestAmino): UpdateExclusionRequest { + return { + name: object.name, + exclusion: object?.exclusion ? LogExclusion.fromAmino(object.exclusion) : undefined, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined + }; + }, + toAmino(message: UpdateExclusionRequest): UpdateExclusionRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.exclusion = message.exclusion ? LogExclusion.toAmino(message.exclusion) : undefined; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateExclusionRequestAminoMsg): UpdateExclusionRequest { + return UpdateExclusionRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateExclusionRequestProtoMsg): UpdateExclusionRequest { + return UpdateExclusionRequest.decode(message.value); + }, + toProto(message: UpdateExclusionRequest): Uint8Array { + return UpdateExclusionRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateExclusionRequest): UpdateExclusionRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateExclusionRequest", + value: UpdateExclusionRequest.encode(message).finish() + }; } }; function createBaseDeleteExclusionRequest(): DeleteExclusionRequest { @@ -4120,6 +5012,7 @@ function createBaseDeleteExclusionRequest(): DeleteExclusionRequest { }; } export const DeleteExclusionRequest = { + typeUrl: "/google.logging.v2.DeleteExclusionRequest", encode(message: DeleteExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4172,6 +5065,31 @@ export const DeleteExclusionRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: DeleteExclusionRequestAmino): DeleteExclusionRequest { + return { + name: object.name + }; + }, + toAmino(message: DeleteExclusionRequest): DeleteExclusionRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: DeleteExclusionRequestAminoMsg): DeleteExclusionRequest { + return DeleteExclusionRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteExclusionRequestProtoMsg): DeleteExclusionRequest { + return DeleteExclusionRequest.decode(message.value); + }, + toProto(message: DeleteExclusionRequest): Uint8Array { + return DeleteExclusionRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteExclusionRequest): DeleteExclusionRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.DeleteExclusionRequest", + value: DeleteExclusionRequest.encode(message).finish() + }; } }; function createBaseGetCmekSettingsRequest(): GetCmekSettingsRequest { @@ -4180,6 +5098,7 @@ function createBaseGetCmekSettingsRequest(): GetCmekSettingsRequest { }; } export const GetCmekSettingsRequest = { + typeUrl: "/google.logging.v2.GetCmekSettingsRequest", encode(message: GetCmekSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4232,6 +5151,31 @@ export const GetCmekSettingsRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetCmekSettingsRequestAmino): GetCmekSettingsRequest { + return { + name: object.name + }; + }, + toAmino(message: GetCmekSettingsRequest): GetCmekSettingsRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetCmekSettingsRequestAminoMsg): GetCmekSettingsRequest { + return GetCmekSettingsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetCmekSettingsRequestProtoMsg): GetCmekSettingsRequest { + return GetCmekSettingsRequest.decode(message.value); + }, + toProto(message: GetCmekSettingsRequest): Uint8Array { + return GetCmekSettingsRequest.encode(message).finish(); + }, + toProtoMsg(message: GetCmekSettingsRequest): GetCmekSettingsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetCmekSettingsRequest", + value: GetCmekSettingsRequest.encode(message).finish() + }; } }; function createBaseUpdateCmekSettingsRequest(): UpdateCmekSettingsRequest { @@ -4242,6 +5186,7 @@ function createBaseUpdateCmekSettingsRequest(): UpdateCmekSettingsRequest { }; } export const UpdateCmekSettingsRequest = { + typeUrl: "/google.logging.v2.UpdateCmekSettingsRequest", encode(message: UpdateCmekSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4318,6 +5263,35 @@ export const UpdateCmekSettingsRequest = { message.cmekSettings !== undefined && (obj.cmek_settings = message.cmekSettings ? CmekSettings.toSDK(message.cmekSettings) : undefined); message.updateMask !== undefined && (obj.update_mask = message.updateMask ? FieldMask.toSDK(message.updateMask) : undefined); return obj; + }, + fromAmino(object: UpdateCmekSettingsRequestAmino): UpdateCmekSettingsRequest { + return { + name: object.name, + cmekSettings: object?.cmek_settings ? CmekSettings.fromAmino(object.cmek_settings) : undefined, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined + }; + }, + toAmino(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.cmek_settings = message.cmekSettings ? CmekSettings.toAmino(message.cmekSettings) : undefined; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateCmekSettingsRequestAminoMsg): UpdateCmekSettingsRequest { + return UpdateCmekSettingsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateCmekSettingsRequestProtoMsg): UpdateCmekSettingsRequest { + return UpdateCmekSettingsRequest.decode(message.value); + }, + toProto(message: UpdateCmekSettingsRequest): Uint8Array { + return UpdateCmekSettingsRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateCmekSettingsRequest): UpdateCmekSettingsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateCmekSettingsRequest", + value: UpdateCmekSettingsRequest.encode(message).finish() + }; } }; function createBaseCmekSettings(): CmekSettings { @@ -4328,6 +5302,7 @@ function createBaseCmekSettings(): CmekSettings { }; } export const CmekSettings = { + typeUrl: "/google.logging.v2.CmekSettings", encode(message: CmekSettings, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4404,6 +5379,35 @@ export const CmekSettings = { obj.kms_key_name = message.kmsKeyName; obj.service_account_id = message.serviceAccountId; return obj; + }, + fromAmino(object: CmekSettingsAmino): CmekSettings { + return { + name: object.name, + kmsKeyName: object.kms_key_name, + serviceAccountId: object.service_account_id + }; + }, + toAmino(message: CmekSettings): CmekSettingsAmino { + const obj: any = {}; + obj.name = message.name; + obj.kms_key_name = message.kmsKeyName; + obj.service_account_id = message.serviceAccountId; + return obj; + }, + fromAminoMsg(object: CmekSettingsAminoMsg): CmekSettings { + return CmekSettings.fromAmino(object.value); + }, + fromProtoMsg(message: CmekSettingsProtoMsg): CmekSettings { + return CmekSettings.decode(message.value); + }, + toProto(message: CmekSettings): Uint8Array { + return CmekSettings.encode(message).finish(); + }, + toProtoMsg(message: CmekSettings): CmekSettingsProtoMsg { + return { + typeUrl: "/google.logging.v2.CmekSettings", + value: CmekSettings.encode(message).finish() + }; } }; function createBaseGetSettingsRequest(): GetSettingsRequest { @@ -4412,6 +5416,7 @@ function createBaseGetSettingsRequest(): GetSettingsRequest { }; } export const GetSettingsRequest = { + typeUrl: "/google.logging.v2.GetSettingsRequest", encode(message: GetSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4464,6 +5469,31 @@ export const GetSettingsRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetSettingsRequestAmino): GetSettingsRequest { + return { + name: object.name + }; + }, + toAmino(message: GetSettingsRequest): GetSettingsRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetSettingsRequestAminoMsg): GetSettingsRequest { + return GetSettingsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetSettingsRequestProtoMsg): GetSettingsRequest { + return GetSettingsRequest.decode(message.value); + }, + toProto(message: GetSettingsRequest): Uint8Array { + return GetSettingsRequest.encode(message).finish(); + }, + toProtoMsg(message: GetSettingsRequest): GetSettingsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetSettingsRequest", + value: GetSettingsRequest.encode(message).finish() + }; } }; function createBaseUpdateSettingsRequest(): UpdateSettingsRequest { @@ -4474,6 +5504,7 @@ function createBaseUpdateSettingsRequest(): UpdateSettingsRequest { }; } export const UpdateSettingsRequest = { + typeUrl: "/google.logging.v2.UpdateSettingsRequest", encode(message: UpdateSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4550,6 +5581,35 @@ export const UpdateSettingsRequest = { message.settings !== undefined && (obj.settings = message.settings ? Settings.toSDK(message.settings) : undefined); message.updateMask !== undefined && (obj.update_mask = message.updateMask ? FieldMask.toSDK(message.updateMask) : undefined); return obj; + }, + fromAmino(object: UpdateSettingsRequestAmino): UpdateSettingsRequest { + return { + name: object.name, + settings: object?.settings ? Settings.fromAmino(object.settings) : undefined, + updateMask: object?.update_mask ? FieldMask.fromAmino(object.update_mask) : undefined + }; + }, + toAmino(message: UpdateSettingsRequest): UpdateSettingsRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.settings = message.settings ? Settings.toAmino(message.settings) : undefined; + obj.update_mask = message.updateMask ? FieldMask.toAmino(message.updateMask) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateSettingsRequestAminoMsg): UpdateSettingsRequest { + return UpdateSettingsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateSettingsRequestProtoMsg): UpdateSettingsRequest { + return UpdateSettingsRequest.decode(message.value); + }, + toProto(message: UpdateSettingsRequest): Uint8Array { + return UpdateSettingsRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateSettingsRequest): UpdateSettingsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateSettingsRequest", + value: UpdateSettingsRequest.encode(message).finish() + }; } }; function createBaseSettings(): Settings { @@ -4562,6 +5622,7 @@ function createBaseSettings(): Settings { }; } export const Settings = { + typeUrl: "/google.logging.v2.Settings", encode(message: Settings, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4662,6 +5723,39 @@ export const Settings = { obj.storage_location = message.storageLocation; obj.disable_default_sink = message.disableDefaultSink; return obj; + }, + fromAmino(object: SettingsAmino): Settings { + return { + name: object.name, + kmsKeyName: object.kms_key_name, + kmsServiceAccountId: object.kms_service_account_id, + storageLocation: object.storage_location, + disableDefaultSink: object.disable_default_sink + }; + }, + toAmino(message: Settings): SettingsAmino { + const obj: any = {}; + obj.name = message.name; + obj.kms_key_name = message.kmsKeyName; + obj.kms_service_account_id = message.kmsServiceAccountId; + obj.storage_location = message.storageLocation; + obj.disable_default_sink = message.disableDefaultSink; + return obj; + }, + fromAminoMsg(object: SettingsAminoMsg): Settings { + return Settings.fromAmino(object.value); + }, + fromProtoMsg(message: SettingsProtoMsg): Settings { + return Settings.decode(message.value); + }, + toProto(message: Settings): Uint8Array { + return Settings.encode(message).finish(); + }, + toProtoMsg(message: Settings): SettingsProtoMsg { + return { + typeUrl: "/google.logging.v2.Settings", + value: Settings.encode(message).finish() + }; } }; function createBaseCopyLogEntriesRequest(): CopyLogEntriesRequest { @@ -4672,6 +5766,7 @@ function createBaseCopyLogEntriesRequest(): CopyLogEntriesRequest { }; } export const CopyLogEntriesRequest = { + typeUrl: "/google.logging.v2.CopyLogEntriesRequest", encode(message: CopyLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -4748,6 +5843,35 @@ export const CopyLogEntriesRequest = { obj.filter = message.filter; obj.destination = message.destination; return obj; + }, + fromAmino(object: CopyLogEntriesRequestAmino): CopyLogEntriesRequest { + return { + name: object.name, + filter: object.filter, + destination: object.destination + }; + }, + toAmino(message: CopyLogEntriesRequest): CopyLogEntriesRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.filter = message.filter; + obj.destination = message.destination; + return obj; + }, + fromAminoMsg(object: CopyLogEntriesRequestAminoMsg): CopyLogEntriesRequest { + return CopyLogEntriesRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CopyLogEntriesRequestProtoMsg): CopyLogEntriesRequest { + return CopyLogEntriesRequest.decode(message.value); + }, + toProto(message: CopyLogEntriesRequest): Uint8Array { + return CopyLogEntriesRequest.encode(message).finish(); + }, + toProtoMsg(message: CopyLogEntriesRequest): CopyLogEntriesRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.CopyLogEntriesRequest", + value: CopyLogEntriesRequest.encode(message).finish() + }; } }; function createBaseCopyLogEntriesMetadata(): CopyLogEntriesMetadata { @@ -4762,6 +5886,7 @@ function createBaseCopyLogEntriesMetadata(): CopyLogEntriesMetadata { }; } export const CopyLogEntriesMetadata = { + typeUrl: "/google.logging.v2.CopyLogEntriesMetadata", encode(message: CopyLogEntriesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.startTime !== undefined) { Timestamp.encode(toTimestamp(message.startTime), writer.uint32(10).fork()).ldelim(); @@ -4886,6 +6011,43 @@ export const CopyLogEntriesMetadata = { obj.progress = message.progress; obj.writer_identity = message.writerIdentity; return obj; + }, + fromAmino(object: CopyLogEntriesMetadataAmino): CopyLogEntriesMetadata { + return { + startTime: object.start_time, + endTime: object.end_time, + state: isSet(object.state) ? operationStateFromJSON(object.state) : -1, + cancellationRequested: object.cancellation_requested, + request: object?.request ? CopyLogEntriesRequest.fromAmino(object.request) : undefined, + progress: object.progress, + writerIdentity: object.writer_identity + }; + }, + toAmino(message: CopyLogEntriesMetadata): CopyLogEntriesMetadataAmino { + const obj: any = {}; + obj.start_time = message.startTime; + obj.end_time = message.endTime; + obj.state = message.state; + obj.cancellation_requested = message.cancellationRequested; + obj.request = message.request ? CopyLogEntriesRequest.toAmino(message.request) : undefined; + obj.progress = message.progress; + obj.writer_identity = message.writerIdentity; + return obj; + }, + fromAminoMsg(object: CopyLogEntriesMetadataAminoMsg): CopyLogEntriesMetadata { + return CopyLogEntriesMetadata.fromAmino(object.value); + }, + fromProtoMsg(message: CopyLogEntriesMetadataProtoMsg): CopyLogEntriesMetadata { + return CopyLogEntriesMetadata.decode(message.value); + }, + toProto(message: CopyLogEntriesMetadata): Uint8Array { + return CopyLogEntriesMetadata.encode(message).finish(); + }, + toProtoMsg(message: CopyLogEntriesMetadata): CopyLogEntriesMetadataProtoMsg { + return { + typeUrl: "/google.logging.v2.CopyLogEntriesMetadata", + value: CopyLogEntriesMetadata.encode(message).finish() + }; } }; function createBaseCopyLogEntriesResponse(): CopyLogEntriesResponse { @@ -4894,6 +6056,7 @@ function createBaseCopyLogEntriesResponse(): CopyLogEntriesResponse { }; } export const CopyLogEntriesResponse = { + typeUrl: "/google.logging.v2.CopyLogEntriesResponse", encode(message: CopyLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logEntriesCopiedCount !== BigInt(0)) { writer.uint32(8).int64(message.logEntriesCopiedCount); @@ -4946,5 +6109,30 @@ export const CopyLogEntriesResponse = { const obj: any = {}; obj.log_entries_copied_count = message.logEntriesCopiedCount; return obj; + }, + fromAmino(object: CopyLogEntriesResponseAmino): CopyLogEntriesResponse { + return { + logEntriesCopiedCount: BigInt(object.log_entries_copied_count) + }; + }, + toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { + const obj: any = {}; + obj.log_entries_copied_count = message.logEntriesCopiedCount ? message.logEntriesCopiedCount.toString() : undefined; + return obj; + }, + fromAminoMsg(object: CopyLogEntriesResponseAminoMsg): CopyLogEntriesResponse { + return CopyLogEntriesResponse.fromAmino(object.value); + }, + fromProtoMsg(message: CopyLogEntriesResponseProtoMsg): CopyLogEntriesResponse { + return CopyLogEntriesResponse.decode(message.value); + }, + toProto(message: CopyLogEntriesResponse): Uint8Array { + return CopyLogEntriesResponse.encode(message).finish(); + }, + toProtoMsg(message: CopyLogEntriesResponse): CopyLogEntriesResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.CopyLogEntriesResponse", + value: CopyLogEntriesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_metrics.ts b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_metrics.ts index ee3212de91..7eb7b4c9a8 100644 --- a/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputosmojs/google/logging/v2/logging_metrics.ts @@ -389,6 +389,27 @@ export const LogMetric_LabelExtractorsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: LogMetric_LabelExtractorsEntryAmino): LogMetric_LabelExtractorsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: LogMetric_LabelExtractorsEntry): LogMetric_LabelExtractorsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: LogMetric_LabelExtractorsEntryAminoMsg): LogMetric_LabelExtractorsEntry { + return LogMetric_LabelExtractorsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: LogMetric_LabelExtractorsEntryProtoMsg): LogMetric_LabelExtractorsEntry { + return LogMetric_LabelExtractorsEntry.decode(message.value); + }, + toProto(message: LogMetric_LabelExtractorsEntry): Uint8Array { + return LogMetric_LabelExtractorsEntry.encode(message).finish(); } }; function createBaseLogMetric(): LogMetric { @@ -407,6 +428,7 @@ function createBaseLogMetric(): LogMetric { }; } export const LogMetric = { + typeUrl: "/google.logging.v2.LogMetric", encode(message: LogMetric, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -617,6 +639,61 @@ export const LogMetric = { message.updateTime !== undefined && (obj.update_time = message.updateTime ?? undefined); message.version !== undefined && (obj.version = logMetric_ApiVersionToJSON(message.version)); return obj; + }, + fromAmino(object: LogMetricAmino): LogMetric { + return { + name: object.name, + description: object.description, + filter: object.filter, + disabled: object.disabled, + metricDescriptor: object?.metric_descriptor ? MetricDescriptor.fromAmino(object.metric_descriptor) : undefined, + valueExtractor: object.value_extractor, + labelExtractors: isObject(object.label_extractors) ? Object.entries(object.label_extractors).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + bucketOptions: object?.bucket_options ? Distribution_BucketOptions.fromAmino(object.bucket_options) : undefined, + createTime: object.create_time, + updateTime: object.update_time, + version: isSet(object.version) ? logMetric_ApiVersionFromJSON(object.version) : -1 + }; + }, + toAmino(message: LogMetric): LogMetricAmino { + const obj: any = {}; + obj.name = message.name; + obj.description = message.description; + obj.filter = message.filter; + obj.disabled = message.disabled; + obj.metric_descriptor = message.metricDescriptor ? MetricDescriptor.toAmino(message.metricDescriptor) : undefined; + obj.value_extractor = message.valueExtractor; + obj.label_extractors = {}; + if (message.labelExtractors) { + Object.entries(message.labelExtractors).forEach(([k, v]) => { + obj.label_extractors[k] = v; + }); + } + obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; + obj.create_time = message.createTime; + obj.update_time = message.updateTime; + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: LogMetricAminoMsg): LogMetric { + return LogMetric.fromAmino(object.value); + }, + fromProtoMsg(message: LogMetricProtoMsg): LogMetric { + return LogMetric.decode(message.value); + }, + toProto(message: LogMetric): Uint8Array { + return LogMetric.encode(message).finish(); + }, + toProtoMsg(message: LogMetric): LogMetricProtoMsg { + return { + typeUrl: "/google.logging.v2.LogMetric", + value: LogMetric.encode(message).finish() + }; } }; function createBaseListLogMetricsRequest(): ListLogMetricsRequest { @@ -627,6 +704,7 @@ function createBaseListLogMetricsRequest(): ListLogMetricsRequest { }; } export const ListLogMetricsRequest = { + typeUrl: "/google.logging.v2.ListLogMetricsRequest", encode(message: ListLogMetricsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -703,6 +781,35 @@ export const ListLogMetricsRequest = { obj.page_token = message.pageToken; obj.page_size = message.pageSize; return obj; + }, + fromAmino(object: ListLogMetricsRequestAmino): ListLogMetricsRequest { + return { + parent: object.parent, + pageToken: object.page_token, + pageSize: object.page_size + }; + }, + toAmino(message: ListLogMetricsRequest): ListLogMetricsRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.page_token = message.pageToken; + obj.page_size = message.pageSize; + return obj; + }, + fromAminoMsg(object: ListLogMetricsRequestAminoMsg): ListLogMetricsRequest { + return ListLogMetricsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListLogMetricsRequestProtoMsg): ListLogMetricsRequest { + return ListLogMetricsRequest.decode(message.value); + }, + toProto(message: ListLogMetricsRequest): Uint8Array { + return ListLogMetricsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListLogMetricsRequest): ListLogMetricsRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.ListLogMetricsRequest", + value: ListLogMetricsRequest.encode(message).finish() + }; } }; function createBaseListLogMetricsResponse(): ListLogMetricsResponse { @@ -712,6 +819,7 @@ function createBaseListLogMetricsResponse(): ListLogMetricsResponse { }; } export const ListLogMetricsResponse = { + typeUrl: "/google.logging.v2.ListLogMetricsResponse", encode(message: ListLogMetricsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.metrics) { LogMetric.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -784,6 +892,37 @@ export const ListLogMetricsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListLogMetricsResponseAmino): ListLogMetricsResponse { + return { + metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => LogMetric.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListLogMetricsResponse): ListLogMetricsResponseAmino { + const obj: any = {}; + if (message.metrics) { + obj.metrics = message.metrics.map(e => e ? LogMetric.toAmino(e) : undefined); + } else { + obj.metrics = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListLogMetricsResponseAminoMsg): ListLogMetricsResponse { + return ListLogMetricsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListLogMetricsResponseProtoMsg): ListLogMetricsResponse { + return ListLogMetricsResponse.decode(message.value); + }, + toProto(message: ListLogMetricsResponse): Uint8Array { + return ListLogMetricsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListLogMetricsResponse): ListLogMetricsResponseProtoMsg { + return { + typeUrl: "/google.logging.v2.ListLogMetricsResponse", + value: ListLogMetricsResponse.encode(message).finish() + }; } }; function createBaseGetLogMetricRequest(): GetLogMetricRequest { @@ -792,6 +931,7 @@ function createBaseGetLogMetricRequest(): GetLogMetricRequest { }; } export const GetLogMetricRequest = { + typeUrl: "/google.logging.v2.GetLogMetricRequest", encode(message: GetLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); @@ -844,6 +984,31 @@ export const GetLogMetricRequest = { const obj: any = {}; obj.metric_name = message.metricName; return obj; + }, + fromAmino(object: GetLogMetricRequestAmino): GetLogMetricRequest { + return { + metricName: object.metric_name + }; + }, + toAmino(message: GetLogMetricRequest): GetLogMetricRequestAmino { + const obj: any = {}; + obj.metric_name = message.metricName; + return obj; + }, + fromAminoMsg(object: GetLogMetricRequestAminoMsg): GetLogMetricRequest { + return GetLogMetricRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetLogMetricRequestProtoMsg): GetLogMetricRequest { + return GetLogMetricRequest.decode(message.value); + }, + toProto(message: GetLogMetricRequest): Uint8Array { + return GetLogMetricRequest.encode(message).finish(); + }, + toProtoMsg(message: GetLogMetricRequest): GetLogMetricRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.GetLogMetricRequest", + value: GetLogMetricRequest.encode(message).finish() + }; } }; function createBaseCreateLogMetricRequest(): CreateLogMetricRequest { @@ -853,6 +1018,7 @@ function createBaseCreateLogMetricRequest(): CreateLogMetricRequest { }; } export const CreateLogMetricRequest = { + typeUrl: "/google.logging.v2.CreateLogMetricRequest", encode(message: CreateLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); @@ -917,6 +1083,33 @@ export const CreateLogMetricRequest = { obj.parent = message.parent; message.metric !== undefined && (obj.metric = message.metric ? LogMetric.toSDK(message.metric) : undefined); return obj; + }, + fromAmino(object: CreateLogMetricRequestAmino): CreateLogMetricRequest { + return { + parent: object.parent, + metric: object?.metric ? LogMetric.fromAmino(object.metric) : undefined + }; + }, + toAmino(message: CreateLogMetricRequest): CreateLogMetricRequestAmino { + const obj: any = {}; + obj.parent = message.parent; + obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; + return obj; + }, + fromAminoMsg(object: CreateLogMetricRequestAminoMsg): CreateLogMetricRequest { + return CreateLogMetricRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CreateLogMetricRequestProtoMsg): CreateLogMetricRequest { + return CreateLogMetricRequest.decode(message.value); + }, + toProto(message: CreateLogMetricRequest): Uint8Array { + return CreateLogMetricRequest.encode(message).finish(); + }, + toProtoMsg(message: CreateLogMetricRequest): CreateLogMetricRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.CreateLogMetricRequest", + value: CreateLogMetricRequest.encode(message).finish() + }; } }; function createBaseUpdateLogMetricRequest(): UpdateLogMetricRequest { @@ -926,6 +1119,7 @@ function createBaseUpdateLogMetricRequest(): UpdateLogMetricRequest { }; } export const UpdateLogMetricRequest = { + typeUrl: "/google.logging.v2.UpdateLogMetricRequest", encode(message: UpdateLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); @@ -990,6 +1184,33 @@ export const UpdateLogMetricRequest = { obj.metric_name = message.metricName; message.metric !== undefined && (obj.metric = message.metric ? LogMetric.toSDK(message.metric) : undefined); return obj; + }, + fromAmino(object: UpdateLogMetricRequestAmino): UpdateLogMetricRequest { + return { + metricName: object.metric_name, + metric: object?.metric ? LogMetric.fromAmino(object.metric) : undefined + }; + }, + toAmino(message: UpdateLogMetricRequest): UpdateLogMetricRequestAmino { + const obj: any = {}; + obj.metric_name = message.metricName; + obj.metric = message.metric ? LogMetric.toAmino(message.metric) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateLogMetricRequestAminoMsg): UpdateLogMetricRequest { + return UpdateLogMetricRequest.fromAmino(object.value); + }, + fromProtoMsg(message: UpdateLogMetricRequestProtoMsg): UpdateLogMetricRequest { + return UpdateLogMetricRequest.decode(message.value); + }, + toProto(message: UpdateLogMetricRequest): Uint8Array { + return UpdateLogMetricRequest.encode(message).finish(); + }, + toProtoMsg(message: UpdateLogMetricRequest): UpdateLogMetricRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.UpdateLogMetricRequest", + value: UpdateLogMetricRequest.encode(message).finish() + }; } }; function createBaseDeleteLogMetricRequest(): DeleteLogMetricRequest { @@ -998,6 +1219,7 @@ function createBaseDeleteLogMetricRequest(): DeleteLogMetricRequest { }; } export const DeleteLogMetricRequest = { + typeUrl: "/google.logging.v2.DeleteLogMetricRequest", encode(message: DeleteLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); @@ -1050,5 +1272,30 @@ export const DeleteLogMetricRequest = { const obj: any = {}; obj.metric_name = message.metricName; return obj; + }, + fromAmino(object: DeleteLogMetricRequestAmino): DeleteLogMetricRequest { + return { + metricName: object.metric_name + }; + }, + toAmino(message: DeleteLogMetricRequest): DeleteLogMetricRequestAmino { + const obj: any = {}; + obj.metric_name = message.metricName; + return obj; + }, + fromAminoMsg(object: DeleteLogMetricRequestAminoMsg): DeleteLogMetricRequest { + return DeleteLogMetricRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteLogMetricRequestProtoMsg): DeleteLogMetricRequest { + return DeleteLogMetricRequest.decode(message.value); + }, + toProto(message: DeleteLogMetricRequest): Uint8Array { + return DeleteLogMetricRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteLogMetricRequest): DeleteLogMetricRequestProtoMsg { + return { + typeUrl: "/google.logging.v2.DeleteLogMetricRequest", + value: DeleteLogMetricRequest.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts b/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts index c8a07ba9b0..4e9c9d3655 100644 --- a/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputosmojs/google/longrunning/operations.ts @@ -189,6 +189,7 @@ function createBaseOperation(): Operation { }; } export const Operation = { + typeUrl: "/google.longrunning.Operation", encode(message: Operation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -289,6 +290,39 @@ export const Operation = { message.error !== undefined && (obj.error = message.error ? Status.toSDK(message.error) : undefined); message.response !== undefined && (obj.response = message.response ? Any.toSDK(message.response) : undefined); return obj; + }, + fromAmino(object: OperationAmino): Operation { + return { + name: object.name, + metadata: object?.metadata ? Any.fromAmino(object.metadata) : undefined, + done: object.done, + error: object?.error ? Status.fromAmino(object.error) : undefined, + response: object?.response ? Any.fromAmino(object.response) : undefined + }; + }, + toAmino(message: Operation): OperationAmino { + const obj: any = {}; + obj.name = message.name; + obj.metadata = message.metadata ? Any.toAmino(message.metadata) : undefined; + obj.done = message.done; + obj.error = message.error ? Status.toAmino(message.error) : undefined; + obj.response = message.response ? Any.toAmino(message.response) : undefined; + return obj; + }, + fromAminoMsg(object: OperationAminoMsg): Operation { + return Operation.fromAmino(object.value); + }, + fromProtoMsg(message: OperationProtoMsg): Operation { + return Operation.decode(message.value); + }, + toProto(message: Operation): Uint8Array { + return Operation.encode(message).finish(); + }, + toProtoMsg(message: Operation): OperationProtoMsg { + return { + typeUrl: "/google.longrunning.Operation", + value: Operation.encode(message).finish() + }; } }; function createBaseGetOperationRequest(): GetOperationRequest { @@ -297,6 +331,7 @@ function createBaseGetOperationRequest(): GetOperationRequest { }; } export const GetOperationRequest = { + typeUrl: "/google.longrunning.GetOperationRequest", encode(message: GetOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -349,6 +384,31 @@ export const GetOperationRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: GetOperationRequestAmino): GetOperationRequest { + return { + name: object.name + }; + }, + toAmino(message: GetOperationRequest): GetOperationRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: GetOperationRequestAminoMsg): GetOperationRequest { + return GetOperationRequest.fromAmino(object.value); + }, + fromProtoMsg(message: GetOperationRequestProtoMsg): GetOperationRequest { + return GetOperationRequest.decode(message.value); + }, + toProto(message: GetOperationRequest): Uint8Array { + return GetOperationRequest.encode(message).finish(); + }, + toProtoMsg(message: GetOperationRequest): GetOperationRequestProtoMsg { + return { + typeUrl: "/google.longrunning.GetOperationRequest", + value: GetOperationRequest.encode(message).finish() + }; } }; function createBaseListOperationsRequest(): ListOperationsRequest { @@ -360,6 +420,7 @@ function createBaseListOperationsRequest(): ListOperationsRequest { }; } export const ListOperationsRequest = { + typeUrl: "/google.longrunning.ListOperationsRequest", encode(message: ListOperationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(34).string(message.name); @@ -448,6 +509,37 @@ export const ListOperationsRequest = { obj.page_size = message.pageSize; obj.page_token = message.pageToken; return obj; + }, + fromAmino(object: ListOperationsRequestAmino): ListOperationsRequest { + return { + name: object.name, + filter: object.filter, + pageSize: object.page_size, + pageToken: object.page_token + }; + }, + toAmino(message: ListOperationsRequest): ListOperationsRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.filter = message.filter; + obj.page_size = message.pageSize; + obj.page_token = message.pageToken; + return obj; + }, + fromAminoMsg(object: ListOperationsRequestAminoMsg): ListOperationsRequest { + return ListOperationsRequest.fromAmino(object.value); + }, + fromProtoMsg(message: ListOperationsRequestProtoMsg): ListOperationsRequest { + return ListOperationsRequest.decode(message.value); + }, + toProto(message: ListOperationsRequest): Uint8Array { + return ListOperationsRequest.encode(message).finish(); + }, + toProtoMsg(message: ListOperationsRequest): ListOperationsRequestProtoMsg { + return { + typeUrl: "/google.longrunning.ListOperationsRequest", + value: ListOperationsRequest.encode(message).finish() + }; } }; function createBaseListOperationsResponse(): ListOperationsResponse { @@ -457,6 +549,7 @@ function createBaseListOperationsResponse(): ListOperationsResponse { }; } export const ListOperationsResponse = { + typeUrl: "/google.longrunning.ListOperationsResponse", encode(message: ListOperationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.operations) { Operation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -529,6 +622,37 @@ export const ListOperationsResponse = { } obj.next_page_token = message.nextPageToken; return obj; + }, + fromAmino(object: ListOperationsResponseAmino): ListOperationsResponse { + return { + operations: Array.isArray(object?.operations) ? object.operations.map((e: any) => Operation.fromAmino(e)) : [], + nextPageToken: object.next_page_token + }; + }, + toAmino(message: ListOperationsResponse): ListOperationsResponseAmino { + const obj: any = {}; + if (message.operations) { + obj.operations = message.operations.map(e => e ? Operation.toAmino(e) : undefined); + } else { + obj.operations = []; + } + obj.next_page_token = message.nextPageToken; + return obj; + }, + fromAminoMsg(object: ListOperationsResponseAminoMsg): ListOperationsResponse { + return ListOperationsResponse.fromAmino(object.value); + }, + fromProtoMsg(message: ListOperationsResponseProtoMsg): ListOperationsResponse { + return ListOperationsResponse.decode(message.value); + }, + toProto(message: ListOperationsResponse): Uint8Array { + return ListOperationsResponse.encode(message).finish(); + }, + toProtoMsg(message: ListOperationsResponse): ListOperationsResponseProtoMsg { + return { + typeUrl: "/google.longrunning.ListOperationsResponse", + value: ListOperationsResponse.encode(message).finish() + }; } }; function createBaseCancelOperationRequest(): CancelOperationRequest { @@ -537,6 +661,7 @@ function createBaseCancelOperationRequest(): CancelOperationRequest { }; } export const CancelOperationRequest = { + typeUrl: "/google.longrunning.CancelOperationRequest", encode(message: CancelOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -589,6 +714,31 @@ export const CancelOperationRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: CancelOperationRequestAmino): CancelOperationRequest { + return { + name: object.name + }; + }, + toAmino(message: CancelOperationRequest): CancelOperationRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: CancelOperationRequestAminoMsg): CancelOperationRequest { + return CancelOperationRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CancelOperationRequestProtoMsg): CancelOperationRequest { + return CancelOperationRequest.decode(message.value); + }, + toProto(message: CancelOperationRequest): Uint8Array { + return CancelOperationRequest.encode(message).finish(); + }, + toProtoMsg(message: CancelOperationRequest): CancelOperationRequestProtoMsg { + return { + typeUrl: "/google.longrunning.CancelOperationRequest", + value: CancelOperationRequest.encode(message).finish() + }; } }; function createBaseDeleteOperationRequest(): DeleteOperationRequest { @@ -597,6 +747,7 @@ function createBaseDeleteOperationRequest(): DeleteOperationRequest { }; } export const DeleteOperationRequest = { + typeUrl: "/google.longrunning.DeleteOperationRequest", encode(message: DeleteOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -649,6 +800,31 @@ export const DeleteOperationRequest = { const obj: any = {}; obj.name = message.name; return obj; + }, + fromAmino(object: DeleteOperationRequestAmino): DeleteOperationRequest { + return { + name: object.name + }; + }, + toAmino(message: DeleteOperationRequest): DeleteOperationRequestAmino { + const obj: any = {}; + obj.name = message.name; + return obj; + }, + fromAminoMsg(object: DeleteOperationRequestAminoMsg): DeleteOperationRequest { + return DeleteOperationRequest.fromAmino(object.value); + }, + fromProtoMsg(message: DeleteOperationRequestProtoMsg): DeleteOperationRequest { + return DeleteOperationRequest.decode(message.value); + }, + toProto(message: DeleteOperationRequest): Uint8Array { + return DeleteOperationRequest.encode(message).finish(); + }, + toProtoMsg(message: DeleteOperationRequest): DeleteOperationRequestProtoMsg { + return { + typeUrl: "/google.longrunning.DeleteOperationRequest", + value: DeleteOperationRequest.encode(message).finish() + }; } }; function createBaseWaitOperationRequest(): WaitOperationRequest { @@ -658,6 +834,7 @@ function createBaseWaitOperationRequest(): WaitOperationRequest { }; } export const WaitOperationRequest = { + typeUrl: "/google.longrunning.WaitOperationRequest", encode(message: WaitOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -722,6 +899,33 @@ export const WaitOperationRequest = { obj.name = message.name; message.timeout !== undefined && (obj.timeout = message.timeout ? Duration.toSDK(message.timeout) : undefined); return obj; + }, + fromAmino(object: WaitOperationRequestAmino): WaitOperationRequest { + return { + name: object.name, + timeout: object?.timeout ? Duration.fromAmino(object.timeout) : undefined + }; + }, + toAmino(message: WaitOperationRequest): WaitOperationRequestAmino { + const obj: any = {}; + obj.name = message.name; + obj.timeout = message.timeout ? Duration.toAmino(message.timeout) : undefined; + return obj; + }, + fromAminoMsg(object: WaitOperationRequestAminoMsg): WaitOperationRequest { + return WaitOperationRequest.fromAmino(object.value); + }, + fromProtoMsg(message: WaitOperationRequestProtoMsg): WaitOperationRequest { + return WaitOperationRequest.decode(message.value); + }, + toProto(message: WaitOperationRequest): Uint8Array { + return WaitOperationRequest.encode(message).finish(); + }, + toProtoMsg(message: WaitOperationRequest): WaitOperationRequestProtoMsg { + return { + typeUrl: "/google.longrunning.WaitOperationRequest", + value: WaitOperationRequest.encode(message).finish() + }; } }; function createBaseOperationInfo(): OperationInfo { @@ -731,6 +935,7 @@ function createBaseOperationInfo(): OperationInfo { }; } export const OperationInfo = { + typeUrl: "/google.longrunning.OperationInfo", encode(message: OperationInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.responseType !== "") { writer.uint32(10).string(message.responseType); @@ -795,5 +1000,32 @@ export const OperationInfo = { obj.response_type = message.responseType; obj.metadata_type = message.metadataType; return obj; + }, + fromAmino(object: OperationInfoAmino): OperationInfo { + return { + responseType: object.response_type, + metadataType: object.metadata_type + }; + }, + toAmino(message: OperationInfo): OperationInfoAmino { + const obj: any = {}; + obj.response_type = message.responseType; + obj.metadata_type = message.metadataType; + return obj; + }, + fromAminoMsg(object: OperationInfoAminoMsg): OperationInfo { + return OperationInfo.fromAmino(object.value); + }, + fromProtoMsg(message: OperationInfoProtoMsg): OperationInfo { + return OperationInfo.decode(message.value); + }, + toProto(message: OperationInfo): Uint8Array { + return OperationInfo.encode(message).finish(); + }, + toProtoMsg(message: OperationInfo): OperationInfoProtoMsg { + return { + typeUrl: "/google.longrunning.OperationInfo", + value: OperationInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/any.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/any.ts index 0e6aaece8d..1e0dcc6334 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/any.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/any.ts @@ -83,6 +83,7 @@ export const protobufPackage = "google.protobuf"; * } */ export interface Any { + $typeUrl?: string; /** * A URL/resource name that uniquely identifies the type of the serialized * protocol buffer message. This string must contain at least @@ -198,16 +199,19 @@ export interface Any { * } */ export interface AnySDKType { + $typeUrl?: string; type_url: string; value: Uint8Array; } function createBaseAny(): Any { return { + $typeUrl: "/google.protobuf.Any", typeUrl: "", value: new Uint8Array() }; } export const Any = { + typeUrl: "/google.protobuf.Any", encode(message: Any, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.typeUrl !== "") { writer.uint32(10).string(message.typeUrl); @@ -272,5 +276,32 @@ export const Any = { obj.type_url = message.typeUrl; obj.value = message.value; return obj; + }, + fromAmino(object: AnyAmino): Any { + return { + typeUrl: object.type, + value: object.value + }; + }, + toAmino(message: Any): AnyAmino { + const obj: any = {}; + obj.type = message.typeUrl; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AnyAminoMsg): Any { + return Any.fromAmino(object.value); + }, + fromProtoMsg(message: AnyProtoMsg): Any { + return Any.decode(message.value); + }, + toProto(message: Any): Uint8Array { + return Any.encode(message).finish(); + }, + toProtoMsg(message: Any): AnyProtoMsg { + return { + typeUrl: "/google.protobuf.Any", + value: Any.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts index d846ab44e3..7bda351887 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/api.ts @@ -288,6 +288,7 @@ function createBaseApi(): Api { }; } export const Api = { + typeUrl: "/google.protobuf.Api", encode(message: Api, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -436,6 +437,55 @@ export const Api = { } message.syntax !== undefined && (obj.syntax = syntaxToJSON(message.syntax)); return obj; + }, + fromAmino(object: ApiAmino): Api { + return { + name: object.name, + methods: Array.isArray(object?.methods) ? object.methods.map((e: any) => Method.fromAmino(e)) : [], + options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromAmino(e)) : [], + version: object.version, + sourceContext: object?.source_context ? SourceContext.fromAmino(object.source_context) : undefined, + mixins: Array.isArray(object?.mixins) ? object.mixins.map((e: any) => Mixin.fromAmino(e)) : [], + syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 + }; + }, + toAmino(message: Api): ApiAmino { + const obj: any = {}; + obj.name = message.name; + if (message.methods) { + obj.methods = message.methods.map(e => e ? Method.toAmino(e) : undefined); + } else { + obj.methods = []; + } + if (message.options) { + obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.version = message.version; + obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; + if (message.mixins) { + obj.mixins = message.mixins.map(e => e ? Mixin.toAmino(e) : undefined); + } else { + obj.mixins = []; + } + obj.syntax = message.syntax; + return obj; + }, + fromAminoMsg(object: ApiAminoMsg): Api { + return Api.fromAmino(object.value); + }, + fromProtoMsg(message: ApiProtoMsg): Api { + return Api.decode(message.value); + }, + toProto(message: Api): Uint8Array { + return Api.encode(message).finish(); + }, + toProtoMsg(message: Api): ApiProtoMsg { + return { + typeUrl: "/google.protobuf.Api", + value: Api.encode(message).finish() + }; } }; function createBaseMethod(): Method { @@ -450,6 +500,7 @@ function createBaseMethod(): Method { }; } export const Method = { + typeUrl: "/google.protobuf.Method", encode(message: Method, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -582,6 +633,47 @@ export const Method = { } message.syntax !== undefined && (obj.syntax = syntaxToJSON(message.syntax)); return obj; + }, + fromAmino(object: MethodAmino): Method { + return { + name: object.name, + requestTypeUrl: object.request_type_url, + requestStreaming: object.request_streaming, + responseTypeUrl: object.response_type_url, + responseStreaming: object.response_streaming, + options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromAmino(e)) : [], + syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 + }; + }, + toAmino(message: Method): MethodAmino { + const obj: any = {}; + obj.name = message.name; + obj.request_type_url = message.requestTypeUrl; + obj.request_streaming = message.requestStreaming; + obj.response_type_url = message.responseTypeUrl; + obj.response_streaming = message.responseStreaming; + if (message.options) { + obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.syntax = message.syntax; + return obj; + }, + fromAminoMsg(object: MethodAminoMsg): Method { + return Method.fromAmino(object.value); + }, + fromProtoMsg(message: MethodProtoMsg): Method { + return Method.decode(message.value); + }, + toProto(message: Method): Uint8Array { + return Method.encode(message).finish(); + }, + toProtoMsg(message: Method): MethodProtoMsg { + return { + typeUrl: "/google.protobuf.Method", + value: Method.encode(message).finish() + }; } }; function createBaseMixin(): Mixin { @@ -591,6 +683,7 @@ function createBaseMixin(): Mixin { }; } export const Mixin = { + typeUrl: "/google.protobuf.Mixin", encode(message: Mixin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -655,5 +748,32 @@ export const Mixin = { obj.name = message.name; obj.root = message.root; return obj; + }, + fromAmino(object: MixinAmino): Mixin { + return { + name: object.name, + root: object.root + }; + }, + toAmino(message: Mixin): MixinAmino { + const obj: any = {}; + obj.name = message.name; + obj.root = message.root; + return obj; + }, + fromAminoMsg(object: MixinAminoMsg): Mixin { + return Mixin.fromAmino(object.value); + }, + fromProtoMsg(message: MixinProtoMsg): Mixin { + return Mixin.decode(message.value); + }, + toProto(message: Mixin): Uint8Array { + return Mixin.encode(message).finish(); + }, + toProtoMsg(message: Mixin): MixinProtoMsg { + return { + typeUrl: "/google.protobuf.Mixin", + value: Mixin.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts index fa14fa9fa2..9344d3dc75 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/compiler/plugin.ts @@ -151,6 +151,7 @@ function createBaseVersion(): Version { }; } export const Version = { + typeUrl: "/google.protobuf.compiler.Version", encode(message: Version, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.major !== 0) { writer.uint32(8).int32(message.major); @@ -239,6 +240,37 @@ export const Version = { obj.patch = message.patch; obj.suffix = message.suffix; return obj; + }, + fromAmino(object: VersionAmino): Version { + return { + major: object.major, + minor: object.minor, + patch: object.patch, + suffix: object.suffix + }; + }, + toAmino(message: Version): VersionAmino { + const obj: any = {}; + obj.major = message.major; + obj.minor = message.minor; + obj.patch = message.patch; + obj.suffix = message.suffix; + return obj; + }, + fromAminoMsg(object: VersionAminoMsg): Version { + return Version.fromAmino(object.value); + }, + fromProtoMsg(message: VersionProtoMsg): Version { + return Version.decode(message.value); + }, + toProto(message: Version): Uint8Array { + return Version.encode(message).finish(); + }, + toProtoMsg(message: Version): VersionProtoMsg { + return { + typeUrl: "/google.protobuf.compiler.Version", + value: Version.encode(message).finish() + }; } }; function createBaseCodeGeneratorRequest(): CodeGeneratorRequest { @@ -250,6 +282,7 @@ function createBaseCodeGeneratorRequest(): CodeGeneratorRequest { }; } export const CodeGeneratorRequest = { + typeUrl: "/google.protobuf.compiler.CodeGeneratorRequest", encode(message: CodeGeneratorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fileToGenerate) { writer.uint32(10).string(v!); @@ -354,6 +387,45 @@ export const CodeGeneratorRequest = { } message.compilerVersion !== undefined && (obj.compiler_version = message.compilerVersion ? Version.toSDK(message.compilerVersion) : undefined); return obj; + }, + fromAmino(object: CodeGeneratorRequestAmino): CodeGeneratorRequest { + return { + fileToGenerate: Array.isArray(object?.file_to_generate) ? object.file_to_generate.map((e: any) => e) : [], + parameter: object.parameter, + protoFile: Array.isArray(object?.proto_file) ? object.proto_file.map((e: any) => FileDescriptorProto.fromAmino(e)) : [], + compilerVersion: object?.compiler_version ? Version.fromAmino(object.compiler_version) : undefined + }; + }, + toAmino(message: CodeGeneratorRequest): CodeGeneratorRequestAmino { + const obj: any = {}; + if (message.fileToGenerate) { + obj.file_to_generate = message.fileToGenerate.map(e => e); + } else { + obj.file_to_generate = []; + } + obj.parameter = message.parameter; + if (message.protoFile) { + obj.proto_file = message.protoFile.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); + } else { + obj.proto_file = []; + } + obj.compiler_version = message.compilerVersion ? Version.toAmino(message.compilerVersion) : undefined; + return obj; + }, + fromAminoMsg(object: CodeGeneratorRequestAminoMsg): CodeGeneratorRequest { + return CodeGeneratorRequest.fromAmino(object.value); + }, + fromProtoMsg(message: CodeGeneratorRequestProtoMsg): CodeGeneratorRequest { + return CodeGeneratorRequest.decode(message.value); + }, + toProto(message: CodeGeneratorRequest): Uint8Array { + return CodeGeneratorRequest.encode(message).finish(); + }, + toProtoMsg(message: CodeGeneratorRequest): CodeGeneratorRequestProtoMsg { + return { + typeUrl: "/google.protobuf.compiler.CodeGeneratorRequest", + value: CodeGeneratorRequest.encode(message).finish() + }; } }; function createBaseCodeGeneratorResponse(): CodeGeneratorResponse { @@ -363,6 +435,7 @@ function createBaseCodeGeneratorResponse(): CodeGeneratorResponse { }; } export const CodeGeneratorResponse = { + typeUrl: "/google.protobuf.compiler.CodeGeneratorResponse", encode(message: CodeGeneratorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.error !== "") { writer.uint32(10).string(message.error); @@ -435,6 +508,37 @@ export const CodeGeneratorResponse = { obj.file = []; } return obj; + }, + fromAmino(object: CodeGeneratorResponseAmino): CodeGeneratorResponse { + return { + error: object.error, + file: Array.isArray(object?.file) ? object.file.map((e: any) => CodeGeneratorResponse_File.fromAmino(e)) : [] + }; + }, + toAmino(message: CodeGeneratorResponse): CodeGeneratorResponseAmino { + const obj: any = {}; + obj.error = message.error; + if (message.file) { + obj.file = message.file.map(e => e ? CodeGeneratorResponse_File.toAmino(e) : undefined); + } else { + obj.file = []; + } + return obj; + }, + fromAminoMsg(object: CodeGeneratorResponseAminoMsg): CodeGeneratorResponse { + return CodeGeneratorResponse.fromAmino(object.value); + }, + fromProtoMsg(message: CodeGeneratorResponseProtoMsg): CodeGeneratorResponse { + return CodeGeneratorResponse.decode(message.value); + }, + toProto(message: CodeGeneratorResponse): Uint8Array { + return CodeGeneratorResponse.encode(message).finish(); + }, + toProtoMsg(message: CodeGeneratorResponse): CodeGeneratorResponseProtoMsg { + return { + typeUrl: "/google.protobuf.compiler.CodeGeneratorResponse", + value: CodeGeneratorResponse.encode(message).finish() + }; } }; function createBaseCodeGeneratorResponse_File(): CodeGeneratorResponse_File { @@ -445,6 +549,7 @@ function createBaseCodeGeneratorResponse_File(): CodeGeneratorResponse_File { }; } export const CodeGeneratorResponse_File = { + typeUrl: "/google.protobuf.compiler.File", encode(message: CodeGeneratorResponse_File, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -521,5 +626,34 @@ export const CodeGeneratorResponse_File = { obj.insertion_point = message.insertionPoint; obj.content = message.content; return obj; + }, + fromAmino(object: CodeGeneratorResponse_FileAmino): CodeGeneratorResponse_File { + return { + name: object.name, + insertionPoint: object.insertion_point, + content: object.content + }; + }, + toAmino(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileAmino { + const obj: any = {}; + obj.name = message.name; + obj.insertion_point = message.insertionPoint; + obj.content = message.content; + return obj; + }, + fromAminoMsg(object: CodeGeneratorResponse_FileAminoMsg): CodeGeneratorResponse_File { + return CodeGeneratorResponse_File.fromAmino(object.value); + }, + fromProtoMsg(message: CodeGeneratorResponse_FileProtoMsg): CodeGeneratorResponse_File { + return CodeGeneratorResponse_File.decode(message.value); + }, + toProto(message: CodeGeneratorResponse_File): Uint8Array { + return CodeGeneratorResponse_File.encode(message).finish(); + }, + toProtoMsg(message: CodeGeneratorResponse_File): CodeGeneratorResponse_FileProtoMsg { + return { + typeUrl: "/google.protobuf.compiler.File", + value: CodeGeneratorResponse_File.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts index 041e2bc5ab..e5cc5b4079 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/descriptor.ts @@ -1284,6 +1284,7 @@ function createBaseFileDescriptorSet(): FileDescriptorSet { }; } export const FileDescriptorSet = { + typeUrl: "/google.protobuf.FileDescriptorSet", encode(message: FileDescriptorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.file) { FileDescriptorProto.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1344,6 +1345,35 @@ export const FileDescriptorSet = { obj.file = []; } return obj; + }, + fromAmino(object: FileDescriptorSetAmino): FileDescriptorSet { + return { + file: Array.isArray(object?.file) ? object.file.map((e: any) => FileDescriptorProto.fromAmino(e)) : [] + }; + }, + toAmino(message: FileDescriptorSet): FileDescriptorSetAmino { + const obj: any = {}; + if (message.file) { + obj.file = message.file.map(e => e ? FileDescriptorProto.toAmino(e) : undefined); + } else { + obj.file = []; + } + return obj; + }, + fromAminoMsg(object: FileDescriptorSetAminoMsg): FileDescriptorSet { + return FileDescriptorSet.fromAmino(object.value); + }, + fromProtoMsg(message: FileDescriptorSetProtoMsg): FileDescriptorSet { + return FileDescriptorSet.decode(message.value); + }, + toProto(message: FileDescriptorSet): Uint8Array { + return FileDescriptorSet.encode(message).finish(); + }, + toProtoMsg(message: FileDescriptorSet): FileDescriptorSetProtoMsg { + return { + typeUrl: "/google.protobuf.FileDescriptorSet", + value: FileDescriptorSet.encode(message).finish() + }; } }; function createBaseFileDescriptorProto(): FileDescriptorProto { @@ -1363,6 +1393,7 @@ function createBaseFileDescriptorProto(): FileDescriptorProto { }; } export const FileDescriptorProto = { + typeUrl: "/google.protobuf.FileDescriptorProto", encode(message: FileDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1621,6 +1652,81 @@ export const FileDescriptorProto = { message.sourceCodeInfo !== undefined && (obj.source_code_info = message.sourceCodeInfo ? SourceCodeInfo.toSDK(message.sourceCodeInfo) : undefined); obj.syntax = message.syntax; return obj; + }, + fromAmino(object: FileDescriptorProtoAmino): FileDescriptorProto { + return { + name: object.name, + package: object.package, + dependency: Array.isArray(object?.dependency) ? object.dependency.map((e: any) => e) : [], + publicDependency: Array.isArray(object?.public_dependency) ? object.public_dependency.map((e: any) => e) : [], + weakDependency: Array.isArray(object?.weak_dependency) ? object.weak_dependency.map((e: any) => e) : [], + messageType: Array.isArray(object?.message_type) ? object.message_type.map((e: any) => DescriptorProto.fromAmino(e)) : [], + enumType: Array.isArray(object?.enum_type) ? object.enum_type.map((e: any) => EnumDescriptorProto.fromAmino(e)) : [], + service: Array.isArray(object?.service) ? object.service.map((e: any) => ServiceDescriptorProto.fromAmino(e)) : [], + extension: Array.isArray(object?.extension) ? object.extension.map((e: any) => FieldDescriptorProto.fromAmino(e)) : [], + options: object?.options ? FileOptions.fromAmino(object.options) : undefined, + sourceCodeInfo: object?.source_code_info ? SourceCodeInfo.fromAmino(object.source_code_info) : undefined, + syntax: object.syntax + }; + }, + toAmino(message: FileDescriptorProto): FileDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + obj.package = message.package; + if (message.dependency) { + obj.dependency = message.dependency.map(e => e); + } else { + obj.dependency = []; + } + if (message.publicDependency) { + obj.public_dependency = message.publicDependency.map(e => e); + } else { + obj.public_dependency = []; + } + if (message.weakDependency) { + obj.weak_dependency = message.weakDependency.map(e => e); + } else { + obj.weak_dependency = []; + } + if (message.messageType) { + obj.message_type = message.messageType.map(e => e ? DescriptorProto.toAmino(e) : undefined); + } else { + obj.message_type = []; + } + if (message.enumType) { + obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); + } else { + obj.enum_type = []; + } + if (message.service) { + obj.service = message.service.map(e => e ? ServiceDescriptorProto.toAmino(e) : undefined); + } else { + obj.service = []; + } + if (message.extension) { + obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); + } else { + obj.extension = []; + } + obj.options = message.options ? FileOptions.toAmino(message.options) : undefined; + obj.source_code_info = message.sourceCodeInfo ? SourceCodeInfo.toAmino(message.sourceCodeInfo) : undefined; + obj.syntax = message.syntax; + return obj; + }, + fromAminoMsg(object: FileDescriptorProtoAminoMsg): FileDescriptorProto { + return FileDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: FileDescriptorProtoProtoMsg): FileDescriptorProto { + return FileDescriptorProto.decode(message.value); + }, + toProto(message: FileDescriptorProto): Uint8Array { + return FileDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: FileDescriptorProto): FileDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.FileDescriptorProto", + value: FileDescriptorProto.encode(message).finish() + }; } }; function createBaseDescriptorProto(): DescriptorProto { @@ -1638,6 +1744,7 @@ function createBaseDescriptorProto(): DescriptorProto { }; } export const DescriptorProto = { + typeUrl: "/google.protobuf.DescriptorProto", encode(message: DescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -1862,6 +1969,81 @@ export const DescriptorProto = { obj.reserved_name = []; } return obj; + }, + fromAmino(object: DescriptorProtoAmino): DescriptorProto { + return { + name: object.name, + field: Array.isArray(object?.field) ? object.field.map((e: any) => FieldDescriptorProto.fromAmino(e)) : [], + extension: Array.isArray(object?.extension) ? object.extension.map((e: any) => FieldDescriptorProto.fromAmino(e)) : [], + nestedType: Array.isArray(object?.nested_type) ? object.nested_type.map((e: any) => DescriptorProto.fromAmino(e)) : [], + enumType: Array.isArray(object?.enum_type) ? object.enum_type.map((e: any) => EnumDescriptorProto.fromAmino(e)) : [], + extensionRange: Array.isArray(object?.extension_range) ? object.extension_range.map((e: any) => DescriptorProto_ExtensionRange.fromAmino(e)) : [], + oneofDecl: Array.isArray(object?.oneof_decl) ? object.oneof_decl.map((e: any) => OneofDescriptorProto.fromAmino(e)) : [], + options: object?.options ? MessageOptions.fromAmino(object.options) : undefined, + reservedRange: Array.isArray(object?.reserved_range) ? object.reserved_range.map((e: any) => DescriptorProto_ReservedRange.fromAmino(e)) : [], + reservedName: Array.isArray(object?.reserved_name) ? object.reserved_name.map((e: any) => e) : [] + }; + }, + toAmino(message: DescriptorProto): DescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + if (message.field) { + obj.field = message.field.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); + } else { + obj.field = []; + } + if (message.extension) { + obj.extension = message.extension.map(e => e ? FieldDescriptorProto.toAmino(e) : undefined); + } else { + obj.extension = []; + } + if (message.nestedType) { + obj.nested_type = message.nestedType.map(e => e ? DescriptorProto.toAmino(e) : undefined); + } else { + obj.nested_type = []; + } + if (message.enumType) { + obj.enum_type = message.enumType.map(e => e ? EnumDescriptorProto.toAmino(e) : undefined); + } else { + obj.enum_type = []; + } + if (message.extensionRange) { + obj.extension_range = message.extensionRange.map(e => e ? DescriptorProto_ExtensionRange.toAmino(e) : undefined); + } else { + obj.extension_range = []; + } + if (message.oneofDecl) { + obj.oneof_decl = message.oneofDecl.map(e => e ? OneofDescriptorProto.toAmino(e) : undefined); + } else { + obj.oneof_decl = []; + } + obj.options = message.options ? MessageOptions.toAmino(message.options) : undefined; + if (message.reservedRange) { + obj.reserved_range = message.reservedRange.map(e => e ? DescriptorProto_ReservedRange.toAmino(e) : undefined); + } else { + obj.reserved_range = []; + } + if (message.reservedName) { + obj.reserved_name = message.reservedName.map(e => e); + } else { + obj.reserved_name = []; + } + return obj; + }, + fromAminoMsg(object: DescriptorProtoAminoMsg): DescriptorProto { + return DescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: DescriptorProtoProtoMsg): DescriptorProto { + return DescriptorProto.decode(message.value); + }, + toProto(message: DescriptorProto): Uint8Array { + return DescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: DescriptorProto): DescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.DescriptorProto", + value: DescriptorProto.encode(message).finish() + }; } }; function createBaseDescriptorProto_ExtensionRange(): DescriptorProto_ExtensionRange { @@ -1872,6 +2054,7 @@ function createBaseDescriptorProto_ExtensionRange(): DescriptorProto_ExtensionRa }; } export const DescriptorProto_ExtensionRange = { + typeUrl: "/google.protobuf.ExtensionRange", encode(message: DescriptorProto_ExtensionRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.start !== 0) { writer.uint32(8).int32(message.start); @@ -1948,6 +2131,35 @@ export const DescriptorProto_ExtensionRange = { obj.end = message.end; message.options !== undefined && (obj.options = message.options ? ExtensionRangeOptions.toSDK(message.options) : undefined); return obj; + }, + fromAmino(object: DescriptorProto_ExtensionRangeAmino): DescriptorProto_ExtensionRange { + return { + start: object.start, + end: object.end, + options: object?.options ? ExtensionRangeOptions.fromAmino(object.options) : undefined + }; + }, + toAmino(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeAmino { + const obj: any = {}; + obj.start = message.start; + obj.end = message.end; + obj.options = message.options ? ExtensionRangeOptions.toAmino(message.options) : undefined; + return obj; + }, + fromAminoMsg(object: DescriptorProto_ExtensionRangeAminoMsg): DescriptorProto_ExtensionRange { + return DescriptorProto_ExtensionRange.fromAmino(object.value); + }, + fromProtoMsg(message: DescriptorProto_ExtensionRangeProtoMsg): DescriptorProto_ExtensionRange { + return DescriptorProto_ExtensionRange.decode(message.value); + }, + toProto(message: DescriptorProto_ExtensionRange): Uint8Array { + return DescriptorProto_ExtensionRange.encode(message).finish(); + }, + toProtoMsg(message: DescriptorProto_ExtensionRange): DescriptorProto_ExtensionRangeProtoMsg { + return { + typeUrl: "/google.protobuf.ExtensionRange", + value: DescriptorProto_ExtensionRange.encode(message).finish() + }; } }; function createBaseDescriptorProto_ReservedRange(): DescriptorProto_ReservedRange { @@ -1957,6 +2169,7 @@ function createBaseDescriptorProto_ReservedRange(): DescriptorProto_ReservedRang }; } export const DescriptorProto_ReservedRange = { + typeUrl: "/google.protobuf.ReservedRange", encode(message: DescriptorProto_ReservedRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.start !== 0) { writer.uint32(8).int32(message.start); @@ -2021,6 +2234,33 @@ export const DescriptorProto_ReservedRange = { obj.start = message.start; obj.end = message.end; return obj; + }, + fromAmino(object: DescriptorProto_ReservedRangeAmino): DescriptorProto_ReservedRange { + return { + start: object.start, + end: object.end + }; + }, + toAmino(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeAmino { + const obj: any = {}; + obj.start = message.start; + obj.end = message.end; + return obj; + }, + fromAminoMsg(object: DescriptorProto_ReservedRangeAminoMsg): DescriptorProto_ReservedRange { + return DescriptorProto_ReservedRange.fromAmino(object.value); + }, + fromProtoMsg(message: DescriptorProto_ReservedRangeProtoMsg): DescriptorProto_ReservedRange { + return DescriptorProto_ReservedRange.decode(message.value); + }, + toProto(message: DescriptorProto_ReservedRange): Uint8Array { + return DescriptorProto_ReservedRange.encode(message).finish(); + }, + toProtoMsg(message: DescriptorProto_ReservedRange): DescriptorProto_ReservedRangeProtoMsg { + return { + typeUrl: "/google.protobuf.ReservedRange", + value: DescriptorProto_ReservedRange.encode(message).finish() + }; } }; function createBaseExtensionRangeOptions(): ExtensionRangeOptions { @@ -2029,6 +2269,7 @@ function createBaseExtensionRangeOptions(): ExtensionRangeOptions { }; } export const ExtensionRangeOptions = { + typeUrl: "/google.protobuf.ExtensionRangeOptions", encode(message: ExtensionRangeOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.uninterpretedOption) { UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim(); @@ -2089,6 +2330,35 @@ export const ExtensionRangeOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: ExtensionRangeOptionsAmino): ExtensionRangeOptions { + return { + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: ExtensionRangeOptions): ExtensionRangeOptionsAmino { + const obj: any = {}; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: ExtensionRangeOptionsAminoMsg): ExtensionRangeOptions { + return ExtensionRangeOptions.fromAmino(object.value); + }, + fromProtoMsg(message: ExtensionRangeOptionsProtoMsg): ExtensionRangeOptions { + return ExtensionRangeOptions.decode(message.value); + }, + toProto(message: ExtensionRangeOptions): Uint8Array { + return ExtensionRangeOptions.encode(message).finish(); + }, + toProtoMsg(message: ExtensionRangeOptions): ExtensionRangeOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.ExtensionRangeOptions", + value: ExtensionRangeOptions.encode(message).finish() + }; } }; function createBaseFieldDescriptorProto(): FieldDescriptorProto { @@ -2106,6 +2376,7 @@ function createBaseFieldDescriptorProto(): FieldDescriptorProto { }; } export const FieldDescriptorProto = { + typeUrl: "/google.protobuf.FieldDescriptorProto", encode(message: FieldDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2266,6 +2537,49 @@ export const FieldDescriptorProto = { obj.json_name = message.jsonName; message.options !== undefined && (obj.options = message.options ? FieldOptions.toSDK(message.options) : undefined); return obj; + }, + fromAmino(object: FieldDescriptorProtoAmino): FieldDescriptorProto { + return { + name: object.name, + number: object.number, + label: isSet(object.label) ? fieldDescriptorProto_LabelFromJSON(object.label) : -1, + type: isSet(object.type) ? fieldDescriptorProto_TypeFromJSON(object.type) : -1, + typeName: object.type_name, + extendee: object.extendee, + defaultValue: object.default_value, + oneofIndex: object.oneof_index, + jsonName: object.json_name, + options: object?.options ? FieldOptions.fromAmino(object.options) : undefined + }; + }, + toAmino(message: FieldDescriptorProto): FieldDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + obj.number = message.number; + obj.label = message.label; + obj.type = message.type; + obj.type_name = message.typeName; + obj.extendee = message.extendee; + obj.default_value = message.defaultValue; + obj.oneof_index = message.oneofIndex; + obj.json_name = message.jsonName; + obj.options = message.options ? FieldOptions.toAmino(message.options) : undefined; + return obj; + }, + fromAminoMsg(object: FieldDescriptorProtoAminoMsg): FieldDescriptorProto { + return FieldDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: FieldDescriptorProtoProtoMsg): FieldDescriptorProto { + return FieldDescriptorProto.decode(message.value); + }, + toProto(message: FieldDescriptorProto): Uint8Array { + return FieldDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: FieldDescriptorProto): FieldDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.FieldDescriptorProto", + value: FieldDescriptorProto.encode(message).finish() + }; } }; function createBaseOneofDescriptorProto(): OneofDescriptorProto { @@ -2275,6 +2589,7 @@ function createBaseOneofDescriptorProto(): OneofDescriptorProto { }; } export const OneofDescriptorProto = { + typeUrl: "/google.protobuf.OneofDescriptorProto", encode(message: OneofDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2339,6 +2654,33 @@ export const OneofDescriptorProto = { obj.name = message.name; message.options !== undefined && (obj.options = message.options ? OneofOptions.toSDK(message.options) : undefined); return obj; + }, + fromAmino(object: OneofDescriptorProtoAmino): OneofDescriptorProto { + return { + name: object.name, + options: object?.options ? OneofOptions.fromAmino(object.options) : undefined + }; + }, + toAmino(message: OneofDescriptorProto): OneofDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + obj.options = message.options ? OneofOptions.toAmino(message.options) : undefined; + return obj; + }, + fromAminoMsg(object: OneofDescriptorProtoAminoMsg): OneofDescriptorProto { + return OneofDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: OneofDescriptorProtoProtoMsg): OneofDescriptorProto { + return OneofDescriptorProto.decode(message.value); + }, + toProto(message: OneofDescriptorProto): Uint8Array { + return OneofDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: OneofDescriptorProto): OneofDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.OneofDescriptorProto", + value: OneofDescriptorProto.encode(message).finish() + }; } }; function createBaseEnumDescriptorProto(): EnumDescriptorProto { @@ -2351,6 +2693,7 @@ function createBaseEnumDescriptorProto(): EnumDescriptorProto { }; } export const EnumDescriptorProto = { + typeUrl: "/google.protobuf.EnumDescriptorProto", encode(message: EnumDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2475,6 +2818,51 @@ export const EnumDescriptorProto = { obj.reserved_name = []; } return obj; + }, + fromAmino(object: EnumDescriptorProtoAmino): EnumDescriptorProto { + return { + name: object.name, + value: Array.isArray(object?.value) ? object.value.map((e: any) => EnumValueDescriptorProto.fromAmino(e)) : [], + options: object?.options ? EnumOptions.fromAmino(object.options) : undefined, + reservedRange: Array.isArray(object?.reserved_range) ? object.reserved_range.map((e: any) => EnumDescriptorProto_EnumReservedRange.fromAmino(e)) : [], + reservedName: Array.isArray(object?.reserved_name) ? object.reserved_name.map((e: any) => e) : [] + }; + }, + toAmino(message: EnumDescriptorProto): EnumDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + if (message.value) { + obj.value = message.value.map(e => e ? EnumValueDescriptorProto.toAmino(e) : undefined); + } else { + obj.value = []; + } + obj.options = message.options ? EnumOptions.toAmino(message.options) : undefined; + if (message.reservedRange) { + obj.reserved_range = message.reservedRange.map(e => e ? EnumDescriptorProto_EnumReservedRange.toAmino(e) : undefined); + } else { + obj.reserved_range = []; + } + if (message.reservedName) { + obj.reserved_name = message.reservedName.map(e => e); + } else { + obj.reserved_name = []; + } + return obj; + }, + fromAminoMsg(object: EnumDescriptorProtoAminoMsg): EnumDescriptorProto { + return EnumDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: EnumDescriptorProtoProtoMsg): EnumDescriptorProto { + return EnumDescriptorProto.decode(message.value); + }, + toProto(message: EnumDescriptorProto): Uint8Array { + return EnumDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: EnumDescriptorProto): EnumDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.EnumDescriptorProto", + value: EnumDescriptorProto.encode(message).finish() + }; } }; function createBaseEnumDescriptorProto_EnumReservedRange(): EnumDescriptorProto_EnumReservedRange { @@ -2484,6 +2872,7 @@ function createBaseEnumDescriptorProto_EnumReservedRange(): EnumDescriptorProto_ }; } export const EnumDescriptorProto_EnumReservedRange = { + typeUrl: "/google.protobuf.EnumReservedRange", encode(message: EnumDescriptorProto_EnumReservedRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.start !== 0) { writer.uint32(8).int32(message.start); @@ -2548,6 +2937,33 @@ export const EnumDescriptorProto_EnumReservedRange = { obj.start = message.start; obj.end = message.end; return obj; + }, + fromAmino(object: EnumDescriptorProto_EnumReservedRangeAmino): EnumDescriptorProto_EnumReservedRange { + return { + start: object.start, + end: object.end + }; + }, + toAmino(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeAmino { + const obj: any = {}; + obj.start = message.start; + obj.end = message.end; + return obj; + }, + fromAminoMsg(object: EnumDescriptorProto_EnumReservedRangeAminoMsg): EnumDescriptorProto_EnumReservedRange { + return EnumDescriptorProto_EnumReservedRange.fromAmino(object.value); + }, + fromProtoMsg(message: EnumDescriptorProto_EnumReservedRangeProtoMsg): EnumDescriptorProto_EnumReservedRange { + return EnumDescriptorProto_EnumReservedRange.decode(message.value); + }, + toProto(message: EnumDescriptorProto_EnumReservedRange): Uint8Array { + return EnumDescriptorProto_EnumReservedRange.encode(message).finish(); + }, + toProtoMsg(message: EnumDescriptorProto_EnumReservedRange): EnumDescriptorProto_EnumReservedRangeProtoMsg { + return { + typeUrl: "/google.protobuf.EnumReservedRange", + value: EnumDescriptorProto_EnumReservedRange.encode(message).finish() + }; } }; function createBaseEnumValueDescriptorProto(): EnumValueDescriptorProto { @@ -2558,6 +2974,7 @@ function createBaseEnumValueDescriptorProto(): EnumValueDescriptorProto { }; } export const EnumValueDescriptorProto = { + typeUrl: "/google.protobuf.EnumValueDescriptorProto", encode(message: EnumValueDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2634,6 +3051,35 @@ export const EnumValueDescriptorProto = { obj.number = message.number; message.options !== undefined && (obj.options = message.options ? EnumValueOptions.toSDK(message.options) : undefined); return obj; + }, + fromAmino(object: EnumValueDescriptorProtoAmino): EnumValueDescriptorProto { + return { + name: object.name, + number: object.number, + options: object?.options ? EnumValueOptions.fromAmino(object.options) : undefined + }; + }, + toAmino(message: EnumValueDescriptorProto): EnumValueDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + obj.number = message.number; + obj.options = message.options ? EnumValueOptions.toAmino(message.options) : undefined; + return obj; + }, + fromAminoMsg(object: EnumValueDescriptorProtoAminoMsg): EnumValueDescriptorProto { + return EnumValueDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: EnumValueDescriptorProtoProtoMsg): EnumValueDescriptorProto { + return EnumValueDescriptorProto.decode(message.value); + }, + toProto(message: EnumValueDescriptorProto): Uint8Array { + return EnumValueDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: EnumValueDescriptorProto): EnumValueDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.EnumValueDescriptorProto", + value: EnumValueDescriptorProto.encode(message).finish() + }; } }; function createBaseServiceDescriptorProto(): ServiceDescriptorProto { @@ -2644,6 +3090,7 @@ function createBaseServiceDescriptorProto(): ServiceDescriptorProto { }; } export const ServiceDescriptorProto = { + typeUrl: "/google.protobuf.ServiceDescriptorProto", encode(message: ServiceDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2728,19 +3175,53 @@ export const ServiceDescriptorProto = { } message.options !== undefined && (obj.options = message.options ? ServiceOptions.toSDK(message.options) : undefined); return obj; - } -}; -function createBaseMethodDescriptorProto(): MethodDescriptorProto { - return { - name: "", - inputType: "", - outputType: "", - options: MethodOptions.fromPartial({}), - clientStreaming: false, - serverStreaming: false - }; + }, + fromAmino(object: ServiceDescriptorProtoAmino): ServiceDescriptorProto { + return { + name: object.name, + method: Array.isArray(object?.method) ? object.method.map((e: any) => MethodDescriptorProto.fromAmino(e)) : [], + options: object?.options ? ServiceOptions.fromAmino(object.options) : undefined + }; + }, + toAmino(message: ServiceDescriptorProto): ServiceDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + if (message.method) { + obj.method = message.method.map(e => e ? MethodDescriptorProto.toAmino(e) : undefined); + } else { + obj.method = []; + } + obj.options = message.options ? ServiceOptions.toAmino(message.options) : undefined; + return obj; + }, + fromAminoMsg(object: ServiceDescriptorProtoAminoMsg): ServiceDescriptorProto { + return ServiceDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceDescriptorProtoProtoMsg): ServiceDescriptorProto { + return ServiceDescriptorProto.decode(message.value); + }, + toProto(message: ServiceDescriptorProto): Uint8Array { + return ServiceDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: ServiceDescriptorProto): ServiceDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.ServiceDescriptorProto", + value: ServiceDescriptorProto.encode(message).finish() + }; + } +}; +function createBaseMethodDescriptorProto(): MethodDescriptorProto { + return { + name: "", + inputType: "", + outputType: "", + options: MethodOptions.fromPartial({}), + clientStreaming: false, + serverStreaming: false + }; } export const MethodDescriptorProto = { + typeUrl: "/google.protobuf.MethodDescriptorProto", encode(message: MethodDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -2853,6 +3334,41 @@ export const MethodDescriptorProto = { obj.client_streaming = message.clientStreaming; obj.server_streaming = message.serverStreaming; return obj; + }, + fromAmino(object: MethodDescriptorProtoAmino): MethodDescriptorProto { + return { + name: object.name, + inputType: object.input_type, + outputType: object.output_type, + options: object?.options ? MethodOptions.fromAmino(object.options) : undefined, + clientStreaming: object.client_streaming, + serverStreaming: object.server_streaming + }; + }, + toAmino(message: MethodDescriptorProto): MethodDescriptorProtoAmino { + const obj: any = {}; + obj.name = message.name; + obj.input_type = message.inputType; + obj.output_type = message.outputType; + obj.options = message.options ? MethodOptions.toAmino(message.options) : undefined; + obj.client_streaming = message.clientStreaming; + obj.server_streaming = message.serverStreaming; + return obj; + }, + fromAminoMsg(object: MethodDescriptorProtoAminoMsg): MethodDescriptorProto { + return MethodDescriptorProto.fromAmino(object.value); + }, + fromProtoMsg(message: MethodDescriptorProtoProtoMsg): MethodDescriptorProto { + return MethodDescriptorProto.decode(message.value); + }, + toProto(message: MethodDescriptorProto): Uint8Array { + return MethodDescriptorProto.encode(message).finish(); + }, + toProtoMsg(message: MethodDescriptorProto): MethodDescriptorProtoProtoMsg { + return { + typeUrl: "/google.protobuf.MethodDescriptorProto", + value: MethodDescriptorProto.encode(message).finish() + }; } }; function createBaseFileOptions(): FileOptions { @@ -2881,6 +3397,7 @@ function createBaseFileOptions(): FileOptions { }; } export const FileOptions = { + typeUrl: "/google.protobuf.FileOptions", encode(message: FileOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.javaPackage !== "") { writer.uint32(10).string(message.javaPackage); @@ -3181,6 +3698,75 @@ export const FileOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: FileOptionsAmino): FileOptions { + return { + javaPackage: object.java_package, + javaOuterClassname: object.java_outer_classname, + javaMultipleFiles: object.java_multiple_files, + javaGenerateEqualsAndHash: object.java_generate_equals_and_hash, + javaStringCheckUtf8: object.java_string_check_utf8, + optimizeFor: isSet(object.optimize_for) ? fileOptions_OptimizeModeFromJSON(object.optimize_for) : -1, + goPackage: object.go_package, + ccGenericServices: object.cc_generic_services, + javaGenericServices: object.java_generic_services, + pyGenericServices: object.py_generic_services, + phpGenericServices: object.php_generic_services, + deprecated: object.deprecated, + ccEnableArenas: object.cc_enable_arenas, + objcClassPrefix: object.objc_class_prefix, + csharpNamespace: object.csharp_namespace, + swiftPrefix: object.swift_prefix, + phpClassPrefix: object.php_class_prefix, + phpNamespace: object.php_namespace, + phpMetadataNamespace: object.php_metadata_namespace, + rubyPackage: object.ruby_package, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: FileOptions): FileOptionsAmino { + const obj: any = {}; + obj.java_package = message.javaPackage; + obj.java_outer_classname = message.javaOuterClassname; + obj.java_multiple_files = message.javaMultipleFiles; + obj.java_generate_equals_and_hash = message.javaGenerateEqualsAndHash; + obj.java_string_check_utf8 = message.javaStringCheckUtf8; + obj.optimize_for = message.optimizeFor; + obj.go_package = message.goPackage; + obj.cc_generic_services = message.ccGenericServices; + obj.java_generic_services = message.javaGenericServices; + obj.py_generic_services = message.pyGenericServices; + obj.php_generic_services = message.phpGenericServices; + obj.deprecated = message.deprecated; + obj.cc_enable_arenas = message.ccEnableArenas; + obj.objc_class_prefix = message.objcClassPrefix; + obj.csharp_namespace = message.csharpNamespace; + obj.swift_prefix = message.swiftPrefix; + obj.php_class_prefix = message.phpClassPrefix; + obj.php_namespace = message.phpNamespace; + obj.php_metadata_namespace = message.phpMetadataNamespace; + obj.ruby_package = message.rubyPackage; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: FileOptionsAminoMsg): FileOptions { + return FileOptions.fromAmino(object.value); + }, + fromProtoMsg(message: FileOptionsProtoMsg): FileOptions { + return FileOptions.decode(message.value); + }, + toProto(message: FileOptions): Uint8Array { + return FileOptions.encode(message).finish(); + }, + toProtoMsg(message: FileOptions): FileOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.FileOptions", + value: FileOptions.encode(message).finish() + }; } }; function createBaseMessageOptions(): MessageOptions { @@ -3193,6 +3779,7 @@ function createBaseMessageOptions(): MessageOptions { }; } export const MessageOptions = { + typeUrl: "/google.protobuf.MessageOptions", encode(message: MessageOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.messageSetWireFormat === true) { writer.uint32(8).bool(message.messageSetWireFormat); @@ -3301,6 +3888,43 @@ export const MessageOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: MessageOptionsAmino): MessageOptions { + return { + messageSetWireFormat: object.message_set_wire_format, + noStandardDescriptorAccessor: object.no_standard_descriptor_accessor, + deprecated: object.deprecated, + mapEntry: object.map_entry, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: MessageOptions): MessageOptionsAmino { + const obj: any = {}; + obj.message_set_wire_format = message.messageSetWireFormat; + obj.no_standard_descriptor_accessor = message.noStandardDescriptorAccessor; + obj.deprecated = message.deprecated; + obj.map_entry = message.mapEntry; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: MessageOptionsAminoMsg): MessageOptions { + return MessageOptions.fromAmino(object.value); + }, + fromProtoMsg(message: MessageOptionsProtoMsg): MessageOptions { + return MessageOptions.decode(message.value); + }, + toProto(message: MessageOptions): Uint8Array { + return MessageOptions.encode(message).finish(); + }, + toProtoMsg(message: MessageOptions): MessageOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.MessageOptions", + value: MessageOptions.encode(message).finish() + }; } }; function createBaseFieldOptions(): FieldOptions { @@ -3315,6 +3939,7 @@ function createBaseFieldOptions(): FieldOptions { }; } export const FieldOptions = { + typeUrl: "/google.protobuf.FieldOptions", encode(message: FieldOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.ctype !== 1) { writer.uint32(8).int32(message.ctype); @@ -3447,6 +4072,47 @@ export const FieldOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: FieldOptionsAmino): FieldOptions { + return { + ctype: isSet(object.ctype) ? fieldOptions_CTypeFromJSON(object.ctype) : -1, + packed: object.packed, + jstype: isSet(object.jstype) ? fieldOptions_JSTypeFromJSON(object.jstype) : -1, + lazy: object.lazy, + deprecated: object.deprecated, + weak: object.weak, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: FieldOptions): FieldOptionsAmino { + const obj: any = {}; + obj.ctype = message.ctype; + obj.packed = message.packed; + obj.jstype = message.jstype; + obj.lazy = message.lazy; + obj.deprecated = message.deprecated; + obj.weak = message.weak; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: FieldOptionsAminoMsg): FieldOptions { + return FieldOptions.fromAmino(object.value); + }, + fromProtoMsg(message: FieldOptionsProtoMsg): FieldOptions { + return FieldOptions.decode(message.value); + }, + toProto(message: FieldOptions): Uint8Array { + return FieldOptions.encode(message).finish(); + }, + toProtoMsg(message: FieldOptions): FieldOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.FieldOptions", + value: FieldOptions.encode(message).finish() + }; } }; function createBaseOneofOptions(): OneofOptions { @@ -3455,6 +4121,7 @@ function createBaseOneofOptions(): OneofOptions { }; } export const OneofOptions = { + typeUrl: "/google.protobuf.OneofOptions", encode(message: OneofOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.uninterpretedOption) { UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim(); @@ -3515,6 +4182,35 @@ export const OneofOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: OneofOptionsAmino): OneofOptions { + return { + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: OneofOptions): OneofOptionsAmino { + const obj: any = {}; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: OneofOptionsAminoMsg): OneofOptions { + return OneofOptions.fromAmino(object.value); + }, + fromProtoMsg(message: OneofOptionsProtoMsg): OneofOptions { + return OneofOptions.decode(message.value); + }, + toProto(message: OneofOptions): Uint8Array { + return OneofOptions.encode(message).finish(); + }, + toProtoMsg(message: OneofOptions): OneofOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.OneofOptions", + value: OneofOptions.encode(message).finish() + }; } }; function createBaseEnumOptions(): EnumOptions { @@ -3525,6 +4221,7 @@ function createBaseEnumOptions(): EnumOptions { }; } export const EnumOptions = { + typeUrl: "/google.protobuf.EnumOptions", encode(message: EnumOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allowAlias === true) { writer.uint32(16).bool(message.allowAlias); @@ -3609,6 +4306,39 @@ export const EnumOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: EnumOptionsAmino): EnumOptions { + return { + allowAlias: object.allow_alias, + deprecated: object.deprecated, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: EnumOptions): EnumOptionsAmino { + const obj: any = {}; + obj.allow_alias = message.allowAlias; + obj.deprecated = message.deprecated; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: EnumOptionsAminoMsg): EnumOptions { + return EnumOptions.fromAmino(object.value); + }, + fromProtoMsg(message: EnumOptionsProtoMsg): EnumOptions { + return EnumOptions.decode(message.value); + }, + toProto(message: EnumOptions): Uint8Array { + return EnumOptions.encode(message).finish(); + }, + toProtoMsg(message: EnumOptions): EnumOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.EnumOptions", + value: EnumOptions.encode(message).finish() + }; } }; function createBaseEnumValueOptions(): EnumValueOptions { @@ -3618,6 +4348,7 @@ function createBaseEnumValueOptions(): EnumValueOptions { }; } export const EnumValueOptions = { + typeUrl: "/google.protobuf.EnumValueOptions", encode(message: EnumValueOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deprecated === true) { writer.uint32(8).bool(message.deprecated); @@ -3690,6 +4421,37 @@ export const EnumValueOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: EnumValueOptionsAmino): EnumValueOptions { + return { + deprecated: object.deprecated, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: EnumValueOptions): EnumValueOptionsAmino { + const obj: any = {}; + obj.deprecated = message.deprecated; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: EnumValueOptionsAminoMsg): EnumValueOptions { + return EnumValueOptions.fromAmino(object.value); + }, + fromProtoMsg(message: EnumValueOptionsProtoMsg): EnumValueOptions { + return EnumValueOptions.decode(message.value); + }, + toProto(message: EnumValueOptions): Uint8Array { + return EnumValueOptions.encode(message).finish(); + }, + toProtoMsg(message: EnumValueOptions): EnumValueOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.EnumValueOptions", + value: EnumValueOptions.encode(message).finish() + }; } }; function createBaseServiceOptions(): ServiceOptions { @@ -3699,6 +4461,7 @@ function createBaseServiceOptions(): ServiceOptions { }; } export const ServiceOptions = { + typeUrl: "/google.protobuf.ServiceOptions", encode(message: ServiceOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deprecated === true) { writer.uint32(264).bool(message.deprecated); @@ -3771,6 +4534,37 @@ export const ServiceOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: ServiceOptionsAmino): ServiceOptions { + return { + deprecated: object.deprecated, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: ServiceOptions): ServiceOptionsAmino { + const obj: any = {}; + obj.deprecated = message.deprecated; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: ServiceOptionsAminoMsg): ServiceOptions { + return ServiceOptions.fromAmino(object.value); + }, + fromProtoMsg(message: ServiceOptionsProtoMsg): ServiceOptions { + return ServiceOptions.decode(message.value); + }, + toProto(message: ServiceOptions): Uint8Array { + return ServiceOptions.encode(message).finish(); + }, + toProtoMsg(message: ServiceOptions): ServiceOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.ServiceOptions", + value: ServiceOptions.encode(message).finish() + }; } }; function createBaseMethodOptions(): MethodOptions { @@ -3781,6 +4575,7 @@ function createBaseMethodOptions(): MethodOptions { }; } export const MethodOptions = { + typeUrl: "/google.protobuf.MethodOptions", encode(message: MethodOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deprecated === true) { writer.uint32(264).bool(message.deprecated); @@ -3865,6 +4660,39 @@ export const MethodOptions = { obj.uninterpreted_option = []; } return obj; + }, + fromAmino(object: MethodOptionsAmino): MethodOptions { + return { + deprecated: object.deprecated, + idempotencyLevel: isSet(object.idempotency_level) ? methodOptions_IdempotencyLevelFromJSON(object.idempotency_level) : -1, + uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromAmino(e)) : [] + }; + }, + toAmino(message: MethodOptions): MethodOptionsAmino { + const obj: any = {}; + obj.deprecated = message.deprecated; + obj.idempotency_level = message.idempotencyLevel; + if (message.uninterpretedOption) { + obj.uninterpreted_option = message.uninterpretedOption.map(e => e ? UninterpretedOption.toAmino(e) : undefined); + } else { + obj.uninterpreted_option = []; + } + return obj; + }, + fromAminoMsg(object: MethodOptionsAminoMsg): MethodOptions { + return MethodOptions.fromAmino(object.value); + }, + fromProtoMsg(message: MethodOptionsProtoMsg): MethodOptions { + return MethodOptions.decode(message.value); + }, + toProto(message: MethodOptions): Uint8Array { + return MethodOptions.encode(message).finish(); + }, + toProtoMsg(message: MethodOptions): MethodOptionsProtoMsg { + return { + typeUrl: "/google.protobuf.MethodOptions", + value: MethodOptions.encode(message).finish() + }; } }; function createBaseUninterpretedOption(): UninterpretedOption { @@ -3879,6 +4707,7 @@ function createBaseUninterpretedOption(): UninterpretedOption { }; } export const UninterpretedOption = { + typeUrl: "/google.protobuf.UninterpretedOption", encode(message: UninterpretedOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.name) { UninterpretedOption_NamePart.encode(v!, writer.uint32(18).fork()).ldelim(); @@ -4011,6 +4840,47 @@ export const UninterpretedOption = { obj.string_value = message.stringValue; obj.aggregate_value = message.aggregateValue; return obj; + }, + fromAmino(object: UninterpretedOptionAmino): UninterpretedOption { + return { + name: Array.isArray(object?.name) ? object.name.map((e: any) => UninterpretedOption_NamePart.fromAmino(e)) : [], + identifierValue: object.identifier_value, + positiveIntValue: BigInt(object.positive_int_value), + negativeIntValue: BigInt(object.negative_int_value), + doubleValue: object.double_value, + stringValue: object.string_value, + aggregateValue: object.aggregate_value + }; + }, + toAmino(message: UninterpretedOption): UninterpretedOptionAmino { + const obj: any = {}; + if (message.name) { + obj.name = message.name.map(e => e ? UninterpretedOption_NamePart.toAmino(e) : undefined); + } else { + obj.name = []; + } + obj.identifier_value = message.identifierValue; + obj.positive_int_value = message.positiveIntValue ? message.positiveIntValue.toString() : undefined; + obj.negative_int_value = message.negativeIntValue ? message.negativeIntValue.toString() : undefined; + obj.double_value = message.doubleValue; + obj.string_value = message.stringValue; + obj.aggregate_value = message.aggregateValue; + return obj; + }, + fromAminoMsg(object: UninterpretedOptionAminoMsg): UninterpretedOption { + return UninterpretedOption.fromAmino(object.value); + }, + fromProtoMsg(message: UninterpretedOptionProtoMsg): UninterpretedOption { + return UninterpretedOption.decode(message.value); + }, + toProto(message: UninterpretedOption): Uint8Array { + return UninterpretedOption.encode(message).finish(); + }, + toProtoMsg(message: UninterpretedOption): UninterpretedOptionProtoMsg { + return { + typeUrl: "/google.protobuf.UninterpretedOption", + value: UninterpretedOption.encode(message).finish() + }; } }; function createBaseUninterpretedOption_NamePart(): UninterpretedOption_NamePart { @@ -4020,6 +4890,7 @@ function createBaseUninterpretedOption_NamePart(): UninterpretedOption_NamePart }; } export const UninterpretedOption_NamePart = { + typeUrl: "/google.protobuf.NamePart", encode(message: UninterpretedOption_NamePart, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.namePart !== "") { writer.uint32(10).string(message.namePart); @@ -4084,6 +4955,33 @@ export const UninterpretedOption_NamePart = { obj.name_part = message.namePart; obj.is_extension = message.isExtension; return obj; + }, + fromAmino(object: UninterpretedOption_NamePartAmino): UninterpretedOption_NamePart { + return { + namePart: object.name_part, + isExtension: object.is_extension + }; + }, + toAmino(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartAmino { + const obj: any = {}; + obj.name_part = message.namePart; + obj.is_extension = message.isExtension; + return obj; + }, + fromAminoMsg(object: UninterpretedOption_NamePartAminoMsg): UninterpretedOption_NamePart { + return UninterpretedOption_NamePart.fromAmino(object.value); + }, + fromProtoMsg(message: UninterpretedOption_NamePartProtoMsg): UninterpretedOption_NamePart { + return UninterpretedOption_NamePart.decode(message.value); + }, + toProto(message: UninterpretedOption_NamePart): Uint8Array { + return UninterpretedOption_NamePart.encode(message).finish(); + }, + toProtoMsg(message: UninterpretedOption_NamePart): UninterpretedOption_NamePartProtoMsg { + return { + typeUrl: "/google.protobuf.NamePart", + value: UninterpretedOption_NamePart.encode(message).finish() + }; } }; function createBaseSourceCodeInfo(): SourceCodeInfo { @@ -4092,6 +4990,7 @@ function createBaseSourceCodeInfo(): SourceCodeInfo { }; } export const SourceCodeInfo = { + typeUrl: "/google.protobuf.SourceCodeInfo", encode(message: SourceCodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.location) { SourceCodeInfo_Location.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -4152,6 +5051,35 @@ export const SourceCodeInfo = { obj.location = []; } return obj; + }, + fromAmino(object: SourceCodeInfoAmino): SourceCodeInfo { + return { + location: Array.isArray(object?.location) ? object.location.map((e: any) => SourceCodeInfo_Location.fromAmino(e)) : [] + }; + }, + toAmino(message: SourceCodeInfo): SourceCodeInfoAmino { + const obj: any = {}; + if (message.location) { + obj.location = message.location.map(e => e ? SourceCodeInfo_Location.toAmino(e) : undefined); + } else { + obj.location = []; + } + return obj; + }, + fromAminoMsg(object: SourceCodeInfoAminoMsg): SourceCodeInfo { + return SourceCodeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: SourceCodeInfoProtoMsg): SourceCodeInfo { + return SourceCodeInfo.decode(message.value); + }, + toProto(message: SourceCodeInfo): Uint8Array { + return SourceCodeInfo.encode(message).finish(); + }, + toProtoMsg(message: SourceCodeInfo): SourceCodeInfoProtoMsg { + return { + typeUrl: "/google.protobuf.SourceCodeInfo", + value: SourceCodeInfo.encode(message).finish() + }; } }; function createBaseSourceCodeInfo_Location(): SourceCodeInfo_Location { @@ -4164,6 +5092,7 @@ function createBaseSourceCodeInfo_Location(): SourceCodeInfo_Location { }; } export const SourceCodeInfo_Location = { + typeUrl: "/google.protobuf.Location", encode(message: SourceCodeInfo_Location, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.path) { @@ -4306,6 +5235,51 @@ export const SourceCodeInfo_Location = { obj.leading_detached_comments = []; } return obj; + }, + fromAmino(object: SourceCodeInfo_LocationAmino): SourceCodeInfo_Location { + return { + path: Array.isArray(object?.path) ? object.path.map((e: any) => e) : [], + span: Array.isArray(object?.span) ? object.span.map((e: any) => e) : [], + leadingComments: object.leading_comments, + trailingComments: object.trailing_comments, + leadingDetachedComments: Array.isArray(object?.leading_detached_comments) ? object.leading_detached_comments.map((e: any) => e) : [] + }; + }, + toAmino(message: SourceCodeInfo_Location): SourceCodeInfo_LocationAmino { + const obj: any = {}; + if (message.path) { + obj.path = message.path.map(e => e); + } else { + obj.path = []; + } + if (message.span) { + obj.span = message.span.map(e => e); + } else { + obj.span = []; + } + obj.leading_comments = message.leadingComments; + obj.trailing_comments = message.trailingComments; + if (message.leadingDetachedComments) { + obj.leading_detached_comments = message.leadingDetachedComments.map(e => e); + } else { + obj.leading_detached_comments = []; + } + return obj; + }, + fromAminoMsg(object: SourceCodeInfo_LocationAminoMsg): SourceCodeInfo_Location { + return SourceCodeInfo_Location.fromAmino(object.value); + }, + fromProtoMsg(message: SourceCodeInfo_LocationProtoMsg): SourceCodeInfo_Location { + return SourceCodeInfo_Location.decode(message.value); + }, + toProto(message: SourceCodeInfo_Location): Uint8Array { + return SourceCodeInfo_Location.encode(message).finish(); + }, + toProtoMsg(message: SourceCodeInfo_Location): SourceCodeInfo_LocationProtoMsg { + return { + typeUrl: "/google.protobuf.Location", + value: SourceCodeInfo_Location.encode(message).finish() + }; } }; function createBaseGeneratedCodeInfo(): GeneratedCodeInfo { @@ -4314,6 +5288,7 @@ function createBaseGeneratedCodeInfo(): GeneratedCodeInfo { }; } export const GeneratedCodeInfo = { + typeUrl: "/google.protobuf.GeneratedCodeInfo", encode(message: GeneratedCodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.annotation) { GeneratedCodeInfo_Annotation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -4374,6 +5349,35 @@ export const GeneratedCodeInfo = { obj.annotation = []; } return obj; + }, + fromAmino(object: GeneratedCodeInfoAmino): GeneratedCodeInfo { + return { + annotation: Array.isArray(object?.annotation) ? object.annotation.map((e: any) => GeneratedCodeInfo_Annotation.fromAmino(e)) : [] + }; + }, + toAmino(message: GeneratedCodeInfo): GeneratedCodeInfoAmino { + const obj: any = {}; + if (message.annotation) { + obj.annotation = message.annotation.map(e => e ? GeneratedCodeInfo_Annotation.toAmino(e) : undefined); + } else { + obj.annotation = []; + } + return obj; + }, + fromAminoMsg(object: GeneratedCodeInfoAminoMsg): GeneratedCodeInfo { + return GeneratedCodeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: GeneratedCodeInfoProtoMsg): GeneratedCodeInfo { + return GeneratedCodeInfo.decode(message.value); + }, + toProto(message: GeneratedCodeInfo): Uint8Array { + return GeneratedCodeInfo.encode(message).finish(); + }, + toProtoMsg(message: GeneratedCodeInfo): GeneratedCodeInfoProtoMsg { + return { + typeUrl: "/google.protobuf.GeneratedCodeInfo", + value: GeneratedCodeInfo.encode(message).finish() + }; } }; function createBaseGeneratedCodeInfo_Annotation(): GeneratedCodeInfo_Annotation { @@ -4385,6 +5389,7 @@ function createBaseGeneratedCodeInfo_Annotation(): GeneratedCodeInfo_Annotation }; } export const GeneratedCodeInfo_Annotation = { + typeUrl: "/google.protobuf.Annotation", encode(message: GeneratedCodeInfo_Annotation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.path) { @@ -4490,5 +5495,40 @@ export const GeneratedCodeInfo_Annotation = { obj.begin = message.begin; obj.end = message.end; return obj; + }, + fromAmino(object: GeneratedCodeInfo_AnnotationAmino): GeneratedCodeInfo_Annotation { + return { + path: Array.isArray(object?.path) ? object.path.map((e: any) => e) : [], + sourceFile: object.source_file, + begin: object.begin, + end: object.end + }; + }, + toAmino(message: GeneratedCodeInfo_Annotation): GeneratedCodeInfo_AnnotationAmino { + const obj: any = {}; + if (message.path) { + obj.path = message.path.map(e => e); + } else { + obj.path = []; + } + obj.source_file = message.sourceFile; + obj.begin = message.begin; + obj.end = message.end; + return obj; + }, + fromAminoMsg(object: GeneratedCodeInfo_AnnotationAminoMsg): GeneratedCodeInfo_Annotation { + return GeneratedCodeInfo_Annotation.fromAmino(object.value); + }, + fromProtoMsg(message: GeneratedCodeInfo_AnnotationProtoMsg): GeneratedCodeInfo_Annotation { + return GeneratedCodeInfo_Annotation.decode(message.value); + }, + toProto(message: GeneratedCodeInfo_Annotation): Uint8Array { + return GeneratedCodeInfo_Annotation.encode(message).finish(); + }, + toProtoMsg(message: GeneratedCodeInfo_Annotation): GeneratedCodeInfo_AnnotationProtoMsg { + return { + typeUrl: "/google.protobuf.Annotation", + value: GeneratedCodeInfo_Annotation.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/duration.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/duration.ts index d233a66688..1137adafdf 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/duration.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/duration.ts @@ -149,6 +149,7 @@ function createBaseDuration(): Duration { }; } export const Duration = { + typeUrl: "/google.protobuf.Duration", encode(message: Duration, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.seconds !== BigInt(0)) { writer.uint32(8).int64(message.seconds); @@ -213,5 +214,30 @@ export const Duration = { obj.seconds = message.seconds; obj.nanos = message.nanos; return obj; + }, + fromAmino(object: DurationAmino): Duration { + const value = BigInt(object); + return { + seconds: value / BigInt("1000000000"), + nanos: Number(value % BigInt("1000000000")) + }; + }, + toAmino(message: Duration): DurationAmino { + return (message.seconds * BigInt("1000000000") + BigInt(message.nanos)).toString(); + }, + fromAminoMsg(object: DurationAminoMsg): Duration { + return Duration.fromAmino(object.value); + }, + fromProtoMsg(message: DurationProtoMsg): Duration { + return Duration.decode(message.value); + }, + toProto(message: Duration): Uint8Array { + return Duration.encode(message).finish(); + }, + toProtoMsg(message: Duration): DurationProtoMsg { + return { + typeUrl: "/google.protobuf.Duration", + value: Duration.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/empty.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/empty.ts index e7f0a3dba9..f9c0c04228 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/empty.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/empty.ts @@ -29,6 +29,7 @@ function createBaseEmpty(): Empty { return {}; } export const Empty = { + typeUrl: "/google.protobuf.Empty", encode(_: Empty, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -66,5 +67,27 @@ export const Empty = { toSDK(_: Empty): EmptySDKType { const obj: any = {}; return obj; + }, + fromAmino(_: EmptyAmino): Empty { + return {}; + }, + toAmino(_: Empty): EmptyAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: EmptyAminoMsg): Empty { + return Empty.fromAmino(object.value); + }, + fromProtoMsg(message: EmptyProtoMsg): Empty { + return Empty.decode(message.value); + }, + toProto(message: Empty): Uint8Array { + return Empty.encode(message).finish(); + }, + toProtoMsg(message: Empty): EmptyProtoMsg { + return { + typeUrl: "/google.protobuf.Empty", + value: Empty.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts index c51dbf2bfc..688df4186f 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/field_mask.ts @@ -416,6 +416,7 @@ function createBaseFieldMask(): FieldMask { }; } export const FieldMask = { + typeUrl: "/google.protobuf.FieldMask", encode(message: FieldMask, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.paths) { writer.uint32(10).string(v!); @@ -476,5 +477,34 @@ export const FieldMask = { obj.paths = []; } return obj; + }, + fromAmino(object: FieldMaskAmino): FieldMask { + return { + paths: Array.isArray(object?.paths) ? object.paths.map((e: any) => e) : [] + }; + }, + toAmino(message: FieldMask): FieldMaskAmino { + const obj: any = {}; + if (message.paths) { + obj.paths = message.paths.map(e => e); + } else { + obj.paths = []; + } + return obj; + }, + fromAminoMsg(object: FieldMaskAminoMsg): FieldMask { + return FieldMask.fromAmino(object.value); + }, + fromProtoMsg(message: FieldMaskProtoMsg): FieldMask { + return FieldMask.decode(message.value); + }, + toProto(message: FieldMask): Uint8Array { + return FieldMask.encode(message).finish(); + }, + toProtoMsg(message: FieldMask): FieldMaskProtoMsg { + return { + typeUrl: "/google.protobuf.FieldMask", + value: FieldMask.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts index e249a42c45..327c390b9c 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/source_context.ts @@ -25,6 +25,7 @@ function createBaseSourceContext(): SourceContext { }; } export const SourceContext = { + typeUrl: "/google.protobuf.SourceContext", encode(message: SourceContext, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fileName !== "") { writer.uint32(10).string(message.fileName); @@ -77,5 +78,30 @@ export const SourceContext = { const obj: any = {}; obj.file_name = message.fileName; return obj; + }, + fromAmino(object: SourceContextAmino): SourceContext { + return { + fileName: object.file_name + }; + }, + toAmino(message: SourceContext): SourceContextAmino { + const obj: any = {}; + obj.file_name = message.fileName; + return obj; + }, + fromAminoMsg(object: SourceContextAminoMsg): SourceContext { + return SourceContext.fromAmino(object.value); + }, + fromProtoMsg(message: SourceContextProtoMsg): SourceContext { + return SourceContext.decode(message.value); + }, + toProto(message: SourceContext): Uint8Array { + return SourceContext.encode(message).finish(); + }, + toProtoMsg(message: SourceContext): SourceContextProtoMsg { + return { + typeUrl: "/google.protobuf.SourceContext", + value: SourceContext.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts index 7e9d94a5a2..7a99396c23 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/struct.ts @@ -198,6 +198,27 @@ export const Struct_FieldsEntry = { obj.key = message.key; message.value !== undefined && (obj.value = message.value ? Value.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: Struct_FieldsEntryAmino): Struct_FieldsEntry { + return { + key: object.key, + value: object?.value ? Value.fromAmino(object.value) : undefined + }; + }, + toAmino(message: Struct_FieldsEntry): Struct_FieldsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value ? Value.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: Struct_FieldsEntryAminoMsg): Struct_FieldsEntry { + return Struct_FieldsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: Struct_FieldsEntryProtoMsg): Struct_FieldsEntry { + return Struct_FieldsEntry.decode(message.value); + }, + toProto(message: Struct_FieldsEntry): Uint8Array { + return Struct_FieldsEntry.encode(message).finish(); } }; function createBaseStruct(): Struct { @@ -206,6 +227,7 @@ function createBaseStruct(): Struct { }; } export const Struct = { + typeUrl: "/google.protobuf.Struct", encode(message: Struct, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.fields).forEach(([key, value]) => { Struct_FieldsEntry.encode({ @@ -296,6 +318,41 @@ export const Struct = { }); } return obj; + }, + fromAmino(object: StructAmino): Struct { + return { + fields: isObject(object.fields) ? Object.entries(object.fields).reduce<{ + [key: string]: Value; + }>((acc, [key, value]) => { + acc[key] = Value.fromAmino(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: Struct): StructAmino { + const obj: any = {}; + obj.fields = {}; + if (message.fields) { + Object.entries(message.fields).forEach(([k, v]) => { + obj.fields[k] = Value.toAmino(v); + }); + } + return obj; + }, + fromAminoMsg(object: StructAminoMsg): Struct { + return Struct.fromAmino(object.value); + }, + fromProtoMsg(message: StructProtoMsg): Struct { + return Struct.decode(message.value); + }, + toProto(message: Struct): Uint8Array { + return Struct.encode(message).finish(); + }, + toProtoMsg(message: Struct): StructProtoMsg { + return { + typeUrl: "/google.protobuf.Struct", + value: Struct.encode(message).finish() + }; } }; function createBaseValue(): Value { @@ -309,6 +366,7 @@ function createBaseValue(): Value { }; } export const Value = { + typeUrl: "/google.protobuf.Value", encode(message: Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); @@ -421,6 +479,41 @@ export const Value = { message.structValue !== undefined && (obj.struct_value = message.structValue ? Struct.toSDK(message.structValue) : undefined); message.listValue !== undefined && (obj.list_value = message.listValue ? ListValue.toSDK(message.listValue) : undefined); return obj; + }, + fromAmino(object: ValueAmino): Value { + return { + nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, + numberValue: object?.number_value, + stringValue: object?.string_value, + boolValue: object?.bool_value, + structValue: object?.struct_value ? Struct.fromAmino(object.struct_value) : undefined, + listValue: object?.list_value ? ListValue.fromAmino(object.list_value) : undefined + }; + }, + toAmino(message: Value): ValueAmino { + const obj: any = {}; + obj.null_value = message.nullValue; + obj.number_value = message.numberValue; + obj.string_value = message.stringValue; + obj.bool_value = message.boolValue; + obj.struct_value = message.structValue ? Struct.toAmino(message.structValue) : undefined; + obj.list_value = message.listValue ? ListValue.toAmino(message.listValue) : undefined; + return obj; + }, + fromAminoMsg(object: ValueAminoMsg): Value { + return Value.fromAmino(object.value); + }, + fromProtoMsg(message: ValueProtoMsg): Value { + return Value.decode(message.value); + }, + toProto(message: Value): Uint8Array { + return Value.encode(message).finish(); + }, + toProtoMsg(message: Value): ValueProtoMsg { + return { + typeUrl: "/google.protobuf.Value", + value: Value.encode(message).finish() + }; } }; function createBaseListValue(): ListValue { @@ -429,6 +522,7 @@ function createBaseListValue(): ListValue { }; } export const ListValue = { + typeUrl: "/google.protobuf.ListValue", encode(message: ListValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -489,5 +583,34 @@ export const ListValue = { obj.values = []; } return obj; + }, + fromAmino(object: ListValueAmino): ListValue { + return { + values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromAmino(e)) : [] + }; + }, + toAmino(message: ListValue): ListValueAmino { + const obj: any = {}; + if (message.values) { + obj.values = message.values.map(e => e ? Value.toAmino(e) : undefined); + } else { + obj.values = []; + } + return obj; + }, + fromAminoMsg(object: ListValueAminoMsg): ListValue { + return ListValue.fromAmino(object.value); + }, + fromProtoMsg(message: ListValueProtoMsg): ListValue { + return ListValue.decode(message.value); + }, + toProto(message: ListValue): Uint8Array { + return ListValue.encode(message).finish(); + }, + toProtoMsg(message: ListValue): ListValueProtoMsg { + return { + typeUrl: "/google.protobuf.ListValue", + value: ListValue.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/timestamp.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/timestamp.ts index c55ca893ef..124eee4aaa 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/timestamp.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/timestamp.ts @@ -1,5 +1,5 @@ import { BinaryReader, BinaryWriter } from "../../binary"; -import { isSet, DeepPartial } from "../../helpers"; +import { isSet, DeepPartial, fromJsonTimestamp, fromTimestamp } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** * A Timestamp represents a point in time independent of any time zone or local @@ -195,6 +195,7 @@ function createBaseTimestamp(): Timestamp { }; } export const Timestamp = { + typeUrl: "/google.protobuf.Timestamp", encode(message: Timestamp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.seconds !== BigInt(0)) { writer.uint32(8).int64(message.seconds); @@ -259,5 +260,26 @@ export const Timestamp = { obj.seconds = message.seconds; obj.nanos = message.nanos; return obj; + }, + fromAmino(object: TimestampAmino): Timestamp { + return fromJsonTimestamp(object); + }, + toAmino(message: Timestamp): TimestampAmino { + return fromTimestamp(message).toString(); + }, + fromAminoMsg(object: TimestampAminoMsg): Timestamp { + return Timestamp.fromAmino(object.value); + }, + fromProtoMsg(message: TimestampProtoMsg): Timestamp { + return Timestamp.decode(message.value); + }, + toProto(message: Timestamp): Uint8Array { + return Timestamp.encode(message).finish(); + }, + toProtoMsg(message: Timestamp): TimestampProtoMsg { + return { + typeUrl: "/google.protobuf.Timestamp", + value: Timestamp.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts index c127b5152c..f32cfa56cd 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/type.ts @@ -379,6 +379,7 @@ function createBaseType(): Type { }; } export const Type = { + typeUrl: "/google.protobuf.Type", encode(message: Type, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -515,6 +516,53 @@ export const Type = { message.sourceContext !== undefined && (obj.source_context = message.sourceContext ? SourceContext.toSDK(message.sourceContext) : undefined); message.syntax !== undefined && (obj.syntax = syntaxToJSON(message.syntax)); return obj; + }, + fromAmino(object: TypeAmino): Type { + return { + name: object.name, + fields: Array.isArray(object?.fields) ? object.fields.map((e: any) => Field.fromAmino(e)) : [], + oneofs: Array.isArray(object?.oneofs) ? object.oneofs.map((e: any) => e) : [], + options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromAmino(e)) : [], + sourceContext: object?.source_context ? SourceContext.fromAmino(object.source_context) : undefined, + syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 + }; + }, + toAmino(message: Type): TypeAmino { + const obj: any = {}; + obj.name = message.name; + if (message.fields) { + obj.fields = message.fields.map(e => e ? Field.toAmino(e) : undefined); + } else { + obj.fields = []; + } + if (message.oneofs) { + obj.oneofs = message.oneofs.map(e => e); + } else { + obj.oneofs = []; + } + if (message.options) { + obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; + obj.syntax = message.syntax; + return obj; + }, + fromAminoMsg(object: TypeAminoMsg): Type { + return Type.fromAmino(object.value); + }, + fromProtoMsg(message: TypeProtoMsg): Type { + return Type.decode(message.value); + }, + toProto(message: Type): Uint8Array { + return Type.encode(message).finish(); + }, + toProtoMsg(message: Type): TypeProtoMsg { + return { + typeUrl: "/google.protobuf.Type", + value: Type.encode(message).finish() + }; } }; function createBaseField(): Field { @@ -532,6 +580,7 @@ function createBaseField(): Field { }; } export const Field = { + typeUrl: "/google.protobuf.Field", encode(message: Field, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== 0) { writer.uint32(8).int32(message.kind); @@ -700,6 +749,53 @@ export const Field = { obj.json_name = message.jsonName; obj.default_value = message.defaultValue; return obj; + }, + fromAmino(object: FieldAmino): Field { + return { + kind: isSet(object.kind) ? field_KindFromJSON(object.kind) : -1, + cardinality: isSet(object.cardinality) ? field_CardinalityFromJSON(object.cardinality) : -1, + number: object.number, + name: object.name, + typeUrl: object.type_url, + oneofIndex: object.oneof_index, + packed: object.packed, + options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromAmino(e)) : [], + jsonName: object.json_name, + defaultValue: object.default_value + }; + }, + toAmino(message: Field): FieldAmino { + const obj: any = {}; + obj.kind = message.kind; + obj.cardinality = message.cardinality; + obj.number = message.number; + obj.name = message.name; + obj.type_url = message.typeUrl; + obj.oneof_index = message.oneofIndex; + obj.packed = message.packed; + if (message.options) { + obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.json_name = message.jsonName; + obj.default_value = message.defaultValue; + return obj; + }, + fromAminoMsg(object: FieldAminoMsg): Field { + return Field.fromAmino(object.value); + }, + fromProtoMsg(message: FieldProtoMsg): Field { + return Field.decode(message.value); + }, + toProto(message: Field): Uint8Array { + return Field.encode(message).finish(); + }, + toProtoMsg(message: Field): FieldProtoMsg { + return { + typeUrl: "/google.protobuf.Field", + value: Field.encode(message).finish() + }; } }; function createBaseEnum(): Enum { @@ -712,6 +808,7 @@ function createBaseEnum(): Enum { }; } export const Enum = { + typeUrl: "/google.protobuf.Enum", encode(message: Enum, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -828,6 +925,47 @@ export const Enum = { message.sourceContext !== undefined && (obj.source_context = message.sourceContext ? SourceContext.toSDK(message.sourceContext) : undefined); message.syntax !== undefined && (obj.syntax = syntaxToJSON(message.syntax)); return obj; + }, + fromAmino(object: EnumAmino): Enum { + return { + name: object.name, + enumvalue: Array.isArray(object?.enumvalue) ? object.enumvalue.map((e: any) => EnumValue.fromAmino(e)) : [], + options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromAmino(e)) : [], + sourceContext: object?.source_context ? SourceContext.fromAmino(object.source_context) : undefined, + syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 + }; + }, + toAmino(message: Enum): EnumAmino { + const obj: any = {}; + obj.name = message.name; + if (message.enumvalue) { + obj.enumvalue = message.enumvalue.map(e => e ? EnumValue.toAmino(e) : undefined); + } else { + obj.enumvalue = []; + } + if (message.options) { + obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); + } else { + obj.options = []; + } + obj.source_context = message.sourceContext ? SourceContext.toAmino(message.sourceContext) : undefined; + obj.syntax = message.syntax; + return obj; + }, + fromAminoMsg(object: EnumAminoMsg): Enum { + return Enum.fromAmino(object.value); + }, + fromProtoMsg(message: EnumProtoMsg): Enum { + return Enum.decode(message.value); + }, + toProto(message: Enum): Uint8Array { + return Enum.encode(message).finish(); + }, + toProtoMsg(message: Enum): EnumProtoMsg { + return { + typeUrl: "/google.protobuf.Enum", + value: Enum.encode(message).finish() + }; } }; function createBaseEnumValue(): EnumValue { @@ -838,6 +976,7 @@ function createBaseEnumValue(): EnumValue { }; } export const EnumValue = { + typeUrl: "/google.protobuf.EnumValue", encode(message: EnumValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -922,6 +1061,39 @@ export const EnumValue = { obj.options = []; } return obj; + }, + fromAmino(object: EnumValueAmino): EnumValue { + return { + name: object.name, + number: object.number, + options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromAmino(e)) : [] + }; + }, + toAmino(message: EnumValue): EnumValueAmino { + const obj: any = {}; + obj.name = message.name; + obj.number = message.number; + if (message.options) { + obj.options = message.options.map(e => e ? Option.toAmino(e) : undefined); + } else { + obj.options = []; + } + return obj; + }, + fromAminoMsg(object: EnumValueAminoMsg): EnumValue { + return EnumValue.fromAmino(object.value); + }, + fromProtoMsg(message: EnumValueProtoMsg): EnumValue { + return EnumValue.decode(message.value); + }, + toProto(message: EnumValue): Uint8Array { + return EnumValue.encode(message).finish(); + }, + toProtoMsg(message: EnumValue): EnumValueProtoMsg { + return { + typeUrl: "/google.protobuf.EnumValue", + value: EnumValue.encode(message).finish() + }; } }; function createBaseOption(): Option { @@ -931,6 +1103,7 @@ function createBaseOption(): Option { }; } export const Option = { + typeUrl: "/google.protobuf.Option", encode(message: Option, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -995,5 +1168,32 @@ export const Option = { obj.name = message.name; message.value !== undefined && (obj.value = message.value ? Any.toSDK(message.value) : undefined); return obj; + }, + fromAmino(object: OptionAmino): Option { + return { + name: object.name, + value: object?.value ? Any.fromAmino(object.value) : undefined + }; + }, + toAmino(message: Option): OptionAmino { + const obj: any = {}; + obj.name = message.name; + obj.value = message.value ? Any.toAmino(message.value) : undefined; + return obj; + }, + fromAminoMsg(object: OptionAminoMsg): Option { + return Option.fromAmino(object.value); + }, + fromProtoMsg(message: OptionProtoMsg): Option { + return Option.decode(message.value); + }, + toProto(message: Option): Uint8Array { + return Option.encode(message).finish(); + }, + toProtoMsg(message: Option): OptionProtoMsg { + return { + typeUrl: "/google.protobuf.Option", + value: Option.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts b/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts index e4668db646..2516a198f8 100644 --- a/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts +++ b/__fixtures__/v-next/outputosmojs/google/protobuf/wrappers.ts @@ -160,6 +160,7 @@ function createBaseDoubleValue(): DoubleValue { }; } export const DoubleValue = { + typeUrl: "/google.protobuf.DoubleValue", encode(message: DoubleValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(9).double(message.value); @@ -212,6 +213,31 @@ export const DoubleValue = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: DoubleValueAmino): DoubleValue { + return { + value: object.value + }; + }, + toAmino(message: DoubleValue): DoubleValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: DoubleValueAminoMsg): DoubleValue { + return DoubleValue.fromAmino(object.value); + }, + fromProtoMsg(message: DoubleValueProtoMsg): DoubleValue { + return DoubleValue.decode(message.value); + }, + toProto(message: DoubleValue): Uint8Array { + return DoubleValue.encode(message).finish(); + }, + toProtoMsg(message: DoubleValue): DoubleValueProtoMsg { + return { + typeUrl: "/google.protobuf.DoubleValue", + value: DoubleValue.encode(message).finish() + }; } }; function createBaseFloatValue(): FloatValue { @@ -220,6 +246,7 @@ function createBaseFloatValue(): FloatValue { }; } export const FloatValue = { + typeUrl: "/google.protobuf.FloatValue", encode(message: FloatValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(13).float(message.value); @@ -272,6 +299,31 @@ export const FloatValue = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: FloatValueAmino): FloatValue { + return { + value: object.value + }; + }, + toAmino(message: FloatValue): FloatValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: FloatValueAminoMsg): FloatValue { + return FloatValue.fromAmino(object.value); + }, + fromProtoMsg(message: FloatValueProtoMsg): FloatValue { + return FloatValue.decode(message.value); + }, + toProto(message: FloatValue): Uint8Array { + return FloatValue.encode(message).finish(); + }, + toProtoMsg(message: FloatValue): FloatValueProtoMsg { + return { + typeUrl: "/google.protobuf.FloatValue", + value: FloatValue.encode(message).finish() + }; } }; function createBaseInt64Value(): Int64Value { @@ -280,6 +332,7 @@ function createBaseInt64Value(): Int64Value { }; } export const Int64Value = { + typeUrl: "/google.protobuf.Int64Value", encode(message: Int64Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== BigInt(0)) { writer.uint32(8).int64(message.value); @@ -332,6 +385,31 @@ export const Int64Value = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: Int64ValueAmino): Int64Value { + return { + value: BigInt(object.value) + }; + }, + toAmino(message: Int64Value): Int64ValueAmino { + const obj: any = {}; + obj.value = message.value ? message.value.toString() : undefined; + return obj; + }, + fromAminoMsg(object: Int64ValueAminoMsg): Int64Value { + return Int64Value.fromAmino(object.value); + }, + fromProtoMsg(message: Int64ValueProtoMsg): Int64Value { + return Int64Value.decode(message.value); + }, + toProto(message: Int64Value): Uint8Array { + return Int64Value.encode(message).finish(); + }, + toProtoMsg(message: Int64Value): Int64ValueProtoMsg { + return { + typeUrl: "/google.protobuf.Int64Value", + value: Int64Value.encode(message).finish() + }; } }; function createBaseUInt64Value(): UInt64Value { @@ -340,6 +418,7 @@ function createBaseUInt64Value(): UInt64Value { }; } export const UInt64Value = { + typeUrl: "/google.protobuf.UInt64Value", encode(message: UInt64Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== BigInt(0)) { writer.uint32(8).uint64(message.value); @@ -392,6 +471,31 @@ export const UInt64Value = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: UInt64ValueAmino): UInt64Value { + return { + value: BigInt(object.value) + }; + }, + toAmino(message: UInt64Value): UInt64ValueAmino { + const obj: any = {}; + obj.value = message.value ? message.value.toString() : undefined; + return obj; + }, + fromAminoMsg(object: UInt64ValueAminoMsg): UInt64Value { + return UInt64Value.fromAmino(object.value); + }, + fromProtoMsg(message: UInt64ValueProtoMsg): UInt64Value { + return UInt64Value.decode(message.value); + }, + toProto(message: UInt64Value): Uint8Array { + return UInt64Value.encode(message).finish(); + }, + toProtoMsg(message: UInt64Value): UInt64ValueProtoMsg { + return { + typeUrl: "/google.protobuf.UInt64Value", + value: UInt64Value.encode(message).finish() + }; } }; function createBaseInt32Value(): Int32Value { @@ -400,6 +504,7 @@ function createBaseInt32Value(): Int32Value { }; } export const Int32Value = { + typeUrl: "/google.protobuf.Int32Value", encode(message: Int32Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(8).int32(message.value); @@ -452,6 +557,31 @@ export const Int32Value = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: Int32ValueAmino): Int32Value { + return { + value: object.value + }; + }, + toAmino(message: Int32Value): Int32ValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: Int32ValueAminoMsg): Int32Value { + return Int32Value.fromAmino(object.value); + }, + fromProtoMsg(message: Int32ValueProtoMsg): Int32Value { + return Int32Value.decode(message.value); + }, + toProto(message: Int32Value): Uint8Array { + return Int32Value.encode(message).finish(); + }, + toProtoMsg(message: Int32Value): Int32ValueProtoMsg { + return { + typeUrl: "/google.protobuf.Int32Value", + value: Int32Value.encode(message).finish() + }; } }; function createBaseUInt32Value(): UInt32Value { @@ -460,6 +590,7 @@ function createBaseUInt32Value(): UInt32Value { }; } export const UInt32Value = { + typeUrl: "/google.protobuf.UInt32Value", encode(message: UInt32Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(8).uint32(message.value); @@ -512,6 +643,31 @@ export const UInt32Value = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: UInt32ValueAmino): UInt32Value { + return { + value: object.value + }; + }, + toAmino(message: UInt32Value): UInt32ValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: UInt32ValueAminoMsg): UInt32Value { + return UInt32Value.fromAmino(object.value); + }, + fromProtoMsg(message: UInt32ValueProtoMsg): UInt32Value { + return UInt32Value.decode(message.value); + }, + toProto(message: UInt32Value): Uint8Array { + return UInt32Value.encode(message).finish(); + }, + toProtoMsg(message: UInt32Value): UInt32ValueProtoMsg { + return { + typeUrl: "/google.protobuf.UInt32Value", + value: UInt32Value.encode(message).finish() + }; } }; function createBaseBoolValue(): BoolValue { @@ -520,6 +676,7 @@ function createBaseBoolValue(): BoolValue { }; } export const BoolValue = { + typeUrl: "/google.protobuf.BoolValue", encode(message: BoolValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value === true) { writer.uint32(8).bool(message.value); @@ -572,6 +729,31 @@ export const BoolValue = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: BoolValueAmino): BoolValue { + return { + value: object.value + }; + }, + toAmino(message: BoolValue): BoolValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: BoolValueAminoMsg): BoolValue { + return BoolValue.fromAmino(object.value); + }, + fromProtoMsg(message: BoolValueProtoMsg): BoolValue { + return BoolValue.decode(message.value); + }, + toProto(message: BoolValue): Uint8Array { + return BoolValue.encode(message).finish(); + }, + toProtoMsg(message: BoolValue): BoolValueProtoMsg { + return { + typeUrl: "/google.protobuf.BoolValue", + value: BoolValue.encode(message).finish() + }; } }; function createBaseStringValue(): StringValue { @@ -580,6 +762,7 @@ function createBaseStringValue(): StringValue { }; } export const StringValue = { + typeUrl: "/google.protobuf.StringValue", encode(message: StringValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== "") { writer.uint32(10).string(message.value); @@ -632,6 +815,31 @@ export const StringValue = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: StringValueAmino): StringValue { + return { + value: object.value + }; + }, + toAmino(message: StringValue): StringValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: StringValueAminoMsg): StringValue { + return StringValue.fromAmino(object.value); + }, + fromProtoMsg(message: StringValueProtoMsg): StringValue { + return StringValue.decode(message.value); + }, + toProto(message: StringValue): Uint8Array { + return StringValue.encode(message).finish(); + }, + toProtoMsg(message: StringValue): StringValueProtoMsg { + return { + typeUrl: "/google.protobuf.StringValue", + value: StringValue.encode(message).finish() + }; } }; function createBaseBytesValue(): BytesValue { @@ -640,6 +848,7 @@ function createBaseBytesValue(): BytesValue { }; } export const BytesValue = { + typeUrl: "/google.protobuf.BytesValue", encode(message: BytesValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value.length !== 0) { writer.uint32(10).bytes(message.value); @@ -692,5 +901,30 @@ export const BytesValue = { const obj: any = {}; obj.value = message.value; return obj; + }, + fromAmino(object: BytesValueAmino): BytesValue { + return { + value: object.value + }; + }, + toAmino(message: BytesValue): BytesValueAmino { + const obj: any = {}; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: BytesValueAminoMsg): BytesValue { + return BytesValue.fromAmino(object.value); + }, + fromProtoMsg(message: BytesValueProtoMsg): BytesValue { + return BytesValue.decode(message.value); + }, + toProto(message: BytesValue): Uint8Array { + return BytesValue.encode(message).finish(); + }, + toProtoMsg(message: BytesValue): BytesValueProtoMsg { + return { + typeUrl: "/google.protobuf.BytesValue", + value: BytesValue.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/rpc/context/attribute_context.ts b/__fixtures__/v-next/outputosmojs/google/rpc/context/attribute_context.ts index b2bde875b3..db7af00452 100644 --- a/__fixtures__/v-next/outputosmojs/google/rpc/context/attribute_context.ts +++ b/__fixtures__/v-next/outputosmojs/google/rpc/context/attribute_context.ts @@ -542,6 +542,7 @@ function createBaseAttributeContext(): AttributeContext { }; } export const AttributeContext = { + typeUrl: "/google.rpc.context.AttributeContext", encode(message: AttributeContext, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.origin !== undefined) { AttributeContext_Peer.encode(message.origin, writer.uint32(58).fork()).ldelim(); @@ -686,6 +687,49 @@ export const AttributeContext = { obj.extensions = []; } return obj; + }, + fromAmino(object: AttributeContextAmino): AttributeContext { + return { + origin: object?.origin ? AttributeContext_Peer.fromAmino(object.origin) : undefined, + source: object?.source ? AttributeContext_Peer.fromAmino(object.source) : undefined, + destination: object?.destination ? AttributeContext_Peer.fromAmino(object.destination) : undefined, + request: object?.request ? AttributeContext_Request.fromAmino(object.request) : undefined, + response: object?.response ? AttributeContext_Response.fromAmino(object.response) : undefined, + resource: object?.resource ? AttributeContext_Resource.fromAmino(object.resource) : undefined, + api: object?.api ? AttributeContext_Api.fromAmino(object.api) : undefined, + extensions: Array.isArray(object?.extensions) ? object.extensions.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: AttributeContext): AttributeContextAmino { + const obj: any = {}; + obj.origin = message.origin ? AttributeContext_Peer.toAmino(message.origin) : undefined; + obj.source = message.source ? AttributeContext_Peer.toAmino(message.source) : undefined; + obj.destination = message.destination ? AttributeContext_Peer.toAmino(message.destination) : undefined; + obj.request = message.request ? AttributeContext_Request.toAmino(message.request) : undefined; + obj.response = message.response ? AttributeContext_Response.toAmino(message.response) : undefined; + obj.resource = message.resource ? AttributeContext_Resource.toAmino(message.resource) : undefined; + obj.api = message.api ? AttributeContext_Api.toAmino(message.api) : undefined; + if (message.extensions) { + obj.extensions = message.extensions.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.extensions = []; + } + return obj; + }, + fromAminoMsg(object: AttributeContextAminoMsg): AttributeContext { + return AttributeContext.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContextProtoMsg): AttributeContext { + return AttributeContext.decode(message.value); + }, + toProto(message: AttributeContext): Uint8Array { + return AttributeContext.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext): AttributeContextProtoMsg { + return { + typeUrl: "/google.rpc.context.AttributeContext", + value: AttributeContext.encode(message).finish() + }; } }; function createBaseAttributeContext_Peer_LabelsEntry(): AttributeContext_Peer_LabelsEntry { @@ -759,6 +803,27 @@ export const AttributeContext_Peer_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeContext_Peer_LabelsEntryAmino): AttributeContext_Peer_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: AttributeContext_Peer_LabelsEntry): AttributeContext_Peer_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeContext_Peer_LabelsEntryAminoMsg): AttributeContext_Peer_LabelsEntry { + return AttributeContext_Peer_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_Peer_LabelsEntryProtoMsg): AttributeContext_Peer_LabelsEntry { + return AttributeContext_Peer_LabelsEntry.decode(message.value); + }, + toProto(message: AttributeContext_Peer_LabelsEntry): Uint8Array { + return AttributeContext_Peer_LabelsEntry.encode(message).finish(); } }; function createBaseAttributeContext_Peer(): AttributeContext_Peer { @@ -771,6 +836,7 @@ function createBaseAttributeContext_Peer(): AttributeContext_Peer { }; } export const AttributeContext_Peer = { + typeUrl: "/google.rpc.context.Peer", encode(message: AttributeContext_Peer, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.ip !== "") { writer.uint32(10).string(message.ip); @@ -909,6 +975,49 @@ export const AttributeContext_Peer = { obj.principal = message.principal; obj.region_code = message.regionCode; return obj; + }, + fromAmino(object: AttributeContext_PeerAmino): AttributeContext_Peer { + return { + ip: object.ip, + port: BigInt(object.port), + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + principal: object.principal, + regionCode: object.region_code + }; + }, + toAmino(message: AttributeContext_Peer): AttributeContext_PeerAmino { + const obj: any = {}; + obj.ip = message.ip; + obj.port = message.port ? message.port.toString() : undefined; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + obj.principal = message.principal; + obj.region_code = message.regionCode; + return obj; + }, + fromAminoMsg(object: AttributeContext_PeerAminoMsg): AttributeContext_Peer { + return AttributeContext_Peer.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_PeerProtoMsg): AttributeContext_Peer { + return AttributeContext_Peer.decode(message.value); + }, + toProto(message: AttributeContext_Peer): Uint8Array { + return AttributeContext_Peer.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext_Peer): AttributeContext_PeerProtoMsg { + return { + typeUrl: "/google.rpc.context.Peer", + value: AttributeContext_Peer.encode(message).finish() + }; } }; function createBaseAttributeContext_Api(): AttributeContext_Api { @@ -920,6 +1029,7 @@ function createBaseAttributeContext_Api(): AttributeContext_Api { }; } export const AttributeContext_Api = { + typeUrl: "/google.rpc.context.Api", encode(message: AttributeContext_Api, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== "") { writer.uint32(10).string(message.service); @@ -1008,6 +1118,37 @@ export const AttributeContext_Api = { obj.protocol = message.protocol; obj.version = message.version; return obj; + }, + fromAmino(object: AttributeContext_ApiAmino): AttributeContext_Api { + return { + service: object.service, + operation: object.operation, + protocol: object.protocol, + version: object.version + }; + }, + toAmino(message: AttributeContext_Api): AttributeContext_ApiAmino { + const obj: any = {}; + obj.service = message.service; + obj.operation = message.operation; + obj.protocol = message.protocol; + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: AttributeContext_ApiAminoMsg): AttributeContext_Api { + return AttributeContext_Api.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_ApiProtoMsg): AttributeContext_Api { + return AttributeContext_Api.decode(message.value); + }, + toProto(message: AttributeContext_Api): Uint8Array { + return AttributeContext_Api.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext_Api): AttributeContext_ApiProtoMsg { + return { + typeUrl: "/google.rpc.context.Api", + value: AttributeContext_Api.encode(message).finish() + }; } }; function createBaseAttributeContext_Auth(): AttributeContext_Auth { @@ -1020,6 +1161,7 @@ function createBaseAttributeContext_Auth(): AttributeContext_Auth { }; } export const AttributeContext_Auth = { + typeUrl: "/google.rpc.context.Auth", encode(message: AttributeContext_Auth, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.principal !== "") { writer.uint32(10).string(message.principal); @@ -1136,6 +1278,47 @@ export const AttributeContext_Auth = { obj.access_levels = []; } return obj; + }, + fromAmino(object: AttributeContext_AuthAmino): AttributeContext_Auth { + return { + principal: object.principal, + audiences: Array.isArray(object?.audiences) ? object.audiences.map((e: any) => e) : [], + presenter: object.presenter, + claims: object?.claims ? Struct.fromAmino(object.claims) : undefined, + accessLevels: Array.isArray(object?.access_levels) ? object.access_levels.map((e: any) => e) : [] + }; + }, + toAmino(message: AttributeContext_Auth): AttributeContext_AuthAmino { + const obj: any = {}; + obj.principal = message.principal; + if (message.audiences) { + obj.audiences = message.audiences.map(e => e); + } else { + obj.audiences = []; + } + obj.presenter = message.presenter; + obj.claims = message.claims ? Struct.toAmino(message.claims) : undefined; + if (message.accessLevels) { + obj.access_levels = message.accessLevels.map(e => e); + } else { + obj.access_levels = []; + } + return obj; + }, + fromAminoMsg(object: AttributeContext_AuthAminoMsg): AttributeContext_Auth { + return AttributeContext_Auth.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_AuthProtoMsg): AttributeContext_Auth { + return AttributeContext_Auth.decode(message.value); + }, + toProto(message: AttributeContext_Auth): Uint8Array { + return AttributeContext_Auth.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext_Auth): AttributeContext_AuthProtoMsg { + return { + typeUrl: "/google.rpc.context.Auth", + value: AttributeContext_Auth.encode(message).finish() + }; } }; function createBaseAttributeContext_Request_HeadersEntry(): AttributeContext_Request_HeadersEntry { @@ -1209,6 +1392,27 @@ export const AttributeContext_Request_HeadersEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeContext_Request_HeadersEntryAmino): AttributeContext_Request_HeadersEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: AttributeContext_Request_HeadersEntry): AttributeContext_Request_HeadersEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeContext_Request_HeadersEntryAminoMsg): AttributeContext_Request_HeadersEntry { + return AttributeContext_Request_HeadersEntry.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_Request_HeadersEntryProtoMsg): AttributeContext_Request_HeadersEntry { + return AttributeContext_Request_HeadersEntry.decode(message.value); + }, + toProto(message: AttributeContext_Request_HeadersEntry): Uint8Array { + return AttributeContext_Request_HeadersEntry.encode(message).finish(); } }; function createBaseAttributeContext_Request(): AttributeContext_Request { @@ -1228,6 +1432,7 @@ function createBaseAttributeContext_Request(): AttributeContext_Request { }; } export const AttributeContext_Request = { + typeUrl: "/google.rpc.context.Request", encode(message: AttributeContext_Request, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -1450,6 +1655,63 @@ export const AttributeContext_Request = { obj.reason = message.reason; message.auth !== undefined && (obj.auth = message.auth ? AttributeContext_Auth.toSDK(message.auth) : undefined); return obj; + }, + fromAmino(object: AttributeContext_RequestAmino): AttributeContext_Request { + return { + id: object.id, + method: object.method, + headers: isObject(object.headers) ? Object.entries(object.headers).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + path: object.path, + host: object.host, + scheme: object.scheme, + query: object.query, + time: object.time, + size: BigInt(object.size), + protocol: object.protocol, + reason: object.reason, + auth: object?.auth ? AttributeContext_Auth.fromAmino(object.auth) : undefined + }; + }, + toAmino(message: AttributeContext_Request): AttributeContext_RequestAmino { + const obj: any = {}; + obj.id = message.id; + obj.method = message.method; + obj.headers = {}; + if (message.headers) { + Object.entries(message.headers).forEach(([k, v]) => { + obj.headers[k] = v; + }); + } + obj.path = message.path; + obj.host = message.host; + obj.scheme = message.scheme; + obj.query = message.query; + obj.time = message.time; + obj.size = message.size ? message.size.toString() : undefined; + obj.protocol = message.protocol; + obj.reason = message.reason; + obj.auth = message.auth ? AttributeContext_Auth.toAmino(message.auth) : undefined; + return obj; + }, + fromAminoMsg(object: AttributeContext_RequestAminoMsg): AttributeContext_Request { + return AttributeContext_Request.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_RequestProtoMsg): AttributeContext_Request { + return AttributeContext_Request.decode(message.value); + }, + toProto(message: AttributeContext_Request): Uint8Array { + return AttributeContext_Request.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext_Request): AttributeContext_RequestProtoMsg { + return { + typeUrl: "/google.rpc.context.Request", + value: AttributeContext_Request.encode(message).finish() + }; } }; function createBaseAttributeContext_Response_HeadersEntry(): AttributeContext_Response_HeadersEntry { @@ -1523,6 +1785,27 @@ export const AttributeContext_Response_HeadersEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeContext_Response_HeadersEntryAmino): AttributeContext_Response_HeadersEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: AttributeContext_Response_HeadersEntry): AttributeContext_Response_HeadersEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeContext_Response_HeadersEntryAminoMsg): AttributeContext_Response_HeadersEntry { + return AttributeContext_Response_HeadersEntry.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_Response_HeadersEntryProtoMsg): AttributeContext_Response_HeadersEntry { + return AttributeContext_Response_HeadersEntry.decode(message.value); + }, + toProto(message: AttributeContext_Response_HeadersEntry): Uint8Array { + return AttributeContext_Response_HeadersEntry.encode(message).finish(); } }; function createBaseAttributeContext_Response(): AttributeContext_Response { @@ -1535,6 +1818,7 @@ function createBaseAttributeContext_Response(): AttributeContext_Response { }; } export const AttributeContext_Response = { + typeUrl: "/google.rpc.context.Response", encode(message: AttributeContext_Response, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== BigInt(0)) { writer.uint32(8).int64(message.code); @@ -1673,6 +1957,49 @@ export const AttributeContext_Response = { message.time !== undefined && (obj.time = message.time ?? undefined); message.backendLatency !== undefined && (obj.backend_latency = message.backendLatency ? Duration.toSDK(message.backendLatency) : undefined); return obj; + }, + fromAmino(object: AttributeContext_ResponseAmino): AttributeContext_Response { + return { + code: BigInt(object.code), + size: BigInt(object.size), + headers: isObject(object.headers) ? Object.entries(object.headers).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + time: object.time, + backendLatency: object?.backend_latency ? Duration.fromAmino(object.backend_latency) : undefined + }; + }, + toAmino(message: AttributeContext_Response): AttributeContext_ResponseAmino { + const obj: any = {}; + obj.code = message.code ? message.code.toString() : undefined; + obj.size = message.size ? message.size.toString() : undefined; + obj.headers = {}; + if (message.headers) { + Object.entries(message.headers).forEach(([k, v]) => { + obj.headers[k] = v; + }); + } + obj.time = message.time; + obj.backend_latency = message.backendLatency ? Duration.toAmino(message.backendLatency) : undefined; + return obj; + }, + fromAminoMsg(object: AttributeContext_ResponseAminoMsg): AttributeContext_Response { + return AttributeContext_Response.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_ResponseProtoMsg): AttributeContext_Response { + return AttributeContext_Response.decode(message.value); + }, + toProto(message: AttributeContext_Response): Uint8Array { + return AttributeContext_Response.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext_Response): AttributeContext_ResponseProtoMsg { + return { + typeUrl: "/google.rpc.context.Response", + value: AttributeContext_Response.encode(message).finish() + }; } }; function createBaseAttributeContext_Resource_LabelsEntry(): AttributeContext_Resource_LabelsEntry { @@ -1746,6 +2073,27 @@ export const AttributeContext_Resource_LabelsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeContext_Resource_LabelsEntryAmino): AttributeContext_Resource_LabelsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: AttributeContext_Resource_LabelsEntry): AttributeContext_Resource_LabelsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeContext_Resource_LabelsEntryAminoMsg): AttributeContext_Resource_LabelsEntry { + return AttributeContext_Resource_LabelsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_Resource_LabelsEntryProtoMsg): AttributeContext_Resource_LabelsEntry { + return AttributeContext_Resource_LabelsEntry.decode(message.value); + }, + toProto(message: AttributeContext_Resource_LabelsEntry): Uint8Array { + return AttributeContext_Resource_LabelsEntry.encode(message).finish(); } }; function createBaseAttributeContext_Resource_AnnotationsEntry(): AttributeContext_Resource_AnnotationsEntry { @@ -1819,6 +2167,27 @@ export const AttributeContext_Resource_AnnotationsEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: AttributeContext_Resource_AnnotationsEntryAmino): AttributeContext_Resource_AnnotationsEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: AttributeContext_Resource_AnnotationsEntry): AttributeContext_Resource_AnnotationsEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: AttributeContext_Resource_AnnotationsEntryAminoMsg): AttributeContext_Resource_AnnotationsEntry { + return AttributeContext_Resource_AnnotationsEntry.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_Resource_AnnotationsEntryProtoMsg): AttributeContext_Resource_AnnotationsEntry { + return AttributeContext_Resource_AnnotationsEntry.decode(message.value); + }, + toProto(message: AttributeContext_Resource_AnnotationsEntry): Uint8Array { + return AttributeContext_Resource_AnnotationsEntry.encode(message).finish(); } }; function createBaseAttributeContext_Resource(): AttributeContext_Resource { @@ -1838,6 +2207,7 @@ function createBaseAttributeContext_Resource(): AttributeContext_Resource { }; } export const AttributeContext_Resource = { + typeUrl: "/google.rpc.context.Resource", encode(message: AttributeContext_Resource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== "") { writer.uint32(10).string(message.service); @@ -2098,5 +2468,72 @@ export const AttributeContext_Resource = { obj.etag = message.etag; obj.location = message.location; return obj; + }, + fromAmino(object: AttributeContext_ResourceAmino): AttributeContext_Resource { + return { + service: object.service, + name: object.name, + type: object.type, + labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + uid: object.uid, + annotations: isObject(object.annotations) ? Object.entries(object.annotations).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {}, + displayName: object.display_name, + createTime: object.create_time, + updateTime: object.update_time, + deleteTime: object.delete_time, + etag: object.etag, + location: object.location + }; + }, + toAmino(message: AttributeContext_Resource): AttributeContext_ResourceAmino { + const obj: any = {}; + obj.service = message.service; + obj.name = message.name; + obj.type = message.type; + obj.labels = {}; + if (message.labels) { + Object.entries(message.labels).forEach(([k, v]) => { + obj.labels[k] = v; + }); + } + obj.uid = message.uid; + obj.annotations = {}; + if (message.annotations) { + Object.entries(message.annotations).forEach(([k, v]) => { + obj.annotations[k] = v; + }); + } + obj.display_name = message.displayName; + obj.create_time = message.createTime; + obj.update_time = message.updateTime; + obj.delete_time = message.deleteTime; + obj.etag = message.etag; + obj.location = message.location; + return obj; + }, + fromAminoMsg(object: AttributeContext_ResourceAminoMsg): AttributeContext_Resource { + return AttributeContext_Resource.fromAmino(object.value); + }, + fromProtoMsg(message: AttributeContext_ResourceProtoMsg): AttributeContext_Resource { + return AttributeContext_Resource.decode(message.value); + }, + toProto(message: AttributeContext_Resource): Uint8Array { + return AttributeContext_Resource.encode(message).finish(); + }, + toProtoMsg(message: AttributeContext_Resource): AttributeContext_ResourceProtoMsg { + return { + typeUrl: "/google.rpc.context.Resource", + value: AttributeContext_Resource.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts b/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts index a4075cd268..5357966fe2 100644 --- a/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts +++ b/__fixtures__/v-next/outputosmojs/google/rpc/error_details.ts @@ -411,6 +411,7 @@ function createBaseRetryInfo(): RetryInfo { }; } export const RetryInfo = { + typeUrl: "/google.rpc.RetryInfo", encode(message: RetryInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.retryDelay !== undefined) { Duration.encode(message.retryDelay, writer.uint32(10).fork()).ldelim(); @@ -463,6 +464,31 @@ export const RetryInfo = { const obj: any = {}; message.retryDelay !== undefined && (obj.retry_delay = message.retryDelay ? Duration.toSDK(message.retryDelay) : undefined); return obj; + }, + fromAmino(object: RetryInfoAmino): RetryInfo { + return { + retryDelay: object?.retry_delay ? Duration.fromAmino(object.retry_delay) : undefined + }; + }, + toAmino(message: RetryInfo): RetryInfoAmino { + const obj: any = {}; + obj.retry_delay = message.retryDelay ? Duration.toAmino(message.retryDelay) : undefined; + return obj; + }, + fromAminoMsg(object: RetryInfoAminoMsg): RetryInfo { + return RetryInfo.fromAmino(object.value); + }, + fromProtoMsg(message: RetryInfoProtoMsg): RetryInfo { + return RetryInfo.decode(message.value); + }, + toProto(message: RetryInfo): Uint8Array { + return RetryInfo.encode(message).finish(); + }, + toProtoMsg(message: RetryInfo): RetryInfoProtoMsg { + return { + typeUrl: "/google.rpc.RetryInfo", + value: RetryInfo.encode(message).finish() + }; } }; function createBaseDebugInfo(): DebugInfo { @@ -472,6 +498,7 @@ function createBaseDebugInfo(): DebugInfo { }; } export const DebugInfo = { + typeUrl: "/google.rpc.DebugInfo", encode(message: DebugInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.stackEntries) { writer.uint32(10).string(v!); @@ -544,6 +571,37 @@ export const DebugInfo = { } obj.detail = message.detail; return obj; + }, + fromAmino(object: DebugInfoAmino): DebugInfo { + return { + stackEntries: Array.isArray(object?.stack_entries) ? object.stack_entries.map((e: any) => e) : [], + detail: object.detail + }; + }, + toAmino(message: DebugInfo): DebugInfoAmino { + const obj: any = {}; + if (message.stackEntries) { + obj.stack_entries = message.stackEntries.map(e => e); + } else { + obj.stack_entries = []; + } + obj.detail = message.detail; + return obj; + }, + fromAminoMsg(object: DebugInfoAminoMsg): DebugInfo { + return DebugInfo.fromAmino(object.value); + }, + fromProtoMsg(message: DebugInfoProtoMsg): DebugInfo { + return DebugInfo.decode(message.value); + }, + toProto(message: DebugInfo): Uint8Array { + return DebugInfo.encode(message).finish(); + }, + toProtoMsg(message: DebugInfo): DebugInfoProtoMsg { + return { + typeUrl: "/google.rpc.DebugInfo", + value: DebugInfo.encode(message).finish() + }; } }; function createBaseQuotaFailure(): QuotaFailure { @@ -552,6 +610,7 @@ function createBaseQuotaFailure(): QuotaFailure { }; } export const QuotaFailure = { + typeUrl: "/google.rpc.QuotaFailure", encode(message: QuotaFailure, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.violations) { QuotaFailure_Violation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -612,6 +671,35 @@ export const QuotaFailure = { obj.violations = []; } return obj; + }, + fromAmino(object: QuotaFailureAmino): QuotaFailure { + return { + violations: Array.isArray(object?.violations) ? object.violations.map((e: any) => QuotaFailure_Violation.fromAmino(e)) : [] + }; + }, + toAmino(message: QuotaFailure): QuotaFailureAmino { + const obj: any = {}; + if (message.violations) { + obj.violations = message.violations.map(e => e ? QuotaFailure_Violation.toAmino(e) : undefined); + } else { + obj.violations = []; + } + return obj; + }, + fromAminoMsg(object: QuotaFailureAminoMsg): QuotaFailure { + return QuotaFailure.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaFailureProtoMsg): QuotaFailure { + return QuotaFailure.decode(message.value); + }, + toProto(message: QuotaFailure): Uint8Array { + return QuotaFailure.encode(message).finish(); + }, + toProtoMsg(message: QuotaFailure): QuotaFailureProtoMsg { + return { + typeUrl: "/google.rpc.QuotaFailure", + value: QuotaFailure.encode(message).finish() + }; } }; function createBaseQuotaFailure_Violation(): QuotaFailure_Violation { @@ -621,6 +709,7 @@ function createBaseQuotaFailure_Violation(): QuotaFailure_Violation { }; } export const QuotaFailure_Violation = { + typeUrl: "/google.rpc.Violation", encode(message: QuotaFailure_Violation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subject !== "") { writer.uint32(10).string(message.subject); @@ -685,6 +774,33 @@ export const QuotaFailure_Violation = { obj.subject = message.subject; obj.description = message.description; return obj; + }, + fromAmino(object: QuotaFailure_ViolationAmino): QuotaFailure_Violation { + return { + subject: object.subject, + description: object.description + }; + }, + toAmino(message: QuotaFailure_Violation): QuotaFailure_ViolationAmino { + const obj: any = {}; + obj.subject = message.subject; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: QuotaFailure_ViolationAminoMsg): QuotaFailure_Violation { + return QuotaFailure_Violation.fromAmino(object.value); + }, + fromProtoMsg(message: QuotaFailure_ViolationProtoMsg): QuotaFailure_Violation { + return QuotaFailure_Violation.decode(message.value); + }, + toProto(message: QuotaFailure_Violation): Uint8Array { + return QuotaFailure_Violation.encode(message).finish(); + }, + toProtoMsg(message: QuotaFailure_Violation): QuotaFailure_ViolationProtoMsg { + return { + typeUrl: "/google.rpc.Violation", + value: QuotaFailure_Violation.encode(message).finish() + }; } }; function createBaseErrorInfo_MetadataEntry(): ErrorInfo_MetadataEntry { @@ -758,6 +874,27 @@ export const ErrorInfo_MetadataEntry = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: ErrorInfo_MetadataEntryAmino): ErrorInfo_MetadataEntry { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: ErrorInfo_MetadataEntry): ErrorInfo_MetadataEntryAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: ErrorInfo_MetadataEntryAminoMsg): ErrorInfo_MetadataEntry { + return ErrorInfo_MetadataEntry.fromAmino(object.value); + }, + fromProtoMsg(message: ErrorInfo_MetadataEntryProtoMsg): ErrorInfo_MetadataEntry { + return ErrorInfo_MetadataEntry.decode(message.value); + }, + toProto(message: ErrorInfo_MetadataEntry): Uint8Array { + return ErrorInfo_MetadataEntry.encode(message).finish(); } }; function createBaseErrorInfo(): ErrorInfo { @@ -768,6 +905,7 @@ function createBaseErrorInfo(): ErrorInfo { }; } export const ErrorInfo = { + typeUrl: "/google.rpc.ErrorInfo", encode(message: ErrorInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.reason !== "") { writer.uint32(10).string(message.reason); @@ -882,6 +1020,45 @@ export const ErrorInfo = { }); } return obj; + }, + fromAmino(object: ErrorInfoAmino): ErrorInfo { + return { + reason: object.reason, + domain: object.domain, + metadata: isObject(object.metadata) ? Object.entries(object.metadata).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}) : {} + }; + }, + toAmino(message: ErrorInfo): ErrorInfoAmino { + const obj: any = {}; + obj.reason = message.reason; + obj.domain = message.domain; + obj.metadata = {}; + if (message.metadata) { + Object.entries(message.metadata).forEach(([k, v]) => { + obj.metadata[k] = v; + }); + } + return obj; + }, + fromAminoMsg(object: ErrorInfoAminoMsg): ErrorInfo { + return ErrorInfo.fromAmino(object.value); + }, + fromProtoMsg(message: ErrorInfoProtoMsg): ErrorInfo { + return ErrorInfo.decode(message.value); + }, + toProto(message: ErrorInfo): Uint8Array { + return ErrorInfo.encode(message).finish(); + }, + toProtoMsg(message: ErrorInfo): ErrorInfoProtoMsg { + return { + typeUrl: "/google.rpc.ErrorInfo", + value: ErrorInfo.encode(message).finish() + }; } }; function createBasePreconditionFailure(): PreconditionFailure { @@ -890,6 +1067,7 @@ function createBasePreconditionFailure(): PreconditionFailure { }; } export const PreconditionFailure = { + typeUrl: "/google.rpc.PreconditionFailure", encode(message: PreconditionFailure, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.violations) { PreconditionFailure_Violation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -950,6 +1128,35 @@ export const PreconditionFailure = { obj.violations = []; } return obj; + }, + fromAmino(object: PreconditionFailureAmino): PreconditionFailure { + return { + violations: Array.isArray(object?.violations) ? object.violations.map((e: any) => PreconditionFailure_Violation.fromAmino(e)) : [] + }; + }, + toAmino(message: PreconditionFailure): PreconditionFailureAmino { + const obj: any = {}; + if (message.violations) { + obj.violations = message.violations.map(e => e ? PreconditionFailure_Violation.toAmino(e) : undefined); + } else { + obj.violations = []; + } + return obj; + }, + fromAminoMsg(object: PreconditionFailureAminoMsg): PreconditionFailure { + return PreconditionFailure.fromAmino(object.value); + }, + fromProtoMsg(message: PreconditionFailureProtoMsg): PreconditionFailure { + return PreconditionFailure.decode(message.value); + }, + toProto(message: PreconditionFailure): Uint8Array { + return PreconditionFailure.encode(message).finish(); + }, + toProtoMsg(message: PreconditionFailure): PreconditionFailureProtoMsg { + return { + typeUrl: "/google.rpc.PreconditionFailure", + value: PreconditionFailure.encode(message).finish() + }; } }; function createBasePreconditionFailure_Violation(): PreconditionFailure_Violation { @@ -960,6 +1167,7 @@ function createBasePreconditionFailure_Violation(): PreconditionFailure_Violatio }; } export const PreconditionFailure_Violation = { + typeUrl: "/google.rpc.Violation", encode(message: PreconditionFailure_Violation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -1036,6 +1244,35 @@ export const PreconditionFailure_Violation = { obj.subject = message.subject; obj.description = message.description; return obj; + }, + fromAmino(object: PreconditionFailure_ViolationAmino): PreconditionFailure_Violation { + return { + type: object.type, + subject: object.subject, + description: object.description + }; + }, + toAmino(message: PreconditionFailure_Violation): PreconditionFailure_ViolationAmino { + const obj: any = {}; + obj.type = message.type; + obj.subject = message.subject; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: PreconditionFailure_ViolationAminoMsg): PreconditionFailure_Violation { + return PreconditionFailure_Violation.fromAmino(object.value); + }, + fromProtoMsg(message: PreconditionFailure_ViolationProtoMsg): PreconditionFailure_Violation { + return PreconditionFailure_Violation.decode(message.value); + }, + toProto(message: PreconditionFailure_Violation): Uint8Array { + return PreconditionFailure_Violation.encode(message).finish(); + }, + toProtoMsg(message: PreconditionFailure_Violation): PreconditionFailure_ViolationProtoMsg { + return { + typeUrl: "/google.rpc.Violation", + value: PreconditionFailure_Violation.encode(message).finish() + }; } }; function createBaseBadRequest(): BadRequest { @@ -1044,6 +1281,7 @@ function createBaseBadRequest(): BadRequest { }; } export const BadRequest = { + typeUrl: "/google.rpc.BadRequest", encode(message: BadRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fieldViolations) { BadRequest_FieldViolation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1104,6 +1342,35 @@ export const BadRequest = { obj.field_violations = []; } return obj; + }, + fromAmino(object: BadRequestAmino): BadRequest { + return { + fieldViolations: Array.isArray(object?.field_violations) ? object.field_violations.map((e: any) => BadRequest_FieldViolation.fromAmino(e)) : [] + }; + }, + toAmino(message: BadRequest): BadRequestAmino { + const obj: any = {}; + if (message.fieldViolations) { + obj.field_violations = message.fieldViolations.map(e => e ? BadRequest_FieldViolation.toAmino(e) : undefined); + } else { + obj.field_violations = []; + } + return obj; + }, + fromAminoMsg(object: BadRequestAminoMsg): BadRequest { + return BadRequest.fromAmino(object.value); + }, + fromProtoMsg(message: BadRequestProtoMsg): BadRequest { + return BadRequest.decode(message.value); + }, + toProto(message: BadRequest): Uint8Array { + return BadRequest.encode(message).finish(); + }, + toProtoMsg(message: BadRequest): BadRequestProtoMsg { + return { + typeUrl: "/google.rpc.BadRequest", + value: BadRequest.encode(message).finish() + }; } }; function createBaseBadRequest_FieldViolation(): BadRequest_FieldViolation { @@ -1113,6 +1380,7 @@ function createBaseBadRequest_FieldViolation(): BadRequest_FieldViolation { }; } export const BadRequest_FieldViolation = { + typeUrl: "/google.rpc.FieldViolation", encode(message: BadRequest_FieldViolation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.field !== "") { writer.uint32(10).string(message.field); @@ -1177,6 +1445,33 @@ export const BadRequest_FieldViolation = { obj.field = message.field; obj.description = message.description; return obj; + }, + fromAmino(object: BadRequest_FieldViolationAmino): BadRequest_FieldViolation { + return { + field: object.field, + description: object.description + }; + }, + toAmino(message: BadRequest_FieldViolation): BadRequest_FieldViolationAmino { + const obj: any = {}; + obj.field = message.field; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: BadRequest_FieldViolationAminoMsg): BadRequest_FieldViolation { + return BadRequest_FieldViolation.fromAmino(object.value); + }, + fromProtoMsg(message: BadRequest_FieldViolationProtoMsg): BadRequest_FieldViolation { + return BadRequest_FieldViolation.decode(message.value); + }, + toProto(message: BadRequest_FieldViolation): Uint8Array { + return BadRequest_FieldViolation.encode(message).finish(); + }, + toProtoMsg(message: BadRequest_FieldViolation): BadRequest_FieldViolationProtoMsg { + return { + typeUrl: "/google.rpc.FieldViolation", + value: BadRequest_FieldViolation.encode(message).finish() + }; } }; function createBaseRequestInfo(): RequestInfo { @@ -1186,6 +1481,7 @@ function createBaseRequestInfo(): RequestInfo { }; } export const RequestInfo = { + typeUrl: "/google.rpc.RequestInfo", encode(message: RequestInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.requestId !== "") { writer.uint32(10).string(message.requestId); @@ -1250,6 +1546,33 @@ export const RequestInfo = { obj.request_id = message.requestId; obj.serving_data = message.servingData; return obj; + }, + fromAmino(object: RequestInfoAmino): RequestInfo { + return { + requestId: object.request_id, + servingData: object.serving_data + }; + }, + toAmino(message: RequestInfo): RequestInfoAmino { + const obj: any = {}; + obj.request_id = message.requestId; + obj.serving_data = message.servingData; + return obj; + }, + fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { + return RequestInfo.fromAmino(object.value); + }, + fromProtoMsg(message: RequestInfoProtoMsg): RequestInfo { + return RequestInfo.decode(message.value); + }, + toProto(message: RequestInfo): Uint8Array { + return RequestInfo.encode(message).finish(); + }, + toProtoMsg(message: RequestInfo): RequestInfoProtoMsg { + return { + typeUrl: "/google.rpc.RequestInfo", + value: RequestInfo.encode(message).finish() + }; } }; function createBaseResourceInfo(): ResourceInfo { @@ -1261,6 +1584,7 @@ function createBaseResourceInfo(): ResourceInfo { }; } export const ResourceInfo = { + typeUrl: "/google.rpc.ResourceInfo", encode(message: ResourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resourceType !== "") { writer.uint32(10).string(message.resourceType); @@ -1349,6 +1673,37 @@ export const ResourceInfo = { obj.owner = message.owner; obj.description = message.description; return obj; + }, + fromAmino(object: ResourceInfoAmino): ResourceInfo { + return { + resourceType: object.resource_type, + resourceName: object.resource_name, + owner: object.owner, + description: object.description + }; + }, + toAmino(message: ResourceInfo): ResourceInfoAmino { + const obj: any = {}; + obj.resource_type = message.resourceType; + obj.resource_name = message.resourceName; + obj.owner = message.owner; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: ResourceInfoAminoMsg): ResourceInfo { + return ResourceInfo.fromAmino(object.value); + }, + fromProtoMsg(message: ResourceInfoProtoMsg): ResourceInfo { + return ResourceInfo.decode(message.value); + }, + toProto(message: ResourceInfo): Uint8Array { + return ResourceInfo.encode(message).finish(); + }, + toProtoMsg(message: ResourceInfo): ResourceInfoProtoMsg { + return { + typeUrl: "/google.rpc.ResourceInfo", + value: ResourceInfo.encode(message).finish() + }; } }; function createBaseHelp(): Help { @@ -1357,6 +1712,7 @@ function createBaseHelp(): Help { }; } export const Help = { + typeUrl: "/google.rpc.Help", encode(message: Help, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.links) { Help_Link.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1417,6 +1773,35 @@ export const Help = { obj.links = []; } return obj; + }, + fromAmino(object: HelpAmino): Help { + return { + links: Array.isArray(object?.links) ? object.links.map((e: any) => Help_Link.fromAmino(e)) : [] + }; + }, + toAmino(message: Help): HelpAmino { + const obj: any = {}; + if (message.links) { + obj.links = message.links.map(e => e ? Help_Link.toAmino(e) : undefined); + } else { + obj.links = []; + } + return obj; + }, + fromAminoMsg(object: HelpAminoMsg): Help { + return Help.fromAmino(object.value); + }, + fromProtoMsg(message: HelpProtoMsg): Help { + return Help.decode(message.value); + }, + toProto(message: Help): Uint8Array { + return Help.encode(message).finish(); + }, + toProtoMsg(message: Help): HelpProtoMsg { + return { + typeUrl: "/google.rpc.Help", + value: Help.encode(message).finish() + }; } }; function createBaseHelp_Link(): Help_Link { @@ -1426,6 +1811,7 @@ function createBaseHelp_Link(): Help_Link { }; } export const Help_Link = { + typeUrl: "/google.rpc.Link", encode(message: Help_Link, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(10).string(message.description); @@ -1490,6 +1876,33 @@ export const Help_Link = { obj.description = message.description; obj.url = message.url; return obj; + }, + fromAmino(object: Help_LinkAmino): Help_Link { + return { + description: object.description, + url: object.url + }; + }, + toAmino(message: Help_Link): Help_LinkAmino { + const obj: any = {}; + obj.description = message.description; + obj.url = message.url; + return obj; + }, + fromAminoMsg(object: Help_LinkAminoMsg): Help_Link { + return Help_Link.fromAmino(object.value); + }, + fromProtoMsg(message: Help_LinkProtoMsg): Help_Link { + return Help_Link.decode(message.value); + }, + toProto(message: Help_Link): Uint8Array { + return Help_Link.encode(message).finish(); + }, + toProtoMsg(message: Help_Link): Help_LinkProtoMsg { + return { + typeUrl: "/google.rpc.Link", + value: Help_Link.encode(message).finish() + }; } }; function createBaseLocalizedMessage(): LocalizedMessage { @@ -1499,6 +1912,7 @@ function createBaseLocalizedMessage(): LocalizedMessage { }; } export const LocalizedMessage = { + typeUrl: "/google.rpc.LocalizedMessage", encode(message: LocalizedMessage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.locale !== "") { writer.uint32(10).string(message.locale); @@ -1563,5 +1977,32 @@ export const LocalizedMessage = { obj.locale = message.locale; obj.message = message.message; return obj; + }, + fromAmino(object: LocalizedMessageAmino): LocalizedMessage { + return { + locale: object.locale, + message: object.message + }; + }, + toAmino(message: LocalizedMessage): LocalizedMessageAmino { + const obj: any = {}; + obj.locale = message.locale; + obj.message = message.message; + return obj; + }, + fromAminoMsg(object: LocalizedMessageAminoMsg): LocalizedMessage { + return LocalizedMessage.fromAmino(object.value); + }, + fromProtoMsg(message: LocalizedMessageProtoMsg): LocalizedMessage { + return LocalizedMessage.decode(message.value); + }, + toProto(message: LocalizedMessage): Uint8Array { + return LocalizedMessage.encode(message).finish(); + }, + toProtoMsg(message: LocalizedMessage): LocalizedMessageProtoMsg { + return { + typeUrl: "/google.rpc.LocalizedMessage", + value: LocalizedMessage.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/google/rpc/status.ts b/__fixtures__/v-next/outputosmojs/google/rpc/status.ts index 530b9d36fa..716e35fbaf 100644 --- a/__fixtures__/v-next/outputosmojs/google/rpc/status.ts +++ b/__fixtures__/v-next/outputosmojs/google/rpc/status.ts @@ -48,6 +48,7 @@ function createBaseStatus(): Status { }; } export const Status = { + typeUrl: "/google.rpc.Status", encode(message: Status, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).int32(message.code); @@ -132,5 +133,38 @@ export const Status = { obj.details = []; } return obj; + }, + fromAmino(object: StatusAmino): Status { + return { + code: object.code, + message: object.message, + details: Array.isArray(object?.details) ? object.details.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: Status): StatusAmino { + const obj: any = {}; + obj.code = message.code; + obj.message = message.message; + if (message.details) { + obj.details = message.details.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.details = []; + } + return obj; + }, + fromAminoMsg(object: StatusAminoMsg): Status { + return Status.fromAmino(object.value); + }, + fromProtoMsg(message: StatusProtoMsg): Status { + return Status.decode(message.value); + }, + toProto(message: Status): Uint8Array { + return Status.encode(message).finish(); + }, + toProtoMsg(message: Status): StatusProtoMsg { + return { + typeUrl: "/google.rpc.Status", + value: Status.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/ack.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/ack.ts index 3d2eaf217f..e8c2cd3145 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/ack.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/ack.ts @@ -24,6 +24,7 @@ function createBaseIncentivizedAcknowledgement(): IncentivizedAcknowledgement { }; } export const IncentivizedAcknowledgement = { + typeUrl: "/ibc.applications.fee.v1.IncentivizedAcknowledgement", encode(message: IncentivizedAcknowledgement, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.appAcknowledgement.length !== 0) { writer.uint32(10).bytes(message.appAcknowledgement); @@ -100,5 +101,40 @@ export const IncentivizedAcknowledgement = { obj.forward_relayer_address = message.forwardRelayerAddress; obj.underlying_app_success = message.underlyingAppSuccess; return obj; + }, + fromAmino(object: IncentivizedAcknowledgementAmino): IncentivizedAcknowledgement { + return { + appAcknowledgement: object.app_acknowledgement, + forwardRelayerAddress: object.forward_relayer_address, + underlyingAppSuccess: object.underlying_app_success + }; + }, + toAmino(message: IncentivizedAcknowledgement): IncentivizedAcknowledgementAmino { + const obj: any = {}; + obj.app_acknowledgement = message.appAcknowledgement; + obj.forward_relayer_address = message.forwardRelayerAddress; + obj.underlying_app_success = message.underlyingAppSuccess; + return obj; + }, + fromAminoMsg(object: IncentivizedAcknowledgementAminoMsg): IncentivizedAcknowledgement { + return IncentivizedAcknowledgement.fromAmino(object.value); + }, + toAminoMsg(message: IncentivizedAcknowledgement): IncentivizedAcknowledgementAminoMsg { + return { + type: "cosmos-sdk/IncentivizedAcknowledgement", + value: IncentivizedAcknowledgement.toAmino(message) + }; + }, + fromProtoMsg(message: IncentivizedAcknowledgementProtoMsg): IncentivizedAcknowledgement { + return IncentivizedAcknowledgement.decode(message.value); + }, + toProto(message: IncentivizedAcknowledgement): Uint8Array { + return IncentivizedAcknowledgement.encode(message).finish(); + }, + toProtoMsg(message: IncentivizedAcknowledgement): IncentivizedAcknowledgementProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.IncentivizedAcknowledgement", + value: IncentivizedAcknowledgement.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/fee.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/fee.ts index 6196fa00a7..c085bdb1fe 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/fee.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/fee.ts @@ -58,6 +58,7 @@ function createBaseFee(): Fee { }; } export const Fee = { + typeUrl: "/ibc.applications.fee.v1.Fee", encode(message: Fee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.recvFee) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -158,6 +159,53 @@ export const Fee = { obj.timeout_fee = []; } return obj; + }, + fromAmino(object: FeeAmino): Fee { + return { + recvFee: Array.isArray(object?.recv_fee) ? object.recv_fee.map((e: any) => Coin.fromAmino(e)) : [], + ackFee: Array.isArray(object?.ack_fee) ? object.ack_fee.map((e: any) => Coin.fromAmino(e)) : [], + timeoutFee: Array.isArray(object?.timeout_fee) ? object.timeout_fee.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Fee): FeeAmino { + const obj: any = {}; + if (message.recvFee) { + obj.recv_fee = message.recvFee.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.recv_fee = []; + } + if (message.ackFee) { + obj.ack_fee = message.ackFee.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.ack_fee = []; + } + if (message.timeoutFee) { + obj.timeout_fee = message.timeoutFee.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.timeout_fee = []; + } + return obj; + }, + fromAminoMsg(object: FeeAminoMsg): Fee { + return Fee.fromAmino(object.value); + }, + toAminoMsg(message: Fee): FeeAminoMsg { + return { + type: "cosmos-sdk/Fee", + value: Fee.toAmino(message) + }; + }, + fromProtoMsg(message: FeeProtoMsg): Fee { + return Fee.decode(message.value); + }, + toProto(message: Fee): Uint8Array { + return Fee.encode(message).finish(); + }, + toProtoMsg(message: Fee): FeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.Fee", + value: Fee.encode(message).finish() + }; } }; function createBasePacketFee(): PacketFee { @@ -168,6 +216,7 @@ function createBasePacketFee(): PacketFee { }; } export const PacketFee = { + typeUrl: "/ibc.applications.fee.v1.PacketFee", encode(message: PacketFee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fee !== undefined) { Fee.encode(message.fee, writer.uint32(10).fork()).ldelim(); @@ -252,6 +301,45 @@ export const PacketFee = { obj.relayers = []; } return obj; + }, + fromAmino(object: PacketFeeAmino): PacketFee { + return { + fee: object?.fee ? Fee.fromAmino(object.fee) : undefined, + refundAddress: object.refund_address, + relayers: Array.isArray(object?.relayers) ? object.relayers.map((e: any) => e) : [] + }; + }, + toAmino(message: PacketFee): PacketFeeAmino { + const obj: any = {}; + obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; + obj.refund_address = message.refundAddress; + if (message.relayers) { + obj.relayers = message.relayers.map(e => e); + } else { + obj.relayers = []; + } + return obj; + }, + fromAminoMsg(object: PacketFeeAminoMsg): PacketFee { + return PacketFee.fromAmino(object.value); + }, + toAminoMsg(message: PacketFee): PacketFeeAminoMsg { + return { + type: "cosmos-sdk/PacketFee", + value: PacketFee.toAmino(message) + }; + }, + fromProtoMsg(message: PacketFeeProtoMsg): PacketFee { + return PacketFee.decode(message.value); + }, + toProto(message: PacketFee): Uint8Array { + return PacketFee.encode(message).finish(); + }, + toProtoMsg(message: PacketFee): PacketFeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.PacketFee", + value: PacketFee.encode(message).finish() + }; } }; function createBasePacketFees(): PacketFees { @@ -260,6 +348,7 @@ function createBasePacketFees(): PacketFees { }; } export const PacketFees = { + typeUrl: "/ibc.applications.fee.v1.PacketFees", encode(message: PacketFees, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.packetFees) { PacketFee.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -320,6 +409,41 @@ export const PacketFees = { obj.packet_fees = []; } return obj; + }, + fromAmino(object: PacketFeesAmino): PacketFees { + return { + packetFees: Array.isArray(object?.packet_fees) ? object.packet_fees.map((e: any) => PacketFee.fromAmino(e)) : [] + }; + }, + toAmino(message: PacketFees): PacketFeesAmino { + const obj: any = {}; + if (message.packetFees) { + obj.packet_fees = message.packetFees.map(e => e ? PacketFee.toAmino(e) : undefined); + } else { + obj.packet_fees = []; + } + return obj; + }, + fromAminoMsg(object: PacketFeesAminoMsg): PacketFees { + return PacketFees.fromAmino(object.value); + }, + toAminoMsg(message: PacketFees): PacketFeesAminoMsg { + return { + type: "cosmos-sdk/PacketFees", + value: PacketFees.toAmino(message) + }; + }, + fromProtoMsg(message: PacketFeesProtoMsg): PacketFees { + return PacketFees.decode(message.value); + }, + toProto(message: PacketFees): Uint8Array { + return PacketFees.encode(message).finish(); + }, + toProtoMsg(message: PacketFees): PacketFeesProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.PacketFees", + value: PacketFees.encode(message).finish() + }; } }; function createBaseIdentifiedPacketFees(): IdentifiedPacketFees { @@ -328,6 +452,7 @@ function createBaseIdentifiedPacketFees(): IdentifiedPacketFees { }; } export const IdentifiedPacketFees = { + typeUrl: "/ibc.applications.fee.v1.IdentifiedPacketFees", encode(message: IdentifiedPacketFees, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.packetFees) { PacketFee.encode(v!, writer.uint32(18).fork()).ldelim(); @@ -388,5 +513,40 @@ export const IdentifiedPacketFees = { obj.packet_fees = []; } return obj; + }, + fromAmino(object: IdentifiedPacketFeesAmino): IdentifiedPacketFees { + return { + packetFees: Array.isArray(object?.packet_fees) ? object.packet_fees.map((e: any) => PacketFee.fromAmino(e)) : [] + }; + }, + toAmino(message: IdentifiedPacketFees): IdentifiedPacketFeesAmino { + const obj: any = {}; + if (message.packetFees) { + obj.packet_fees = message.packetFees.map(e => e ? PacketFee.toAmino(e) : undefined); + } else { + obj.packet_fees = []; + } + return obj; + }, + fromAminoMsg(object: IdentifiedPacketFeesAminoMsg): IdentifiedPacketFees { + return IdentifiedPacketFees.fromAmino(object.value); + }, + toAminoMsg(message: IdentifiedPacketFees): IdentifiedPacketFeesAminoMsg { + return { + type: "cosmos-sdk/IdentifiedPacketFees", + value: IdentifiedPacketFees.toAmino(message) + }; + }, + fromProtoMsg(message: IdentifiedPacketFeesProtoMsg): IdentifiedPacketFees { + return IdentifiedPacketFees.decode(message.value); + }, + toProto(message: IdentifiedPacketFees): Uint8Array { + return IdentifiedPacketFees.encode(message).finish(); + }, + toProtoMsg(message: IdentifiedPacketFees): IdentifiedPacketFeesProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.IdentifiedPacketFees", + value: IdentifiedPacketFees.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/genesis.ts index 70ccdf2431..5b4364fe76 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/genesis.ts @@ -90,6 +90,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.applications.fee.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.identifiedFees) { IdentifiedPacketFees.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -230,6 +231,65 @@ export const GenesisState = { obj.forward_relayers = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + identifiedFees: Array.isArray(object?.identified_fees) ? object.identified_fees.map((e: any) => IdentifiedPacketFees.fromAmino(e)) : [], + feeEnabledChannels: Array.isArray(object?.fee_enabled_channels) ? object.fee_enabled_channels.map((e: any) => FeeEnabledChannel.fromAmino(e)) : [], + registeredPayees: Array.isArray(object?.registered_payees) ? object.registered_payees.map((e: any) => RegisteredPayee.fromAmino(e)) : [], + registeredCounterpartyPayees: Array.isArray(object?.registered_counterparty_payees) ? object.registered_counterparty_payees.map((e: any) => RegisteredCounterpartyPayee.fromAmino(e)) : [], + forwardRelayers: Array.isArray(object?.forward_relayers) ? object.forward_relayers.map((e: any) => ForwardRelayerAddress.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.identifiedFees) { + obj.identified_fees = message.identifiedFees.map(e => e ? IdentifiedPacketFees.toAmino(e) : undefined); + } else { + obj.identified_fees = []; + } + if (message.feeEnabledChannels) { + obj.fee_enabled_channels = message.feeEnabledChannels.map(e => e ? FeeEnabledChannel.toAmino(e) : undefined); + } else { + obj.fee_enabled_channels = []; + } + if (message.registeredPayees) { + obj.registered_payees = message.registeredPayees.map(e => e ? RegisteredPayee.toAmino(e) : undefined); + } else { + obj.registered_payees = []; + } + if (message.registeredCounterpartyPayees) { + obj.registered_counterparty_payees = message.registeredCounterpartyPayees.map(e => e ? RegisteredCounterpartyPayee.toAmino(e) : undefined); + } else { + obj.registered_counterparty_payees = []; + } + if (message.forwardRelayers) { + obj.forward_relayers = message.forwardRelayers.map(e => e ? ForwardRelayerAddress.toAmino(e) : undefined); + } else { + obj.forward_relayers = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseFeeEnabledChannel(): FeeEnabledChannel { @@ -239,6 +299,7 @@ function createBaseFeeEnabledChannel(): FeeEnabledChannel { }; } export const FeeEnabledChannel = { + typeUrl: "/ibc.applications.fee.v1.FeeEnabledChannel", encode(message: FeeEnabledChannel, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -303,6 +364,39 @@ export const FeeEnabledChannel = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: FeeEnabledChannelAmino): FeeEnabledChannel { + return { + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: FeeEnabledChannel): FeeEnabledChannelAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: FeeEnabledChannelAminoMsg): FeeEnabledChannel { + return FeeEnabledChannel.fromAmino(object.value); + }, + toAminoMsg(message: FeeEnabledChannel): FeeEnabledChannelAminoMsg { + return { + type: "cosmos-sdk/FeeEnabledChannel", + value: FeeEnabledChannel.toAmino(message) + }; + }, + fromProtoMsg(message: FeeEnabledChannelProtoMsg): FeeEnabledChannel { + return FeeEnabledChannel.decode(message.value); + }, + toProto(message: FeeEnabledChannel): Uint8Array { + return FeeEnabledChannel.encode(message).finish(); + }, + toProtoMsg(message: FeeEnabledChannel): FeeEnabledChannelProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.FeeEnabledChannel", + value: FeeEnabledChannel.encode(message).finish() + }; } }; function createBaseRegisteredPayee(): RegisteredPayee { @@ -313,6 +407,7 @@ function createBaseRegisteredPayee(): RegisteredPayee { }; } export const RegisteredPayee = { + typeUrl: "/ibc.applications.fee.v1.RegisteredPayee", encode(message: RegisteredPayee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channelId !== "") { writer.uint32(10).string(message.channelId); @@ -389,6 +484,41 @@ export const RegisteredPayee = { obj.relayer = message.relayer; obj.payee = message.payee; return obj; + }, + fromAmino(object: RegisteredPayeeAmino): RegisteredPayee { + return { + channelId: object.channel_id, + relayer: object.relayer, + payee: object.payee + }; + }, + toAmino(message: RegisteredPayee): RegisteredPayeeAmino { + const obj: any = {}; + obj.channel_id = message.channelId; + obj.relayer = message.relayer; + obj.payee = message.payee; + return obj; + }, + fromAminoMsg(object: RegisteredPayeeAminoMsg): RegisteredPayee { + return RegisteredPayee.fromAmino(object.value); + }, + toAminoMsg(message: RegisteredPayee): RegisteredPayeeAminoMsg { + return { + type: "cosmos-sdk/RegisteredPayee", + value: RegisteredPayee.toAmino(message) + }; + }, + fromProtoMsg(message: RegisteredPayeeProtoMsg): RegisteredPayee { + return RegisteredPayee.decode(message.value); + }, + toProto(message: RegisteredPayee): Uint8Array { + return RegisteredPayee.encode(message).finish(); + }, + toProtoMsg(message: RegisteredPayee): RegisteredPayeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.RegisteredPayee", + value: RegisteredPayee.encode(message).finish() + }; } }; function createBaseRegisteredCounterpartyPayee(): RegisteredCounterpartyPayee { @@ -399,6 +529,7 @@ function createBaseRegisteredCounterpartyPayee(): RegisteredCounterpartyPayee { }; } export const RegisteredCounterpartyPayee = { + typeUrl: "/ibc.applications.fee.v1.RegisteredCounterpartyPayee", encode(message: RegisteredCounterpartyPayee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channelId !== "") { writer.uint32(10).string(message.channelId); @@ -475,6 +606,41 @@ export const RegisteredCounterpartyPayee = { obj.relayer = message.relayer; obj.counterparty_payee = message.counterpartyPayee; return obj; + }, + fromAmino(object: RegisteredCounterpartyPayeeAmino): RegisteredCounterpartyPayee { + return { + channelId: object.channel_id, + relayer: object.relayer, + counterpartyPayee: object.counterparty_payee + }; + }, + toAmino(message: RegisteredCounterpartyPayee): RegisteredCounterpartyPayeeAmino { + const obj: any = {}; + obj.channel_id = message.channelId; + obj.relayer = message.relayer; + obj.counterparty_payee = message.counterpartyPayee; + return obj; + }, + fromAminoMsg(object: RegisteredCounterpartyPayeeAminoMsg): RegisteredCounterpartyPayee { + return RegisteredCounterpartyPayee.fromAmino(object.value); + }, + toAminoMsg(message: RegisteredCounterpartyPayee): RegisteredCounterpartyPayeeAminoMsg { + return { + type: "cosmos-sdk/RegisteredCounterpartyPayee", + value: RegisteredCounterpartyPayee.toAmino(message) + }; + }, + fromProtoMsg(message: RegisteredCounterpartyPayeeProtoMsg): RegisteredCounterpartyPayee { + return RegisteredCounterpartyPayee.decode(message.value); + }, + toProto(message: RegisteredCounterpartyPayee): Uint8Array { + return RegisteredCounterpartyPayee.encode(message).finish(); + }, + toProtoMsg(message: RegisteredCounterpartyPayee): RegisteredCounterpartyPayeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.RegisteredCounterpartyPayee", + value: RegisteredCounterpartyPayee.encode(message).finish() + }; } }; function createBaseForwardRelayerAddress(): ForwardRelayerAddress { @@ -483,6 +649,7 @@ function createBaseForwardRelayerAddress(): ForwardRelayerAddress { }; } export const ForwardRelayerAddress = { + typeUrl: "/ibc.applications.fee.v1.ForwardRelayerAddress", encode(message: ForwardRelayerAddress, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -535,5 +702,36 @@ export const ForwardRelayerAddress = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: ForwardRelayerAddressAmino): ForwardRelayerAddress { + return { + address: object.address + }; + }, + toAmino(message: ForwardRelayerAddress): ForwardRelayerAddressAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: ForwardRelayerAddressAminoMsg): ForwardRelayerAddress { + return ForwardRelayerAddress.fromAmino(object.value); + }, + toAminoMsg(message: ForwardRelayerAddress): ForwardRelayerAddressAminoMsg { + return { + type: "cosmos-sdk/ForwardRelayerAddress", + value: ForwardRelayerAddress.toAmino(message) + }; + }, + fromProtoMsg(message: ForwardRelayerAddressProtoMsg): ForwardRelayerAddress { + return ForwardRelayerAddress.decode(message.value); + }, + toProto(message: ForwardRelayerAddress): Uint8Array { + return ForwardRelayerAddress.encode(message).finish(); + }, + toProtoMsg(message: ForwardRelayerAddress): ForwardRelayerAddressProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.ForwardRelayerAddress", + value: ForwardRelayerAddress.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/metadata.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/metadata.ts index 2ac21d4f1a..34b23fb5a4 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/metadata.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/metadata.ts @@ -26,6 +26,7 @@ function createBaseMetadata(): Metadata { }; } export const Metadata = { + typeUrl: "/ibc.applications.fee.v1.Metadata", encode(message: Metadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.feeVersion !== "") { writer.uint32(10).string(message.feeVersion); @@ -90,5 +91,38 @@ export const Metadata = { obj.fee_version = message.feeVersion; obj.app_version = message.appVersion; return obj; + }, + fromAmino(object: MetadataAmino): Metadata { + return { + feeVersion: object.fee_version, + appVersion: object.app_version + }; + }, + toAmino(message: Metadata): MetadataAmino { + const obj: any = {}; + obj.fee_version = message.feeVersion; + obj.app_version = message.appVersion; + return obj; + }, + fromAminoMsg(object: MetadataAminoMsg): Metadata { + return Metadata.fromAmino(object.value); + }, + toAminoMsg(message: Metadata): MetadataAminoMsg { + return { + type: "cosmos-sdk/Metadata", + value: Metadata.toAmino(message) + }; + }, + fromProtoMsg(message: MetadataProtoMsg): Metadata { + return Metadata.decode(message.value); + }, + toProto(message: Metadata): Uint8Array { + return Metadata.encode(message).finish(); + }, + toProtoMsg(message: Metadata): MetadataProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.Metadata", + value: Metadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/query.ts index 2d76ec7f9b..d7bc00dc04 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/query.ts @@ -214,6 +214,7 @@ function createBaseQueryIncentivizedPacketsRequest(): QueryIncentivizedPacketsRe }; } export const QueryIncentivizedPacketsRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsRequest", encode(message: QueryIncentivizedPacketsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -278,6 +279,39 @@ export const QueryIncentivizedPacketsRequest = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); obj.query_height = message.queryHeight; return obj; + }, + fromAmino(object: QueryIncentivizedPacketsRequestAmino): QueryIncentivizedPacketsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined, + queryHeight: BigInt(object.query_height) + }; + }, + toAmino(message: QueryIncentivizedPacketsRequest): QueryIncentivizedPacketsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + obj.query_height = message.queryHeight ? message.queryHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPacketsRequestAminoMsg): QueryIncentivizedPacketsRequest { + return QueryIncentivizedPacketsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPacketsRequest): QueryIncentivizedPacketsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryIncentivizedPacketsRequest", + value: QueryIncentivizedPacketsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPacketsRequestProtoMsg): QueryIncentivizedPacketsRequest { + return QueryIncentivizedPacketsRequest.decode(message.value); + }, + toProto(message: QueryIncentivizedPacketsRequest): Uint8Array { + return QueryIncentivizedPacketsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPacketsRequest): QueryIncentivizedPacketsRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsRequest", + value: QueryIncentivizedPacketsRequest.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPacketsResponse(): QueryIncentivizedPacketsResponse { @@ -287,6 +321,7 @@ function createBaseQueryIncentivizedPacketsResponse(): QueryIncentivizedPacketsR }; } export const QueryIncentivizedPacketsResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsResponse", encode(message: QueryIncentivizedPacketsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.incentivizedPackets) { IdentifiedPacketFees.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -359,6 +394,43 @@ export const QueryIncentivizedPacketsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryIncentivizedPacketsResponseAmino): QueryIncentivizedPacketsResponse { + return { + incentivizedPackets: Array.isArray(object?.incentivized_packets) ? object.incentivized_packets.map((e: any) => IdentifiedPacketFees.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryIncentivizedPacketsResponse): QueryIncentivizedPacketsResponseAmino { + const obj: any = {}; + if (message.incentivizedPackets) { + obj.incentivized_packets = message.incentivizedPackets.map(e => e ? IdentifiedPacketFees.toAmino(e) : undefined); + } else { + obj.incentivized_packets = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPacketsResponseAminoMsg): QueryIncentivizedPacketsResponse { + return QueryIncentivizedPacketsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPacketsResponse): QueryIncentivizedPacketsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryIncentivizedPacketsResponse", + value: QueryIncentivizedPacketsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPacketsResponseProtoMsg): QueryIncentivizedPacketsResponse { + return QueryIncentivizedPacketsResponse.decode(message.value); + }, + toProto(message: QueryIncentivizedPacketsResponse): Uint8Array { + return QueryIncentivizedPacketsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPacketsResponse): QueryIncentivizedPacketsResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsResponse", + value: QueryIncentivizedPacketsResponse.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPacketRequest(): QueryIncentivizedPacketRequest { @@ -367,6 +439,7 @@ function createBaseQueryIncentivizedPacketRequest(): QueryIncentivizedPacketRequ }; } export const QueryIncentivizedPacketRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketRequest", encode(message: QueryIncentivizedPacketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.queryHeight !== BigInt(0)) { writer.uint32(16).uint64(message.queryHeight); @@ -419,6 +492,37 @@ export const QueryIncentivizedPacketRequest = { const obj: any = {}; obj.query_height = message.queryHeight; return obj; + }, + fromAmino(object: QueryIncentivizedPacketRequestAmino): QueryIncentivizedPacketRequest { + return { + queryHeight: BigInt(object.query_height) + }; + }, + toAmino(message: QueryIncentivizedPacketRequest): QueryIncentivizedPacketRequestAmino { + const obj: any = {}; + obj.query_height = message.queryHeight ? message.queryHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPacketRequestAminoMsg): QueryIncentivizedPacketRequest { + return QueryIncentivizedPacketRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPacketRequest): QueryIncentivizedPacketRequestAminoMsg { + return { + type: "cosmos-sdk/QueryIncentivizedPacketRequest", + value: QueryIncentivizedPacketRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPacketRequestProtoMsg): QueryIncentivizedPacketRequest { + return QueryIncentivizedPacketRequest.decode(message.value); + }, + toProto(message: QueryIncentivizedPacketRequest): Uint8Array { + return QueryIncentivizedPacketRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPacketRequest): QueryIncentivizedPacketRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketRequest", + value: QueryIncentivizedPacketRequest.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPacketResponse(): QueryIncentivizedPacketResponse { @@ -427,6 +531,7 @@ function createBaseQueryIncentivizedPacketResponse(): QueryIncentivizedPacketRes }; } export const QueryIncentivizedPacketResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketResponse", encode(message: QueryIncentivizedPacketResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.incentivizedPacket !== undefined) { IdentifiedPacketFees.encode(message.incentivizedPacket, writer.uint32(10).fork()).ldelim(); @@ -479,6 +584,37 @@ export const QueryIncentivizedPacketResponse = { const obj: any = {}; message.incentivizedPacket !== undefined && (obj.incentivized_packet = message.incentivizedPacket ? IdentifiedPacketFees.toSDK(message.incentivizedPacket) : undefined); return obj; + }, + fromAmino(object: QueryIncentivizedPacketResponseAmino): QueryIncentivizedPacketResponse { + return { + incentivizedPacket: object?.incentivized_packet ? IdentifiedPacketFees.fromAmino(object.incentivized_packet) : undefined + }; + }, + toAmino(message: QueryIncentivizedPacketResponse): QueryIncentivizedPacketResponseAmino { + const obj: any = {}; + obj.incentivized_packet = message.incentivizedPacket ? IdentifiedPacketFees.toAmino(message.incentivizedPacket) : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPacketResponseAminoMsg): QueryIncentivizedPacketResponse { + return QueryIncentivizedPacketResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPacketResponse): QueryIncentivizedPacketResponseAminoMsg { + return { + type: "cosmos-sdk/QueryIncentivizedPacketResponse", + value: QueryIncentivizedPacketResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPacketResponseProtoMsg): QueryIncentivizedPacketResponse { + return QueryIncentivizedPacketResponse.decode(message.value); + }, + toProto(message: QueryIncentivizedPacketResponse): Uint8Array { + return QueryIncentivizedPacketResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPacketResponse): QueryIncentivizedPacketResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketResponse", + value: QueryIncentivizedPacketResponse.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPacketsForChannelRequest(): QueryIncentivizedPacketsForChannelRequest { @@ -490,6 +626,7 @@ function createBaseQueryIncentivizedPacketsForChannelRequest(): QueryIncentivize }; } export const QueryIncentivizedPacketsForChannelRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsForChannelRequest", encode(message: QueryIncentivizedPacketsForChannelRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -578,6 +715,43 @@ export const QueryIncentivizedPacketsForChannelRequest = { obj.channel_id = message.channelId; obj.query_height = message.queryHeight; return obj; + }, + fromAmino(object: QueryIncentivizedPacketsForChannelRequestAmino): QueryIncentivizedPacketsForChannelRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined, + portId: object.port_id, + channelId: object.channel_id, + queryHeight: BigInt(object.query_height) + }; + }, + toAmino(message: QueryIncentivizedPacketsForChannelRequest): QueryIncentivizedPacketsForChannelRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.query_height = message.queryHeight ? message.queryHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPacketsForChannelRequestAminoMsg): QueryIncentivizedPacketsForChannelRequest { + return QueryIncentivizedPacketsForChannelRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPacketsForChannelRequest): QueryIncentivizedPacketsForChannelRequestAminoMsg { + return { + type: "cosmos-sdk/QueryIncentivizedPacketsForChannelRequest", + value: QueryIncentivizedPacketsForChannelRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPacketsForChannelRequestProtoMsg): QueryIncentivizedPacketsForChannelRequest { + return QueryIncentivizedPacketsForChannelRequest.decode(message.value); + }, + toProto(message: QueryIncentivizedPacketsForChannelRequest): Uint8Array { + return QueryIncentivizedPacketsForChannelRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPacketsForChannelRequest): QueryIncentivizedPacketsForChannelRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsForChannelRequest", + value: QueryIncentivizedPacketsForChannelRequest.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPacketsForChannelResponse(): QueryIncentivizedPacketsForChannelResponse { @@ -587,6 +761,7 @@ function createBaseQueryIncentivizedPacketsForChannelResponse(): QueryIncentiviz }; } export const QueryIncentivizedPacketsForChannelResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsForChannelResponse", encode(message: QueryIncentivizedPacketsForChannelResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.incentivizedPackets) { IdentifiedPacketFees.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -659,12 +834,50 @@ export const QueryIncentivizedPacketsForChannelResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryIncentivizedPacketsForChannelResponseAmino): QueryIncentivizedPacketsForChannelResponse { + return { + incentivizedPackets: Array.isArray(object?.incentivized_packets) ? object.incentivized_packets.map((e: any) => IdentifiedPacketFees.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryIncentivizedPacketsForChannelResponse): QueryIncentivizedPacketsForChannelResponseAmino { + const obj: any = {}; + if (message.incentivizedPackets) { + obj.incentivized_packets = message.incentivizedPackets.map(e => e ? IdentifiedPacketFees.toAmino(e) : undefined); + } else { + obj.incentivized_packets = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPacketsForChannelResponseAminoMsg): QueryIncentivizedPacketsForChannelResponse { + return QueryIncentivizedPacketsForChannelResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPacketsForChannelResponse): QueryIncentivizedPacketsForChannelResponseAminoMsg { + return { + type: "cosmos-sdk/QueryIncentivizedPacketsForChannelResponse", + value: QueryIncentivizedPacketsForChannelResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPacketsForChannelResponseProtoMsg): QueryIncentivizedPacketsForChannelResponse { + return QueryIncentivizedPacketsForChannelResponse.decode(message.value); + }, + toProto(message: QueryIncentivizedPacketsForChannelResponse): Uint8Array { + return QueryIncentivizedPacketsForChannelResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPacketsForChannelResponse): QueryIncentivizedPacketsForChannelResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryIncentivizedPacketsForChannelResponse", + value: QueryIncentivizedPacketsForChannelResponse.encode(message).finish() + }; } }; function createBaseQueryTotalRecvFeesRequest(): QueryTotalRecvFeesRequest { return {}; } export const QueryTotalRecvFeesRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryTotalRecvFeesRequest", encode(_: QueryTotalRecvFeesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -702,6 +915,34 @@ export const QueryTotalRecvFeesRequest = { toSDK(_: QueryTotalRecvFeesRequest): QueryTotalRecvFeesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryTotalRecvFeesRequestAmino): QueryTotalRecvFeesRequest { + return {}; + }, + toAmino(_: QueryTotalRecvFeesRequest): QueryTotalRecvFeesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryTotalRecvFeesRequestAminoMsg): QueryTotalRecvFeesRequest { + return QueryTotalRecvFeesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalRecvFeesRequest): QueryTotalRecvFeesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryTotalRecvFeesRequest", + value: QueryTotalRecvFeesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalRecvFeesRequestProtoMsg): QueryTotalRecvFeesRequest { + return QueryTotalRecvFeesRequest.decode(message.value); + }, + toProto(message: QueryTotalRecvFeesRequest): Uint8Array { + return QueryTotalRecvFeesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalRecvFeesRequest): QueryTotalRecvFeesRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryTotalRecvFeesRequest", + value: QueryTotalRecvFeesRequest.encode(message).finish() + }; } }; function createBaseQueryTotalRecvFeesResponse(): QueryTotalRecvFeesResponse { @@ -710,6 +951,7 @@ function createBaseQueryTotalRecvFeesResponse(): QueryTotalRecvFeesResponse { }; } export const QueryTotalRecvFeesResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryTotalRecvFeesResponse", encode(message: QueryTotalRecvFeesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.recvFees) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -770,12 +1012,48 @@ export const QueryTotalRecvFeesResponse = { obj.recv_fees = []; } return obj; + }, + fromAmino(object: QueryTotalRecvFeesResponseAmino): QueryTotalRecvFeesResponse { + return { + recvFees: Array.isArray(object?.recv_fees) ? object.recv_fees.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalRecvFeesResponse): QueryTotalRecvFeesResponseAmino { + const obj: any = {}; + if (message.recvFees) { + obj.recv_fees = message.recvFees.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.recv_fees = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalRecvFeesResponseAminoMsg): QueryTotalRecvFeesResponse { + return QueryTotalRecvFeesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalRecvFeesResponse): QueryTotalRecvFeesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryTotalRecvFeesResponse", + value: QueryTotalRecvFeesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalRecvFeesResponseProtoMsg): QueryTotalRecvFeesResponse { + return QueryTotalRecvFeesResponse.decode(message.value); + }, + toProto(message: QueryTotalRecvFeesResponse): Uint8Array { + return QueryTotalRecvFeesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalRecvFeesResponse): QueryTotalRecvFeesResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryTotalRecvFeesResponse", + value: QueryTotalRecvFeesResponse.encode(message).finish() + }; } }; function createBaseQueryTotalAckFeesRequest(): QueryTotalAckFeesRequest { return {}; } export const QueryTotalAckFeesRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryTotalAckFeesRequest", encode(_: QueryTotalAckFeesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -813,6 +1091,34 @@ export const QueryTotalAckFeesRequest = { toSDK(_: QueryTotalAckFeesRequest): QueryTotalAckFeesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryTotalAckFeesRequestAmino): QueryTotalAckFeesRequest { + return {}; + }, + toAmino(_: QueryTotalAckFeesRequest): QueryTotalAckFeesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryTotalAckFeesRequestAminoMsg): QueryTotalAckFeesRequest { + return QueryTotalAckFeesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalAckFeesRequest): QueryTotalAckFeesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryTotalAckFeesRequest", + value: QueryTotalAckFeesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalAckFeesRequestProtoMsg): QueryTotalAckFeesRequest { + return QueryTotalAckFeesRequest.decode(message.value); + }, + toProto(message: QueryTotalAckFeesRequest): Uint8Array { + return QueryTotalAckFeesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalAckFeesRequest): QueryTotalAckFeesRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryTotalAckFeesRequest", + value: QueryTotalAckFeesRequest.encode(message).finish() + }; } }; function createBaseQueryTotalAckFeesResponse(): QueryTotalAckFeesResponse { @@ -821,6 +1127,7 @@ function createBaseQueryTotalAckFeesResponse(): QueryTotalAckFeesResponse { }; } export const QueryTotalAckFeesResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryTotalAckFeesResponse", encode(message: QueryTotalAckFeesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.ackFees) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -881,12 +1188,48 @@ export const QueryTotalAckFeesResponse = { obj.ack_fees = []; } return obj; + }, + fromAmino(object: QueryTotalAckFeesResponseAmino): QueryTotalAckFeesResponse { + return { + ackFees: Array.isArray(object?.ack_fees) ? object.ack_fees.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalAckFeesResponse): QueryTotalAckFeesResponseAmino { + const obj: any = {}; + if (message.ackFees) { + obj.ack_fees = message.ackFees.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.ack_fees = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalAckFeesResponseAminoMsg): QueryTotalAckFeesResponse { + return QueryTotalAckFeesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalAckFeesResponse): QueryTotalAckFeesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryTotalAckFeesResponse", + value: QueryTotalAckFeesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalAckFeesResponseProtoMsg): QueryTotalAckFeesResponse { + return QueryTotalAckFeesResponse.decode(message.value); + }, + toProto(message: QueryTotalAckFeesResponse): Uint8Array { + return QueryTotalAckFeesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalAckFeesResponse): QueryTotalAckFeesResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryTotalAckFeesResponse", + value: QueryTotalAckFeesResponse.encode(message).finish() + }; } }; function createBaseQueryTotalTimeoutFeesRequest(): QueryTotalTimeoutFeesRequest { return {}; } export const QueryTotalTimeoutFeesRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryTotalTimeoutFeesRequest", encode(_: QueryTotalTimeoutFeesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -924,6 +1267,34 @@ export const QueryTotalTimeoutFeesRequest = { toSDK(_: QueryTotalTimeoutFeesRequest): QueryTotalTimeoutFeesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryTotalTimeoutFeesRequestAmino): QueryTotalTimeoutFeesRequest { + return {}; + }, + toAmino(_: QueryTotalTimeoutFeesRequest): QueryTotalTimeoutFeesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryTotalTimeoutFeesRequestAminoMsg): QueryTotalTimeoutFeesRequest { + return QueryTotalTimeoutFeesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalTimeoutFeesRequest): QueryTotalTimeoutFeesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryTotalTimeoutFeesRequest", + value: QueryTotalTimeoutFeesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalTimeoutFeesRequestProtoMsg): QueryTotalTimeoutFeesRequest { + return QueryTotalTimeoutFeesRequest.decode(message.value); + }, + toProto(message: QueryTotalTimeoutFeesRequest): Uint8Array { + return QueryTotalTimeoutFeesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalTimeoutFeesRequest): QueryTotalTimeoutFeesRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryTotalTimeoutFeesRequest", + value: QueryTotalTimeoutFeesRequest.encode(message).finish() + }; } }; function createBaseQueryTotalTimeoutFeesResponse(): QueryTotalTimeoutFeesResponse { @@ -932,6 +1303,7 @@ function createBaseQueryTotalTimeoutFeesResponse(): QueryTotalTimeoutFeesRespons }; } export const QueryTotalTimeoutFeesResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryTotalTimeoutFeesResponse", encode(message: QueryTotalTimeoutFeesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.timeoutFees) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -992,6 +1364,41 @@ export const QueryTotalTimeoutFeesResponse = { obj.timeout_fees = []; } return obj; + }, + fromAmino(object: QueryTotalTimeoutFeesResponseAmino): QueryTotalTimeoutFeesResponse { + return { + timeoutFees: Array.isArray(object?.timeout_fees) ? object.timeout_fees.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalTimeoutFeesResponse): QueryTotalTimeoutFeesResponseAmino { + const obj: any = {}; + if (message.timeoutFees) { + obj.timeout_fees = message.timeoutFees.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.timeout_fees = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalTimeoutFeesResponseAminoMsg): QueryTotalTimeoutFeesResponse { + return QueryTotalTimeoutFeesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalTimeoutFeesResponse): QueryTotalTimeoutFeesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryTotalTimeoutFeesResponse", + value: QueryTotalTimeoutFeesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalTimeoutFeesResponseProtoMsg): QueryTotalTimeoutFeesResponse { + return QueryTotalTimeoutFeesResponse.decode(message.value); + }, + toProto(message: QueryTotalTimeoutFeesResponse): Uint8Array { + return QueryTotalTimeoutFeesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalTimeoutFeesResponse): QueryTotalTimeoutFeesResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryTotalTimeoutFeesResponse", + value: QueryTotalTimeoutFeesResponse.encode(message).finish() + }; } }; function createBaseQueryPayeeRequest(): QueryPayeeRequest { @@ -1001,6 +1408,7 @@ function createBaseQueryPayeeRequest(): QueryPayeeRequest { }; } export const QueryPayeeRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryPayeeRequest", encode(message: QueryPayeeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channelId !== "") { writer.uint32(10).string(message.channelId); @@ -1065,6 +1473,39 @@ export const QueryPayeeRequest = { obj.channel_id = message.channelId; obj.relayer = message.relayer; return obj; + }, + fromAmino(object: QueryPayeeRequestAmino): QueryPayeeRequest { + return { + channelId: object.channel_id, + relayer: object.relayer + }; + }, + toAmino(message: QueryPayeeRequest): QueryPayeeRequestAmino { + const obj: any = {}; + obj.channel_id = message.channelId; + obj.relayer = message.relayer; + return obj; + }, + fromAminoMsg(object: QueryPayeeRequestAminoMsg): QueryPayeeRequest { + return QueryPayeeRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPayeeRequest): QueryPayeeRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPayeeRequest", + value: QueryPayeeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPayeeRequestProtoMsg): QueryPayeeRequest { + return QueryPayeeRequest.decode(message.value); + }, + toProto(message: QueryPayeeRequest): Uint8Array { + return QueryPayeeRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPayeeRequest): QueryPayeeRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryPayeeRequest", + value: QueryPayeeRequest.encode(message).finish() + }; } }; function createBaseQueryPayeeResponse(): QueryPayeeResponse { @@ -1073,6 +1514,7 @@ function createBaseQueryPayeeResponse(): QueryPayeeResponse { }; } export const QueryPayeeResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryPayeeResponse", encode(message: QueryPayeeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.payeeAddress !== "") { writer.uint32(10).string(message.payeeAddress); @@ -1125,6 +1567,37 @@ export const QueryPayeeResponse = { const obj: any = {}; obj.payee_address = message.payeeAddress; return obj; + }, + fromAmino(object: QueryPayeeResponseAmino): QueryPayeeResponse { + return { + payeeAddress: object.payee_address + }; + }, + toAmino(message: QueryPayeeResponse): QueryPayeeResponseAmino { + const obj: any = {}; + obj.payee_address = message.payeeAddress; + return obj; + }, + fromAminoMsg(object: QueryPayeeResponseAminoMsg): QueryPayeeResponse { + return QueryPayeeResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPayeeResponse): QueryPayeeResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPayeeResponse", + value: QueryPayeeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPayeeResponseProtoMsg): QueryPayeeResponse { + return QueryPayeeResponse.decode(message.value); + }, + toProto(message: QueryPayeeResponse): Uint8Array { + return QueryPayeeResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPayeeResponse): QueryPayeeResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryPayeeResponse", + value: QueryPayeeResponse.encode(message).finish() + }; } }; function createBaseQueryCounterpartyPayeeRequest(): QueryCounterpartyPayeeRequest { @@ -1134,6 +1607,7 @@ function createBaseQueryCounterpartyPayeeRequest(): QueryCounterpartyPayeeReques }; } export const QueryCounterpartyPayeeRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryCounterpartyPayeeRequest", encode(message: QueryCounterpartyPayeeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channelId !== "") { writer.uint32(10).string(message.channelId); @@ -1198,6 +1672,39 @@ export const QueryCounterpartyPayeeRequest = { obj.channel_id = message.channelId; obj.relayer = message.relayer; return obj; + }, + fromAmino(object: QueryCounterpartyPayeeRequestAmino): QueryCounterpartyPayeeRequest { + return { + channelId: object.channel_id, + relayer: object.relayer + }; + }, + toAmino(message: QueryCounterpartyPayeeRequest): QueryCounterpartyPayeeRequestAmino { + const obj: any = {}; + obj.channel_id = message.channelId; + obj.relayer = message.relayer; + return obj; + }, + fromAminoMsg(object: QueryCounterpartyPayeeRequestAminoMsg): QueryCounterpartyPayeeRequest { + return QueryCounterpartyPayeeRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCounterpartyPayeeRequest): QueryCounterpartyPayeeRequestAminoMsg { + return { + type: "cosmos-sdk/QueryCounterpartyPayeeRequest", + value: QueryCounterpartyPayeeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCounterpartyPayeeRequestProtoMsg): QueryCounterpartyPayeeRequest { + return QueryCounterpartyPayeeRequest.decode(message.value); + }, + toProto(message: QueryCounterpartyPayeeRequest): Uint8Array { + return QueryCounterpartyPayeeRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCounterpartyPayeeRequest): QueryCounterpartyPayeeRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryCounterpartyPayeeRequest", + value: QueryCounterpartyPayeeRequest.encode(message).finish() + }; } }; function createBaseQueryCounterpartyPayeeResponse(): QueryCounterpartyPayeeResponse { @@ -1206,6 +1713,7 @@ function createBaseQueryCounterpartyPayeeResponse(): QueryCounterpartyPayeeRespo }; } export const QueryCounterpartyPayeeResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryCounterpartyPayeeResponse", encode(message: QueryCounterpartyPayeeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.counterpartyPayee !== "") { writer.uint32(10).string(message.counterpartyPayee); @@ -1258,6 +1766,37 @@ export const QueryCounterpartyPayeeResponse = { const obj: any = {}; obj.counterparty_payee = message.counterpartyPayee; return obj; + }, + fromAmino(object: QueryCounterpartyPayeeResponseAmino): QueryCounterpartyPayeeResponse { + return { + counterpartyPayee: object.counterparty_payee + }; + }, + toAmino(message: QueryCounterpartyPayeeResponse): QueryCounterpartyPayeeResponseAmino { + const obj: any = {}; + obj.counterparty_payee = message.counterpartyPayee; + return obj; + }, + fromAminoMsg(object: QueryCounterpartyPayeeResponseAminoMsg): QueryCounterpartyPayeeResponse { + return QueryCounterpartyPayeeResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCounterpartyPayeeResponse): QueryCounterpartyPayeeResponseAminoMsg { + return { + type: "cosmos-sdk/QueryCounterpartyPayeeResponse", + value: QueryCounterpartyPayeeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCounterpartyPayeeResponseProtoMsg): QueryCounterpartyPayeeResponse { + return QueryCounterpartyPayeeResponse.decode(message.value); + }, + toProto(message: QueryCounterpartyPayeeResponse): Uint8Array { + return QueryCounterpartyPayeeResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCounterpartyPayeeResponse): QueryCounterpartyPayeeResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryCounterpartyPayeeResponse", + value: QueryCounterpartyPayeeResponse.encode(message).finish() + }; } }; function createBaseQueryFeeEnabledChannelsRequest(): QueryFeeEnabledChannelsRequest { @@ -1267,6 +1806,7 @@ function createBaseQueryFeeEnabledChannelsRequest(): QueryFeeEnabledChannelsRequ }; } export const QueryFeeEnabledChannelsRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelsRequest", encode(message: QueryFeeEnabledChannelsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -1331,6 +1871,39 @@ export const QueryFeeEnabledChannelsRequest = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); obj.query_height = message.queryHeight; return obj; + }, + fromAmino(object: QueryFeeEnabledChannelsRequestAmino): QueryFeeEnabledChannelsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined, + queryHeight: BigInt(object.query_height) + }; + }, + toAmino(message: QueryFeeEnabledChannelsRequest): QueryFeeEnabledChannelsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + obj.query_height = message.queryHeight ? message.queryHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryFeeEnabledChannelsRequestAminoMsg): QueryFeeEnabledChannelsRequest { + return QueryFeeEnabledChannelsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryFeeEnabledChannelsRequest): QueryFeeEnabledChannelsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryFeeEnabledChannelsRequest", + value: QueryFeeEnabledChannelsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryFeeEnabledChannelsRequestProtoMsg): QueryFeeEnabledChannelsRequest { + return QueryFeeEnabledChannelsRequest.decode(message.value); + }, + toProto(message: QueryFeeEnabledChannelsRequest): Uint8Array { + return QueryFeeEnabledChannelsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryFeeEnabledChannelsRequest): QueryFeeEnabledChannelsRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelsRequest", + value: QueryFeeEnabledChannelsRequest.encode(message).finish() + }; } }; function createBaseQueryFeeEnabledChannelsResponse(): QueryFeeEnabledChannelsResponse { @@ -1340,6 +1913,7 @@ function createBaseQueryFeeEnabledChannelsResponse(): QueryFeeEnabledChannelsRes }; } export const QueryFeeEnabledChannelsResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelsResponse", encode(message: QueryFeeEnabledChannelsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.feeEnabledChannels) { FeeEnabledChannel.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1412,6 +1986,43 @@ export const QueryFeeEnabledChannelsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryFeeEnabledChannelsResponseAmino): QueryFeeEnabledChannelsResponse { + return { + feeEnabledChannels: Array.isArray(object?.fee_enabled_channels) ? object.fee_enabled_channels.map((e: any) => FeeEnabledChannel.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryFeeEnabledChannelsResponse): QueryFeeEnabledChannelsResponseAmino { + const obj: any = {}; + if (message.feeEnabledChannels) { + obj.fee_enabled_channels = message.feeEnabledChannels.map(e => e ? FeeEnabledChannel.toAmino(e) : undefined); + } else { + obj.fee_enabled_channels = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryFeeEnabledChannelsResponseAminoMsg): QueryFeeEnabledChannelsResponse { + return QueryFeeEnabledChannelsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryFeeEnabledChannelsResponse): QueryFeeEnabledChannelsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryFeeEnabledChannelsResponse", + value: QueryFeeEnabledChannelsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryFeeEnabledChannelsResponseProtoMsg): QueryFeeEnabledChannelsResponse { + return QueryFeeEnabledChannelsResponse.decode(message.value); + }, + toProto(message: QueryFeeEnabledChannelsResponse): Uint8Array { + return QueryFeeEnabledChannelsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryFeeEnabledChannelsResponse): QueryFeeEnabledChannelsResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelsResponse", + value: QueryFeeEnabledChannelsResponse.encode(message).finish() + }; } }; function createBaseQueryFeeEnabledChannelRequest(): QueryFeeEnabledChannelRequest { @@ -1421,6 +2032,7 @@ function createBaseQueryFeeEnabledChannelRequest(): QueryFeeEnabledChannelReques }; } export const QueryFeeEnabledChannelRequest = { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelRequest", encode(message: QueryFeeEnabledChannelRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1485,6 +2097,39 @@ export const QueryFeeEnabledChannelRequest = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: QueryFeeEnabledChannelRequestAmino): QueryFeeEnabledChannelRequest { + return { + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: QueryFeeEnabledChannelRequest): QueryFeeEnabledChannelRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: QueryFeeEnabledChannelRequestAminoMsg): QueryFeeEnabledChannelRequest { + return QueryFeeEnabledChannelRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryFeeEnabledChannelRequest): QueryFeeEnabledChannelRequestAminoMsg { + return { + type: "cosmos-sdk/QueryFeeEnabledChannelRequest", + value: QueryFeeEnabledChannelRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryFeeEnabledChannelRequestProtoMsg): QueryFeeEnabledChannelRequest { + return QueryFeeEnabledChannelRequest.decode(message.value); + }, + toProto(message: QueryFeeEnabledChannelRequest): Uint8Array { + return QueryFeeEnabledChannelRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryFeeEnabledChannelRequest): QueryFeeEnabledChannelRequestProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelRequest", + value: QueryFeeEnabledChannelRequest.encode(message).finish() + }; } }; function createBaseQueryFeeEnabledChannelResponse(): QueryFeeEnabledChannelResponse { @@ -1493,6 +2138,7 @@ function createBaseQueryFeeEnabledChannelResponse(): QueryFeeEnabledChannelRespo }; } export const QueryFeeEnabledChannelResponse = { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelResponse", encode(message: QueryFeeEnabledChannelResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.feeEnabled === true) { writer.uint32(8).bool(message.feeEnabled); @@ -1545,5 +2191,36 @@ export const QueryFeeEnabledChannelResponse = { const obj: any = {}; obj.fee_enabled = message.feeEnabled; return obj; + }, + fromAmino(object: QueryFeeEnabledChannelResponseAmino): QueryFeeEnabledChannelResponse { + return { + feeEnabled: object.fee_enabled + }; + }, + toAmino(message: QueryFeeEnabledChannelResponse): QueryFeeEnabledChannelResponseAmino { + const obj: any = {}; + obj.fee_enabled = message.feeEnabled; + return obj; + }, + fromAminoMsg(object: QueryFeeEnabledChannelResponseAminoMsg): QueryFeeEnabledChannelResponse { + return QueryFeeEnabledChannelResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryFeeEnabledChannelResponse): QueryFeeEnabledChannelResponseAminoMsg { + return { + type: "cosmos-sdk/QueryFeeEnabledChannelResponse", + value: QueryFeeEnabledChannelResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryFeeEnabledChannelResponseProtoMsg): QueryFeeEnabledChannelResponse { + return QueryFeeEnabledChannelResponse.decode(message.value); + }, + toProto(message: QueryFeeEnabledChannelResponse): Uint8Array { + return QueryFeeEnabledChannelResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryFeeEnabledChannelResponse): QueryFeeEnabledChannelResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.QueryFeeEnabledChannelResponse", + value: QueryFeeEnabledChannelResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/tx.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/tx.ts index 1294e57c28..0dc31a3770 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/fee/v1/tx.ts @@ -107,6 +107,7 @@ function createBaseMsgRegisterPayee(): MsgRegisterPayee { }; } export const MsgRegisterPayee = { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterPayee", encode(message: MsgRegisterPayee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -195,12 +196,50 @@ export const MsgRegisterPayee = { obj.relayer = message.relayer; obj.payee = message.payee; return obj; + }, + fromAmino(object: MsgRegisterPayeeAmino): MsgRegisterPayee { + return { + portId: object.port_id, + channelId: object.channel_id, + relayer: object.relayer, + payee: object.payee + }; + }, + toAmino(message: MsgRegisterPayee): MsgRegisterPayeeAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.relayer = message.relayer; + obj.payee = message.payee; + return obj; + }, + fromAminoMsg(object: MsgRegisterPayeeAminoMsg): MsgRegisterPayee { + return MsgRegisterPayee.fromAmino(object.value); + }, + toAminoMsg(message: MsgRegisterPayee): MsgRegisterPayeeAminoMsg { + return { + type: "cosmos-sdk/MsgRegisterPayee", + value: MsgRegisterPayee.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRegisterPayeeProtoMsg): MsgRegisterPayee { + return MsgRegisterPayee.decode(message.value); + }, + toProto(message: MsgRegisterPayee): Uint8Array { + return MsgRegisterPayee.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterPayee): MsgRegisterPayeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterPayee", + value: MsgRegisterPayee.encode(message).finish() + }; } }; function createBaseMsgRegisterPayeeResponse(): MsgRegisterPayeeResponse { return {}; } export const MsgRegisterPayeeResponse = { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterPayeeResponse", encode(_: MsgRegisterPayeeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -238,6 +277,34 @@ export const MsgRegisterPayeeResponse = { toSDK(_: MsgRegisterPayeeResponse): MsgRegisterPayeeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRegisterPayeeResponseAmino): MsgRegisterPayeeResponse { + return {}; + }, + toAmino(_: MsgRegisterPayeeResponse): MsgRegisterPayeeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRegisterPayeeResponseAminoMsg): MsgRegisterPayeeResponse { + return MsgRegisterPayeeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRegisterPayeeResponse): MsgRegisterPayeeResponseAminoMsg { + return { + type: "cosmos-sdk/MsgRegisterPayeeResponse", + value: MsgRegisterPayeeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRegisterPayeeResponseProtoMsg): MsgRegisterPayeeResponse { + return MsgRegisterPayeeResponse.decode(message.value); + }, + toProto(message: MsgRegisterPayeeResponse): Uint8Array { + return MsgRegisterPayeeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterPayeeResponse): MsgRegisterPayeeResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterPayeeResponse", + value: MsgRegisterPayeeResponse.encode(message).finish() + }; } }; function createBaseMsgRegisterCounterpartyPayee(): MsgRegisterCounterpartyPayee { @@ -249,6 +316,7 @@ function createBaseMsgRegisterCounterpartyPayee(): MsgRegisterCounterpartyPayee }; } export const MsgRegisterCounterpartyPayee = { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterCounterpartyPayee", encode(message: MsgRegisterCounterpartyPayee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -337,12 +405,50 @@ export const MsgRegisterCounterpartyPayee = { obj.relayer = message.relayer; obj.counterparty_payee = message.counterpartyPayee; return obj; + }, + fromAmino(object: MsgRegisterCounterpartyPayeeAmino): MsgRegisterCounterpartyPayee { + return { + portId: object.port_id, + channelId: object.channel_id, + relayer: object.relayer, + counterpartyPayee: object.counterparty_payee + }; + }, + toAmino(message: MsgRegisterCounterpartyPayee): MsgRegisterCounterpartyPayeeAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.relayer = message.relayer; + obj.counterparty_payee = message.counterpartyPayee; + return obj; + }, + fromAminoMsg(object: MsgRegisterCounterpartyPayeeAminoMsg): MsgRegisterCounterpartyPayee { + return MsgRegisterCounterpartyPayee.fromAmino(object.value); + }, + toAminoMsg(message: MsgRegisterCounterpartyPayee): MsgRegisterCounterpartyPayeeAminoMsg { + return { + type: "cosmos-sdk/MsgRegisterCounterpartyPayee", + value: MsgRegisterCounterpartyPayee.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRegisterCounterpartyPayeeProtoMsg): MsgRegisterCounterpartyPayee { + return MsgRegisterCounterpartyPayee.decode(message.value); + }, + toProto(message: MsgRegisterCounterpartyPayee): Uint8Array { + return MsgRegisterCounterpartyPayee.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterCounterpartyPayee): MsgRegisterCounterpartyPayeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterCounterpartyPayee", + value: MsgRegisterCounterpartyPayee.encode(message).finish() + }; } }; function createBaseMsgRegisterCounterpartyPayeeResponse(): MsgRegisterCounterpartyPayeeResponse { return {}; } export const MsgRegisterCounterpartyPayeeResponse = { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterCounterpartyPayeeResponse", encode(_: MsgRegisterCounterpartyPayeeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -380,6 +486,34 @@ export const MsgRegisterCounterpartyPayeeResponse = { toSDK(_: MsgRegisterCounterpartyPayeeResponse): MsgRegisterCounterpartyPayeeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRegisterCounterpartyPayeeResponseAmino): MsgRegisterCounterpartyPayeeResponse { + return {}; + }, + toAmino(_: MsgRegisterCounterpartyPayeeResponse): MsgRegisterCounterpartyPayeeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRegisterCounterpartyPayeeResponseAminoMsg): MsgRegisterCounterpartyPayeeResponse { + return MsgRegisterCounterpartyPayeeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRegisterCounterpartyPayeeResponse): MsgRegisterCounterpartyPayeeResponseAminoMsg { + return { + type: "cosmos-sdk/MsgRegisterCounterpartyPayeeResponse", + value: MsgRegisterCounterpartyPayeeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRegisterCounterpartyPayeeResponseProtoMsg): MsgRegisterCounterpartyPayeeResponse { + return MsgRegisterCounterpartyPayeeResponse.decode(message.value); + }, + toProto(message: MsgRegisterCounterpartyPayeeResponse): Uint8Array { + return MsgRegisterCounterpartyPayeeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterCounterpartyPayeeResponse): MsgRegisterCounterpartyPayeeResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgRegisterCounterpartyPayeeResponse", + value: MsgRegisterCounterpartyPayeeResponse.encode(message).finish() + }; } }; function createBaseMsgPayPacketFee(): MsgPayPacketFee { @@ -392,6 +526,7 @@ function createBaseMsgPayPacketFee(): MsgPayPacketFee { }; } export const MsgPayPacketFee = { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFee", encode(message: MsgPayPacketFee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fee !== undefined) { Fee.encode(message.fee, writer.uint32(10).fork()).ldelim(); @@ -500,12 +635,56 @@ export const MsgPayPacketFee = { obj.relayers = []; } return obj; + }, + fromAmino(object: MsgPayPacketFeeAmino): MsgPayPacketFee { + return { + fee: object?.fee ? Fee.fromAmino(object.fee) : undefined, + sourcePortId: object.source_port_id, + sourceChannelId: object.source_channel_id, + signer: object.signer, + relayers: Array.isArray(object?.relayers) ? object.relayers.map((e: any) => e) : [] + }; + }, + toAmino(message: MsgPayPacketFee): MsgPayPacketFeeAmino { + const obj: any = {}; + obj.fee = message.fee ? Fee.toAmino(message.fee) : undefined; + obj.source_port_id = message.sourcePortId; + obj.source_channel_id = message.sourceChannelId; + obj.signer = message.signer; + if (message.relayers) { + obj.relayers = message.relayers.map(e => e); + } else { + obj.relayers = []; + } + return obj; + }, + fromAminoMsg(object: MsgPayPacketFeeAminoMsg): MsgPayPacketFee { + return MsgPayPacketFee.fromAmino(object.value); + }, + toAminoMsg(message: MsgPayPacketFee): MsgPayPacketFeeAminoMsg { + return { + type: "cosmos-sdk/MsgPayPacketFee", + value: MsgPayPacketFee.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPayPacketFeeProtoMsg): MsgPayPacketFee { + return MsgPayPacketFee.decode(message.value); + }, + toProto(message: MsgPayPacketFee): Uint8Array { + return MsgPayPacketFee.encode(message).finish(); + }, + toProtoMsg(message: MsgPayPacketFee): MsgPayPacketFeeProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFee", + value: MsgPayPacketFee.encode(message).finish() + }; } }; function createBaseMsgPayPacketFeeResponse(): MsgPayPacketFeeResponse { return {}; } export const MsgPayPacketFeeResponse = { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFeeResponse", encode(_: MsgPayPacketFeeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -543,6 +722,34 @@ export const MsgPayPacketFeeResponse = { toSDK(_: MsgPayPacketFeeResponse): MsgPayPacketFeeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgPayPacketFeeResponseAmino): MsgPayPacketFeeResponse { + return {}; + }, + toAmino(_: MsgPayPacketFeeResponse): MsgPayPacketFeeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgPayPacketFeeResponseAminoMsg): MsgPayPacketFeeResponse { + return MsgPayPacketFeeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgPayPacketFeeResponse): MsgPayPacketFeeResponseAminoMsg { + return { + type: "cosmos-sdk/MsgPayPacketFeeResponse", + value: MsgPayPacketFeeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPayPacketFeeResponseProtoMsg): MsgPayPacketFeeResponse { + return MsgPayPacketFeeResponse.decode(message.value); + }, + toProto(message: MsgPayPacketFeeResponse): Uint8Array { + return MsgPayPacketFeeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgPayPacketFeeResponse): MsgPayPacketFeeResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFeeResponse", + value: MsgPayPacketFeeResponse.encode(message).finish() + }; } }; function createBaseMsgPayPacketFeeAsync(): MsgPayPacketFeeAsync { @@ -551,6 +758,7 @@ function createBaseMsgPayPacketFeeAsync(): MsgPayPacketFeeAsync { }; } export const MsgPayPacketFeeAsync = { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFeeAsync", encode(message: MsgPayPacketFeeAsync, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.packetFee !== undefined) { PacketFee.encode(message.packetFee, writer.uint32(18).fork()).ldelim(); @@ -603,12 +811,44 @@ export const MsgPayPacketFeeAsync = { const obj: any = {}; message.packetFee !== undefined && (obj.packet_fee = message.packetFee ? PacketFee.toSDK(message.packetFee) : undefined); return obj; + }, + fromAmino(object: MsgPayPacketFeeAsyncAmino): MsgPayPacketFeeAsync { + return { + packetFee: object?.packet_fee ? PacketFee.fromAmino(object.packet_fee) : undefined + }; + }, + toAmino(message: MsgPayPacketFeeAsync): MsgPayPacketFeeAsyncAmino { + const obj: any = {}; + obj.packet_fee = message.packetFee ? PacketFee.toAmino(message.packetFee) : undefined; + return obj; + }, + fromAminoMsg(object: MsgPayPacketFeeAsyncAminoMsg): MsgPayPacketFeeAsync { + return MsgPayPacketFeeAsync.fromAmino(object.value); + }, + toAminoMsg(message: MsgPayPacketFeeAsync): MsgPayPacketFeeAsyncAminoMsg { + return { + type: "cosmos-sdk/MsgPayPacketFeeAsync", + value: MsgPayPacketFeeAsync.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPayPacketFeeAsyncProtoMsg): MsgPayPacketFeeAsync { + return MsgPayPacketFeeAsync.decode(message.value); + }, + toProto(message: MsgPayPacketFeeAsync): Uint8Array { + return MsgPayPacketFeeAsync.encode(message).finish(); + }, + toProtoMsg(message: MsgPayPacketFeeAsync): MsgPayPacketFeeAsyncProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFeeAsync", + value: MsgPayPacketFeeAsync.encode(message).finish() + }; } }; function createBaseMsgPayPacketFeeAsyncResponse(): MsgPayPacketFeeAsyncResponse { return {}; } export const MsgPayPacketFeeAsyncResponse = { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFeeAsyncResponse", encode(_: MsgPayPacketFeeAsyncResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -646,5 +886,33 @@ export const MsgPayPacketFeeAsyncResponse = { toSDK(_: MsgPayPacketFeeAsyncResponse): MsgPayPacketFeeAsyncResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgPayPacketFeeAsyncResponseAmino): MsgPayPacketFeeAsyncResponse { + return {}; + }, + toAmino(_: MsgPayPacketFeeAsyncResponse): MsgPayPacketFeeAsyncResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgPayPacketFeeAsyncResponseAminoMsg): MsgPayPacketFeeAsyncResponse { + return MsgPayPacketFeeAsyncResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgPayPacketFeeAsyncResponse): MsgPayPacketFeeAsyncResponseAminoMsg { + return { + type: "cosmos-sdk/MsgPayPacketFeeAsyncResponse", + value: MsgPayPacketFeeAsyncResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgPayPacketFeeAsyncResponseProtoMsg): MsgPayPacketFeeAsyncResponse { + return MsgPayPacketFeeAsyncResponse.decode(message.value); + }, + toProto(message: MsgPayPacketFeeAsyncResponse): Uint8Array { + return MsgPayPacketFeeAsyncResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgPayPacketFeeAsyncResponse): MsgPayPacketFeeAsyncResponseProtoMsg { + return { + typeUrl: "/ibc.applications.fee.v1.MsgPayPacketFeeAsyncResponse", + value: MsgPayPacketFeeAsyncResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/controller.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/controller.ts index f5dbcd4829..257b7fd417 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/controller.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/controller.ts @@ -22,6 +22,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.controllerEnabled === true) { writer.uint32(8).bool(message.controllerEnabled); @@ -74,5 +75,36 @@ export const Params = { const obj: any = {}; obj.controller_enabled = message.controllerEnabled; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + controllerEnabled: object.controller_enabled + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.controller_enabled = message.controllerEnabled; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/query.ts index 4dee04a589..59832c3e00 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/query.ts @@ -40,6 +40,7 @@ function createBaseQueryInterchainAccountRequest(): QueryInterchainAccountReques }; } export const QueryInterchainAccountRequest = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryInterchainAccountRequest", encode(message: QueryInterchainAccountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -104,6 +105,39 @@ export const QueryInterchainAccountRequest = { obj.owner = message.owner; obj.connection_id = message.connectionId; return obj; + }, + fromAmino(object: QueryInterchainAccountRequestAmino): QueryInterchainAccountRequest { + return { + owner: object.owner, + connectionId: object.connection_id + }; + }, + toAmino(message: QueryInterchainAccountRequest): QueryInterchainAccountRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.connection_id = message.connectionId; + return obj; + }, + fromAminoMsg(object: QueryInterchainAccountRequestAminoMsg): QueryInterchainAccountRequest { + return QueryInterchainAccountRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryInterchainAccountRequest): QueryInterchainAccountRequestAminoMsg { + return { + type: "cosmos-sdk/QueryInterchainAccountRequest", + value: QueryInterchainAccountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryInterchainAccountRequestProtoMsg): QueryInterchainAccountRequest { + return QueryInterchainAccountRequest.decode(message.value); + }, + toProto(message: QueryInterchainAccountRequest): Uint8Array { + return QueryInterchainAccountRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryInterchainAccountRequest): QueryInterchainAccountRequestProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryInterchainAccountRequest", + value: QueryInterchainAccountRequest.encode(message).finish() + }; } }; function createBaseQueryInterchainAccountResponse(): QueryInterchainAccountResponse { @@ -112,6 +146,7 @@ function createBaseQueryInterchainAccountResponse(): QueryInterchainAccountRespo }; } export const QueryInterchainAccountResponse = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryInterchainAccountResponse", encode(message: QueryInterchainAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -164,12 +199,44 @@ export const QueryInterchainAccountResponse = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryInterchainAccountResponseAmino): QueryInterchainAccountResponse { + return { + address: object.address + }; + }, + toAmino(message: QueryInterchainAccountResponse): QueryInterchainAccountResponseAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryInterchainAccountResponseAminoMsg): QueryInterchainAccountResponse { + return QueryInterchainAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryInterchainAccountResponse): QueryInterchainAccountResponseAminoMsg { + return { + type: "cosmos-sdk/QueryInterchainAccountResponse", + value: QueryInterchainAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryInterchainAccountResponseProtoMsg): QueryInterchainAccountResponse { + return QueryInterchainAccountResponse.decode(message.value); + }, + toProto(message: QueryInterchainAccountResponse): Uint8Array { + return QueryInterchainAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryInterchainAccountResponse): QueryInterchainAccountResponseProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryInterchainAccountResponse", + value: QueryInterchainAccountResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -207,6 +274,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -215,6 +310,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -267,5 +363,36 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/tx.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/tx.ts index 73bbd2c874..9adea502af 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/controller/v1/tx.ts @@ -58,6 +58,7 @@ function createBaseMsgRegisterInterchainAccount(): MsgRegisterInterchainAccount }; } export const MsgRegisterInterchainAccount = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount", encode(message: MsgRegisterInterchainAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -134,6 +135,41 @@ export const MsgRegisterInterchainAccount = { obj.connection_id = message.connectionId; obj.version = message.version; return obj; + }, + fromAmino(object: MsgRegisterInterchainAccountAmino): MsgRegisterInterchainAccount { + return { + owner: object.owner, + connectionId: object.connection_id, + version: object.version + }; + }, + toAmino(message: MsgRegisterInterchainAccount): MsgRegisterInterchainAccountAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.connection_id = message.connectionId; + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: MsgRegisterInterchainAccountAminoMsg): MsgRegisterInterchainAccount { + return MsgRegisterInterchainAccount.fromAmino(object.value); + }, + toAminoMsg(message: MsgRegisterInterchainAccount): MsgRegisterInterchainAccountAminoMsg { + return { + type: "cosmos-sdk/MsgRegisterInterchainAccount", + value: MsgRegisterInterchainAccount.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRegisterInterchainAccountProtoMsg): MsgRegisterInterchainAccount { + return MsgRegisterInterchainAccount.decode(message.value); + }, + toProto(message: MsgRegisterInterchainAccount): Uint8Array { + return MsgRegisterInterchainAccount.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterInterchainAccount): MsgRegisterInterchainAccountProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccount", + value: MsgRegisterInterchainAccount.encode(message).finish() + }; } }; function createBaseMsgRegisterInterchainAccountResponse(): MsgRegisterInterchainAccountResponse { @@ -143,6 +179,7 @@ function createBaseMsgRegisterInterchainAccountResponse(): MsgRegisterInterchain }; } export const MsgRegisterInterchainAccountResponse = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccountResponse", encode(message: MsgRegisterInterchainAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channelId !== "") { writer.uint32(10).string(message.channelId); @@ -207,6 +244,39 @@ export const MsgRegisterInterchainAccountResponse = { obj.channel_id = message.channelId; obj.port_id = message.portId; return obj; + }, + fromAmino(object: MsgRegisterInterchainAccountResponseAmino): MsgRegisterInterchainAccountResponse { + return { + channelId: object.channel_id, + portId: object.port_id + }; + }, + toAmino(message: MsgRegisterInterchainAccountResponse): MsgRegisterInterchainAccountResponseAmino { + const obj: any = {}; + obj.channel_id = message.channelId; + obj.port_id = message.portId; + return obj; + }, + fromAminoMsg(object: MsgRegisterInterchainAccountResponseAminoMsg): MsgRegisterInterchainAccountResponse { + return MsgRegisterInterchainAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRegisterInterchainAccountResponse): MsgRegisterInterchainAccountResponseAminoMsg { + return { + type: "cosmos-sdk/MsgRegisterInterchainAccountResponse", + value: MsgRegisterInterchainAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRegisterInterchainAccountResponseProtoMsg): MsgRegisterInterchainAccountResponse { + return MsgRegisterInterchainAccountResponse.decode(message.value); + }, + toProto(message: MsgRegisterInterchainAccountResponse): Uint8Array { + return MsgRegisterInterchainAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRegisterInterchainAccountResponse): MsgRegisterInterchainAccountResponseProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgRegisterInterchainAccountResponse", + value: MsgRegisterInterchainAccountResponse.encode(message).finish() + }; } }; function createBaseMsgSendTx(): MsgSendTx { @@ -218,6 +288,7 @@ function createBaseMsgSendTx(): MsgSendTx { }; } export const MsgSendTx = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgSendTx", encode(message: MsgSendTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -306,6 +377,43 @@ export const MsgSendTx = { message.packetData !== undefined && (obj.packet_data = message.packetData ? InterchainAccountPacketData.toSDK(message.packetData) : undefined); obj.relative_timeout = message.relativeTimeout; return obj; + }, + fromAmino(object: MsgSendTxAmino): MsgSendTx { + return { + owner: object.owner, + connectionId: object.connection_id, + packetData: object?.packet_data ? InterchainAccountPacketData.fromAmino(object.packet_data) : undefined, + relativeTimeout: BigInt(object.relative_timeout) + }; + }, + toAmino(message: MsgSendTx): MsgSendTxAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.connection_id = message.connectionId; + obj.packet_data = message.packetData ? InterchainAccountPacketData.toAmino(message.packetData) : undefined; + obj.relative_timeout = message.relativeTimeout ? message.relativeTimeout.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSendTxAminoMsg): MsgSendTx { + return MsgSendTx.fromAmino(object.value); + }, + toAminoMsg(message: MsgSendTx): MsgSendTxAminoMsg { + return { + type: "cosmos-sdk/MsgSendTx", + value: MsgSendTx.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSendTxProtoMsg): MsgSendTx { + return MsgSendTx.decode(message.value); + }, + toProto(message: MsgSendTx): Uint8Array { + return MsgSendTx.encode(message).finish(); + }, + toProtoMsg(message: MsgSendTx): MsgSendTxProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgSendTx", + value: MsgSendTx.encode(message).finish() + }; } }; function createBaseMsgSendTxResponse(): MsgSendTxResponse { @@ -314,6 +422,7 @@ function createBaseMsgSendTxResponse(): MsgSendTxResponse { }; } export const MsgSendTxResponse = { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse", encode(message: MsgSendTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -366,5 +475,36 @@ export const MsgSendTxResponse = { const obj: any = {}; obj.sequence = message.sequence; return obj; + }, + fromAmino(object: MsgSendTxResponseAmino): MsgSendTxResponse { + return { + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: MsgSendTxResponse): MsgSendTxResponseAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSendTxResponseAminoMsg): MsgSendTxResponse { + return MsgSendTxResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSendTxResponse): MsgSendTxResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSendTxResponse", + value: MsgSendTxResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSendTxResponseProtoMsg): MsgSendTxResponse { + return MsgSendTxResponse.decode(message.value); + }, + toProto(message: MsgSendTxResponse): Uint8Array { + return MsgSendTxResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSendTxResponse): MsgSendTxResponseProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.controller.v1.MsgSendTxResponse", + value: MsgSendTxResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/genesis/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/genesis/v1/genesis.ts index a7e99ba7aa..1e3049d403 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/genesis/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/genesis/v1/genesis.ts @@ -82,6 +82,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.controllerGenesisState !== undefined) { ControllerGenesisState.encode(message.controllerGenesisState, writer.uint32(10).fork()).ldelim(); @@ -146,6 +147,39 @@ export const GenesisState = { message.controllerGenesisState !== undefined && (obj.controller_genesis_state = message.controllerGenesisState ? ControllerGenesisState.toSDK(message.controllerGenesisState) : undefined); message.hostGenesisState !== undefined && (obj.host_genesis_state = message.hostGenesisState ? HostGenesisState.toSDK(message.hostGenesisState) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + controllerGenesisState: object?.controller_genesis_state ? ControllerGenesisState.fromAmino(object.controller_genesis_state) : undefined, + hostGenesisState: object?.host_genesis_state ? HostGenesisState.fromAmino(object.host_genesis_state) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.controller_genesis_state = message.controllerGenesisState ? ControllerGenesisState.toAmino(message.controllerGenesisState) : undefined; + obj.host_genesis_state = message.hostGenesisState ? HostGenesisState.toAmino(message.hostGenesisState) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseControllerGenesisState(): ControllerGenesisState { @@ -157,6 +191,7 @@ function createBaseControllerGenesisState(): ControllerGenesisState { }; } export const ControllerGenesisState = { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.ControllerGenesisState", encode(message: ControllerGenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.activeChannels) { ActiveChannel.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -269,6 +304,55 @@ export const ControllerGenesisState = { } message.params !== undefined && (obj.params = message.params ? Params1.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: ControllerGenesisStateAmino): ControllerGenesisState { + return { + activeChannels: Array.isArray(object?.active_channels) ? object.active_channels.map((e: any) => ActiveChannel.fromAmino(e)) : [], + interchainAccounts: Array.isArray(object?.interchain_accounts) ? object.interchain_accounts.map((e: any) => RegisteredInterchainAccount.fromAmino(e)) : [], + ports: Array.isArray(object?.ports) ? object.ports.map((e: any) => e) : [], + params: object?.params ? Params1.fromAmino(object.params) : undefined + }; + }, + toAmino(message: ControllerGenesisState): ControllerGenesisStateAmino { + const obj: any = {}; + if (message.activeChannels) { + obj.active_channels = message.activeChannels.map(e => e ? ActiveChannel.toAmino(e) : undefined); + } else { + obj.active_channels = []; + } + if (message.interchainAccounts) { + obj.interchain_accounts = message.interchainAccounts.map(e => e ? RegisteredInterchainAccount.toAmino(e) : undefined); + } else { + obj.interchain_accounts = []; + } + if (message.ports) { + obj.ports = message.ports.map(e => e); + } else { + obj.ports = []; + } + obj.params = message.params ? Params1.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: ControllerGenesisStateAminoMsg): ControllerGenesisState { + return ControllerGenesisState.fromAmino(object.value); + }, + toAminoMsg(message: ControllerGenesisState): ControllerGenesisStateAminoMsg { + return { + type: "cosmos-sdk/ControllerGenesisState", + value: ControllerGenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: ControllerGenesisStateProtoMsg): ControllerGenesisState { + return ControllerGenesisState.decode(message.value); + }, + toProto(message: ControllerGenesisState): Uint8Array { + return ControllerGenesisState.encode(message).finish(); + }, + toProtoMsg(message: ControllerGenesisState): ControllerGenesisStateProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.ControllerGenesisState", + value: ControllerGenesisState.encode(message).finish() + }; } }; function createBaseHostGenesisState(): HostGenesisState { @@ -280,6 +364,7 @@ function createBaseHostGenesisState(): HostGenesisState { }; } export const HostGenesisState = { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.HostGenesisState", encode(message: HostGenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.activeChannels) { ActiveChannel.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -384,6 +469,51 @@ export const HostGenesisState = { obj.port = message.port; message.params !== undefined && (obj.params = message.params ? Params2.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: HostGenesisStateAmino): HostGenesisState { + return { + activeChannels: Array.isArray(object?.active_channels) ? object.active_channels.map((e: any) => ActiveChannel.fromAmino(e)) : [], + interchainAccounts: Array.isArray(object?.interchain_accounts) ? object.interchain_accounts.map((e: any) => RegisteredInterchainAccount.fromAmino(e)) : [], + port: object.port, + params: object?.params ? Params2.fromAmino(object.params) : undefined + }; + }, + toAmino(message: HostGenesisState): HostGenesisStateAmino { + const obj: any = {}; + if (message.activeChannels) { + obj.active_channels = message.activeChannels.map(e => e ? ActiveChannel.toAmino(e) : undefined); + } else { + obj.active_channels = []; + } + if (message.interchainAccounts) { + obj.interchain_accounts = message.interchainAccounts.map(e => e ? RegisteredInterchainAccount.toAmino(e) : undefined); + } else { + obj.interchain_accounts = []; + } + obj.port = message.port; + obj.params = message.params ? Params2.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: HostGenesisStateAminoMsg): HostGenesisState { + return HostGenesisState.fromAmino(object.value); + }, + toAminoMsg(message: HostGenesisState): HostGenesisStateAminoMsg { + return { + type: "cosmos-sdk/HostGenesisState", + value: HostGenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: HostGenesisStateProtoMsg): HostGenesisState { + return HostGenesisState.decode(message.value); + }, + toProto(message: HostGenesisState): Uint8Array { + return HostGenesisState.encode(message).finish(); + }, + toProtoMsg(message: HostGenesisState): HostGenesisStateProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.HostGenesisState", + value: HostGenesisState.encode(message).finish() + }; } }; function createBaseActiveChannel(): ActiveChannel { @@ -395,6 +525,7 @@ function createBaseActiveChannel(): ActiveChannel { }; } export const ActiveChannel = { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.ActiveChannel", encode(message: ActiveChannel, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -483,6 +614,43 @@ export const ActiveChannel = { obj.channel_id = message.channelId; obj.is_middleware_enabled = message.isMiddlewareEnabled; return obj; + }, + fromAmino(object: ActiveChannelAmino): ActiveChannel { + return { + connectionId: object.connection_id, + portId: object.port_id, + channelId: object.channel_id, + isMiddlewareEnabled: object.is_middleware_enabled + }; + }, + toAmino(message: ActiveChannel): ActiveChannelAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.is_middleware_enabled = message.isMiddlewareEnabled; + return obj; + }, + fromAminoMsg(object: ActiveChannelAminoMsg): ActiveChannel { + return ActiveChannel.fromAmino(object.value); + }, + toAminoMsg(message: ActiveChannel): ActiveChannelAminoMsg { + return { + type: "cosmos-sdk/ActiveChannel", + value: ActiveChannel.toAmino(message) + }; + }, + fromProtoMsg(message: ActiveChannelProtoMsg): ActiveChannel { + return ActiveChannel.decode(message.value); + }, + toProto(message: ActiveChannel): Uint8Array { + return ActiveChannel.encode(message).finish(); + }, + toProtoMsg(message: ActiveChannel): ActiveChannelProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.ActiveChannel", + value: ActiveChannel.encode(message).finish() + }; } }; function createBaseRegisteredInterchainAccount(): RegisteredInterchainAccount { @@ -493,6 +661,7 @@ function createBaseRegisteredInterchainAccount(): RegisteredInterchainAccount { }; } export const RegisteredInterchainAccount = { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount", encode(message: RegisteredInterchainAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -569,5 +738,40 @@ export const RegisteredInterchainAccount = { obj.port_id = message.portId; obj.account_address = message.accountAddress; return obj; + }, + fromAmino(object: RegisteredInterchainAccountAmino): RegisteredInterchainAccount { + return { + connectionId: object.connection_id, + portId: object.port_id, + accountAddress: object.account_address + }; + }, + toAmino(message: RegisteredInterchainAccount): RegisteredInterchainAccountAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + obj.port_id = message.portId; + obj.account_address = message.accountAddress; + return obj; + }, + fromAminoMsg(object: RegisteredInterchainAccountAminoMsg): RegisteredInterchainAccount { + return RegisteredInterchainAccount.fromAmino(object.value); + }, + toAminoMsg(message: RegisteredInterchainAccount): RegisteredInterchainAccountAminoMsg { + return { + type: "cosmos-sdk/RegisteredInterchainAccount", + value: RegisteredInterchainAccount.toAmino(message) + }; + }, + fromProtoMsg(message: RegisteredInterchainAccountProtoMsg): RegisteredInterchainAccount { + return RegisteredInterchainAccount.decode(message.value); + }, + toProto(message: RegisteredInterchainAccount): Uint8Array { + return RegisteredInterchainAccount.encode(message).finish(); + }, + toProtoMsg(message: RegisteredInterchainAccount): RegisteredInterchainAccountProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.genesis.v1.RegisteredInterchainAccount", + value: RegisteredInterchainAccount.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/host.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/host.ts index dc15e2fff8..167574597c 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/host.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/host.ts @@ -26,6 +26,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/ibc.applications.interchain_accounts.host.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hostEnabled === true) { writer.uint32(8).bool(message.hostEnabled); @@ -98,5 +99,42 @@ export const Params = { obj.allow_messages = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + hostEnabled: object.host_enabled, + allowMessages: Array.isArray(object?.allow_messages) ? object.allow_messages.map((e: any) => e) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.host_enabled = message.hostEnabled; + if (message.allowMessages) { + obj.allow_messages = message.allowMessages.map(e => e); + } else { + obj.allow_messages = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.host.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/query.ts index ef3b9cb0e8..319552b456 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/host/v1/query.ts @@ -19,6 +19,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/ibc.applications.interchain_accounts.host.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -56,6 +57,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.host.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -64,6 +93,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/ibc.applications.interchain_accounts.host.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -116,5 +146,36 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.host.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/account.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/account.ts index 6f7e3f3eb9..689f3af7b5 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/account.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/account.ts @@ -19,6 +19,7 @@ function createBaseInterchainAccount(): InterchainAccount { }; } export const InterchainAccount = { + typeUrl: "/ibc.applications.interchain_accounts.v1.InterchainAccount", encode(message: InterchainAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseAccount !== undefined) { BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim(); @@ -83,5 +84,38 @@ export const InterchainAccount = { message.baseAccount !== undefined && (obj.base_account = message.baseAccount ? BaseAccount.toSDK(message.baseAccount) : undefined); obj.account_owner = message.accountOwner; return obj; + }, + fromAmino(object: InterchainAccountAmino): InterchainAccount { + return { + baseAccount: object?.base_account ? BaseAccount.fromAmino(object.base_account) : undefined, + accountOwner: object.account_owner + }; + }, + toAmino(message: InterchainAccount): InterchainAccountAmino { + const obj: any = {}; + obj.base_account = message.baseAccount ? BaseAccount.toAmino(message.baseAccount) : undefined; + obj.account_owner = message.accountOwner; + return obj; + }, + fromAminoMsg(object: InterchainAccountAminoMsg): InterchainAccount { + return InterchainAccount.fromAmino(object.value); + }, + toAminoMsg(message: InterchainAccount): InterchainAccountAminoMsg { + return { + type: "cosmos-sdk/InterchainAccount", + value: InterchainAccount.toAmino(message) + }; + }, + fromProtoMsg(message: InterchainAccountProtoMsg): InterchainAccount { + return InterchainAccount.decode(message.value); + }, + toProto(message: InterchainAccount): Uint8Array { + return InterchainAccount.encode(message).finish(); + }, + toProtoMsg(message: InterchainAccount): InterchainAccountProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.v1.InterchainAccount", + value: InterchainAccount.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/metadata.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/metadata.ts index a1a1b25688..c6d4a3c50b 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/metadata.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/metadata.ts @@ -45,6 +45,7 @@ function createBaseMetadata(): Metadata { }; } export const Metadata = { + typeUrl: "/ibc.applications.interchain_accounts.v1.Metadata", encode(message: Metadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.version !== "") { writer.uint32(10).string(message.version); @@ -157,5 +158,46 @@ export const Metadata = { obj.encoding = message.encoding; obj.tx_type = message.txType; return obj; + }, + fromAmino(object: MetadataAmino): Metadata { + return { + version: object.version, + controllerConnectionId: object.controller_connection_id, + hostConnectionId: object.host_connection_id, + address: object.address, + encoding: object.encoding, + txType: object.tx_type + }; + }, + toAmino(message: Metadata): MetadataAmino { + const obj: any = {}; + obj.version = message.version; + obj.controller_connection_id = message.controllerConnectionId; + obj.host_connection_id = message.hostConnectionId; + obj.address = message.address; + obj.encoding = message.encoding; + obj.tx_type = message.txType; + return obj; + }, + fromAminoMsg(object: MetadataAminoMsg): Metadata { + return Metadata.fromAmino(object.value); + }, + toAminoMsg(message: Metadata): MetadataAminoMsg { + return { + type: "cosmos-sdk/Metadata", + value: Metadata.toAmino(message) + }; + }, + fromProtoMsg(message: MetadataProtoMsg): Metadata { + return Metadata.decode(message.value); + }, + toProto(message: Metadata): Uint8Array { + return Metadata.encode(message).finish(); + }, + toProtoMsg(message: Metadata): MetadataProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.v1.Metadata", + value: Metadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/packet.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/packet.ts index 14b5782cda..7cc7ae4d62 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/packet.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/interchain_accounts/v1/packet.ts @@ -67,6 +67,7 @@ function createBaseInterchainAccountPacketData(): InterchainAccountPacketData { }; } export const InterchainAccountPacketData = { + typeUrl: "/ibc.applications.interchain_accounts.v1.InterchainAccountPacketData", encode(message: InterchainAccountPacketData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== 0) { writer.uint32(8).int32(message.type); @@ -143,6 +144,41 @@ export const InterchainAccountPacketData = { obj.data = message.data; obj.memo = message.memo; return obj; + }, + fromAmino(object: InterchainAccountPacketDataAmino): InterchainAccountPacketData { + return { + type: isSet(object.type) ? typeFromJSON(object.type) : -1, + data: object.data, + memo: object.memo + }; + }, + toAmino(message: InterchainAccountPacketData): InterchainAccountPacketDataAmino { + const obj: any = {}; + obj.type = message.type; + obj.data = message.data; + obj.memo = message.memo; + return obj; + }, + fromAminoMsg(object: InterchainAccountPacketDataAminoMsg): InterchainAccountPacketData { + return InterchainAccountPacketData.fromAmino(object.value); + }, + toAminoMsg(message: InterchainAccountPacketData): InterchainAccountPacketDataAminoMsg { + return { + type: "cosmos-sdk/InterchainAccountPacketData", + value: InterchainAccountPacketData.toAmino(message) + }; + }, + fromProtoMsg(message: InterchainAccountPacketDataProtoMsg): InterchainAccountPacketData { + return InterchainAccountPacketData.decode(message.value); + }, + toProto(message: InterchainAccountPacketData): Uint8Array { + return InterchainAccountPacketData.encode(message).finish(); + }, + toProtoMsg(message: InterchainAccountPacketData): InterchainAccountPacketDataProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.v1.InterchainAccountPacketData", + value: InterchainAccountPacketData.encode(message).finish() + }; } }; function createBaseCosmosTx(): CosmosTx { @@ -151,6 +187,7 @@ function createBaseCosmosTx(): CosmosTx { }; } export const CosmosTx = { + typeUrl: "/ibc.applications.interchain_accounts.v1.CosmosTx", encode(message: CosmosTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.messages) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -211,5 +248,40 @@ export const CosmosTx = { obj.messages = []; } return obj; + }, + fromAmino(object: CosmosTxAmino): CosmosTx { + return { + messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: CosmosTx): CosmosTxAmino { + const obj: any = {}; + if (message.messages) { + obj.messages = message.messages.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.messages = []; + } + return obj; + }, + fromAminoMsg(object: CosmosTxAminoMsg): CosmosTx { + return CosmosTx.fromAmino(object.value); + }, + toAminoMsg(message: CosmosTx): CosmosTxAminoMsg { + return { + type: "cosmos-sdk/CosmosTx", + value: CosmosTx.toAmino(message) + }; + }, + fromProtoMsg(message: CosmosTxProtoMsg): CosmosTx { + return CosmosTx.decode(message.value); + }, + toProto(message: CosmosTx): Uint8Array { + return CosmosTx.encode(message).finish(); + }, + toProtoMsg(message: CosmosTx): CosmosTxProtoMsg { + return { + typeUrl: "/ibc.applications.interchain_accounts.v1.CosmosTx", + value: CosmosTx.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/authz.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/authz.ts index 7edb3f5382..580f517ec0 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/authz.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/authz.ts @@ -44,6 +44,7 @@ function createBaseAllocation(): Allocation { }; } export const Allocation = { + typeUrl: "/ibc.applications.transfer.v1.Allocation", encode(message: Allocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sourcePort !== "") { writer.uint32(10).string(message.sourcePort); @@ -148,6 +149,51 @@ export const Allocation = { obj.allow_list = []; } return obj; + }, + fromAmino(object: AllocationAmino): Allocation { + return { + sourcePort: object.source_port, + sourceChannel: object.source_channel, + spendLimit: Array.isArray(object?.spend_limit) ? object.spend_limit.map((e: any) => Coin.fromAmino(e)) : [], + allowList: Array.isArray(object?.allow_list) ? object.allow_list.map((e: any) => e) : [] + }; + }, + toAmino(message: Allocation): AllocationAmino { + const obj: any = {}; + obj.source_port = message.sourcePort; + obj.source_channel = message.sourceChannel; + if (message.spendLimit) { + obj.spend_limit = message.spendLimit.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.spend_limit = []; + } + if (message.allowList) { + obj.allow_list = message.allowList.map(e => e); + } else { + obj.allow_list = []; + } + return obj; + }, + fromAminoMsg(object: AllocationAminoMsg): Allocation { + return Allocation.fromAmino(object.value); + }, + toAminoMsg(message: Allocation): AllocationAminoMsg { + return { + type: "cosmos-sdk/Allocation", + value: Allocation.toAmino(message) + }; + }, + fromProtoMsg(message: AllocationProtoMsg): Allocation { + return Allocation.decode(message.value); + }, + toProto(message: Allocation): Uint8Array { + return Allocation.encode(message).finish(); + }, + toProtoMsg(message: Allocation): AllocationProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.Allocation", + value: Allocation.encode(message).finish() + }; } }; function createBaseTransferAuthorization(): TransferAuthorization { @@ -156,6 +202,7 @@ function createBaseTransferAuthorization(): TransferAuthorization { }; } export const TransferAuthorization = { + typeUrl: "/ibc.applications.transfer.v1.TransferAuthorization", encode(message: TransferAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allocations) { Allocation.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -216,5 +263,40 @@ export const TransferAuthorization = { obj.allocations = []; } return obj; + }, + fromAmino(object: TransferAuthorizationAmino): TransferAuthorization { + return { + allocations: Array.isArray(object?.allocations) ? object.allocations.map((e: any) => Allocation.fromAmino(e)) : [] + }; + }, + toAmino(message: TransferAuthorization): TransferAuthorizationAmino { + const obj: any = {}; + if (message.allocations) { + obj.allocations = message.allocations.map(e => e ? Allocation.toAmino(e) : undefined); + } else { + obj.allocations = []; + } + return obj; + }, + fromAminoMsg(object: TransferAuthorizationAminoMsg): TransferAuthorization { + return TransferAuthorization.fromAmino(object.value); + }, + toAminoMsg(message: TransferAuthorization): TransferAuthorizationAminoMsg { + return { + type: "cosmos-sdk/TransferAuthorization", + value: TransferAuthorization.toAmino(message) + }; + }, + fromProtoMsg(message: TransferAuthorizationProtoMsg): TransferAuthorization { + return TransferAuthorization.decode(message.value); + }, + toProto(message: TransferAuthorization): Uint8Array { + return TransferAuthorization.encode(message).finish(); + }, + toProtoMsg(message: TransferAuthorization): TransferAuthorizationProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.TransferAuthorization", + value: TransferAuthorization.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/genesis.ts index 060225197d..ab8128a210 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/genesis.ts @@ -22,6 +22,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.applications.transfer.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -106,5 +107,44 @@ export const GenesisState = { } message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + portId: object.port_id, + denomTraces: Array.isArray(object?.denom_traces) ? object.denom_traces.map((e: any) => DenomTrace.fromAmino(e)) : [], + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.port_id = message.portId; + if (message.denomTraces) { + obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); + } else { + obj.denom_traces = []; + } + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/query.ts index ae67619f81..0d9ea1ef07 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/query.ts @@ -85,6 +85,7 @@ function createBaseQueryDenomTraceRequest(): QueryDenomTraceRequest { }; } export const QueryDenomTraceRequest = { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceRequest", encode(message: QueryDenomTraceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== "") { writer.uint32(10).string(message.hash); @@ -137,6 +138,37 @@ export const QueryDenomTraceRequest = { const obj: any = {}; obj.hash = message.hash; return obj; + }, + fromAmino(object: QueryDenomTraceRequestAmino): QueryDenomTraceRequest { + return { + hash: object.hash + }; + }, + toAmino(message: QueryDenomTraceRequest): QueryDenomTraceRequestAmino { + const obj: any = {}; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: QueryDenomTraceRequestAminoMsg): QueryDenomTraceRequest { + return QueryDenomTraceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomTraceRequest): QueryDenomTraceRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDenomTraceRequest", + value: QueryDenomTraceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomTraceRequestProtoMsg): QueryDenomTraceRequest { + return QueryDenomTraceRequest.decode(message.value); + }, + toProto(message: QueryDenomTraceRequest): Uint8Array { + return QueryDenomTraceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomTraceRequest): QueryDenomTraceRequestProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceRequest", + value: QueryDenomTraceRequest.encode(message).finish() + }; } }; function createBaseQueryDenomTraceResponse(): QueryDenomTraceResponse { @@ -145,6 +177,7 @@ function createBaseQueryDenomTraceResponse(): QueryDenomTraceResponse { }; } export const QueryDenomTraceResponse = { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceResponse", encode(message: QueryDenomTraceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denomTrace !== undefined) { DenomTrace.encode(message.denomTrace, writer.uint32(10).fork()).ldelim(); @@ -197,6 +230,37 @@ export const QueryDenomTraceResponse = { const obj: any = {}; message.denomTrace !== undefined && (obj.denom_trace = message.denomTrace ? DenomTrace.toSDK(message.denomTrace) : undefined); return obj; + }, + fromAmino(object: QueryDenomTraceResponseAmino): QueryDenomTraceResponse { + return { + denomTrace: object?.denom_trace ? DenomTrace.fromAmino(object.denom_trace) : undefined + }; + }, + toAmino(message: QueryDenomTraceResponse): QueryDenomTraceResponseAmino { + const obj: any = {}; + obj.denom_trace = message.denomTrace ? DenomTrace.toAmino(message.denomTrace) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomTraceResponseAminoMsg): QueryDenomTraceResponse { + return QueryDenomTraceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomTraceResponse): QueryDenomTraceResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDenomTraceResponse", + value: QueryDenomTraceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomTraceResponseProtoMsg): QueryDenomTraceResponse { + return QueryDenomTraceResponse.decode(message.value); + }, + toProto(message: QueryDenomTraceResponse): Uint8Array { + return QueryDenomTraceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomTraceResponse): QueryDenomTraceResponseProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTraceResponse", + value: QueryDenomTraceResponse.encode(message).finish() + }; } }; function createBaseQueryDenomTracesRequest(): QueryDenomTracesRequest { @@ -205,6 +269,7 @@ function createBaseQueryDenomTracesRequest(): QueryDenomTracesRequest { }; } export const QueryDenomTracesRequest = { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesRequest", encode(message: QueryDenomTracesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -257,6 +322,37 @@ export const QueryDenomTracesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDenomTracesRequestAmino): QueryDenomTracesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDenomTracesRequest): QueryDenomTracesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomTracesRequestAminoMsg): QueryDenomTracesRequest { + return QueryDenomTracesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomTracesRequest): QueryDenomTracesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryDenomTracesRequest", + value: QueryDenomTracesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomTracesRequestProtoMsg): QueryDenomTracesRequest { + return QueryDenomTracesRequest.decode(message.value); + }, + toProto(message: QueryDenomTracesRequest): Uint8Array { + return QueryDenomTracesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomTracesRequest): QueryDenomTracesRequestProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesRequest", + value: QueryDenomTracesRequest.encode(message).finish() + }; } }; function createBaseQueryDenomTracesResponse(): QueryDenomTracesResponse { @@ -266,6 +362,7 @@ function createBaseQueryDenomTracesResponse(): QueryDenomTracesResponse { }; } export const QueryDenomTracesResponse = { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesResponse", encode(message: QueryDenomTracesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.denomTraces) { DenomTrace.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -338,12 +435,50 @@ export const QueryDenomTracesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryDenomTracesResponseAmino): QueryDenomTracesResponse { + return { + denomTraces: Array.isArray(object?.denom_traces) ? object.denom_traces.map((e: any) => DenomTrace.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryDenomTracesResponse): QueryDenomTracesResponseAmino { + const obj: any = {}; + if (message.denomTraces) { + obj.denom_traces = message.denomTraces.map(e => e ? DenomTrace.toAmino(e) : undefined); + } else { + obj.denom_traces = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomTracesResponseAminoMsg): QueryDenomTracesResponse { + return QueryDenomTracesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomTracesResponse): QueryDenomTracesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryDenomTracesResponse", + value: QueryDenomTracesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomTracesResponseProtoMsg): QueryDenomTracesResponse { + return QueryDenomTracesResponse.decode(message.value); + }, + toProto(message: QueryDenomTracesResponse): Uint8Array { + return QueryDenomTracesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomTracesResponse): QueryDenomTracesResponseProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.QueryDenomTracesResponse", + value: QueryDenomTracesResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/ibc.applications.transfer.v1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -381,6 +516,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryParamsRequest", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -389,6 +552,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/ibc.applications.transfer.v1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -441,5 +605,36 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryParamsResponse", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/transfer.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/transfer.ts index 3745f6e1ad..4405b9dd80 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/transfer.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/transfer.ts @@ -57,6 +57,7 @@ function createBaseDenomTrace(): DenomTrace { }; } export const DenomTrace = { + typeUrl: "/ibc.applications.transfer.v1.DenomTrace", encode(message: DenomTrace, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path !== "") { writer.uint32(10).string(message.path); @@ -121,6 +122,39 @@ export const DenomTrace = { obj.path = message.path; obj.base_denom = message.baseDenom; return obj; + }, + fromAmino(object: DenomTraceAmino): DenomTrace { + return { + path: object.path, + baseDenom: object.base_denom + }; + }, + toAmino(message: DenomTrace): DenomTraceAmino { + const obj: any = {}; + obj.path = message.path; + obj.base_denom = message.baseDenom; + return obj; + }, + fromAminoMsg(object: DenomTraceAminoMsg): DenomTrace { + return DenomTrace.fromAmino(object.value); + }, + toAminoMsg(message: DenomTrace): DenomTraceAminoMsg { + return { + type: "cosmos-sdk/DenomTrace", + value: DenomTrace.toAmino(message) + }; + }, + fromProtoMsg(message: DenomTraceProtoMsg): DenomTrace { + return DenomTrace.decode(message.value); + }, + toProto(message: DenomTrace): Uint8Array { + return DenomTrace.encode(message).finish(); + }, + toProtoMsg(message: DenomTrace): DenomTraceProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.DenomTrace", + value: DenomTrace.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -130,6 +164,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/ibc.applications.transfer.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sendEnabled === true) { writer.uint32(8).bool(message.sendEnabled); @@ -194,5 +229,38 @@ export const Params = { obj.send_enabled = message.sendEnabled; obj.receive_enabled = message.receiveEnabled; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + sendEnabled: object.send_enabled, + receiveEnabled: object.receive_enabled + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.send_enabled = message.sendEnabled; + obj.receive_enabled = message.receiveEnabled; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/tx.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/tx.ts index cf9e1e0ea6..e924a974bb 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v1/tx.ts @@ -60,6 +60,7 @@ function createBaseMsgTransfer(): MsgTransfer { }; } export const MsgTransfer = { + typeUrl: "/ibc.applications.transfer.v1.MsgTransfer", encode(message: MsgTransfer, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sourcePort !== "") { writer.uint32(10).string(message.sourcePort); @@ -184,12 +185,56 @@ export const MsgTransfer = { message.timeoutHeight !== undefined && (obj.timeout_height = message.timeoutHeight ? Height.toSDK(message.timeoutHeight) : undefined); obj.timeout_timestamp = message.timeoutTimestamp; return obj; + }, + fromAmino(object: MsgTransferAmino): MsgTransfer { + return { + sourcePort: object.source_port, + sourceChannel: object.source_channel, + token: object?.token ? Coin.fromAmino(object.token) : undefined, + sender: object.sender, + receiver: object.receiver, + timeoutHeight: object?.timeout_height ? Height.fromAmino(object.timeout_height) : undefined, + timeoutTimestamp: BigInt(object.timeout_timestamp) + }; + }, + toAmino(message: MsgTransfer): MsgTransferAmino { + const obj: any = {}; + obj.source_port = message.sourcePort; + obj.source_channel = message.sourceChannel; + obj.token = message.token ? Coin.toAmino(message.token) : undefined; + obj.sender = message.sender; + obj.receiver = message.receiver; + obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; + obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgTransferAminoMsg): MsgTransfer { + return MsgTransfer.fromAmino(object.value); + }, + toAminoMsg(message: MsgTransfer): MsgTransferAminoMsg { + return { + type: "cosmos-sdk/MsgTransfer", + value: MsgTransfer.toAmino(message) + }; + }, + fromProtoMsg(message: MsgTransferProtoMsg): MsgTransfer { + return MsgTransfer.decode(message.value); + }, + toProto(message: MsgTransfer): Uint8Array { + return MsgTransfer.encode(message).finish(); + }, + toProtoMsg(message: MsgTransfer): MsgTransferProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.MsgTransfer", + value: MsgTransfer.encode(message).finish() + }; } }; function createBaseMsgTransferResponse(): MsgTransferResponse { return {}; } export const MsgTransferResponse = { + typeUrl: "/ibc.applications.transfer.v1.MsgTransferResponse", encode(_: MsgTransferResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -227,5 +272,33 @@ export const MsgTransferResponse = { toSDK(_: MsgTransferResponse): MsgTransferResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgTransferResponseAmino): MsgTransferResponse { + return {}; + }, + toAmino(_: MsgTransferResponse): MsgTransferResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgTransferResponseAminoMsg): MsgTransferResponse { + return MsgTransferResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgTransferResponse): MsgTransferResponseAminoMsg { + return { + type: "cosmos-sdk/MsgTransferResponse", + value: MsgTransferResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgTransferResponseProtoMsg): MsgTransferResponse { + return MsgTransferResponse.decode(message.value); + }, + toProto(message: MsgTransferResponse): Uint8Array { + return MsgTransferResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgTransferResponse): MsgTransferResponseProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v1.MsgTransferResponse", + value: MsgTransferResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v2/packet.ts b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v2/packet.ts index fb92f7106c..a8205324cb 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v2/packet.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/applications/transfer/v2/packet.ts @@ -36,6 +36,7 @@ function createBaseFungibleTokenPacketData(): FungibleTokenPacketData { }; } export const FungibleTokenPacketData = { + typeUrl: "/ibc.applications.transfer.v2.FungibleTokenPacketData", encode(message: FungibleTokenPacketData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -124,5 +125,42 @@ export const FungibleTokenPacketData = { obj.sender = message.sender; obj.receiver = message.receiver; return obj; + }, + fromAmino(object: FungibleTokenPacketDataAmino): FungibleTokenPacketData { + return { + denom: object.denom, + amount: object.amount, + sender: object.sender, + receiver: object.receiver + }; + }, + toAmino(message: FungibleTokenPacketData): FungibleTokenPacketDataAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.amount = message.amount; + obj.sender = message.sender; + obj.receiver = message.receiver; + return obj; + }, + fromAminoMsg(object: FungibleTokenPacketDataAminoMsg): FungibleTokenPacketData { + return FungibleTokenPacketData.fromAmino(object.value); + }, + toAminoMsg(message: FungibleTokenPacketData): FungibleTokenPacketDataAminoMsg { + return { + type: "cosmos-sdk/FungibleTokenPacketData", + value: FungibleTokenPacketData.toAmino(message) + }; + }, + fromProtoMsg(message: FungibleTokenPacketDataProtoMsg): FungibleTokenPacketData { + return FungibleTokenPacketData.decode(message.value); + }, + toProto(message: FungibleTokenPacketData): Uint8Array { + return FungibleTokenPacketData.encode(message).finish(); + }, + toProtoMsg(message: FungibleTokenPacketData): FungibleTokenPacketDataProtoMsg { + return { + typeUrl: "/ibc.applications.transfer.v2.FungibleTokenPacketData", + value: FungibleTokenPacketData.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/channel.ts b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/channel.ts index dc19060387..1460a5ee2b 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/channel.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/channel.ts @@ -288,6 +288,7 @@ function createBaseChannel(): Channel { }; } export const Channel = { + typeUrl: "/ibc.core.channel.v1.Channel", encode(message: Channel, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.state !== 0) { writer.uint32(8).int32(message.state); @@ -396,6 +397,49 @@ export const Channel = { } obj.version = message.version; return obj; + }, + fromAmino(object: ChannelAmino): Channel { + return { + state: isSet(object.state) ? stateFromJSON(object.state) : -1, + ordering: isSet(object.ordering) ? orderFromJSON(object.ordering) : -1, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + connectionHops: Array.isArray(object?.connection_hops) ? object.connection_hops.map((e: any) => e) : [], + version: object.version + }; + }, + toAmino(message: Channel): ChannelAmino { + const obj: any = {}; + obj.state = message.state; + obj.ordering = message.ordering; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + if (message.connectionHops) { + obj.connection_hops = message.connectionHops.map(e => e); + } else { + obj.connection_hops = []; + } + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: ChannelAminoMsg): Channel { + return Channel.fromAmino(object.value); + }, + toAminoMsg(message: Channel): ChannelAminoMsg { + return { + type: "cosmos-sdk/Channel", + value: Channel.toAmino(message) + }; + }, + fromProtoMsg(message: ChannelProtoMsg): Channel { + return Channel.decode(message.value); + }, + toProto(message: Channel): Uint8Array { + return Channel.encode(message).finish(); + }, + toProtoMsg(message: Channel): ChannelProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.Channel", + value: Channel.encode(message).finish() + }; } }; function createBaseIdentifiedChannel(): IdentifiedChannel { @@ -410,6 +454,7 @@ function createBaseIdentifiedChannel(): IdentifiedChannel { }; } export const IdentifiedChannel = { + typeUrl: "/ibc.core.channel.v1.IdentifiedChannel", encode(message: IdentifiedChannel, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.state !== 0) { writer.uint32(8).int32(message.state); @@ -542,6 +587,53 @@ export const IdentifiedChannel = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: IdentifiedChannelAmino): IdentifiedChannel { + return { + state: isSet(object.state) ? stateFromJSON(object.state) : -1, + ordering: isSet(object.ordering) ? orderFromJSON(object.ordering) : -1, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + connectionHops: Array.isArray(object?.connection_hops) ? object.connection_hops.map((e: any) => e) : [], + version: object.version, + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: IdentifiedChannel): IdentifiedChannelAmino { + const obj: any = {}; + obj.state = message.state; + obj.ordering = message.ordering; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + if (message.connectionHops) { + obj.connection_hops = message.connectionHops.map(e => e); + } else { + obj.connection_hops = []; + } + obj.version = message.version; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: IdentifiedChannelAminoMsg): IdentifiedChannel { + return IdentifiedChannel.fromAmino(object.value); + }, + toAminoMsg(message: IdentifiedChannel): IdentifiedChannelAminoMsg { + return { + type: "cosmos-sdk/IdentifiedChannel", + value: IdentifiedChannel.toAmino(message) + }; + }, + fromProtoMsg(message: IdentifiedChannelProtoMsg): IdentifiedChannel { + return IdentifiedChannel.decode(message.value); + }, + toProto(message: IdentifiedChannel): Uint8Array { + return IdentifiedChannel.encode(message).finish(); + }, + toProtoMsg(message: IdentifiedChannel): IdentifiedChannelProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.IdentifiedChannel", + value: IdentifiedChannel.encode(message).finish() + }; } }; function createBaseCounterparty(): Counterparty { @@ -551,6 +643,7 @@ function createBaseCounterparty(): Counterparty { }; } export const Counterparty = { + typeUrl: "/ibc.core.channel.v1.Counterparty", encode(message: Counterparty, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -615,6 +708,39 @@ export const Counterparty = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: CounterpartyAmino): Counterparty { + return { + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: Counterparty): CounterpartyAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { + return Counterparty.fromAmino(object.value); + }, + toAminoMsg(message: Counterparty): CounterpartyAminoMsg { + return { + type: "cosmos-sdk/Counterparty", + value: Counterparty.toAmino(message) + }; + }, + fromProtoMsg(message: CounterpartyProtoMsg): Counterparty { + return Counterparty.decode(message.value); + }, + toProto(message: Counterparty): Uint8Array { + return Counterparty.encode(message).finish(); + }, + toProtoMsg(message: Counterparty): CounterpartyProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.Counterparty", + value: Counterparty.encode(message).finish() + }; } }; function createBasePacket(): Packet { @@ -630,6 +756,7 @@ function createBasePacket(): Packet { }; } export const Packet = { + typeUrl: "/ibc.core.channel.v1.Packet", encode(message: Packet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -766,6 +893,51 @@ export const Packet = { message.timeoutHeight !== undefined && (obj.timeout_height = message.timeoutHeight ? Height.toSDK(message.timeoutHeight) : undefined); obj.timeout_timestamp = message.timeoutTimestamp; return obj; + }, + fromAmino(object: PacketAmino): Packet { + return { + sequence: BigInt(object.sequence), + sourcePort: object.source_port, + sourceChannel: object.source_channel, + destinationPort: object.destination_port, + destinationChannel: object.destination_channel, + data: object.data, + timeoutHeight: object?.timeout_height ? Height.fromAmino(object.timeout_height) : undefined, + timeoutTimestamp: BigInt(object.timeout_timestamp) + }; + }, + toAmino(message: Packet): PacketAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.source_port = message.sourcePort; + obj.source_channel = message.sourceChannel; + obj.destination_port = message.destinationPort; + obj.destination_channel = message.destinationChannel; + obj.data = message.data; + obj.timeout_height = message.timeoutHeight ? Height.toAmino(message.timeoutHeight) : {}; + obj.timeout_timestamp = message.timeoutTimestamp ? message.timeoutTimestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: PacketAminoMsg): Packet { + return Packet.fromAmino(object.value); + }, + toAminoMsg(message: Packet): PacketAminoMsg { + return { + type: "cosmos-sdk/Packet", + value: Packet.toAmino(message) + }; + }, + fromProtoMsg(message: PacketProtoMsg): Packet { + return Packet.decode(message.value); + }, + toProto(message: Packet): Uint8Array { + return Packet.encode(message).finish(); + }, + toProtoMsg(message: Packet): PacketProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.Packet", + value: Packet.encode(message).finish() + }; } }; function createBasePacketState(): PacketState { @@ -777,6 +949,7 @@ function createBasePacketState(): PacketState { }; } export const PacketState = { + typeUrl: "/ibc.core.channel.v1.PacketState", encode(message: PacketState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -865,6 +1038,43 @@ export const PacketState = { obj.sequence = message.sequence; obj.data = message.data; return obj; + }, + fromAmino(object: PacketStateAmino): PacketState { + return { + portId: object.port_id, + channelId: object.channel_id, + sequence: BigInt(object.sequence), + data: object.data + }; + }, + toAmino(message: PacketState): PacketStateAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: PacketStateAminoMsg): PacketState { + return PacketState.fromAmino(object.value); + }, + toAminoMsg(message: PacketState): PacketStateAminoMsg { + return { + type: "cosmos-sdk/PacketState", + value: PacketState.toAmino(message) + }; + }, + fromProtoMsg(message: PacketStateProtoMsg): PacketState { + return PacketState.decode(message.value); + }, + toProto(message: PacketState): Uint8Array { + return PacketState.encode(message).finish(); + }, + toProtoMsg(message: PacketState): PacketStateProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.PacketState", + value: PacketState.encode(message).finish() + }; } }; function createBaseAcknowledgement(): Acknowledgement { @@ -874,6 +1084,7 @@ function createBaseAcknowledgement(): Acknowledgement { }; } export const Acknowledgement = { + typeUrl: "/ibc.core.channel.v1.Acknowledgement", encode(message: Acknowledgement, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.result !== undefined) { writer.uint32(170).bytes(message.result); @@ -938,5 +1149,38 @@ export const Acknowledgement = { obj.result = message.result; obj.error = message.error; return obj; + }, + fromAmino(object: AcknowledgementAmino): Acknowledgement { + return { + result: object?.result, + error: object?.error + }; + }, + toAmino(message: Acknowledgement): AcknowledgementAmino { + const obj: any = {}; + obj.result = message.result; + obj.error = message.error; + return obj; + }, + fromAminoMsg(object: AcknowledgementAminoMsg): Acknowledgement { + return Acknowledgement.fromAmino(object.value); + }, + toAminoMsg(message: Acknowledgement): AcknowledgementAminoMsg { + return { + type: "cosmos-sdk/Acknowledgement", + value: Acknowledgement.toAmino(message) + }; + }, + fromProtoMsg(message: AcknowledgementProtoMsg): Acknowledgement { + return Acknowledgement.decode(message.value); + }, + toProto(message: Acknowledgement): Uint8Array { + return Acknowledgement.encode(message).finish(); + }, + toProtoMsg(message: Acknowledgement): AcknowledgementProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.Acknowledgement", + value: Acknowledgement.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/genesis.ts index f025e91c23..47350db256 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/genesis.ts @@ -56,6 +56,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.core.channel.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.channels) { IdentifiedChannel.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -248,6 +249,79 @@ export const GenesisState = { } obj.next_channel_sequence = message.nextChannelSequence; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + channels: Array.isArray(object?.channels) ? object.channels.map((e: any) => IdentifiedChannel.fromAmino(e)) : [], + acknowledgements: Array.isArray(object?.acknowledgements) ? object.acknowledgements.map((e: any) => PacketState.fromAmino(e)) : [], + commitments: Array.isArray(object?.commitments) ? object.commitments.map((e: any) => PacketState.fromAmino(e)) : [], + receipts: Array.isArray(object?.receipts) ? object.receipts.map((e: any) => PacketState.fromAmino(e)) : [], + sendSequences: Array.isArray(object?.send_sequences) ? object.send_sequences.map((e: any) => PacketSequence.fromAmino(e)) : [], + recvSequences: Array.isArray(object?.recv_sequences) ? object.recv_sequences.map((e: any) => PacketSequence.fromAmino(e)) : [], + ackSequences: Array.isArray(object?.ack_sequences) ? object.ack_sequences.map((e: any) => PacketSequence.fromAmino(e)) : [], + nextChannelSequence: BigInt(object.next_channel_sequence) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.channels) { + obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); + } else { + obj.channels = []; + } + if (message.acknowledgements) { + obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); + } else { + obj.acknowledgements = []; + } + if (message.commitments) { + obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); + } else { + obj.commitments = []; + } + if (message.receipts) { + obj.receipts = message.receipts.map(e => e ? PacketState.toAmino(e) : undefined); + } else { + obj.receipts = []; + } + if (message.sendSequences) { + obj.send_sequences = message.sendSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); + } else { + obj.send_sequences = []; + } + if (message.recvSequences) { + obj.recv_sequences = message.recvSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); + } else { + obj.recv_sequences = []; + } + if (message.ackSequences) { + obj.ack_sequences = message.ackSequences.map(e => e ? PacketSequence.toAmino(e) : undefined); + } else { + obj.ack_sequences = []; + } + obj.next_channel_sequence = message.nextChannelSequence ? message.nextChannelSequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBasePacketSequence(): PacketSequence { @@ -258,6 +332,7 @@ function createBasePacketSequence(): PacketSequence { }; } export const PacketSequence = { + typeUrl: "/ibc.core.channel.v1.PacketSequence", encode(message: PacketSequence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -334,5 +409,40 @@ export const PacketSequence = { obj.channel_id = message.channelId; obj.sequence = message.sequence; return obj; + }, + fromAmino(object: PacketSequenceAmino): PacketSequence { + return { + portId: object.port_id, + channelId: object.channel_id, + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: PacketSequence): PacketSequenceAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: PacketSequenceAminoMsg): PacketSequence { + return PacketSequence.fromAmino(object.value); + }, + toAminoMsg(message: PacketSequence): PacketSequenceAminoMsg { + return { + type: "cosmos-sdk/PacketSequence", + value: PacketSequence.toAmino(message) + }; + }, + fromProtoMsg(message: PacketSequenceProtoMsg): PacketSequence { + return PacketSequence.decode(message.value); + }, + toProto(message: PacketSequence): Uint8Array { + return PacketSequence.encode(message).finish(); + }, + toProtoMsg(message: PacketSequence): PacketSequenceProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.PacketSequence", + value: PacketSequence.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/query.ts index 97278c4c9c..28eb88f2e6 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/query.ts @@ -531,6 +531,7 @@ function createBaseQueryChannelRequest(): QueryChannelRequest { }; } export const QueryChannelRequest = { + typeUrl: "/ibc.core.channel.v1.QueryChannelRequest", encode(message: QueryChannelRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -595,6 +596,39 @@ export const QueryChannelRequest = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: QueryChannelRequestAmino): QueryChannelRequest { + return { + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: QueryChannelRequest): QueryChannelRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: QueryChannelRequestAminoMsg): QueryChannelRequest { + return QueryChannelRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelRequest): QueryChannelRequestAminoMsg { + return { + type: "cosmos-sdk/QueryChannelRequest", + value: QueryChannelRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelRequestProtoMsg): QueryChannelRequest { + return QueryChannelRequest.decode(message.value); + }, + toProto(message: QueryChannelRequest): Uint8Array { + return QueryChannelRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelRequest): QueryChannelRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelRequest", + value: QueryChannelRequest.encode(message).finish() + }; } }; function createBaseQueryChannelResponse(): QueryChannelResponse { @@ -605,6 +639,7 @@ function createBaseQueryChannelResponse(): QueryChannelResponse { }; } export const QueryChannelResponse = { + typeUrl: "/ibc.core.channel.v1.QueryChannelResponse", encode(message: QueryChannelResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channel !== undefined) { Channel.encode(message.channel, writer.uint32(10).fork()).ldelim(); @@ -681,6 +716,41 @@ export const QueryChannelResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryChannelResponseAmino): QueryChannelResponse { + return { + channel: object?.channel ? Channel.fromAmino(object.channel) : undefined, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryChannelResponse): QueryChannelResponseAmino { + const obj: any = {}; + obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryChannelResponseAminoMsg): QueryChannelResponse { + return QueryChannelResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelResponse): QueryChannelResponseAminoMsg { + return { + type: "cosmos-sdk/QueryChannelResponse", + value: QueryChannelResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelResponseProtoMsg): QueryChannelResponse { + return QueryChannelResponse.decode(message.value); + }, + toProto(message: QueryChannelResponse): Uint8Array { + return QueryChannelResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelResponse): QueryChannelResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelResponse", + value: QueryChannelResponse.encode(message).finish() + }; } }; function createBaseQueryChannelsRequest(): QueryChannelsRequest { @@ -689,6 +759,7 @@ function createBaseQueryChannelsRequest(): QueryChannelsRequest { }; } export const QueryChannelsRequest = { + typeUrl: "/ibc.core.channel.v1.QueryChannelsRequest", encode(message: QueryChannelsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -741,6 +812,37 @@ export const QueryChannelsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryChannelsRequestAmino): QueryChannelsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryChannelsRequest): QueryChannelsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryChannelsRequestAminoMsg): QueryChannelsRequest { + return QueryChannelsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelsRequest): QueryChannelsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryChannelsRequest", + value: QueryChannelsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelsRequestProtoMsg): QueryChannelsRequest { + return QueryChannelsRequest.decode(message.value); + }, + toProto(message: QueryChannelsRequest): Uint8Array { + return QueryChannelsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelsRequest): QueryChannelsRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelsRequest", + value: QueryChannelsRequest.encode(message).finish() + }; } }; function createBaseQueryChannelsResponse(): QueryChannelsResponse { @@ -751,6 +853,7 @@ function createBaseQueryChannelsResponse(): QueryChannelsResponse { }; } export const QueryChannelsResponse = { + typeUrl: "/ibc.core.channel.v1.QueryChannelsResponse", encode(message: QueryChannelsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.channels) { IdentifiedChannel.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -835,6 +938,45 @@ export const QueryChannelsResponse = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryChannelsResponseAmino): QueryChannelsResponse { + return { + channels: Array.isArray(object?.channels) ? object.channels.map((e: any) => IdentifiedChannel.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined, + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryChannelsResponse): QueryChannelsResponseAmino { + const obj: any = {}; + if (message.channels) { + obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); + } else { + obj.channels = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryChannelsResponseAminoMsg): QueryChannelsResponse { + return QueryChannelsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelsResponse): QueryChannelsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryChannelsResponse", + value: QueryChannelsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelsResponseProtoMsg): QueryChannelsResponse { + return QueryChannelsResponse.decode(message.value); + }, + toProto(message: QueryChannelsResponse): Uint8Array { + return QueryChannelsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelsResponse): QueryChannelsResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelsResponse", + value: QueryChannelsResponse.encode(message).finish() + }; } }; function createBaseQueryConnectionChannelsRequest(): QueryConnectionChannelsRequest { @@ -844,6 +986,7 @@ function createBaseQueryConnectionChannelsRequest(): QueryConnectionChannelsRequ }; } export const QueryConnectionChannelsRequest = { + typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsRequest", encode(message: QueryConnectionChannelsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connection !== "") { writer.uint32(10).string(message.connection); @@ -908,6 +1051,39 @@ export const QueryConnectionChannelsRequest = { obj.connection = message.connection; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryConnectionChannelsRequestAmino): QueryConnectionChannelsRequest { + return { + connection: object.connection, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAmino { + const obj: any = {}; + obj.connection = message.connection; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryConnectionChannelsRequestAminoMsg): QueryConnectionChannelsRequest { + return QueryConnectionChannelsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionChannelsRequest", + value: QueryConnectionChannelsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionChannelsRequestProtoMsg): QueryConnectionChannelsRequest { + return QueryConnectionChannelsRequest.decode(message.value); + }, + toProto(message: QueryConnectionChannelsRequest): Uint8Array { + return QueryConnectionChannelsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionChannelsRequest): QueryConnectionChannelsRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsRequest", + value: QueryConnectionChannelsRequest.encode(message).finish() + }; } }; function createBaseQueryConnectionChannelsResponse(): QueryConnectionChannelsResponse { @@ -918,6 +1094,7 @@ function createBaseQueryConnectionChannelsResponse(): QueryConnectionChannelsRes }; } export const QueryConnectionChannelsResponse = { + typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsResponse", encode(message: QueryConnectionChannelsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.channels) { IdentifiedChannel.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1002,6 +1179,45 @@ export const QueryConnectionChannelsResponse = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryConnectionChannelsResponseAmino): QueryConnectionChannelsResponse { + return { + channels: Array.isArray(object?.channels) ? object.channels.map((e: any) => IdentifiedChannel.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined, + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryConnectionChannelsResponse): QueryConnectionChannelsResponseAmino { + const obj: any = {}; + if (message.channels) { + obj.channels = message.channels.map(e => e ? IdentifiedChannel.toAmino(e) : undefined); + } else { + obj.channels = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryConnectionChannelsResponseAminoMsg): QueryConnectionChannelsResponse { + return QueryConnectionChannelsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionChannelsResponse): QueryConnectionChannelsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionChannelsResponse", + value: QueryConnectionChannelsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionChannelsResponseProtoMsg): QueryConnectionChannelsResponse { + return QueryConnectionChannelsResponse.decode(message.value); + }, + toProto(message: QueryConnectionChannelsResponse): Uint8Array { + return QueryConnectionChannelsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionChannelsResponse): QueryConnectionChannelsResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryConnectionChannelsResponse", + value: QueryConnectionChannelsResponse.encode(message).finish() + }; } }; function createBaseQueryChannelClientStateRequest(): QueryChannelClientStateRequest { @@ -1011,6 +1227,7 @@ function createBaseQueryChannelClientStateRequest(): QueryChannelClientStateRequ }; } export const QueryChannelClientStateRequest = { + typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateRequest", encode(message: QueryChannelClientStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1075,6 +1292,39 @@ export const QueryChannelClientStateRequest = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: QueryChannelClientStateRequestAmino): QueryChannelClientStateRequest { + return { + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: QueryChannelClientStateRequestAminoMsg): QueryChannelClientStateRequest { + return QueryChannelClientStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryChannelClientStateRequest", + value: QueryChannelClientStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelClientStateRequestProtoMsg): QueryChannelClientStateRequest { + return QueryChannelClientStateRequest.decode(message.value); + }, + toProto(message: QueryChannelClientStateRequest): Uint8Array { + return QueryChannelClientStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelClientStateRequest): QueryChannelClientStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateRequest", + value: QueryChannelClientStateRequest.encode(message).finish() + }; } }; function createBaseQueryChannelClientStateResponse(): QueryChannelClientStateResponse { @@ -1085,6 +1335,7 @@ function createBaseQueryChannelClientStateResponse(): QueryChannelClientStateRes }; } export const QueryChannelClientStateResponse = { + typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateResponse", encode(message: QueryChannelClientStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifiedClientState !== undefined) { IdentifiedClientState.encode(message.identifiedClientState, writer.uint32(10).fork()).ldelim(); @@ -1161,6 +1412,41 @@ export const QueryChannelClientStateResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryChannelClientStateResponseAmino): QueryChannelClientStateResponse { + return { + identifiedClientState: object?.identified_client_state ? IdentifiedClientState.fromAmino(object.identified_client_state) : undefined, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryChannelClientStateResponse): QueryChannelClientStateResponseAmino { + const obj: any = {}; + obj.identified_client_state = message.identifiedClientState ? IdentifiedClientState.toAmino(message.identifiedClientState) : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryChannelClientStateResponseAminoMsg): QueryChannelClientStateResponse { + return QueryChannelClientStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelClientStateResponse): QueryChannelClientStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryChannelClientStateResponse", + value: QueryChannelClientStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelClientStateResponseProtoMsg): QueryChannelClientStateResponse { + return QueryChannelClientStateResponse.decode(message.value); + }, + toProto(message: QueryChannelClientStateResponse): Uint8Array { + return QueryChannelClientStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelClientStateResponse): QueryChannelClientStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelClientStateResponse", + value: QueryChannelClientStateResponse.encode(message).finish() + }; } }; function createBaseQueryChannelConsensusStateRequest(): QueryChannelConsensusStateRequest { @@ -1172,6 +1458,7 @@ function createBaseQueryChannelConsensusStateRequest(): QueryChannelConsensusSta }; } export const QueryChannelConsensusStateRequest = { + typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateRequest", encode(message: QueryChannelConsensusStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1260,6 +1547,43 @@ export const QueryChannelConsensusStateRequest = { obj.revision_number = message.revisionNumber; obj.revision_height = message.revisionHeight; return obj; + }, + fromAmino(object: QueryChannelConsensusStateRequestAmino): QueryChannelConsensusStateRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + revisionNumber: BigInt(object.revision_number), + revisionHeight: BigInt(object.revision_height) + }; + }, + toAmino(message: QueryChannelConsensusStateRequest): QueryChannelConsensusStateRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryChannelConsensusStateRequestAminoMsg): QueryChannelConsensusStateRequest { + return QueryChannelConsensusStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelConsensusStateRequest): QueryChannelConsensusStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryChannelConsensusStateRequest", + value: QueryChannelConsensusStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelConsensusStateRequestProtoMsg): QueryChannelConsensusStateRequest { + return QueryChannelConsensusStateRequest.decode(message.value); + }, + toProto(message: QueryChannelConsensusStateRequest): Uint8Array { + return QueryChannelConsensusStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelConsensusStateRequest): QueryChannelConsensusStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateRequest", + value: QueryChannelConsensusStateRequest.encode(message).finish() + }; } }; function createBaseQueryChannelConsensusStateResponse(): QueryChannelConsensusStateResponse { @@ -1271,6 +1595,7 @@ function createBaseQueryChannelConsensusStateResponse(): QueryChannelConsensusSt }; } export const QueryChannelConsensusStateResponse = { + typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateResponse", encode(message: QueryChannelConsensusStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.consensusState !== undefined) { Any.encode(message.consensusState, writer.uint32(10).fork()).ldelim(); @@ -1359,6 +1684,43 @@ export const QueryChannelConsensusStateResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryChannelConsensusStateResponseAmino): QueryChannelConsensusStateResponse { + return { + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined, + clientId: object.client_id, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAmino { + const obj: any = {}; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + obj.client_id = message.clientId; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryChannelConsensusStateResponseAminoMsg): QueryChannelConsensusStateResponse { + return QueryChannelConsensusStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryChannelConsensusStateResponse", + value: QueryChannelConsensusStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryChannelConsensusStateResponseProtoMsg): QueryChannelConsensusStateResponse { + return QueryChannelConsensusStateResponse.decode(message.value); + }, + toProto(message: QueryChannelConsensusStateResponse): Uint8Array { + return QueryChannelConsensusStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryChannelConsensusStateResponse): QueryChannelConsensusStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryChannelConsensusStateResponse", + value: QueryChannelConsensusStateResponse.encode(message).finish() + }; } }; function createBaseQueryPacketCommitmentRequest(): QueryPacketCommitmentRequest { @@ -1369,6 +1731,7 @@ function createBaseQueryPacketCommitmentRequest(): QueryPacketCommitmentRequest }; } export const QueryPacketCommitmentRequest = { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentRequest", encode(message: QueryPacketCommitmentRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1445,6 +1808,41 @@ export const QueryPacketCommitmentRequest = { obj.channel_id = message.channelId; obj.sequence = message.sequence; return obj; + }, + fromAmino(object: QueryPacketCommitmentRequestAmino): QueryPacketCommitmentRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: QueryPacketCommitmentRequest): QueryPacketCommitmentRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPacketCommitmentRequestAminoMsg): QueryPacketCommitmentRequest { + return QueryPacketCommitmentRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketCommitmentRequest): QueryPacketCommitmentRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPacketCommitmentRequest", + value: QueryPacketCommitmentRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketCommitmentRequestProtoMsg): QueryPacketCommitmentRequest { + return QueryPacketCommitmentRequest.decode(message.value); + }, + toProto(message: QueryPacketCommitmentRequest): Uint8Array { + return QueryPacketCommitmentRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketCommitmentRequest): QueryPacketCommitmentRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentRequest", + value: QueryPacketCommitmentRequest.encode(message).finish() + }; } }; function createBaseQueryPacketCommitmentResponse(): QueryPacketCommitmentResponse { @@ -1455,6 +1853,7 @@ function createBaseQueryPacketCommitmentResponse(): QueryPacketCommitmentRespons }; } export const QueryPacketCommitmentResponse = { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentResponse", encode(message: QueryPacketCommitmentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.commitment.length !== 0) { writer.uint32(10).bytes(message.commitment); @@ -1531,6 +1930,41 @@ export const QueryPacketCommitmentResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryPacketCommitmentResponseAmino): QueryPacketCommitmentResponse { + return { + commitment: object.commitment, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryPacketCommitmentResponse): QueryPacketCommitmentResponseAmino { + const obj: any = {}; + obj.commitment = message.commitment; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryPacketCommitmentResponseAminoMsg): QueryPacketCommitmentResponse { + return QueryPacketCommitmentResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketCommitmentResponse): QueryPacketCommitmentResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPacketCommitmentResponse", + value: QueryPacketCommitmentResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketCommitmentResponseProtoMsg): QueryPacketCommitmentResponse { + return QueryPacketCommitmentResponse.decode(message.value); + }, + toProto(message: QueryPacketCommitmentResponse): Uint8Array { + return QueryPacketCommitmentResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketCommitmentResponse): QueryPacketCommitmentResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentResponse", + value: QueryPacketCommitmentResponse.encode(message).finish() + }; } }; function createBaseQueryPacketCommitmentsRequest(): QueryPacketCommitmentsRequest { @@ -1541,6 +1975,7 @@ function createBaseQueryPacketCommitmentsRequest(): QueryPacketCommitmentsReques }; } export const QueryPacketCommitmentsRequest = { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsRequest", encode(message: QueryPacketCommitmentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1617,6 +2052,41 @@ export const QueryPacketCommitmentsRequest = { obj.channel_id = message.channelId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPacketCommitmentsRequestAmino): QueryPacketCommitmentsRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPacketCommitmentsRequestAminoMsg): QueryPacketCommitmentsRequest { + return QueryPacketCommitmentsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPacketCommitmentsRequest", + value: QueryPacketCommitmentsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketCommitmentsRequestProtoMsg): QueryPacketCommitmentsRequest { + return QueryPacketCommitmentsRequest.decode(message.value); + }, + toProto(message: QueryPacketCommitmentsRequest): Uint8Array { + return QueryPacketCommitmentsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketCommitmentsRequest): QueryPacketCommitmentsRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsRequest", + value: QueryPacketCommitmentsRequest.encode(message).finish() + }; } }; function createBaseQueryPacketCommitmentsResponse(): QueryPacketCommitmentsResponse { @@ -1627,6 +2097,7 @@ function createBaseQueryPacketCommitmentsResponse(): QueryPacketCommitmentsRespo }; } export const QueryPacketCommitmentsResponse = { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsResponse", encode(message: QueryPacketCommitmentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.commitments) { PacketState.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1711,6 +2182,45 @@ export const QueryPacketCommitmentsResponse = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryPacketCommitmentsResponseAmino): QueryPacketCommitmentsResponse { + return { + commitments: Array.isArray(object?.commitments) ? object.commitments.map((e: any) => PacketState.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined, + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryPacketCommitmentsResponse): QueryPacketCommitmentsResponseAmino { + const obj: any = {}; + if (message.commitments) { + obj.commitments = message.commitments.map(e => e ? PacketState.toAmino(e) : undefined); + } else { + obj.commitments = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryPacketCommitmentsResponseAminoMsg): QueryPacketCommitmentsResponse { + return QueryPacketCommitmentsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketCommitmentsResponse): QueryPacketCommitmentsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPacketCommitmentsResponse", + value: QueryPacketCommitmentsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketCommitmentsResponseProtoMsg): QueryPacketCommitmentsResponse { + return QueryPacketCommitmentsResponse.decode(message.value); + }, + toProto(message: QueryPacketCommitmentsResponse): Uint8Array { + return QueryPacketCommitmentsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketCommitmentsResponse): QueryPacketCommitmentsResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketCommitmentsResponse", + value: QueryPacketCommitmentsResponse.encode(message).finish() + }; } }; function createBaseQueryPacketReceiptRequest(): QueryPacketReceiptRequest { @@ -1721,6 +2231,7 @@ function createBaseQueryPacketReceiptRequest(): QueryPacketReceiptRequest { }; } export const QueryPacketReceiptRequest = { + typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptRequest", encode(message: QueryPacketReceiptRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1797,6 +2308,41 @@ export const QueryPacketReceiptRequest = { obj.channel_id = message.channelId; obj.sequence = message.sequence; return obj; + }, + fromAmino(object: QueryPacketReceiptRequestAmino): QueryPacketReceiptRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: QueryPacketReceiptRequest): QueryPacketReceiptRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPacketReceiptRequestAminoMsg): QueryPacketReceiptRequest { + return QueryPacketReceiptRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketReceiptRequest): QueryPacketReceiptRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPacketReceiptRequest", + value: QueryPacketReceiptRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketReceiptRequestProtoMsg): QueryPacketReceiptRequest { + return QueryPacketReceiptRequest.decode(message.value); + }, + toProto(message: QueryPacketReceiptRequest): Uint8Array { + return QueryPacketReceiptRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketReceiptRequest): QueryPacketReceiptRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptRequest", + value: QueryPacketReceiptRequest.encode(message).finish() + }; } }; function createBaseQueryPacketReceiptResponse(): QueryPacketReceiptResponse { @@ -1807,6 +2353,7 @@ function createBaseQueryPacketReceiptResponse(): QueryPacketReceiptResponse { }; } export const QueryPacketReceiptResponse = { + typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptResponse", encode(message: QueryPacketReceiptResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.received === true) { writer.uint32(16).bool(message.received); @@ -1883,6 +2430,41 @@ export const QueryPacketReceiptResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryPacketReceiptResponseAmino): QueryPacketReceiptResponse { + return { + received: object.received, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAmino { + const obj: any = {}; + obj.received = message.received; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryPacketReceiptResponseAminoMsg): QueryPacketReceiptResponse { + return QueryPacketReceiptResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPacketReceiptResponse", + value: QueryPacketReceiptResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketReceiptResponseProtoMsg): QueryPacketReceiptResponse { + return QueryPacketReceiptResponse.decode(message.value); + }, + toProto(message: QueryPacketReceiptResponse): Uint8Array { + return QueryPacketReceiptResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketReceiptResponse): QueryPacketReceiptResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketReceiptResponse", + value: QueryPacketReceiptResponse.encode(message).finish() + }; } }; function createBaseQueryPacketAcknowledgementRequest(): QueryPacketAcknowledgementRequest { @@ -1893,6 +2475,7 @@ function createBaseQueryPacketAcknowledgementRequest(): QueryPacketAcknowledgeme }; } export const QueryPacketAcknowledgementRequest = { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementRequest", encode(message: QueryPacketAcknowledgementRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1969,6 +2552,41 @@ export const QueryPacketAcknowledgementRequest = { obj.channel_id = message.channelId; obj.sequence = message.sequence; return obj; + }, + fromAmino(object: QueryPacketAcknowledgementRequestAmino): QueryPacketAcknowledgementRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + sequence: BigInt(object.sequence) + }; + }, + toAmino(message: QueryPacketAcknowledgementRequest): QueryPacketAcknowledgementRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPacketAcknowledgementRequestAminoMsg): QueryPacketAcknowledgementRequest { + return QueryPacketAcknowledgementRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketAcknowledgementRequest): QueryPacketAcknowledgementRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPacketAcknowledgementRequest", + value: QueryPacketAcknowledgementRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketAcknowledgementRequestProtoMsg): QueryPacketAcknowledgementRequest { + return QueryPacketAcknowledgementRequest.decode(message.value); + }, + toProto(message: QueryPacketAcknowledgementRequest): Uint8Array { + return QueryPacketAcknowledgementRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketAcknowledgementRequest): QueryPacketAcknowledgementRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementRequest", + value: QueryPacketAcknowledgementRequest.encode(message).finish() + }; } }; function createBaseQueryPacketAcknowledgementResponse(): QueryPacketAcknowledgementResponse { @@ -1979,6 +2597,7 @@ function createBaseQueryPacketAcknowledgementResponse(): QueryPacketAcknowledgem }; } export const QueryPacketAcknowledgementResponse = { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementResponse", encode(message: QueryPacketAcknowledgementResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.acknowledgement.length !== 0) { writer.uint32(10).bytes(message.acknowledgement); @@ -2055,6 +2674,41 @@ export const QueryPacketAcknowledgementResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryPacketAcknowledgementResponseAmino): QueryPacketAcknowledgementResponse { + return { + acknowledgement: object.acknowledgement, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryPacketAcknowledgementResponse): QueryPacketAcknowledgementResponseAmino { + const obj: any = {}; + obj.acknowledgement = message.acknowledgement; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryPacketAcknowledgementResponseAminoMsg): QueryPacketAcknowledgementResponse { + return QueryPacketAcknowledgementResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketAcknowledgementResponse): QueryPacketAcknowledgementResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPacketAcknowledgementResponse", + value: QueryPacketAcknowledgementResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketAcknowledgementResponseProtoMsg): QueryPacketAcknowledgementResponse { + return QueryPacketAcknowledgementResponse.decode(message.value); + }, + toProto(message: QueryPacketAcknowledgementResponse): Uint8Array { + return QueryPacketAcknowledgementResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketAcknowledgementResponse): QueryPacketAcknowledgementResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementResponse", + value: QueryPacketAcknowledgementResponse.encode(message).finish() + }; } }; function createBaseQueryPacketAcknowledgementsRequest(): QueryPacketAcknowledgementsRequest { @@ -2066,6 +2720,7 @@ function createBaseQueryPacketAcknowledgementsRequest(): QueryPacketAcknowledgem }; } export const QueryPacketAcknowledgementsRequest = { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsRequest", encode(message: QueryPacketAcknowledgementsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -2171,6 +2826,47 @@ export const QueryPacketAcknowledgementsRequest = { obj.packet_commitment_sequences = []; } return obj; + }, + fromAmino(object: QueryPacketAcknowledgementsRequestAmino): QueryPacketAcknowledgementsRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined, + packetCommitmentSequences: Array.isArray(object?.packet_commitment_sequences) ? object.packet_commitment_sequences.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + if (message.packetCommitmentSequences) { + obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); + } else { + obj.packet_commitment_sequences = []; + } + return obj; + }, + fromAminoMsg(object: QueryPacketAcknowledgementsRequestAminoMsg): QueryPacketAcknowledgementsRequest { + return QueryPacketAcknowledgementsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryPacketAcknowledgementsRequest", + value: QueryPacketAcknowledgementsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketAcknowledgementsRequestProtoMsg): QueryPacketAcknowledgementsRequest { + return QueryPacketAcknowledgementsRequest.decode(message.value); + }, + toProto(message: QueryPacketAcknowledgementsRequest): Uint8Array { + return QueryPacketAcknowledgementsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketAcknowledgementsRequest): QueryPacketAcknowledgementsRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsRequest", + value: QueryPacketAcknowledgementsRequest.encode(message).finish() + }; } }; function createBaseQueryPacketAcknowledgementsResponse(): QueryPacketAcknowledgementsResponse { @@ -2181,6 +2877,7 @@ function createBaseQueryPacketAcknowledgementsResponse(): QueryPacketAcknowledge }; } export const QueryPacketAcknowledgementsResponse = { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsResponse", encode(message: QueryPacketAcknowledgementsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.acknowledgements) { PacketState.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2265,6 +2962,45 @@ export const QueryPacketAcknowledgementsResponse = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryPacketAcknowledgementsResponseAmino): QueryPacketAcknowledgementsResponse { + return { + acknowledgements: Array.isArray(object?.acknowledgements) ? object.acknowledgements.map((e: any) => PacketState.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined, + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryPacketAcknowledgementsResponse): QueryPacketAcknowledgementsResponseAmino { + const obj: any = {}; + if (message.acknowledgements) { + obj.acknowledgements = message.acknowledgements.map(e => e ? PacketState.toAmino(e) : undefined); + } else { + obj.acknowledgements = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryPacketAcknowledgementsResponseAminoMsg): QueryPacketAcknowledgementsResponse { + return QueryPacketAcknowledgementsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPacketAcknowledgementsResponse): QueryPacketAcknowledgementsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryPacketAcknowledgementsResponse", + value: QueryPacketAcknowledgementsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPacketAcknowledgementsResponseProtoMsg): QueryPacketAcknowledgementsResponse { + return QueryPacketAcknowledgementsResponse.decode(message.value); + }, + toProto(message: QueryPacketAcknowledgementsResponse): Uint8Array { + return QueryPacketAcknowledgementsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPacketAcknowledgementsResponse): QueryPacketAcknowledgementsResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryPacketAcknowledgementsResponse", + value: QueryPacketAcknowledgementsResponse.encode(message).finish() + }; } }; function createBaseQueryUnreceivedPacketsRequest(): QueryUnreceivedPacketsRequest { @@ -2275,6 +3011,7 @@ function createBaseQueryUnreceivedPacketsRequest(): QueryUnreceivedPacketsReques }; } export const QueryUnreceivedPacketsRequest = { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsRequest", encode(message: QueryUnreceivedPacketsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -2368,6 +3105,45 @@ export const QueryUnreceivedPacketsRequest = { obj.packet_commitment_sequences = []; } return obj; + }, + fromAmino(object: QueryUnreceivedPacketsRequestAmino): QueryUnreceivedPacketsRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + packetCommitmentSequences: Array.isArray(object?.packet_commitment_sequences) ? object.packet_commitment_sequences.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + if (message.packetCommitmentSequences) { + obj.packet_commitment_sequences = message.packetCommitmentSequences.map(e => e.toString()); + } else { + obj.packet_commitment_sequences = []; + } + return obj; + }, + fromAminoMsg(object: QueryUnreceivedPacketsRequestAminoMsg): QueryUnreceivedPacketsRequest { + return QueryUnreceivedPacketsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryUnreceivedPacketsRequest", + value: QueryUnreceivedPacketsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnreceivedPacketsRequestProtoMsg): QueryUnreceivedPacketsRequest { + return QueryUnreceivedPacketsRequest.decode(message.value); + }, + toProto(message: QueryUnreceivedPacketsRequest): Uint8Array { + return QueryUnreceivedPacketsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUnreceivedPacketsRequest): QueryUnreceivedPacketsRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsRequest", + value: QueryUnreceivedPacketsRequest.encode(message).finish() + }; } }; function createBaseQueryUnreceivedPacketsResponse(): QueryUnreceivedPacketsResponse { @@ -2377,6 +3153,7 @@ function createBaseQueryUnreceivedPacketsResponse(): QueryUnreceivedPacketsRespo }; } export const QueryUnreceivedPacketsResponse = { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsResponse", encode(message: QueryUnreceivedPacketsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.sequences) { @@ -2458,6 +3235,43 @@ export const QueryUnreceivedPacketsResponse = { } message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryUnreceivedPacketsResponseAmino): QueryUnreceivedPacketsResponse { + return { + sequences: Array.isArray(object?.sequences) ? object.sequences.map((e: any) => BigInt(e)) : [], + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryUnreceivedPacketsResponse): QueryUnreceivedPacketsResponseAmino { + const obj: any = {}; + if (message.sequences) { + obj.sequences = message.sequences.map(e => e.toString()); + } else { + obj.sequences = []; + } + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryUnreceivedPacketsResponseAminoMsg): QueryUnreceivedPacketsResponse { + return QueryUnreceivedPacketsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnreceivedPacketsResponse): QueryUnreceivedPacketsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryUnreceivedPacketsResponse", + value: QueryUnreceivedPacketsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnreceivedPacketsResponseProtoMsg): QueryUnreceivedPacketsResponse { + return QueryUnreceivedPacketsResponse.decode(message.value); + }, + toProto(message: QueryUnreceivedPacketsResponse): Uint8Array { + return QueryUnreceivedPacketsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUnreceivedPacketsResponse): QueryUnreceivedPacketsResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedPacketsResponse", + value: QueryUnreceivedPacketsResponse.encode(message).finish() + }; } }; function createBaseQueryUnreceivedAcksRequest(): QueryUnreceivedAcksRequest { @@ -2468,6 +3282,7 @@ function createBaseQueryUnreceivedAcksRequest(): QueryUnreceivedAcksRequest { }; } export const QueryUnreceivedAcksRequest = { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksRequest", encode(message: QueryUnreceivedAcksRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -2561,6 +3376,45 @@ export const QueryUnreceivedAcksRequest = { obj.packet_ack_sequences = []; } return obj; + }, + fromAmino(object: QueryUnreceivedAcksRequestAmino): QueryUnreceivedAcksRequest { + return { + portId: object.port_id, + channelId: object.channel_id, + packetAckSequences: Array.isArray(object?.packet_ack_sequences) ? object.packet_ack_sequences.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + if (message.packetAckSequences) { + obj.packet_ack_sequences = message.packetAckSequences.map(e => e.toString()); + } else { + obj.packet_ack_sequences = []; + } + return obj; + }, + fromAminoMsg(object: QueryUnreceivedAcksRequestAminoMsg): QueryUnreceivedAcksRequest { + return QueryUnreceivedAcksRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestAminoMsg { + return { + type: "cosmos-sdk/QueryUnreceivedAcksRequest", + value: QueryUnreceivedAcksRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnreceivedAcksRequestProtoMsg): QueryUnreceivedAcksRequest { + return QueryUnreceivedAcksRequest.decode(message.value); + }, + toProto(message: QueryUnreceivedAcksRequest): Uint8Array { + return QueryUnreceivedAcksRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUnreceivedAcksRequest): QueryUnreceivedAcksRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksRequest", + value: QueryUnreceivedAcksRequest.encode(message).finish() + }; } }; function createBaseQueryUnreceivedAcksResponse(): QueryUnreceivedAcksResponse { @@ -2570,6 +3424,7 @@ function createBaseQueryUnreceivedAcksResponse(): QueryUnreceivedAcksResponse { }; } export const QueryUnreceivedAcksResponse = { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksResponse", encode(message: QueryUnreceivedAcksResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.sequences) { @@ -2651,6 +3506,43 @@ export const QueryUnreceivedAcksResponse = { } message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryUnreceivedAcksResponseAmino): QueryUnreceivedAcksResponse { + return { + sequences: Array.isArray(object?.sequences) ? object.sequences.map((e: any) => BigInt(e)) : [], + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryUnreceivedAcksResponse): QueryUnreceivedAcksResponseAmino { + const obj: any = {}; + if (message.sequences) { + obj.sequences = message.sequences.map(e => e.toString()); + } else { + obj.sequences = []; + } + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryUnreceivedAcksResponseAminoMsg): QueryUnreceivedAcksResponse { + return QueryUnreceivedAcksResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnreceivedAcksResponse): QueryUnreceivedAcksResponseAminoMsg { + return { + type: "cosmos-sdk/QueryUnreceivedAcksResponse", + value: QueryUnreceivedAcksResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnreceivedAcksResponseProtoMsg): QueryUnreceivedAcksResponse { + return QueryUnreceivedAcksResponse.decode(message.value); + }, + toProto(message: QueryUnreceivedAcksResponse): Uint8Array { + return QueryUnreceivedAcksResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUnreceivedAcksResponse): QueryUnreceivedAcksResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryUnreceivedAcksResponse", + value: QueryUnreceivedAcksResponse.encode(message).finish() + }; } }; function createBaseQueryNextSequenceReceiveRequest(): QueryNextSequenceReceiveRequest { @@ -2660,6 +3552,7 @@ function createBaseQueryNextSequenceReceiveRequest(): QueryNextSequenceReceiveRe }; } export const QueryNextSequenceReceiveRequest = { + typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveRequest", encode(message: QueryNextSequenceReceiveRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -2724,6 +3617,39 @@ export const QueryNextSequenceReceiveRequest = { obj.port_id = message.portId; obj.channel_id = message.channelId; return obj; + }, + fromAmino(object: QueryNextSequenceReceiveRequestAmino): QueryNextSequenceReceiveRequest { + return { + portId: object.port_id, + channelId: object.channel_id + }; + }, + toAmino(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + return obj; + }, + fromAminoMsg(object: QueryNextSequenceReceiveRequestAminoMsg): QueryNextSequenceReceiveRequest { + return QueryNextSequenceReceiveRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestAminoMsg { + return { + type: "cosmos-sdk/QueryNextSequenceReceiveRequest", + value: QueryNextSequenceReceiveRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNextSequenceReceiveRequestProtoMsg): QueryNextSequenceReceiveRequest { + return QueryNextSequenceReceiveRequest.decode(message.value); + }, + toProto(message: QueryNextSequenceReceiveRequest): Uint8Array { + return QueryNextSequenceReceiveRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryNextSequenceReceiveRequest): QueryNextSequenceReceiveRequestProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveRequest", + value: QueryNextSequenceReceiveRequest.encode(message).finish() + }; } }; function createBaseQueryNextSequenceReceiveResponse(): QueryNextSequenceReceiveResponse { @@ -2734,6 +3660,7 @@ function createBaseQueryNextSequenceReceiveResponse(): QueryNextSequenceReceiveR }; } export const QueryNextSequenceReceiveResponse = { + typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveResponse", encode(message: QueryNextSequenceReceiveResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nextSequenceReceive !== BigInt(0)) { writer.uint32(8).uint64(message.nextSequenceReceive); @@ -2810,5 +3737,40 @@ export const QueryNextSequenceReceiveResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryNextSequenceReceiveResponseAmino): QueryNextSequenceReceiveResponse { + return { + nextSequenceReceive: BigInt(object.next_sequence_receive), + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAmino { + const obj: any = {}; + obj.next_sequence_receive = message.nextSequenceReceive ? message.nextSequenceReceive.toString() : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryNextSequenceReceiveResponseAminoMsg): QueryNextSequenceReceiveResponse { + return QueryNextSequenceReceiveResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseAminoMsg { + return { + type: "cosmos-sdk/QueryNextSequenceReceiveResponse", + value: QueryNextSequenceReceiveResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNextSequenceReceiveResponseProtoMsg): QueryNextSequenceReceiveResponse { + return QueryNextSequenceReceiveResponse.decode(message.value); + }, + toProto(message: QueryNextSequenceReceiveResponse): Uint8Array { + return QueryNextSequenceReceiveResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryNextSequenceReceiveResponse): QueryNextSequenceReceiveResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.QueryNextSequenceReceiveResponse", + value: QueryNextSequenceReceiveResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/tx.ts b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/tx.ts index 0f993af9ad..7b939c3757 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/channel/v1/tx.ts @@ -263,6 +263,7 @@ function createBaseMsgChannelOpenInit(): MsgChannelOpenInit { }; } export const MsgChannelOpenInit = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInit", encode(message: MsgChannelOpenInit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -339,12 +340,48 @@ export const MsgChannelOpenInit = { message.channel !== undefined && (obj.channel = message.channel ? Channel.toSDK(message.channel) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgChannelOpenInitAmino): MsgChannelOpenInit { + return { + portId: object.port_id, + channel: object?.channel ? Channel.fromAmino(object.channel) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgChannelOpenInit): MsgChannelOpenInitAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenInitAminoMsg): MsgChannelOpenInit { + return MsgChannelOpenInit.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenInit): MsgChannelOpenInitAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenInit", + value: MsgChannelOpenInit.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenInitProtoMsg): MsgChannelOpenInit { + return MsgChannelOpenInit.decode(message.value); + }, + toProto(message: MsgChannelOpenInit): Uint8Array { + return MsgChannelOpenInit.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenInit): MsgChannelOpenInitProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInit", + value: MsgChannelOpenInit.encode(message).finish() + }; } }; function createBaseMsgChannelOpenInitResponse(): MsgChannelOpenInitResponse { return {}; } export const MsgChannelOpenInitResponse = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInitResponse", encode(_: MsgChannelOpenInitResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -382,6 +419,34 @@ export const MsgChannelOpenInitResponse = { toSDK(_: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChannelOpenInitResponseAmino): MsgChannelOpenInitResponse { + return {}; + }, + toAmino(_: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenInitResponseAminoMsg): MsgChannelOpenInitResponse { + return MsgChannelOpenInitResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenInitResponse", + value: MsgChannelOpenInitResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenInitResponseProtoMsg): MsgChannelOpenInitResponse { + return MsgChannelOpenInitResponse.decode(message.value); + }, + toProto(message: MsgChannelOpenInitResponse): Uint8Array { + return MsgChannelOpenInitResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenInitResponse): MsgChannelOpenInitResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenInitResponse", + value: MsgChannelOpenInitResponse.encode(message).finish() + }; } }; function createBaseMsgChannelOpenTry(): MsgChannelOpenTry { @@ -396,6 +461,7 @@ function createBaseMsgChannelOpenTry(): MsgChannelOpenTry { }; } export const MsgChannelOpenTry = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTry", encode(message: MsgChannelOpenTry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -520,12 +586,56 @@ export const MsgChannelOpenTry = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgChannelOpenTryAmino): MsgChannelOpenTry { + return { + portId: object.port_id, + previousChannelId: object.previous_channel_id, + channel: object?.channel ? Channel.fromAmino(object.channel) : undefined, + counterpartyVersion: object.counterparty_version, + proofInit: object.proof_init, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgChannelOpenTry): MsgChannelOpenTryAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.previous_channel_id = message.previousChannelId; + obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; + obj.counterparty_version = message.counterpartyVersion; + obj.proof_init = message.proofInit; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenTryAminoMsg): MsgChannelOpenTry { + return MsgChannelOpenTry.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenTry): MsgChannelOpenTryAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenTry", + value: MsgChannelOpenTry.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenTryProtoMsg): MsgChannelOpenTry { + return MsgChannelOpenTry.decode(message.value); + }, + toProto(message: MsgChannelOpenTry): Uint8Array { + return MsgChannelOpenTry.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenTry): MsgChannelOpenTryProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTry", + value: MsgChannelOpenTry.encode(message).finish() + }; } }; function createBaseMsgChannelOpenTryResponse(): MsgChannelOpenTryResponse { return {}; } export const MsgChannelOpenTryResponse = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTryResponse", encode(_: MsgChannelOpenTryResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -563,6 +673,34 @@ export const MsgChannelOpenTryResponse = { toSDK(_: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChannelOpenTryResponseAmino): MsgChannelOpenTryResponse { + return {}; + }, + toAmino(_: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenTryResponseAminoMsg): MsgChannelOpenTryResponse { + return MsgChannelOpenTryResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenTryResponse", + value: MsgChannelOpenTryResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenTryResponseProtoMsg): MsgChannelOpenTryResponse { + return MsgChannelOpenTryResponse.decode(message.value); + }, + toProto(message: MsgChannelOpenTryResponse): Uint8Array { + return MsgChannelOpenTryResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenTryResponse): MsgChannelOpenTryResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenTryResponse", + value: MsgChannelOpenTryResponse.encode(message).finish() + }; } }; function createBaseMsgChannelOpenAck(): MsgChannelOpenAck { @@ -577,6 +715,7 @@ function createBaseMsgChannelOpenAck(): MsgChannelOpenAck { }; } export const MsgChannelOpenAck = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAck", encode(message: MsgChannelOpenAck, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -701,12 +840,56 @@ export const MsgChannelOpenAck = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgChannelOpenAckAmino): MsgChannelOpenAck { + return { + portId: object.port_id, + channelId: object.channel_id, + counterpartyChannelId: object.counterparty_channel_id, + counterpartyVersion: object.counterparty_version, + proofTry: object.proof_try, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgChannelOpenAck): MsgChannelOpenAckAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.counterparty_channel_id = message.counterpartyChannelId; + obj.counterparty_version = message.counterpartyVersion; + obj.proof_try = message.proofTry; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenAckAminoMsg): MsgChannelOpenAck { + return MsgChannelOpenAck.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenAck): MsgChannelOpenAckAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenAck", + value: MsgChannelOpenAck.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenAckProtoMsg): MsgChannelOpenAck { + return MsgChannelOpenAck.decode(message.value); + }, + toProto(message: MsgChannelOpenAck): Uint8Array { + return MsgChannelOpenAck.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenAck): MsgChannelOpenAckProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAck", + value: MsgChannelOpenAck.encode(message).finish() + }; } }; function createBaseMsgChannelOpenAckResponse(): MsgChannelOpenAckResponse { return {}; } export const MsgChannelOpenAckResponse = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAckResponse", encode(_: MsgChannelOpenAckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -744,6 +927,34 @@ export const MsgChannelOpenAckResponse = { toSDK(_: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChannelOpenAckResponseAmino): MsgChannelOpenAckResponse { + return {}; + }, + toAmino(_: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenAckResponseAminoMsg): MsgChannelOpenAckResponse { + return MsgChannelOpenAckResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenAckResponse", + value: MsgChannelOpenAckResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenAckResponseProtoMsg): MsgChannelOpenAckResponse { + return MsgChannelOpenAckResponse.decode(message.value); + }, + toProto(message: MsgChannelOpenAckResponse): Uint8Array { + return MsgChannelOpenAckResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenAckResponse): MsgChannelOpenAckResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenAckResponse", + value: MsgChannelOpenAckResponse.encode(message).finish() + }; } }; function createBaseMsgChannelOpenConfirm(): MsgChannelOpenConfirm { @@ -756,6 +967,7 @@ function createBaseMsgChannelOpenConfirm(): MsgChannelOpenConfirm { }; } export const MsgChannelOpenConfirm = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirm", encode(message: MsgChannelOpenConfirm, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -856,12 +1068,52 @@ export const MsgChannelOpenConfirm = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgChannelOpenConfirmAmino): MsgChannelOpenConfirm { + return { + portId: object.port_id, + channelId: object.channel_id, + proofAck: object.proof_ack, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.proof_ack = message.proofAck; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenConfirmAminoMsg): MsgChannelOpenConfirm { + return MsgChannelOpenConfirm.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenConfirm", + value: MsgChannelOpenConfirm.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenConfirmProtoMsg): MsgChannelOpenConfirm { + return MsgChannelOpenConfirm.decode(message.value); + }, + toProto(message: MsgChannelOpenConfirm): Uint8Array { + return MsgChannelOpenConfirm.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenConfirm): MsgChannelOpenConfirmProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirm", + value: MsgChannelOpenConfirm.encode(message).finish() + }; } }; function createBaseMsgChannelOpenConfirmResponse(): MsgChannelOpenConfirmResponse { return {}; } export const MsgChannelOpenConfirmResponse = { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirmResponse", encode(_: MsgChannelOpenConfirmResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -899,6 +1151,34 @@ export const MsgChannelOpenConfirmResponse = { toSDK(_: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChannelOpenConfirmResponseAmino): MsgChannelOpenConfirmResponse { + return {}; + }, + toAmino(_: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChannelOpenConfirmResponseAminoMsg): MsgChannelOpenConfirmResponse { + return MsgChannelOpenConfirmResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseAminoMsg { + return { + type: "cosmos-sdk/MsgChannelOpenConfirmResponse", + value: MsgChannelOpenConfirmResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelOpenConfirmResponseProtoMsg): MsgChannelOpenConfirmResponse { + return MsgChannelOpenConfirmResponse.decode(message.value); + }, + toProto(message: MsgChannelOpenConfirmResponse): Uint8Array { + return MsgChannelOpenConfirmResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelOpenConfirmResponse): MsgChannelOpenConfirmResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelOpenConfirmResponse", + value: MsgChannelOpenConfirmResponse.encode(message).finish() + }; } }; function createBaseMsgChannelCloseInit(): MsgChannelCloseInit { @@ -909,6 +1189,7 @@ function createBaseMsgChannelCloseInit(): MsgChannelCloseInit { }; } export const MsgChannelCloseInit = { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInit", encode(message: MsgChannelCloseInit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -985,12 +1266,48 @@ export const MsgChannelCloseInit = { obj.channel_id = message.channelId; obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgChannelCloseInitAmino): MsgChannelCloseInit { + return { + portId: object.port_id, + channelId: object.channel_id, + signer: object.signer + }; + }, + toAmino(message: MsgChannelCloseInit): MsgChannelCloseInitAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgChannelCloseInitAminoMsg): MsgChannelCloseInit { + return MsgChannelCloseInit.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelCloseInit): MsgChannelCloseInitAminoMsg { + return { + type: "cosmos-sdk/MsgChannelCloseInit", + value: MsgChannelCloseInit.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelCloseInitProtoMsg): MsgChannelCloseInit { + return MsgChannelCloseInit.decode(message.value); + }, + toProto(message: MsgChannelCloseInit): Uint8Array { + return MsgChannelCloseInit.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelCloseInit): MsgChannelCloseInitProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInit", + value: MsgChannelCloseInit.encode(message).finish() + }; } }; function createBaseMsgChannelCloseInitResponse(): MsgChannelCloseInitResponse { return {}; } export const MsgChannelCloseInitResponse = { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInitResponse", encode(_: MsgChannelCloseInitResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1028,6 +1345,34 @@ export const MsgChannelCloseInitResponse = { toSDK(_: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChannelCloseInitResponseAmino): MsgChannelCloseInitResponse { + return {}; + }, + toAmino(_: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChannelCloseInitResponseAminoMsg): MsgChannelCloseInitResponse { + return MsgChannelCloseInitResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseAminoMsg { + return { + type: "cosmos-sdk/MsgChannelCloseInitResponse", + value: MsgChannelCloseInitResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelCloseInitResponseProtoMsg): MsgChannelCloseInitResponse { + return MsgChannelCloseInitResponse.decode(message.value); + }, + toProto(message: MsgChannelCloseInitResponse): Uint8Array { + return MsgChannelCloseInitResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelCloseInitResponse): MsgChannelCloseInitResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseInitResponse", + value: MsgChannelCloseInitResponse.encode(message).finish() + }; } }; function createBaseMsgChannelCloseConfirm(): MsgChannelCloseConfirm { @@ -1040,6 +1385,7 @@ function createBaseMsgChannelCloseConfirm(): MsgChannelCloseConfirm { }; } export const MsgChannelCloseConfirm = { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirm", encode(message: MsgChannelCloseConfirm, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -1140,12 +1486,52 @@ export const MsgChannelCloseConfirm = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgChannelCloseConfirmAmino): MsgChannelCloseConfirm { + return { + portId: object.port_id, + channelId: object.channel_id, + proofInit: object.proof_init, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.channel_id = message.channelId; + obj.proof_init = message.proofInit; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgChannelCloseConfirmAminoMsg): MsgChannelCloseConfirm { + return MsgChannelCloseConfirm.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmAminoMsg { + return { + type: "cosmos-sdk/MsgChannelCloseConfirm", + value: MsgChannelCloseConfirm.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelCloseConfirmProtoMsg): MsgChannelCloseConfirm { + return MsgChannelCloseConfirm.decode(message.value); + }, + toProto(message: MsgChannelCloseConfirm): Uint8Array { + return MsgChannelCloseConfirm.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelCloseConfirm): MsgChannelCloseConfirmProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirm", + value: MsgChannelCloseConfirm.encode(message).finish() + }; } }; function createBaseMsgChannelCloseConfirmResponse(): MsgChannelCloseConfirmResponse { return {}; } export const MsgChannelCloseConfirmResponse = { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirmResponse", encode(_: MsgChannelCloseConfirmResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1183,6 +1569,34 @@ export const MsgChannelCloseConfirmResponse = { toSDK(_: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChannelCloseConfirmResponseAmino): MsgChannelCloseConfirmResponse { + return {}; + }, + toAmino(_: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChannelCloseConfirmResponseAminoMsg): MsgChannelCloseConfirmResponse { + return MsgChannelCloseConfirmResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseAminoMsg { + return { + type: "cosmos-sdk/MsgChannelCloseConfirmResponse", + value: MsgChannelCloseConfirmResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChannelCloseConfirmResponseProtoMsg): MsgChannelCloseConfirmResponse { + return MsgChannelCloseConfirmResponse.decode(message.value); + }, + toProto(message: MsgChannelCloseConfirmResponse): Uint8Array { + return MsgChannelCloseConfirmResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChannelCloseConfirmResponse): MsgChannelCloseConfirmResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgChannelCloseConfirmResponse", + value: MsgChannelCloseConfirmResponse.encode(message).finish() + }; } }; function createBaseMsgRecvPacket(): MsgRecvPacket { @@ -1194,6 +1608,7 @@ function createBaseMsgRecvPacket(): MsgRecvPacket { }; } export const MsgRecvPacket = { + typeUrl: "/ibc.core.channel.v1.MsgRecvPacket", encode(message: MsgRecvPacket, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.packet !== undefined) { Packet.encode(message.packet, writer.uint32(10).fork()).ldelim(); @@ -1282,12 +1697,50 @@ export const MsgRecvPacket = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgRecvPacketAmino): MsgRecvPacket { + return { + packet: object?.packet ? Packet.fromAmino(object.packet) : undefined, + proofCommitment: object.proof_commitment, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgRecvPacket): MsgRecvPacketAmino { + const obj: any = {}; + obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; + obj.proof_commitment = message.proofCommitment; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgRecvPacketAminoMsg): MsgRecvPacket { + return MsgRecvPacket.fromAmino(object.value); + }, + toAminoMsg(message: MsgRecvPacket): MsgRecvPacketAminoMsg { + return { + type: "cosmos-sdk/MsgRecvPacket", + value: MsgRecvPacket.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRecvPacketProtoMsg): MsgRecvPacket { + return MsgRecvPacket.decode(message.value); + }, + toProto(message: MsgRecvPacket): Uint8Array { + return MsgRecvPacket.encode(message).finish(); + }, + toProtoMsg(message: MsgRecvPacket): MsgRecvPacketProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgRecvPacket", + value: MsgRecvPacket.encode(message).finish() + }; } }; function createBaseMsgRecvPacketResponse(): MsgRecvPacketResponse { return {}; } export const MsgRecvPacketResponse = { + typeUrl: "/ibc.core.channel.v1.MsgRecvPacketResponse", encode(_: MsgRecvPacketResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1325,6 +1778,34 @@ export const MsgRecvPacketResponse = { toSDK(_: MsgRecvPacketResponse): MsgRecvPacketResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRecvPacketResponseAmino): MsgRecvPacketResponse { + return {}; + }, + toAmino(_: MsgRecvPacketResponse): MsgRecvPacketResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRecvPacketResponseAminoMsg): MsgRecvPacketResponse { + return MsgRecvPacketResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRecvPacketResponse): MsgRecvPacketResponseAminoMsg { + return { + type: "cosmos-sdk/MsgRecvPacketResponse", + value: MsgRecvPacketResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRecvPacketResponseProtoMsg): MsgRecvPacketResponse { + return MsgRecvPacketResponse.decode(message.value); + }, + toProto(message: MsgRecvPacketResponse): Uint8Array { + return MsgRecvPacketResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRecvPacketResponse): MsgRecvPacketResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgRecvPacketResponse", + value: MsgRecvPacketResponse.encode(message).finish() + }; } }; function createBaseMsgTimeout(): MsgTimeout { @@ -1337,6 +1818,7 @@ function createBaseMsgTimeout(): MsgTimeout { }; } export const MsgTimeout = { + typeUrl: "/ibc.core.channel.v1.MsgTimeout", encode(message: MsgTimeout, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.packet !== undefined) { Packet.encode(message.packet, writer.uint32(10).fork()).ldelim(); @@ -1437,12 +1919,52 @@ export const MsgTimeout = { obj.next_sequence_recv = message.nextSequenceRecv; obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgTimeoutAmino): MsgTimeout { + return { + packet: object?.packet ? Packet.fromAmino(object.packet) : undefined, + proofUnreceived: object.proof_unreceived, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + nextSequenceRecv: BigInt(object.next_sequence_recv), + signer: object.signer + }; + }, + toAmino(message: MsgTimeout): MsgTimeoutAmino { + const obj: any = {}; + obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; + obj.proof_unreceived = message.proofUnreceived; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgTimeoutAminoMsg): MsgTimeout { + return MsgTimeout.fromAmino(object.value); + }, + toAminoMsg(message: MsgTimeout): MsgTimeoutAminoMsg { + return { + type: "cosmos-sdk/MsgTimeout", + value: MsgTimeout.toAmino(message) + }; + }, + fromProtoMsg(message: MsgTimeoutProtoMsg): MsgTimeout { + return MsgTimeout.decode(message.value); + }, + toProto(message: MsgTimeout): Uint8Array { + return MsgTimeout.encode(message).finish(); + }, + toProtoMsg(message: MsgTimeout): MsgTimeoutProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgTimeout", + value: MsgTimeout.encode(message).finish() + }; } }; function createBaseMsgTimeoutResponse(): MsgTimeoutResponse { return {}; } export const MsgTimeoutResponse = { + typeUrl: "/ibc.core.channel.v1.MsgTimeoutResponse", encode(_: MsgTimeoutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1480,6 +2002,34 @@ export const MsgTimeoutResponse = { toSDK(_: MsgTimeoutResponse): MsgTimeoutResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgTimeoutResponseAmino): MsgTimeoutResponse { + return {}; + }, + toAmino(_: MsgTimeoutResponse): MsgTimeoutResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgTimeoutResponseAminoMsg): MsgTimeoutResponse { + return MsgTimeoutResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgTimeoutResponse): MsgTimeoutResponseAminoMsg { + return { + type: "cosmos-sdk/MsgTimeoutResponse", + value: MsgTimeoutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgTimeoutResponseProtoMsg): MsgTimeoutResponse { + return MsgTimeoutResponse.decode(message.value); + }, + toProto(message: MsgTimeoutResponse): Uint8Array { + return MsgTimeoutResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgTimeoutResponse): MsgTimeoutResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgTimeoutResponse", + value: MsgTimeoutResponse.encode(message).finish() + }; } }; function createBaseMsgTimeoutOnClose(): MsgTimeoutOnClose { @@ -1493,6 +2043,7 @@ function createBaseMsgTimeoutOnClose(): MsgTimeoutOnClose { }; } export const MsgTimeoutOnClose = { + typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnClose", encode(message: MsgTimeoutOnClose, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.packet !== undefined) { Packet.encode(message.packet, writer.uint32(10).fork()).ldelim(); @@ -1605,12 +2156,54 @@ export const MsgTimeoutOnClose = { obj.next_sequence_recv = message.nextSequenceRecv; obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgTimeoutOnCloseAmino): MsgTimeoutOnClose { + return { + packet: object?.packet ? Packet.fromAmino(object.packet) : undefined, + proofUnreceived: object.proof_unreceived, + proofClose: object.proof_close, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + nextSequenceRecv: BigInt(object.next_sequence_recv), + signer: object.signer + }; + }, + toAmino(message: MsgTimeoutOnClose): MsgTimeoutOnCloseAmino { + const obj: any = {}; + obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; + obj.proof_unreceived = message.proofUnreceived; + obj.proof_close = message.proofClose; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.next_sequence_recv = message.nextSequenceRecv ? message.nextSequenceRecv.toString() : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgTimeoutOnCloseAminoMsg): MsgTimeoutOnClose { + return MsgTimeoutOnClose.fromAmino(object.value); + }, + toAminoMsg(message: MsgTimeoutOnClose): MsgTimeoutOnCloseAminoMsg { + return { + type: "cosmos-sdk/MsgTimeoutOnClose", + value: MsgTimeoutOnClose.toAmino(message) + }; + }, + fromProtoMsg(message: MsgTimeoutOnCloseProtoMsg): MsgTimeoutOnClose { + return MsgTimeoutOnClose.decode(message.value); + }, + toProto(message: MsgTimeoutOnClose): Uint8Array { + return MsgTimeoutOnClose.encode(message).finish(); + }, + toProtoMsg(message: MsgTimeoutOnClose): MsgTimeoutOnCloseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnClose", + value: MsgTimeoutOnClose.encode(message).finish() + }; } }; function createBaseMsgTimeoutOnCloseResponse(): MsgTimeoutOnCloseResponse { return {}; } export const MsgTimeoutOnCloseResponse = { + typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnCloseResponse", encode(_: MsgTimeoutOnCloseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1648,6 +2241,34 @@ export const MsgTimeoutOnCloseResponse = { toSDK(_: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgTimeoutOnCloseResponseAmino): MsgTimeoutOnCloseResponse { + return {}; + }, + toAmino(_: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgTimeoutOnCloseResponseAminoMsg): MsgTimeoutOnCloseResponse { + return MsgTimeoutOnCloseResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseAminoMsg { + return { + type: "cosmos-sdk/MsgTimeoutOnCloseResponse", + value: MsgTimeoutOnCloseResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgTimeoutOnCloseResponseProtoMsg): MsgTimeoutOnCloseResponse { + return MsgTimeoutOnCloseResponse.decode(message.value); + }, + toProto(message: MsgTimeoutOnCloseResponse): Uint8Array { + return MsgTimeoutOnCloseResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgTimeoutOnCloseResponse): MsgTimeoutOnCloseResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgTimeoutOnCloseResponse", + value: MsgTimeoutOnCloseResponse.encode(message).finish() + }; } }; function createBaseMsgAcknowledgement(): MsgAcknowledgement { @@ -1660,6 +2281,7 @@ function createBaseMsgAcknowledgement(): MsgAcknowledgement { }; } export const MsgAcknowledgement = { + typeUrl: "/ibc.core.channel.v1.MsgAcknowledgement", encode(message: MsgAcknowledgement, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.packet !== undefined) { Packet.encode(message.packet, writer.uint32(10).fork()).ldelim(); @@ -1760,12 +2382,52 @@ export const MsgAcknowledgement = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgAcknowledgementAmino): MsgAcknowledgement { + return { + packet: object?.packet ? Packet.fromAmino(object.packet) : undefined, + acknowledgement: object.acknowledgement, + proofAcked: object.proof_acked, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgAcknowledgement): MsgAcknowledgementAmino { + const obj: any = {}; + obj.packet = message.packet ? Packet.toAmino(message.packet) : undefined; + obj.acknowledgement = message.acknowledgement; + obj.proof_acked = message.proofAcked; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgAcknowledgementAminoMsg): MsgAcknowledgement { + return MsgAcknowledgement.fromAmino(object.value); + }, + toAminoMsg(message: MsgAcknowledgement): MsgAcknowledgementAminoMsg { + return { + type: "cosmos-sdk/MsgAcknowledgement", + value: MsgAcknowledgement.toAmino(message) + }; + }, + fromProtoMsg(message: MsgAcknowledgementProtoMsg): MsgAcknowledgement { + return MsgAcknowledgement.decode(message.value); + }, + toProto(message: MsgAcknowledgement): Uint8Array { + return MsgAcknowledgement.encode(message).finish(); + }, + toProtoMsg(message: MsgAcknowledgement): MsgAcknowledgementProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgAcknowledgement", + value: MsgAcknowledgement.encode(message).finish() + }; } }; function createBaseMsgAcknowledgementResponse(): MsgAcknowledgementResponse { return {}; } export const MsgAcknowledgementResponse = { + typeUrl: "/ibc.core.channel.v1.MsgAcknowledgementResponse", encode(_: MsgAcknowledgementResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1803,5 +2465,33 @@ export const MsgAcknowledgementResponse = { toSDK(_: MsgAcknowledgementResponse): MsgAcknowledgementResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgAcknowledgementResponseAmino): MsgAcknowledgementResponse { + return {}; + }, + toAmino(_: MsgAcknowledgementResponse): MsgAcknowledgementResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgAcknowledgementResponseAminoMsg): MsgAcknowledgementResponse { + return MsgAcknowledgementResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgAcknowledgementResponse): MsgAcknowledgementResponseAminoMsg { + return { + type: "cosmos-sdk/MsgAcknowledgementResponse", + value: MsgAcknowledgementResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgAcknowledgementResponseProtoMsg): MsgAcknowledgementResponse { + return MsgAcknowledgementResponse.decode(message.value); + }, + toProto(message: MsgAcknowledgementResponse): Uint8Array { + return MsgAcknowledgementResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgAcknowledgementResponse): MsgAcknowledgementResponseProtoMsg { + return { + typeUrl: "/ibc.core.channel.v1.MsgAcknowledgementResponse", + value: MsgAcknowledgementResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/client.ts b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/client.ts index fa79bf3608..28d1f1fafe 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/client.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/client.ts @@ -166,6 +166,7 @@ function createBaseIdentifiedClientState(): IdentifiedClientState { }; } export const IdentifiedClientState = { + typeUrl: "/ibc.core.client.v1.IdentifiedClientState", encode(message: IdentifiedClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -230,6 +231,39 @@ export const IdentifiedClientState = { obj.client_id = message.clientId; message.clientState !== undefined && (obj.client_state = message.clientState ? Any.toSDK(message.clientState) : undefined); return obj; + }, + fromAmino(object: IdentifiedClientStateAmino): IdentifiedClientState { + return { + clientId: object.client_id, + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined + }; + }, + toAmino(message: IdentifiedClientState): IdentifiedClientStateAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + return obj; + }, + fromAminoMsg(object: IdentifiedClientStateAminoMsg): IdentifiedClientState { + return IdentifiedClientState.fromAmino(object.value); + }, + toAminoMsg(message: IdentifiedClientState): IdentifiedClientStateAminoMsg { + return { + type: "cosmos-sdk/IdentifiedClientState", + value: IdentifiedClientState.toAmino(message) + }; + }, + fromProtoMsg(message: IdentifiedClientStateProtoMsg): IdentifiedClientState { + return IdentifiedClientState.decode(message.value); + }, + toProto(message: IdentifiedClientState): Uint8Array { + return IdentifiedClientState.encode(message).finish(); + }, + toProtoMsg(message: IdentifiedClientState): IdentifiedClientStateProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.IdentifiedClientState", + value: IdentifiedClientState.encode(message).finish() + }; } }; function createBaseConsensusStateWithHeight(): ConsensusStateWithHeight { @@ -239,6 +273,7 @@ function createBaseConsensusStateWithHeight(): ConsensusStateWithHeight { }; } export const ConsensusStateWithHeight = { + typeUrl: "/ibc.core.client.v1.ConsensusStateWithHeight", encode(message: ConsensusStateWithHeight, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== undefined) { Height.encode(message.height, writer.uint32(10).fork()).ldelim(); @@ -303,6 +338,39 @@ export const ConsensusStateWithHeight = { message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? Any.toSDK(message.consensusState) : undefined); return obj; + }, + fromAmino(object: ConsensusStateWithHeightAmino): ConsensusStateWithHeight { + return { + height: object?.height ? Height.fromAmino(object.height) : undefined, + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined + }; + }, + toAmino(message: ConsensusStateWithHeight): ConsensusStateWithHeightAmino { + const obj: any = {}; + obj.height = message.height ? Height.toAmino(message.height) : undefined; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusStateWithHeightAminoMsg): ConsensusStateWithHeight { + return ConsensusStateWithHeight.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusStateWithHeight): ConsensusStateWithHeightAminoMsg { + return { + type: "cosmos-sdk/ConsensusStateWithHeight", + value: ConsensusStateWithHeight.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateWithHeightProtoMsg): ConsensusStateWithHeight { + return ConsensusStateWithHeight.decode(message.value); + }, + toProto(message: ConsensusStateWithHeight): Uint8Array { + return ConsensusStateWithHeight.encode(message).finish(); + }, + toProtoMsg(message: ConsensusStateWithHeight): ConsensusStateWithHeightProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.ConsensusStateWithHeight", + value: ConsensusStateWithHeight.encode(message).finish() + }; } }; function createBaseClientConsensusStates(): ClientConsensusStates { @@ -312,6 +380,7 @@ function createBaseClientConsensusStates(): ClientConsensusStates { }; } export const ClientConsensusStates = { + typeUrl: "/ibc.core.client.v1.ClientConsensusStates", encode(message: ClientConsensusStates, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -384,6 +453,43 @@ export const ClientConsensusStates = { obj.consensus_states = []; } return obj; + }, + fromAmino(object: ClientConsensusStatesAmino): ClientConsensusStates { + return { + clientId: object.client_id, + consensusStates: Array.isArray(object?.consensus_states) ? object.consensus_states.map((e: any) => ConsensusStateWithHeight.fromAmino(e)) : [] + }; + }, + toAmino(message: ClientConsensusStates): ClientConsensusStatesAmino { + const obj: any = {}; + obj.client_id = message.clientId; + if (message.consensusStates) { + obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); + } else { + obj.consensus_states = []; + } + return obj; + }, + fromAminoMsg(object: ClientConsensusStatesAminoMsg): ClientConsensusStates { + return ClientConsensusStates.fromAmino(object.value); + }, + toAminoMsg(message: ClientConsensusStates): ClientConsensusStatesAminoMsg { + return { + type: "cosmos-sdk/ClientConsensusStates", + value: ClientConsensusStates.toAmino(message) + }; + }, + fromProtoMsg(message: ClientConsensusStatesProtoMsg): ClientConsensusStates { + return ClientConsensusStates.decode(message.value); + }, + toProto(message: ClientConsensusStates): Uint8Array { + return ClientConsensusStates.encode(message).finish(); + }, + toProtoMsg(message: ClientConsensusStates): ClientConsensusStatesProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.ClientConsensusStates", + value: ClientConsensusStates.encode(message).finish() + }; } }; function createBaseClientUpdateProposal(): ClientUpdateProposal { @@ -395,6 +501,7 @@ function createBaseClientUpdateProposal(): ClientUpdateProposal { }; } export const ClientUpdateProposal = { + typeUrl: "/ibc.core.client.v1.ClientUpdateProposal", encode(message: ClientUpdateProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -483,6 +590,43 @@ export const ClientUpdateProposal = { obj.subject_client_id = message.subjectClientId; obj.substitute_client_id = message.substituteClientId; return obj; + }, + fromAmino(object: ClientUpdateProposalAmino): ClientUpdateProposal { + return { + title: object.title, + description: object.description, + subjectClientId: object.subject_client_id, + substituteClientId: object.substitute_client_id + }; + }, + toAmino(message: ClientUpdateProposal): ClientUpdateProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.subject_client_id = message.subjectClientId; + obj.substitute_client_id = message.substituteClientId; + return obj; + }, + fromAminoMsg(object: ClientUpdateProposalAminoMsg): ClientUpdateProposal { + return ClientUpdateProposal.fromAmino(object.value); + }, + toAminoMsg(message: ClientUpdateProposal): ClientUpdateProposalAminoMsg { + return { + type: "cosmos-sdk/ClientUpdateProposal", + value: ClientUpdateProposal.toAmino(message) + }; + }, + fromProtoMsg(message: ClientUpdateProposalProtoMsg): ClientUpdateProposal { + return ClientUpdateProposal.decode(message.value); + }, + toProto(message: ClientUpdateProposal): Uint8Array { + return ClientUpdateProposal.encode(message).finish(); + }, + toProtoMsg(message: ClientUpdateProposal): ClientUpdateProposalProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.ClientUpdateProposal", + value: ClientUpdateProposal.encode(message).finish() + }; } }; function createBaseUpgradeProposal(): UpgradeProposal { @@ -494,6 +638,7 @@ function createBaseUpgradeProposal(): UpgradeProposal { }; } export const UpgradeProposal = { + typeUrl: "/ibc.core.client.v1.UpgradeProposal", encode(message: UpgradeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -582,6 +727,43 @@ export const UpgradeProposal = { message.plan !== undefined && (obj.plan = message.plan ? Plan.toSDK(message.plan) : undefined); message.upgradedClientState !== undefined && (obj.upgraded_client_state = message.upgradedClientState ? Any.toSDK(message.upgradedClientState) : undefined); return obj; + }, + fromAmino(object: UpgradeProposalAmino): UpgradeProposal { + return { + title: object.title, + description: object.description, + plan: object?.plan ? Plan.fromAmino(object.plan) : undefined, + upgradedClientState: object?.upgraded_client_state ? Any.fromAmino(object.upgraded_client_state) : undefined + }; + }, + toAmino(message: UpgradeProposal): UpgradeProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.plan = message.plan ? Plan.toAmino(message.plan) : undefined; + obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; + return obj; + }, + fromAminoMsg(object: UpgradeProposalAminoMsg): UpgradeProposal { + return UpgradeProposal.fromAmino(object.value); + }, + toAminoMsg(message: UpgradeProposal): UpgradeProposalAminoMsg { + return { + type: "cosmos-sdk/UpgradeProposal", + value: UpgradeProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UpgradeProposalProtoMsg): UpgradeProposal { + return UpgradeProposal.decode(message.value); + }, + toProto(message: UpgradeProposal): Uint8Array { + return UpgradeProposal.encode(message).finish(); + }, + toProtoMsg(message: UpgradeProposal): UpgradeProposalProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.UpgradeProposal", + value: UpgradeProposal.encode(message).finish() + }; } }; function createBaseHeight(): Height { @@ -591,6 +773,7 @@ function createBaseHeight(): Height { }; } export const Height = { + typeUrl: "/ibc.core.client.v1.Height", encode(message: Height, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.revisionNumber !== BigInt(0)) { writer.uint32(8).uint64(message.revisionNumber); @@ -655,6 +838,39 @@ export const Height = { obj.revision_number = message.revisionNumber; obj.revision_height = message.revisionHeight; return obj; + }, + fromAmino(object: HeightAmino): Height { + return { + revisionNumber: BigInt(object.revision_number || "0"), + revisionHeight: BigInt(object.revision_height || "0") + }; + }, + toAmino(message: Height): HeightAmino { + const obj: any = {}; + obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: HeightAminoMsg): Height { + return Height.fromAmino(object.value); + }, + toAminoMsg(message: Height): HeightAminoMsg { + return { + type: "cosmos-sdk/Height", + value: Height.toAmino(message) + }; + }, + fromProtoMsg(message: HeightProtoMsg): Height { + return Height.decode(message.value); + }, + toProto(message: Height): Uint8Array { + return Height.encode(message).finish(); + }, + toProtoMsg(message: Height): HeightProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.Height", + value: Height.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -663,6 +879,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/ibc.core.client.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowedClients) { writer.uint32(10).string(v!); @@ -723,5 +940,40 @@ export const Params = { obj.allowed_clients = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + allowedClients: Array.isArray(object?.allowed_clients) ? object.allowed_clients.map((e: any) => e) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.allowedClients) { + obj.allowed_clients = message.allowedClients.map(e => e); + } else { + obj.allowed_clients = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/genesis.ts index d73f60a4a9..dea423845c 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/genesis.ts @@ -70,6 +70,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.core.client.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.clients) { IdentifiedClientState.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -206,6 +207,59 @@ export const GenesisState = { obj.create_localhost = message.createLocalhost; obj.next_client_sequence = message.nextClientSequence; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + clients: Array.isArray(object?.clients) ? object.clients.map((e: any) => IdentifiedClientState.fromAmino(e)) : [], + clientsConsensus: Array.isArray(object?.clients_consensus) ? object.clients_consensus.map((e: any) => ClientConsensusStates.fromAmino(e)) : [], + clientsMetadata: Array.isArray(object?.clients_metadata) ? object.clients_metadata.map((e: any) => IdentifiedGenesisMetadata.fromAmino(e)) : [], + params: object?.params ? Params.fromAmino(object.params) : undefined, + createLocalhost: object.create_localhost, + nextClientSequence: BigInt(object.next_client_sequence) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.clients) { + obj.clients = message.clients.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); + } else { + obj.clients = []; + } + if (message.clientsConsensus) { + obj.clients_consensus = message.clientsConsensus.map(e => e ? ClientConsensusStates.toAmino(e) : undefined); + } else { + obj.clients_consensus = []; + } + if (message.clientsMetadata) { + obj.clients_metadata = message.clientsMetadata.map(e => e ? IdentifiedGenesisMetadata.toAmino(e) : undefined); + } else { + obj.clients_metadata = []; + } + obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.create_localhost = message.createLocalhost; + obj.next_client_sequence = message.nextClientSequence ? message.nextClientSequence.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseGenesisMetadata(): GenesisMetadata { @@ -215,6 +269,7 @@ function createBaseGenesisMetadata(): GenesisMetadata { }; } export const GenesisMetadata = { + typeUrl: "/ibc.core.client.v1.GenesisMetadata", encode(message: GenesisMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -279,6 +334,39 @@ export const GenesisMetadata = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: GenesisMetadataAmino): GenesisMetadata { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: GenesisMetadata): GenesisMetadataAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: GenesisMetadataAminoMsg): GenesisMetadata { + return GenesisMetadata.fromAmino(object.value); + }, + toAminoMsg(message: GenesisMetadata): GenesisMetadataAminoMsg { + return { + type: "cosmos-sdk/GenesisMetadata", + value: GenesisMetadata.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisMetadataProtoMsg): GenesisMetadata { + return GenesisMetadata.decode(message.value); + }, + toProto(message: GenesisMetadata): Uint8Array { + return GenesisMetadata.encode(message).finish(); + }, + toProtoMsg(message: GenesisMetadata): GenesisMetadataProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.GenesisMetadata", + value: GenesisMetadata.encode(message).finish() + }; } }; function createBaseIdentifiedGenesisMetadata(): IdentifiedGenesisMetadata { @@ -288,6 +376,7 @@ function createBaseIdentifiedGenesisMetadata(): IdentifiedGenesisMetadata { }; } export const IdentifiedGenesisMetadata = { + typeUrl: "/ibc.core.client.v1.IdentifiedGenesisMetadata", encode(message: IdentifiedGenesisMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -360,5 +449,42 @@ export const IdentifiedGenesisMetadata = { obj.client_metadata = []; } return obj; + }, + fromAmino(object: IdentifiedGenesisMetadataAmino): IdentifiedGenesisMetadata { + return { + clientId: object.client_id, + clientMetadata: Array.isArray(object?.client_metadata) ? object.client_metadata.map((e: any) => GenesisMetadata.fromAmino(e)) : [] + }; + }, + toAmino(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAmino { + const obj: any = {}; + obj.client_id = message.clientId; + if (message.clientMetadata) { + obj.client_metadata = message.clientMetadata.map(e => e ? GenesisMetadata.toAmino(e) : undefined); + } else { + obj.client_metadata = []; + } + return obj; + }, + fromAminoMsg(object: IdentifiedGenesisMetadataAminoMsg): IdentifiedGenesisMetadata { + return IdentifiedGenesisMetadata.fromAmino(object.value); + }, + toAminoMsg(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataAminoMsg { + return { + type: "cosmos-sdk/IdentifiedGenesisMetadata", + value: IdentifiedGenesisMetadata.toAmino(message) + }; + }, + fromProtoMsg(message: IdentifiedGenesisMetadataProtoMsg): IdentifiedGenesisMetadata { + return IdentifiedGenesisMetadata.decode(message.value); + }, + toProto(message: IdentifiedGenesisMetadata): Uint8Array { + return IdentifiedGenesisMetadata.encode(message).finish(); + }, + toProtoMsg(message: IdentifiedGenesisMetadata): IdentifiedGenesisMetadataProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.IdentifiedGenesisMetadata", + value: IdentifiedGenesisMetadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/query.ts index 0e33a3a208..0116a70527 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/query.ts @@ -271,6 +271,7 @@ function createBaseQueryClientStateRequest(): QueryClientStateRequest { }; } export const QueryClientStateRequest = { + typeUrl: "/ibc.core.client.v1.QueryClientStateRequest", encode(message: QueryClientStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -323,6 +324,37 @@ export const QueryClientStateRequest = { const obj: any = {}; obj.client_id = message.clientId; return obj; + }, + fromAmino(object: QueryClientStateRequestAmino): QueryClientStateRequest { + return { + clientId: object.client_id + }; + }, + toAmino(message: QueryClientStateRequest): QueryClientStateRequestAmino { + const obj: any = {}; + obj.client_id = message.clientId; + return obj; + }, + fromAminoMsg(object: QueryClientStateRequestAminoMsg): QueryClientStateRequest { + return QueryClientStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientStateRequest): QueryClientStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClientStateRequest", + value: QueryClientStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientStateRequestProtoMsg): QueryClientStateRequest { + return QueryClientStateRequest.decode(message.value); + }, + toProto(message: QueryClientStateRequest): Uint8Array { + return QueryClientStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClientStateRequest): QueryClientStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientStateRequest", + value: QueryClientStateRequest.encode(message).finish() + }; } }; function createBaseQueryClientStateResponse(): QueryClientStateResponse { @@ -333,6 +365,7 @@ function createBaseQueryClientStateResponse(): QueryClientStateResponse { }; } export const QueryClientStateResponse = { + typeUrl: "/ibc.core.client.v1.QueryClientStateResponse", encode(message: QueryClientStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientState !== undefined) { Any.encode(message.clientState, writer.uint32(10).fork()).ldelim(); @@ -409,6 +442,41 @@ export const QueryClientStateResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryClientStateResponseAmino): QueryClientStateResponse { + return { + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryClientStateResponse): QueryClientStateResponseAmino { + const obj: any = {}; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryClientStateResponseAminoMsg): QueryClientStateResponse { + return QueryClientStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientStateResponse): QueryClientStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClientStateResponse", + value: QueryClientStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientStateResponseProtoMsg): QueryClientStateResponse { + return QueryClientStateResponse.decode(message.value); + }, + toProto(message: QueryClientStateResponse): Uint8Array { + return QueryClientStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClientStateResponse): QueryClientStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientStateResponse", + value: QueryClientStateResponse.encode(message).finish() + }; } }; function createBaseQueryClientStatesRequest(): QueryClientStatesRequest { @@ -417,6 +485,7 @@ function createBaseQueryClientStatesRequest(): QueryClientStatesRequest { }; } export const QueryClientStatesRequest = { + typeUrl: "/ibc.core.client.v1.QueryClientStatesRequest", encode(message: QueryClientStatesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -469,6 +538,37 @@ export const QueryClientStatesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryClientStatesRequestAmino): QueryClientStatesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryClientStatesRequest): QueryClientStatesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClientStatesRequestAminoMsg): QueryClientStatesRequest { + return QueryClientStatesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientStatesRequest): QueryClientStatesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClientStatesRequest", + value: QueryClientStatesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientStatesRequestProtoMsg): QueryClientStatesRequest { + return QueryClientStatesRequest.decode(message.value); + }, + toProto(message: QueryClientStatesRequest): Uint8Array { + return QueryClientStatesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClientStatesRequest): QueryClientStatesRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientStatesRequest", + value: QueryClientStatesRequest.encode(message).finish() + }; } }; function createBaseQueryClientStatesResponse(): QueryClientStatesResponse { @@ -478,6 +578,7 @@ function createBaseQueryClientStatesResponse(): QueryClientStatesResponse { }; } export const QueryClientStatesResponse = { + typeUrl: "/ibc.core.client.v1.QueryClientStatesResponse", encode(message: QueryClientStatesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.clientStates) { IdentifiedClientState.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -550,6 +651,43 @@ export const QueryClientStatesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryClientStatesResponseAmino): QueryClientStatesResponse { + return { + clientStates: Array.isArray(object?.client_states) ? object.client_states.map((e: any) => IdentifiedClientState.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryClientStatesResponse): QueryClientStatesResponseAmino { + const obj: any = {}; + if (message.clientStates) { + obj.client_states = message.clientStates.map(e => e ? IdentifiedClientState.toAmino(e) : undefined); + } else { + obj.client_states = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClientStatesResponseAminoMsg): QueryClientStatesResponse { + return QueryClientStatesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientStatesResponse): QueryClientStatesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClientStatesResponse", + value: QueryClientStatesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientStatesResponseProtoMsg): QueryClientStatesResponse { + return QueryClientStatesResponse.decode(message.value); + }, + toProto(message: QueryClientStatesResponse): Uint8Array { + return QueryClientStatesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClientStatesResponse): QueryClientStatesResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientStatesResponse", + value: QueryClientStatesResponse.encode(message).finish() + }; } }; function createBaseQueryConsensusStateRequest(): QueryConsensusStateRequest { @@ -561,6 +699,7 @@ function createBaseQueryConsensusStateRequest(): QueryConsensusStateRequest { }; } export const QueryConsensusStateRequest = { + typeUrl: "/ibc.core.client.v1.QueryConsensusStateRequest", encode(message: QueryConsensusStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -649,6 +788,43 @@ export const QueryConsensusStateRequest = { obj.revision_height = message.revisionHeight; obj.latest_height = message.latestHeight; return obj; + }, + fromAmino(object: QueryConsensusStateRequestAmino): QueryConsensusStateRequest { + return { + clientId: object.client_id, + revisionNumber: BigInt(object.revision_number), + revisionHeight: BigInt(object.revision_height), + latestHeight: object.latest_height + }; + }, + toAmino(message: QueryConsensusStateRequest): QueryConsensusStateRequestAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined; + obj.latest_height = message.latestHeight; + return obj; + }, + fromAminoMsg(object: QueryConsensusStateRequestAminoMsg): QueryConsensusStateRequest { + return QueryConsensusStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConsensusStateRequest): QueryConsensusStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConsensusStateRequest", + value: QueryConsensusStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConsensusStateRequestProtoMsg): QueryConsensusStateRequest { + return QueryConsensusStateRequest.decode(message.value); + }, + toProto(message: QueryConsensusStateRequest): Uint8Array { + return QueryConsensusStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConsensusStateRequest): QueryConsensusStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryConsensusStateRequest", + value: QueryConsensusStateRequest.encode(message).finish() + }; } }; function createBaseQueryConsensusStateResponse(): QueryConsensusStateResponse { @@ -659,6 +835,7 @@ function createBaseQueryConsensusStateResponse(): QueryConsensusStateResponse { }; } export const QueryConsensusStateResponse = { + typeUrl: "/ibc.core.client.v1.QueryConsensusStateResponse", encode(message: QueryConsensusStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.consensusState !== undefined) { Any.encode(message.consensusState, writer.uint32(10).fork()).ldelim(); @@ -735,6 +912,41 @@ export const QueryConsensusStateResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryConsensusStateResponseAmino): QueryConsensusStateResponse { + return { + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryConsensusStateResponse): QueryConsensusStateResponseAmino { + const obj: any = {}; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryConsensusStateResponseAminoMsg): QueryConsensusStateResponse { + return QueryConsensusStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConsensusStateResponse): QueryConsensusStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConsensusStateResponse", + value: QueryConsensusStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConsensusStateResponseProtoMsg): QueryConsensusStateResponse { + return QueryConsensusStateResponse.decode(message.value); + }, + toProto(message: QueryConsensusStateResponse): Uint8Array { + return QueryConsensusStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConsensusStateResponse): QueryConsensusStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryConsensusStateResponse", + value: QueryConsensusStateResponse.encode(message).finish() + }; } }; function createBaseQueryConsensusStatesRequest(): QueryConsensusStatesRequest { @@ -744,6 +956,7 @@ function createBaseQueryConsensusStatesRequest(): QueryConsensusStatesRequest { }; } export const QueryConsensusStatesRequest = { + typeUrl: "/ibc.core.client.v1.QueryConsensusStatesRequest", encode(message: QueryConsensusStatesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -808,6 +1021,39 @@ export const QueryConsensusStatesRequest = { obj.client_id = message.clientId; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryConsensusStatesRequestAmino): QueryConsensusStatesRequest { + return { + clientId: object.client_id, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryConsensusStatesRequestAminoMsg): QueryConsensusStatesRequest { + return QueryConsensusStatesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConsensusStatesRequest", + value: QueryConsensusStatesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConsensusStatesRequestProtoMsg): QueryConsensusStatesRequest { + return QueryConsensusStatesRequest.decode(message.value); + }, + toProto(message: QueryConsensusStatesRequest): Uint8Array { + return QueryConsensusStatesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConsensusStatesRequest): QueryConsensusStatesRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryConsensusStatesRequest", + value: QueryConsensusStatesRequest.encode(message).finish() + }; } }; function createBaseQueryConsensusStatesResponse(): QueryConsensusStatesResponse { @@ -817,6 +1063,7 @@ function createBaseQueryConsensusStatesResponse(): QueryConsensusStatesResponse }; } export const QueryConsensusStatesResponse = { + typeUrl: "/ibc.core.client.v1.QueryConsensusStatesResponse", encode(message: QueryConsensusStatesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.consensusStates) { ConsensusStateWithHeight.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -889,6 +1136,43 @@ export const QueryConsensusStatesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryConsensusStatesResponseAmino): QueryConsensusStatesResponse { + return { + consensusStates: Array.isArray(object?.consensus_states) ? object.consensus_states.map((e: any) => ConsensusStateWithHeight.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryConsensusStatesResponse): QueryConsensusStatesResponseAmino { + const obj: any = {}; + if (message.consensusStates) { + obj.consensus_states = message.consensusStates.map(e => e ? ConsensusStateWithHeight.toAmino(e) : undefined); + } else { + obj.consensus_states = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryConsensusStatesResponseAminoMsg): QueryConsensusStatesResponse { + return QueryConsensusStatesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConsensusStatesResponse): QueryConsensusStatesResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConsensusStatesResponse", + value: QueryConsensusStatesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConsensusStatesResponseProtoMsg): QueryConsensusStatesResponse { + return QueryConsensusStatesResponse.decode(message.value); + }, + toProto(message: QueryConsensusStatesResponse): Uint8Array { + return QueryConsensusStatesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConsensusStatesResponse): QueryConsensusStatesResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryConsensusStatesResponse", + value: QueryConsensusStatesResponse.encode(message).finish() + }; } }; function createBaseQueryClientStatusRequest(): QueryClientStatusRequest { @@ -897,6 +1181,7 @@ function createBaseQueryClientStatusRequest(): QueryClientStatusRequest { }; } export const QueryClientStatusRequest = { + typeUrl: "/ibc.core.client.v1.QueryClientStatusRequest", encode(message: QueryClientStatusRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -949,6 +1234,37 @@ export const QueryClientStatusRequest = { const obj: any = {}; obj.client_id = message.clientId; return obj; + }, + fromAmino(object: QueryClientStatusRequestAmino): QueryClientStatusRequest { + return { + clientId: object.client_id + }; + }, + toAmino(message: QueryClientStatusRequest): QueryClientStatusRequestAmino { + const obj: any = {}; + obj.client_id = message.clientId; + return obj; + }, + fromAminoMsg(object: QueryClientStatusRequestAminoMsg): QueryClientStatusRequest { + return QueryClientStatusRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientStatusRequest): QueryClientStatusRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClientStatusRequest", + value: QueryClientStatusRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientStatusRequestProtoMsg): QueryClientStatusRequest { + return QueryClientStatusRequest.decode(message.value); + }, + toProto(message: QueryClientStatusRequest): Uint8Array { + return QueryClientStatusRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClientStatusRequest): QueryClientStatusRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientStatusRequest", + value: QueryClientStatusRequest.encode(message).finish() + }; } }; function createBaseQueryClientStatusResponse(): QueryClientStatusResponse { @@ -957,6 +1273,7 @@ function createBaseQueryClientStatusResponse(): QueryClientStatusResponse { }; } export const QueryClientStatusResponse = { + typeUrl: "/ibc.core.client.v1.QueryClientStatusResponse", encode(message: QueryClientStatusResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.status !== "") { writer.uint32(10).string(message.status); @@ -1009,12 +1326,44 @@ export const QueryClientStatusResponse = { const obj: any = {}; obj.status = message.status; return obj; + }, + fromAmino(object: QueryClientStatusResponseAmino): QueryClientStatusResponse { + return { + status: object.status + }; + }, + toAmino(message: QueryClientStatusResponse): QueryClientStatusResponseAmino { + const obj: any = {}; + obj.status = message.status; + return obj; + }, + fromAminoMsg(object: QueryClientStatusResponseAminoMsg): QueryClientStatusResponse { + return QueryClientStatusResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientStatusResponse): QueryClientStatusResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClientStatusResponse", + value: QueryClientStatusResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientStatusResponseProtoMsg): QueryClientStatusResponse { + return QueryClientStatusResponse.decode(message.value); + }, + toProto(message: QueryClientStatusResponse): Uint8Array { + return QueryClientStatusResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClientStatusResponse): QueryClientStatusResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientStatusResponse", + value: QueryClientStatusResponse.encode(message).finish() + }; } }; function createBaseQueryClientParamsRequest(): QueryClientParamsRequest { return {}; } export const QueryClientParamsRequest = { + typeUrl: "/ibc.core.client.v1.QueryClientParamsRequest", encode(_: QueryClientParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1052,6 +1401,34 @@ export const QueryClientParamsRequest = { toSDK(_: QueryClientParamsRequest): QueryClientParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryClientParamsRequestAmino): QueryClientParamsRequest { + return {}; + }, + toAmino(_: QueryClientParamsRequest): QueryClientParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryClientParamsRequestAminoMsg): QueryClientParamsRequest { + return QueryClientParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientParamsRequest): QueryClientParamsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClientParamsRequest", + value: QueryClientParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientParamsRequestProtoMsg): QueryClientParamsRequest { + return QueryClientParamsRequest.decode(message.value); + }, + toProto(message: QueryClientParamsRequest): Uint8Array { + return QueryClientParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClientParamsRequest): QueryClientParamsRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientParamsRequest", + value: QueryClientParamsRequest.encode(message).finish() + }; } }; function createBaseQueryClientParamsResponse(): QueryClientParamsResponse { @@ -1060,6 +1437,7 @@ function createBaseQueryClientParamsResponse(): QueryClientParamsResponse { }; } export const QueryClientParamsResponse = { + typeUrl: "/ibc.core.client.v1.QueryClientParamsResponse", encode(message: QueryClientParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -1112,12 +1490,44 @@ export const QueryClientParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryClientParamsResponseAmino): QueryClientParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryClientParamsResponse): QueryClientParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClientParamsResponseAminoMsg): QueryClientParamsResponse { + return QueryClientParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientParamsResponse): QueryClientParamsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClientParamsResponse", + value: QueryClientParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientParamsResponseProtoMsg): QueryClientParamsResponse { + return QueryClientParamsResponse.decode(message.value); + }, + toProto(message: QueryClientParamsResponse): Uint8Array { + return QueryClientParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClientParamsResponse): QueryClientParamsResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryClientParamsResponse", + value: QueryClientParamsResponse.encode(message).finish() + }; } }; function createBaseQueryUpgradedClientStateRequest(): QueryUpgradedClientStateRequest { return {}; } export const QueryUpgradedClientStateRequest = { + typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateRequest", encode(_: QueryUpgradedClientStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1155,6 +1565,34 @@ export const QueryUpgradedClientStateRequest = { toSDK(_: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryUpgradedClientStateRequestAmino): QueryUpgradedClientStateRequest { + return {}; + }, + toAmino(_: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryUpgradedClientStateRequestAminoMsg): QueryUpgradedClientStateRequest { + return QueryUpgradedClientStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryUpgradedClientStateRequest", + value: QueryUpgradedClientStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUpgradedClientStateRequestProtoMsg): QueryUpgradedClientStateRequest { + return QueryUpgradedClientStateRequest.decode(message.value); + }, + toProto(message: QueryUpgradedClientStateRequest): Uint8Array { + return QueryUpgradedClientStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUpgradedClientStateRequest): QueryUpgradedClientStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateRequest", + value: QueryUpgradedClientStateRequest.encode(message).finish() + }; } }; function createBaseQueryUpgradedClientStateResponse(): QueryUpgradedClientStateResponse { @@ -1163,6 +1601,7 @@ function createBaseQueryUpgradedClientStateResponse(): QueryUpgradedClientStateR }; } export const QueryUpgradedClientStateResponse = { + typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateResponse", encode(message: QueryUpgradedClientStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.upgradedClientState !== undefined) { Any.encode(message.upgradedClientState, writer.uint32(10).fork()).ldelim(); @@ -1215,12 +1654,44 @@ export const QueryUpgradedClientStateResponse = { const obj: any = {}; message.upgradedClientState !== undefined && (obj.upgraded_client_state = message.upgradedClientState ? Any.toSDK(message.upgradedClientState) : undefined); return obj; + }, + fromAmino(object: QueryUpgradedClientStateResponseAmino): QueryUpgradedClientStateResponse { + return { + upgradedClientState: object?.upgraded_client_state ? Any.fromAmino(object.upgraded_client_state) : undefined + }; + }, + toAmino(message: QueryUpgradedClientStateResponse): QueryUpgradedClientStateResponseAmino { + const obj: any = {}; + obj.upgraded_client_state = message.upgradedClientState ? Any.toAmino(message.upgradedClientState) : undefined; + return obj; + }, + fromAminoMsg(object: QueryUpgradedClientStateResponseAminoMsg): QueryUpgradedClientStateResponse { + return QueryUpgradedClientStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUpgradedClientStateResponse): QueryUpgradedClientStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryUpgradedClientStateResponse", + value: QueryUpgradedClientStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUpgradedClientStateResponseProtoMsg): QueryUpgradedClientStateResponse { + return QueryUpgradedClientStateResponse.decode(message.value); + }, + toProto(message: QueryUpgradedClientStateResponse): Uint8Array { + return QueryUpgradedClientStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUpgradedClientStateResponse): QueryUpgradedClientStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryUpgradedClientStateResponse", + value: QueryUpgradedClientStateResponse.encode(message).finish() + }; } }; function createBaseQueryUpgradedConsensusStateRequest(): QueryUpgradedConsensusStateRequest { return {}; } export const QueryUpgradedConsensusStateRequest = { + typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateRequest", encode(_: QueryUpgradedConsensusStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1258,6 +1729,34 @@ export const QueryUpgradedConsensusStateRequest = { toSDK(_: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryUpgradedConsensusStateRequestAmino): QueryUpgradedConsensusStateRequest { + return {}; + }, + toAmino(_: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryUpgradedConsensusStateRequestAminoMsg): QueryUpgradedConsensusStateRequest { + return QueryUpgradedConsensusStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryUpgradedConsensusStateRequest", + value: QueryUpgradedConsensusStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUpgradedConsensusStateRequestProtoMsg): QueryUpgradedConsensusStateRequest { + return QueryUpgradedConsensusStateRequest.decode(message.value); + }, + toProto(message: QueryUpgradedConsensusStateRequest): Uint8Array { + return QueryUpgradedConsensusStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateRequest", + value: QueryUpgradedConsensusStateRequest.encode(message).finish() + }; } }; function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensusStateResponse { @@ -1266,6 +1765,7 @@ function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensus }; } export const QueryUpgradedConsensusStateResponse = { + typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateResponse", encode(message: QueryUpgradedConsensusStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.upgradedConsensusState !== undefined) { Any.encode(message.upgradedConsensusState, writer.uint32(10).fork()).ldelim(); @@ -1318,5 +1818,36 @@ export const QueryUpgradedConsensusStateResponse = { const obj: any = {}; message.upgradedConsensusState !== undefined && (obj.upgraded_consensus_state = message.upgradedConsensusState ? Any.toSDK(message.upgradedConsensusState) : undefined); return obj; + }, + fromAmino(object: QueryUpgradedConsensusStateResponseAmino): QueryUpgradedConsensusStateResponse { + return { + upgradedConsensusState: object?.upgraded_consensus_state ? Any.fromAmino(object.upgraded_consensus_state) : undefined + }; + }, + toAmino(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseAmino { + const obj: any = {}; + obj.upgraded_consensus_state = message.upgradedConsensusState ? Any.toAmino(message.upgradedConsensusState) : undefined; + return obj; + }, + fromAminoMsg(object: QueryUpgradedConsensusStateResponseAminoMsg): QueryUpgradedConsensusStateResponse { + return QueryUpgradedConsensusStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryUpgradedConsensusStateResponse", + value: QueryUpgradedConsensusStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUpgradedConsensusStateResponseProtoMsg): QueryUpgradedConsensusStateResponse { + return QueryUpgradedConsensusStateResponse.decode(message.value); + }, + toProto(message: QueryUpgradedConsensusStateResponse): Uint8Array { + return QueryUpgradedConsensusStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUpgradedConsensusStateResponse): QueryUpgradedConsensusStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.QueryUpgradedConsensusStateResponse", + value: QueryUpgradedConsensusStateResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/tx.ts b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/tx.ts index f855bfe052..778dc3273c 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/client/v1/tx.ts @@ -125,6 +125,7 @@ function createBaseMsgCreateClient(): MsgCreateClient { }; } export const MsgCreateClient = { + typeUrl: "/ibc.core.client.v1.MsgCreateClient", encode(message: MsgCreateClient, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientState !== undefined) { Any.encode(message.clientState, writer.uint32(10).fork()).ldelim(); @@ -201,12 +202,48 @@ export const MsgCreateClient = { message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? Any.toSDK(message.consensusState) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgCreateClientAmino): MsgCreateClient { + return { + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined, + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgCreateClient): MsgCreateClientAmino { + const obj: any = {}; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgCreateClientAminoMsg): MsgCreateClient { + return MsgCreateClient.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateClient): MsgCreateClientAminoMsg { + return { + type: "cosmos-sdk/MsgCreateClient", + value: MsgCreateClient.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateClientProtoMsg): MsgCreateClient { + return MsgCreateClient.decode(message.value); + }, + toProto(message: MsgCreateClient): Uint8Array { + return MsgCreateClient.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateClient): MsgCreateClientProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgCreateClient", + value: MsgCreateClient.encode(message).finish() + }; } }; function createBaseMsgCreateClientResponse(): MsgCreateClientResponse { return {}; } export const MsgCreateClientResponse = { + typeUrl: "/ibc.core.client.v1.MsgCreateClientResponse", encode(_: MsgCreateClientResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -244,6 +281,34 @@ export const MsgCreateClientResponse = { toSDK(_: MsgCreateClientResponse): MsgCreateClientResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateClientResponseAmino): MsgCreateClientResponse { + return {}; + }, + toAmino(_: MsgCreateClientResponse): MsgCreateClientResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateClientResponseAminoMsg): MsgCreateClientResponse { + return MsgCreateClientResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateClientResponse): MsgCreateClientResponseAminoMsg { + return { + type: "cosmos-sdk/MsgCreateClientResponse", + value: MsgCreateClientResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateClientResponseProtoMsg): MsgCreateClientResponse { + return MsgCreateClientResponse.decode(message.value); + }, + toProto(message: MsgCreateClientResponse): Uint8Array { + return MsgCreateClientResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateClientResponse): MsgCreateClientResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgCreateClientResponse", + value: MsgCreateClientResponse.encode(message).finish() + }; } }; function createBaseMsgUpdateClient(): MsgUpdateClient { @@ -254,6 +319,7 @@ function createBaseMsgUpdateClient(): MsgUpdateClient { }; } export const MsgUpdateClient = { + typeUrl: "/ibc.core.client.v1.MsgUpdateClient", encode(message: MsgUpdateClient, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -330,12 +396,48 @@ export const MsgUpdateClient = { message.header !== undefined && (obj.header = message.header ? Any.toSDK(message.header) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgUpdateClientAmino): MsgUpdateClient { + return { + clientId: object.client_id, + header: object?.header ? Any.fromAmino(object.header) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgUpdateClient): MsgUpdateClientAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.header = message.header ? Any.toAmino(message.header) : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgUpdateClientAminoMsg): MsgUpdateClient { + return MsgUpdateClient.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateClient): MsgUpdateClientAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateClient", + value: MsgUpdateClient.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateClientProtoMsg): MsgUpdateClient { + return MsgUpdateClient.decode(message.value); + }, + toProto(message: MsgUpdateClient): Uint8Array { + return MsgUpdateClient.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateClient): MsgUpdateClientProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgUpdateClient", + value: MsgUpdateClient.encode(message).finish() + }; } }; function createBaseMsgUpdateClientResponse(): MsgUpdateClientResponse { return {}; } export const MsgUpdateClientResponse = { + typeUrl: "/ibc.core.client.v1.MsgUpdateClientResponse", encode(_: MsgUpdateClientResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -373,6 +475,34 @@ export const MsgUpdateClientResponse = { toSDK(_: MsgUpdateClientResponse): MsgUpdateClientResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpdateClientResponseAmino): MsgUpdateClientResponse { + return {}; + }, + toAmino(_: MsgUpdateClientResponse): MsgUpdateClientResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpdateClientResponseAminoMsg): MsgUpdateClientResponse { + return MsgUpdateClientResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpdateClientResponse): MsgUpdateClientResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpdateClientResponse", + value: MsgUpdateClientResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpdateClientResponseProtoMsg): MsgUpdateClientResponse { + return MsgUpdateClientResponse.decode(message.value); + }, + toProto(message: MsgUpdateClientResponse): Uint8Array { + return MsgUpdateClientResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpdateClientResponse): MsgUpdateClientResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgUpdateClientResponse", + value: MsgUpdateClientResponse.encode(message).finish() + }; } }; function createBaseMsgUpgradeClient(): MsgUpgradeClient { @@ -386,6 +516,7 @@ function createBaseMsgUpgradeClient(): MsgUpgradeClient { }; } export const MsgUpgradeClient = { + typeUrl: "/ibc.core.client.v1.MsgUpgradeClient", encode(message: MsgUpgradeClient, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -498,12 +629,54 @@ export const MsgUpgradeClient = { obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState; obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgUpgradeClientAmino): MsgUpgradeClient { + return { + clientId: object.client_id, + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined, + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined, + proofUpgradeClient: object.proof_upgrade_client, + proofUpgradeConsensusState: object.proof_upgrade_consensus_state, + signer: object.signer + }; + }, + toAmino(message: MsgUpgradeClient): MsgUpgradeClientAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + obj.proof_upgrade_client = message.proofUpgradeClient; + obj.proof_upgrade_consensus_state = message.proofUpgradeConsensusState; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgUpgradeClientAminoMsg): MsgUpgradeClient { + return MsgUpgradeClient.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpgradeClient): MsgUpgradeClientAminoMsg { + return { + type: "cosmos-sdk/MsgUpgradeClient", + value: MsgUpgradeClient.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpgradeClientProtoMsg): MsgUpgradeClient { + return MsgUpgradeClient.decode(message.value); + }, + toProto(message: MsgUpgradeClient): Uint8Array { + return MsgUpgradeClient.encode(message).finish(); + }, + toProtoMsg(message: MsgUpgradeClient): MsgUpgradeClientProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgUpgradeClient", + value: MsgUpgradeClient.encode(message).finish() + }; } }; function createBaseMsgUpgradeClientResponse(): MsgUpgradeClientResponse { return {}; } export const MsgUpgradeClientResponse = { + typeUrl: "/ibc.core.client.v1.MsgUpgradeClientResponse", encode(_: MsgUpgradeClientResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -541,6 +714,34 @@ export const MsgUpgradeClientResponse = { toSDK(_: MsgUpgradeClientResponse): MsgUpgradeClientResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUpgradeClientResponseAmino): MsgUpgradeClientResponse { + return {}; + }, + toAmino(_: MsgUpgradeClientResponse): MsgUpgradeClientResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUpgradeClientResponseAminoMsg): MsgUpgradeClientResponse { + return MsgUpgradeClientResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUpgradeClientResponse): MsgUpgradeClientResponseAminoMsg { + return { + type: "cosmos-sdk/MsgUpgradeClientResponse", + value: MsgUpgradeClientResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUpgradeClientResponseProtoMsg): MsgUpgradeClientResponse { + return MsgUpgradeClientResponse.decode(message.value); + }, + toProto(message: MsgUpgradeClientResponse): Uint8Array { + return MsgUpgradeClientResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUpgradeClientResponse): MsgUpgradeClientResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgUpgradeClientResponse", + value: MsgUpgradeClientResponse.encode(message).finish() + }; } }; function createBaseMsgSubmitMisbehaviour(): MsgSubmitMisbehaviour { @@ -551,6 +752,7 @@ function createBaseMsgSubmitMisbehaviour(): MsgSubmitMisbehaviour { }; } export const MsgSubmitMisbehaviour = { + typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviour", encode(message: MsgSubmitMisbehaviour, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -627,12 +829,48 @@ export const MsgSubmitMisbehaviour = { message.misbehaviour !== undefined && (obj.misbehaviour = message.misbehaviour ? Any.toSDK(message.misbehaviour) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgSubmitMisbehaviourAmino): MsgSubmitMisbehaviour { + return { + clientId: object.client_id, + misbehaviour: object?.misbehaviour ? Any.fromAmino(object.misbehaviour) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.misbehaviour = message.misbehaviour ? Any.toAmino(message.misbehaviour) : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgSubmitMisbehaviourAminoMsg): MsgSubmitMisbehaviour { + return MsgSubmitMisbehaviour.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitMisbehaviour", + value: MsgSubmitMisbehaviour.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitMisbehaviourProtoMsg): MsgSubmitMisbehaviour { + return MsgSubmitMisbehaviour.decode(message.value); + }, + toProto(message: MsgSubmitMisbehaviour): Uint8Array { + return MsgSubmitMisbehaviour.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitMisbehaviour): MsgSubmitMisbehaviourProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviour", + value: MsgSubmitMisbehaviour.encode(message).finish() + }; } }; function createBaseMsgSubmitMisbehaviourResponse(): MsgSubmitMisbehaviourResponse { return {}; } export const MsgSubmitMisbehaviourResponse = { + typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviourResponse", encode(_: MsgSubmitMisbehaviourResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -670,5 +908,33 @@ export const MsgSubmitMisbehaviourResponse = { toSDK(_: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSubmitMisbehaviourResponseAmino): MsgSubmitMisbehaviourResponse { + return {}; + }, + toAmino(_: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSubmitMisbehaviourResponseAminoMsg): MsgSubmitMisbehaviourResponse { + return MsgSubmitMisbehaviourResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseAminoMsg { + return { + type: "cosmos-sdk/MsgSubmitMisbehaviourResponse", + value: MsgSubmitMisbehaviourResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSubmitMisbehaviourResponseProtoMsg): MsgSubmitMisbehaviourResponse { + return MsgSubmitMisbehaviourResponse.decode(message.value); + }, + toProto(message: MsgSubmitMisbehaviourResponse): Uint8Array { + return MsgSubmitMisbehaviourResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSubmitMisbehaviourResponse): MsgSubmitMisbehaviourResponseProtoMsg { + return { + typeUrl: "/ibc.core.client.v1.MsgSubmitMisbehaviourResponse", + value: MsgSubmitMisbehaviourResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/commitment/v1/commitment.ts b/__fixtures__/v-next/outputosmojs/ibc/core/commitment/v1/commitment.ts index 446056da7a..3f0b8ca0d1 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/commitment/v1/commitment.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/commitment/v1/commitment.ts @@ -74,6 +74,7 @@ function createBaseMerkleRoot(): MerkleRoot { }; } export const MerkleRoot = { + typeUrl: "/ibc.core.commitment.v1.MerkleRoot", encode(message: MerkleRoot, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash.length !== 0) { writer.uint32(10).bytes(message.hash); @@ -126,6 +127,37 @@ export const MerkleRoot = { const obj: any = {}; obj.hash = message.hash; return obj; + }, + fromAmino(object: MerkleRootAmino): MerkleRoot { + return { + hash: object.hash + }; + }, + toAmino(message: MerkleRoot): MerkleRootAmino { + const obj: any = {}; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: MerkleRootAminoMsg): MerkleRoot { + return MerkleRoot.fromAmino(object.value); + }, + toAminoMsg(message: MerkleRoot): MerkleRootAminoMsg { + return { + type: "cosmos-sdk/MerkleRoot", + value: MerkleRoot.toAmino(message) + }; + }, + fromProtoMsg(message: MerkleRootProtoMsg): MerkleRoot { + return MerkleRoot.decode(message.value); + }, + toProto(message: MerkleRoot): Uint8Array { + return MerkleRoot.encode(message).finish(); + }, + toProtoMsg(message: MerkleRoot): MerkleRootProtoMsg { + return { + typeUrl: "/ibc.core.commitment.v1.MerkleRoot", + value: MerkleRoot.encode(message).finish() + }; } }; function createBaseMerklePrefix(): MerklePrefix { @@ -134,6 +166,7 @@ function createBaseMerklePrefix(): MerklePrefix { }; } export const MerklePrefix = { + typeUrl: "/ibc.core.commitment.v1.MerklePrefix", encode(message: MerklePrefix, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.keyPrefix.length !== 0) { writer.uint32(10).bytes(message.keyPrefix); @@ -186,6 +219,37 @@ export const MerklePrefix = { const obj: any = {}; obj.key_prefix = message.keyPrefix; return obj; + }, + fromAmino(object: MerklePrefixAmino): MerklePrefix { + return { + keyPrefix: object.key_prefix + }; + }, + toAmino(message: MerklePrefix): MerklePrefixAmino { + const obj: any = {}; + obj.key_prefix = message.keyPrefix; + return obj; + }, + fromAminoMsg(object: MerklePrefixAminoMsg): MerklePrefix { + return MerklePrefix.fromAmino(object.value); + }, + toAminoMsg(message: MerklePrefix): MerklePrefixAminoMsg { + return { + type: "cosmos-sdk/MerklePrefix", + value: MerklePrefix.toAmino(message) + }; + }, + fromProtoMsg(message: MerklePrefixProtoMsg): MerklePrefix { + return MerklePrefix.decode(message.value); + }, + toProto(message: MerklePrefix): Uint8Array { + return MerklePrefix.encode(message).finish(); + }, + toProtoMsg(message: MerklePrefix): MerklePrefixProtoMsg { + return { + typeUrl: "/ibc.core.commitment.v1.MerklePrefix", + value: MerklePrefix.encode(message).finish() + }; } }; function createBaseMerklePath(): MerklePath { @@ -194,6 +258,7 @@ function createBaseMerklePath(): MerklePath { }; } export const MerklePath = { + typeUrl: "/ibc.core.commitment.v1.MerklePath", encode(message: MerklePath, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.keyPath) { writer.uint32(10).string(v!); @@ -254,6 +319,41 @@ export const MerklePath = { obj.key_path = []; } return obj; + }, + fromAmino(object: MerklePathAmino): MerklePath { + return { + keyPath: Array.isArray(object?.key_path) ? object.key_path.map((e: any) => e) : [] + }; + }, + toAmino(message: MerklePath): MerklePathAmino { + const obj: any = {}; + if (message.keyPath) { + obj.key_path = message.keyPath.map(e => e); + } else { + obj.key_path = []; + } + return obj; + }, + fromAminoMsg(object: MerklePathAminoMsg): MerklePath { + return MerklePath.fromAmino(object.value); + }, + toAminoMsg(message: MerklePath): MerklePathAminoMsg { + return { + type: "cosmos-sdk/MerklePath", + value: MerklePath.toAmino(message) + }; + }, + fromProtoMsg(message: MerklePathProtoMsg): MerklePath { + return MerklePath.decode(message.value); + }, + toProto(message: MerklePath): Uint8Array { + return MerklePath.encode(message).finish(); + }, + toProtoMsg(message: MerklePath): MerklePathProtoMsg { + return { + typeUrl: "/ibc.core.commitment.v1.MerklePath", + value: MerklePath.encode(message).finish() + }; } }; function createBaseMerkleProof(): MerkleProof { @@ -262,6 +362,7 @@ function createBaseMerkleProof(): MerkleProof { }; } export const MerkleProof = { + typeUrl: "/ibc.core.commitment.v1.MerkleProof", encode(message: MerkleProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proofs) { CommitmentProof.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -322,5 +423,40 @@ export const MerkleProof = { obj.proofs = []; } return obj; + }, + fromAmino(object: MerkleProofAmino): MerkleProof { + return { + proofs: Array.isArray(object?.proofs) ? object.proofs.map((e: any) => CommitmentProof.fromAmino(e)) : [] + }; + }, + toAmino(message: MerkleProof): MerkleProofAmino { + const obj: any = {}; + if (message.proofs) { + obj.proofs = message.proofs.map(e => e ? CommitmentProof.toAmino(e) : undefined); + } else { + obj.proofs = []; + } + return obj; + }, + fromAminoMsg(object: MerkleProofAminoMsg): MerkleProof { + return MerkleProof.fromAmino(object.value); + }, + toAminoMsg(message: MerkleProof): MerkleProofAminoMsg { + return { + type: "cosmos-sdk/MerkleProof", + value: MerkleProof.toAmino(message) + }; + }, + fromProtoMsg(message: MerkleProofProtoMsg): MerkleProof { + return MerkleProof.decode(message.value); + }, + toProto(message: MerkleProof): Uint8Array { + return MerkleProof.encode(message).finish(); + }, + toProtoMsg(message: MerkleProof): MerkleProofProtoMsg { + return { + typeUrl: "/ibc.core.commitment.v1.MerkleProof", + value: MerkleProof.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/connection.ts b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/connection.ts index 8b0782a361..9d5bf42a2e 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/connection.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/connection.ts @@ -210,6 +210,7 @@ function createBaseConnectionEnd(): ConnectionEnd { }; } export const ConnectionEnd = { + typeUrl: "/ibc.core.connection.v1.ConnectionEnd", encode(message: ConnectionEnd, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -318,6 +319,49 @@ export const ConnectionEnd = { message.counterparty !== undefined && (obj.counterparty = message.counterparty ? Counterparty.toSDK(message.counterparty) : undefined); obj.delay_period = message.delayPeriod; return obj; + }, + fromAmino(object: ConnectionEndAmino): ConnectionEnd { + return { + clientId: object.client_id, + versions: Array.isArray(object?.versions) ? object.versions.map((e: any) => Version.fromAmino(e)) : [], + state: isSet(object.state) ? stateFromJSON(object.state) : -1, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + delayPeriod: BigInt(object.delay_period) + }; + }, + toAmino(message: ConnectionEnd): ConnectionEndAmino { + const obj: any = {}; + obj.client_id = message.clientId; + if (message.versions) { + obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); + } else { + obj.versions = []; + } + obj.state = message.state; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConnectionEndAminoMsg): ConnectionEnd { + return ConnectionEnd.fromAmino(object.value); + }, + toAminoMsg(message: ConnectionEnd): ConnectionEndAminoMsg { + return { + type: "cosmos-sdk/ConnectionEnd", + value: ConnectionEnd.toAmino(message) + }; + }, + fromProtoMsg(message: ConnectionEndProtoMsg): ConnectionEnd { + return ConnectionEnd.decode(message.value); + }, + toProto(message: ConnectionEnd): Uint8Array { + return ConnectionEnd.encode(message).finish(); + }, + toProtoMsg(message: ConnectionEnd): ConnectionEndProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.ConnectionEnd", + value: ConnectionEnd.encode(message).finish() + }; } }; function createBaseIdentifiedConnection(): IdentifiedConnection { @@ -331,6 +375,7 @@ function createBaseIdentifiedConnection(): IdentifiedConnection { }; } export const IdentifiedConnection = { + typeUrl: "/ibc.core.connection.v1.IdentifiedConnection", encode(message: IdentifiedConnection, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -451,6 +496,51 @@ export const IdentifiedConnection = { message.counterparty !== undefined && (obj.counterparty = message.counterparty ? Counterparty.toSDK(message.counterparty) : undefined); obj.delay_period = message.delayPeriod; return obj; + }, + fromAmino(object: IdentifiedConnectionAmino): IdentifiedConnection { + return { + id: object.id, + clientId: object.client_id, + versions: Array.isArray(object?.versions) ? object.versions.map((e: any) => Version.fromAmino(e)) : [], + state: isSet(object.state) ? stateFromJSON(object.state) : -1, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + delayPeriod: BigInt(object.delay_period) + }; + }, + toAmino(message: IdentifiedConnection): IdentifiedConnectionAmino { + const obj: any = {}; + obj.id = message.id; + obj.client_id = message.clientId; + if (message.versions) { + obj.versions = message.versions.map(e => e ? Version.toAmino(e) : undefined); + } else { + obj.versions = []; + } + obj.state = message.state; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + return obj; + }, + fromAminoMsg(object: IdentifiedConnectionAminoMsg): IdentifiedConnection { + return IdentifiedConnection.fromAmino(object.value); + }, + toAminoMsg(message: IdentifiedConnection): IdentifiedConnectionAminoMsg { + return { + type: "cosmos-sdk/IdentifiedConnection", + value: IdentifiedConnection.toAmino(message) + }; + }, + fromProtoMsg(message: IdentifiedConnectionProtoMsg): IdentifiedConnection { + return IdentifiedConnection.decode(message.value); + }, + toProto(message: IdentifiedConnection): Uint8Array { + return IdentifiedConnection.encode(message).finish(); + }, + toProtoMsg(message: IdentifiedConnection): IdentifiedConnectionProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.IdentifiedConnection", + value: IdentifiedConnection.encode(message).finish() + }; } }; function createBaseCounterparty(): Counterparty { @@ -461,6 +551,7 @@ function createBaseCounterparty(): Counterparty { }; } export const Counterparty = { + typeUrl: "/ibc.core.connection.v1.Counterparty", encode(message: Counterparty, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -537,6 +628,41 @@ export const Counterparty = { obj.connection_id = message.connectionId; message.prefix !== undefined && (obj.prefix = message.prefix ? MerklePrefix.toSDK(message.prefix) : undefined); return obj; + }, + fromAmino(object: CounterpartyAmino): Counterparty { + return { + clientId: object.client_id, + connectionId: object.connection_id, + prefix: object?.prefix ? MerklePrefix.fromAmino(object.prefix) : undefined + }; + }, + toAmino(message: Counterparty): CounterpartyAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.connection_id = message.connectionId; + obj.prefix = message.prefix ? MerklePrefix.toAmino(message.prefix) : undefined; + return obj; + }, + fromAminoMsg(object: CounterpartyAminoMsg): Counterparty { + return Counterparty.fromAmino(object.value); + }, + toAminoMsg(message: Counterparty): CounterpartyAminoMsg { + return { + type: "cosmos-sdk/Counterparty", + value: Counterparty.toAmino(message) + }; + }, + fromProtoMsg(message: CounterpartyProtoMsg): Counterparty { + return Counterparty.decode(message.value); + }, + toProto(message: Counterparty): Uint8Array { + return Counterparty.encode(message).finish(); + }, + toProtoMsg(message: Counterparty): CounterpartyProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.Counterparty", + value: Counterparty.encode(message).finish() + }; } }; function createBaseClientPaths(): ClientPaths { @@ -545,6 +671,7 @@ function createBaseClientPaths(): ClientPaths { }; } export const ClientPaths = { + typeUrl: "/ibc.core.connection.v1.ClientPaths", encode(message: ClientPaths, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.paths) { writer.uint32(10).string(v!); @@ -605,6 +732,41 @@ export const ClientPaths = { obj.paths = []; } return obj; + }, + fromAmino(object: ClientPathsAmino): ClientPaths { + return { + paths: Array.isArray(object?.paths) ? object.paths.map((e: any) => e) : [] + }; + }, + toAmino(message: ClientPaths): ClientPathsAmino { + const obj: any = {}; + if (message.paths) { + obj.paths = message.paths.map(e => e); + } else { + obj.paths = []; + } + return obj; + }, + fromAminoMsg(object: ClientPathsAminoMsg): ClientPaths { + return ClientPaths.fromAmino(object.value); + }, + toAminoMsg(message: ClientPaths): ClientPathsAminoMsg { + return { + type: "cosmos-sdk/ClientPaths", + value: ClientPaths.toAmino(message) + }; + }, + fromProtoMsg(message: ClientPathsProtoMsg): ClientPaths { + return ClientPaths.decode(message.value); + }, + toProto(message: ClientPaths): Uint8Array { + return ClientPaths.encode(message).finish(); + }, + toProtoMsg(message: ClientPaths): ClientPathsProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.ClientPaths", + value: ClientPaths.encode(message).finish() + }; } }; function createBaseConnectionPaths(): ConnectionPaths { @@ -614,6 +776,7 @@ function createBaseConnectionPaths(): ConnectionPaths { }; } export const ConnectionPaths = { + typeUrl: "/ibc.core.connection.v1.ConnectionPaths", encode(message: ConnectionPaths, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -686,6 +849,43 @@ export const ConnectionPaths = { obj.paths = []; } return obj; + }, + fromAmino(object: ConnectionPathsAmino): ConnectionPaths { + return { + clientId: object.client_id, + paths: Array.isArray(object?.paths) ? object.paths.map((e: any) => e) : [] + }; + }, + toAmino(message: ConnectionPaths): ConnectionPathsAmino { + const obj: any = {}; + obj.client_id = message.clientId; + if (message.paths) { + obj.paths = message.paths.map(e => e); + } else { + obj.paths = []; + } + return obj; + }, + fromAminoMsg(object: ConnectionPathsAminoMsg): ConnectionPaths { + return ConnectionPaths.fromAmino(object.value); + }, + toAminoMsg(message: ConnectionPaths): ConnectionPathsAminoMsg { + return { + type: "cosmos-sdk/ConnectionPaths", + value: ConnectionPaths.toAmino(message) + }; + }, + fromProtoMsg(message: ConnectionPathsProtoMsg): ConnectionPaths { + return ConnectionPaths.decode(message.value); + }, + toProto(message: ConnectionPaths): Uint8Array { + return ConnectionPaths.encode(message).finish(); + }, + toProtoMsg(message: ConnectionPaths): ConnectionPathsProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.ConnectionPaths", + value: ConnectionPaths.encode(message).finish() + }; } }; function createBaseVersion(): Version { @@ -695,6 +895,7 @@ function createBaseVersion(): Version { }; } export const Version = { + typeUrl: "/ibc.core.connection.v1.Version", encode(message: Version, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); @@ -767,6 +968,43 @@ export const Version = { obj.features = []; } return obj; + }, + fromAmino(object: VersionAmino): Version { + return { + identifier: object.identifier, + features: Array.isArray(object?.features) ? object.features.map((e: any) => e) : [] + }; + }, + toAmino(message: Version): VersionAmino { + const obj: any = {}; + obj.identifier = message.identifier; + if (message.features) { + obj.features = message.features.map(e => e); + } else { + obj.features = []; + } + return obj; + }, + fromAminoMsg(object: VersionAminoMsg): Version { + return Version.fromAmino(object.value); + }, + toAminoMsg(message: Version): VersionAminoMsg { + return { + type: "cosmos-sdk/Version", + value: Version.toAmino(message) + }; + }, + fromProtoMsg(message: VersionProtoMsg): Version { + return Version.decode(message.value); + }, + toProto(message: Version): Uint8Array { + return Version.encode(message).finish(); + }, + toProtoMsg(message: Version): VersionProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.Version", + value: Version.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -775,6 +1013,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/ibc.core.connection.v1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxExpectedTimePerBlock !== BigInt(0)) { writer.uint32(8).uint64(message.maxExpectedTimePerBlock); @@ -827,5 +1066,36 @@ export const Params = { const obj: any = {}; obj.max_expected_time_per_block = message.maxExpectedTimePerBlock; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + maxExpectedTimePerBlock: BigInt(object.max_expected_time_per_block) + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.max_expected_time_per_block = message.maxExpectedTimePerBlock ? message.maxExpectedTimePerBlock.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "cosmos-sdk/Params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/genesis.ts index 7b990126ba..e5a2b41a7f 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/genesis.ts @@ -26,6 +26,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.core.connection.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.connections) { IdentifiedConnection.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -130,5 +131,50 @@ export const GenesisState = { obj.next_connection_sequence = message.nextConnectionSequence; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + connections: Array.isArray(object?.connections) ? object.connections.map((e: any) => IdentifiedConnection.fromAmino(e)) : [], + clientConnectionPaths: Array.isArray(object?.client_connection_paths) ? object.client_connection_paths.map((e: any) => ConnectionPaths.fromAmino(e)) : [], + nextConnectionSequence: BigInt(object.next_connection_sequence), + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.connections) { + obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); + } else { + obj.connections = []; + } + if (message.clientConnectionPaths) { + obj.client_connection_paths = message.clientConnectionPaths.map(e => e ? ConnectionPaths.toAmino(e) : undefined); + } else { + obj.client_connection_paths = []; + } + obj.next_connection_sequence = message.nextConnectionSequence ? message.nextConnectionSequence.toString() : undefined; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/query.ts index 3e2f78224f..91d10e192b 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/query.ts @@ -199,6 +199,7 @@ function createBaseQueryConnectionRequest(): QueryConnectionRequest { }; } export const QueryConnectionRequest = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionRequest", encode(message: QueryConnectionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -251,6 +252,37 @@ export const QueryConnectionRequest = { const obj: any = {}; obj.connection_id = message.connectionId; return obj; + }, + fromAmino(object: QueryConnectionRequestAmino): QueryConnectionRequest { + return { + connectionId: object.connection_id + }; + }, + toAmino(message: QueryConnectionRequest): QueryConnectionRequestAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + return obj; + }, + fromAminoMsg(object: QueryConnectionRequestAminoMsg): QueryConnectionRequest { + return QueryConnectionRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionRequest): QueryConnectionRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionRequest", + value: QueryConnectionRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionRequestProtoMsg): QueryConnectionRequest { + return QueryConnectionRequest.decode(message.value); + }, + toProto(message: QueryConnectionRequest): Uint8Array { + return QueryConnectionRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionRequest): QueryConnectionRequestProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionRequest", + value: QueryConnectionRequest.encode(message).finish() + }; } }; function createBaseQueryConnectionResponse(): QueryConnectionResponse { @@ -261,6 +293,7 @@ function createBaseQueryConnectionResponse(): QueryConnectionResponse { }; } export const QueryConnectionResponse = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionResponse", encode(message: QueryConnectionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connection !== undefined) { ConnectionEnd.encode(message.connection, writer.uint32(10).fork()).ldelim(); @@ -337,6 +370,41 @@ export const QueryConnectionResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryConnectionResponseAmino): QueryConnectionResponse { + return { + connection: object?.connection ? ConnectionEnd.fromAmino(object.connection) : undefined, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryConnectionResponse): QueryConnectionResponseAmino { + const obj: any = {}; + obj.connection = message.connection ? ConnectionEnd.toAmino(message.connection) : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryConnectionResponseAminoMsg): QueryConnectionResponse { + return QueryConnectionResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionResponse): QueryConnectionResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionResponse", + value: QueryConnectionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionResponseProtoMsg): QueryConnectionResponse { + return QueryConnectionResponse.decode(message.value); + }, + toProto(message: QueryConnectionResponse): Uint8Array { + return QueryConnectionResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionResponse): QueryConnectionResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionResponse", + value: QueryConnectionResponse.encode(message).finish() + }; } }; function createBaseQueryConnectionsRequest(): QueryConnectionsRequest { @@ -345,6 +413,7 @@ function createBaseQueryConnectionsRequest(): QueryConnectionsRequest { }; } export const QueryConnectionsRequest = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionsRequest", encode(message: QueryConnectionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -397,6 +466,37 @@ export const QueryConnectionsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryConnectionsRequestAmino): QueryConnectionsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryConnectionsRequest): QueryConnectionsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryConnectionsRequestAminoMsg): QueryConnectionsRequest { + return QueryConnectionsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionsRequest): QueryConnectionsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionsRequest", + value: QueryConnectionsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionsRequestProtoMsg): QueryConnectionsRequest { + return QueryConnectionsRequest.decode(message.value); + }, + toProto(message: QueryConnectionsRequest): Uint8Array { + return QueryConnectionsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionsRequest): QueryConnectionsRequestProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionsRequest", + value: QueryConnectionsRequest.encode(message).finish() + }; } }; function createBaseQueryConnectionsResponse(): QueryConnectionsResponse { @@ -407,6 +507,7 @@ function createBaseQueryConnectionsResponse(): QueryConnectionsResponse { }; } export const QueryConnectionsResponse = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionsResponse", encode(message: QueryConnectionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.connections) { IdentifiedConnection.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -491,6 +592,45 @@ export const QueryConnectionsResponse = { message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: QueryConnectionsResponseAmino): QueryConnectionsResponse { + return { + connections: Array.isArray(object?.connections) ? object.connections.map((e: any) => IdentifiedConnection.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined, + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: QueryConnectionsResponse): QueryConnectionsResponseAmino { + const obj: any = {}; + if (message.connections) { + obj.connections = message.connections.map(e => e ? IdentifiedConnection.toAmino(e) : undefined); + } else { + obj.connections = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: QueryConnectionsResponseAminoMsg): QueryConnectionsResponse { + return QueryConnectionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionsResponse): QueryConnectionsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionsResponse", + value: QueryConnectionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionsResponseProtoMsg): QueryConnectionsResponse { + return QueryConnectionsResponse.decode(message.value); + }, + toProto(message: QueryConnectionsResponse): Uint8Array { + return QueryConnectionsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionsResponse): QueryConnectionsResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionsResponse", + value: QueryConnectionsResponse.encode(message).finish() + }; } }; function createBaseQueryClientConnectionsRequest(): QueryClientConnectionsRequest { @@ -499,6 +639,7 @@ function createBaseQueryClientConnectionsRequest(): QueryClientConnectionsReques }; } export const QueryClientConnectionsRequest = { + typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsRequest", encode(message: QueryClientConnectionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -551,6 +692,37 @@ export const QueryClientConnectionsRequest = { const obj: any = {}; obj.client_id = message.clientId; return obj; + }, + fromAmino(object: QueryClientConnectionsRequestAmino): QueryClientConnectionsRequest { + return { + clientId: object.client_id + }; + }, + toAmino(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAmino { + const obj: any = {}; + obj.client_id = message.clientId; + return obj; + }, + fromAminoMsg(object: QueryClientConnectionsRequestAminoMsg): QueryClientConnectionsRequest { + return QueryClientConnectionsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestAminoMsg { + return { + type: "cosmos-sdk/QueryClientConnectionsRequest", + value: QueryClientConnectionsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientConnectionsRequestProtoMsg): QueryClientConnectionsRequest { + return QueryClientConnectionsRequest.decode(message.value); + }, + toProto(message: QueryClientConnectionsRequest): Uint8Array { + return QueryClientConnectionsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClientConnectionsRequest): QueryClientConnectionsRequestProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsRequest", + value: QueryClientConnectionsRequest.encode(message).finish() + }; } }; function createBaseQueryClientConnectionsResponse(): QueryClientConnectionsResponse { @@ -561,6 +733,7 @@ function createBaseQueryClientConnectionsResponse(): QueryClientConnectionsRespo }; } export const QueryClientConnectionsResponse = { + typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsResponse", encode(message: QueryClientConnectionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.connectionPaths) { writer.uint32(10).string(v!); @@ -645,6 +818,45 @@ export const QueryClientConnectionsResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryClientConnectionsResponseAmino): QueryClientConnectionsResponse { + return { + connectionPaths: Array.isArray(object?.connection_paths) ? object.connection_paths.map((e: any) => e) : [], + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryClientConnectionsResponse): QueryClientConnectionsResponseAmino { + const obj: any = {}; + if (message.connectionPaths) { + obj.connection_paths = message.connectionPaths.map(e => e); + } else { + obj.connection_paths = []; + } + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryClientConnectionsResponseAminoMsg): QueryClientConnectionsResponse { + return QueryClientConnectionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClientConnectionsResponse): QueryClientConnectionsResponseAminoMsg { + return { + type: "cosmos-sdk/QueryClientConnectionsResponse", + value: QueryClientConnectionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClientConnectionsResponseProtoMsg): QueryClientConnectionsResponse { + return QueryClientConnectionsResponse.decode(message.value); + }, + toProto(message: QueryClientConnectionsResponse): Uint8Array { + return QueryClientConnectionsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClientConnectionsResponse): QueryClientConnectionsResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryClientConnectionsResponse", + value: QueryClientConnectionsResponse.encode(message).finish() + }; } }; function createBaseQueryConnectionClientStateRequest(): QueryConnectionClientStateRequest { @@ -653,6 +865,7 @@ function createBaseQueryConnectionClientStateRequest(): QueryConnectionClientSta }; } export const QueryConnectionClientStateRequest = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateRequest", encode(message: QueryConnectionClientStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -705,6 +918,37 @@ export const QueryConnectionClientStateRequest = { const obj: any = {}; obj.connection_id = message.connectionId; return obj; + }, + fromAmino(object: QueryConnectionClientStateRequestAmino): QueryConnectionClientStateRequest { + return { + connectionId: object.connection_id + }; + }, + toAmino(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + return obj; + }, + fromAminoMsg(object: QueryConnectionClientStateRequestAminoMsg): QueryConnectionClientStateRequest { + return QueryConnectionClientStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionClientStateRequest", + value: QueryConnectionClientStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionClientStateRequestProtoMsg): QueryConnectionClientStateRequest { + return QueryConnectionClientStateRequest.decode(message.value); + }, + toProto(message: QueryConnectionClientStateRequest): Uint8Array { + return QueryConnectionClientStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionClientStateRequest): QueryConnectionClientStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateRequest", + value: QueryConnectionClientStateRequest.encode(message).finish() + }; } }; function createBaseQueryConnectionClientStateResponse(): QueryConnectionClientStateResponse { @@ -715,6 +959,7 @@ function createBaseQueryConnectionClientStateResponse(): QueryConnectionClientSt }; } export const QueryConnectionClientStateResponse = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateResponse", encode(message: QueryConnectionClientStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifiedClientState !== undefined) { IdentifiedClientState.encode(message.identifiedClientState, writer.uint32(10).fork()).ldelim(); @@ -791,6 +1036,41 @@ export const QueryConnectionClientStateResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryConnectionClientStateResponseAmino): QueryConnectionClientStateResponse { + return { + identifiedClientState: object?.identified_client_state ? IdentifiedClientState.fromAmino(object.identified_client_state) : undefined, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryConnectionClientStateResponse): QueryConnectionClientStateResponseAmino { + const obj: any = {}; + obj.identified_client_state = message.identifiedClientState ? IdentifiedClientState.toAmino(message.identifiedClientState) : undefined; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryConnectionClientStateResponseAminoMsg): QueryConnectionClientStateResponse { + return QueryConnectionClientStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionClientStateResponse): QueryConnectionClientStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionClientStateResponse", + value: QueryConnectionClientStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionClientStateResponseProtoMsg): QueryConnectionClientStateResponse { + return QueryConnectionClientStateResponse.decode(message.value); + }, + toProto(message: QueryConnectionClientStateResponse): Uint8Array { + return QueryConnectionClientStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionClientStateResponse): QueryConnectionClientStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionClientStateResponse", + value: QueryConnectionClientStateResponse.encode(message).finish() + }; } }; function createBaseQueryConnectionConsensusStateRequest(): QueryConnectionConsensusStateRequest { @@ -801,6 +1081,7 @@ function createBaseQueryConnectionConsensusStateRequest(): QueryConnectionConsen }; } export const QueryConnectionConsensusStateRequest = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateRequest", encode(message: QueryConnectionConsensusStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -877,6 +1158,41 @@ export const QueryConnectionConsensusStateRequest = { obj.revision_number = message.revisionNumber; obj.revision_height = message.revisionHeight; return obj; + }, + fromAmino(object: QueryConnectionConsensusStateRequestAmino): QueryConnectionConsensusStateRequest { + return { + connectionId: object.connection_id, + revisionNumber: BigInt(object.revision_number), + revisionHeight: BigInt(object.revision_height) + }; + }, + toAmino(message: QueryConnectionConsensusStateRequest): QueryConnectionConsensusStateRequestAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + obj.revision_number = message.revisionNumber ? message.revisionNumber.toString() : undefined; + obj.revision_height = message.revisionHeight ? message.revisionHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryConnectionConsensusStateRequestAminoMsg): QueryConnectionConsensusStateRequest { + return QueryConnectionConsensusStateRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionConsensusStateRequest): QueryConnectionConsensusStateRequestAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionConsensusStateRequest", + value: QueryConnectionConsensusStateRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionConsensusStateRequestProtoMsg): QueryConnectionConsensusStateRequest { + return QueryConnectionConsensusStateRequest.decode(message.value); + }, + toProto(message: QueryConnectionConsensusStateRequest): Uint8Array { + return QueryConnectionConsensusStateRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionConsensusStateRequest): QueryConnectionConsensusStateRequestProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateRequest", + value: QueryConnectionConsensusStateRequest.encode(message).finish() + }; } }; function createBaseQueryConnectionConsensusStateResponse(): QueryConnectionConsensusStateResponse { @@ -888,6 +1204,7 @@ function createBaseQueryConnectionConsensusStateResponse(): QueryConnectionConse }; } export const QueryConnectionConsensusStateResponse = { + typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateResponse", encode(message: QueryConnectionConsensusStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.consensusState !== undefined) { Any.encode(message.consensusState, writer.uint32(10).fork()).ldelim(); @@ -976,5 +1293,42 @@ export const QueryConnectionConsensusStateResponse = { obj.proof = message.proof; message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); return obj; + }, + fromAmino(object: QueryConnectionConsensusStateResponseAmino): QueryConnectionConsensusStateResponse { + return { + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined, + clientId: object.client_id, + proof: object.proof, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined + }; + }, + toAmino(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAmino { + const obj: any = {}; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + obj.client_id = message.clientId; + obj.proof = message.proof; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + return obj; + }, + fromAminoMsg(object: QueryConnectionConsensusStateResponseAminoMsg): QueryConnectionConsensusStateResponse { + return QueryConnectionConsensusStateResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseAminoMsg { + return { + type: "cosmos-sdk/QueryConnectionConsensusStateResponse", + value: QueryConnectionConsensusStateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConnectionConsensusStateResponseProtoMsg): QueryConnectionConsensusStateResponse { + return QueryConnectionConsensusStateResponse.decode(message.value); + }, + toProto(message: QueryConnectionConsensusStateResponse): Uint8Array { + return QueryConnectionConsensusStateResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryConnectionConsensusStateResponse): QueryConnectionConsensusStateResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.QueryConnectionConsensusStateResponse", + value: QueryConnectionConsensusStateResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/tx.ts b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/tx.ts index eafc4c6b47..fe156dbf80 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/connection/v1/tx.ts @@ -169,6 +169,7 @@ function createBaseMsgConnectionOpenInit(): MsgConnectionOpenInit { }; } export const MsgConnectionOpenInit = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInit", encode(message: MsgConnectionOpenInit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -269,12 +270,52 @@ export const MsgConnectionOpenInit = { obj.delay_period = message.delayPeriod; obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgConnectionOpenInitAmino): MsgConnectionOpenInit { + return { + clientId: object.client_id, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + version: object?.version ? Version.fromAmino(object.version) : undefined, + delayPeriod: BigInt(object.delay_period), + signer: object.signer + }; + }, + toAmino(message: MsgConnectionOpenInit): MsgConnectionOpenInitAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + obj.version = message.version ? Version.toAmino(message.version) : undefined; + obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenInitAminoMsg): MsgConnectionOpenInit { + return MsgConnectionOpenInit.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenInit): MsgConnectionOpenInitAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenInit", + value: MsgConnectionOpenInit.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenInitProtoMsg): MsgConnectionOpenInit { + return MsgConnectionOpenInit.decode(message.value); + }, + toProto(message: MsgConnectionOpenInit): Uint8Array { + return MsgConnectionOpenInit.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenInit): MsgConnectionOpenInitProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInit", + value: MsgConnectionOpenInit.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenInitResponse(): MsgConnectionOpenInitResponse { return {}; } export const MsgConnectionOpenInitResponse = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInitResponse", encode(_: MsgConnectionOpenInitResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -312,6 +353,34 @@ export const MsgConnectionOpenInitResponse = { toSDK(_: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgConnectionOpenInitResponseAmino): MsgConnectionOpenInitResponse { + return {}; + }, + toAmino(_: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenInitResponseAminoMsg): MsgConnectionOpenInitResponse { + return MsgConnectionOpenInitResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenInitResponse", + value: MsgConnectionOpenInitResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenInitResponseProtoMsg): MsgConnectionOpenInitResponse { + return MsgConnectionOpenInitResponse.decode(message.value); + }, + toProto(message: MsgConnectionOpenInitResponse): Uint8Array { + return MsgConnectionOpenInitResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenInitResponse): MsgConnectionOpenInitResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenInitResponse", + value: MsgConnectionOpenInitResponse.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenTry(): MsgConnectionOpenTry { @@ -331,6 +400,7 @@ function createBaseMsgConnectionOpenTry(): MsgConnectionOpenTry { }; } export const MsgConnectionOpenTry = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTry", encode(message: MsgConnectionOpenTry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -523,12 +593,70 @@ export const MsgConnectionOpenTry = { message.consensusHeight !== undefined && (obj.consensus_height = message.consensusHeight ? Height.toSDK(message.consensusHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgConnectionOpenTryAmino): MsgConnectionOpenTry { + return { + clientId: object.client_id, + previousConnectionId: object.previous_connection_id, + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + delayPeriod: BigInt(object.delay_period), + counterpartyVersions: Array.isArray(object?.counterparty_versions) ? object.counterparty_versions.map((e: any) => Version.fromAmino(e)) : [], + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + proofInit: object.proof_init, + proofClient: object.proof_client, + proofConsensus: object.proof_consensus, + consensusHeight: object?.consensus_height ? Height.fromAmino(object.consensus_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgConnectionOpenTry): MsgConnectionOpenTryAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.previous_connection_id = message.previousConnectionId; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + obj.delay_period = message.delayPeriod ? message.delayPeriod.toString() : undefined; + if (message.counterpartyVersions) { + obj.counterparty_versions = message.counterpartyVersions.map(e => e ? Version.toAmino(e) : undefined); + } else { + obj.counterparty_versions = []; + } + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.proof_init = message.proofInit; + obj.proof_client = message.proofClient; + obj.proof_consensus = message.proofConsensus; + obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenTryAminoMsg): MsgConnectionOpenTry { + return MsgConnectionOpenTry.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenTry): MsgConnectionOpenTryAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenTry", + value: MsgConnectionOpenTry.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenTryProtoMsg): MsgConnectionOpenTry { + return MsgConnectionOpenTry.decode(message.value); + }, + toProto(message: MsgConnectionOpenTry): Uint8Array { + return MsgConnectionOpenTry.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenTry): MsgConnectionOpenTryProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTry", + value: MsgConnectionOpenTry.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenTryResponse(): MsgConnectionOpenTryResponse { return {}; } export const MsgConnectionOpenTryResponse = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTryResponse", encode(_: MsgConnectionOpenTryResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -566,6 +694,34 @@ export const MsgConnectionOpenTryResponse = { toSDK(_: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgConnectionOpenTryResponseAmino): MsgConnectionOpenTryResponse { + return {}; + }, + toAmino(_: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenTryResponseAminoMsg): MsgConnectionOpenTryResponse { + return MsgConnectionOpenTryResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenTryResponse", + value: MsgConnectionOpenTryResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenTryResponseProtoMsg): MsgConnectionOpenTryResponse { + return MsgConnectionOpenTryResponse.decode(message.value); + }, + toProto(message: MsgConnectionOpenTryResponse): Uint8Array { + return MsgConnectionOpenTryResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenTryResponse): MsgConnectionOpenTryResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenTryResponse", + value: MsgConnectionOpenTryResponse.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenAck(): MsgConnectionOpenAck { @@ -583,6 +739,7 @@ function createBaseMsgConnectionOpenAck(): MsgConnectionOpenAck { }; } export const MsgConnectionOpenAck = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAck", encode(message: MsgConnectionOpenAck, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -743,12 +900,62 @@ export const MsgConnectionOpenAck = { message.consensusHeight !== undefined && (obj.consensus_height = message.consensusHeight ? Height.toSDK(message.consensusHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgConnectionOpenAckAmino): MsgConnectionOpenAck { + return { + connectionId: object.connection_id, + counterpartyConnectionId: object.counterparty_connection_id, + version: object?.version ? Version.fromAmino(object.version) : undefined, + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + proofTry: object.proof_try, + proofClient: object.proof_client, + proofConsensus: object.proof_consensus, + consensusHeight: object?.consensus_height ? Height.fromAmino(object.consensus_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgConnectionOpenAck): MsgConnectionOpenAckAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + obj.counterparty_connection_id = message.counterpartyConnectionId; + obj.version = message.version ? Version.toAmino(message.version) : undefined; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.proof_try = message.proofTry; + obj.proof_client = message.proofClient; + obj.proof_consensus = message.proofConsensus; + obj.consensus_height = message.consensusHeight ? Height.toAmino(message.consensusHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenAckAminoMsg): MsgConnectionOpenAck { + return MsgConnectionOpenAck.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenAck): MsgConnectionOpenAckAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenAck", + value: MsgConnectionOpenAck.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenAckProtoMsg): MsgConnectionOpenAck { + return MsgConnectionOpenAck.decode(message.value); + }, + toProto(message: MsgConnectionOpenAck): Uint8Array { + return MsgConnectionOpenAck.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenAck): MsgConnectionOpenAckProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAck", + value: MsgConnectionOpenAck.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenAckResponse(): MsgConnectionOpenAckResponse { return {}; } export const MsgConnectionOpenAckResponse = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAckResponse", encode(_: MsgConnectionOpenAckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -786,6 +993,34 @@ export const MsgConnectionOpenAckResponse = { toSDK(_: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgConnectionOpenAckResponseAmino): MsgConnectionOpenAckResponse { + return {}; + }, + toAmino(_: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenAckResponseAminoMsg): MsgConnectionOpenAckResponse { + return MsgConnectionOpenAckResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenAckResponse", + value: MsgConnectionOpenAckResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenAckResponseProtoMsg): MsgConnectionOpenAckResponse { + return MsgConnectionOpenAckResponse.decode(message.value); + }, + toProto(message: MsgConnectionOpenAckResponse): Uint8Array { + return MsgConnectionOpenAckResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenAckResponse): MsgConnectionOpenAckResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenAckResponse", + value: MsgConnectionOpenAckResponse.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenConfirm(): MsgConnectionOpenConfirm { @@ -797,6 +1032,7 @@ function createBaseMsgConnectionOpenConfirm(): MsgConnectionOpenConfirm { }; } export const MsgConnectionOpenConfirm = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirm", encode(message: MsgConnectionOpenConfirm, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.connectionId !== "") { writer.uint32(10).string(message.connectionId); @@ -885,12 +1121,50 @@ export const MsgConnectionOpenConfirm = { message.proofHeight !== undefined && (obj.proof_height = message.proofHeight ? Height.toSDK(message.proofHeight) : undefined); obj.signer = message.signer; return obj; + }, + fromAmino(object: MsgConnectionOpenConfirmAmino): MsgConnectionOpenConfirm { + return { + connectionId: object.connection_id, + proofAck: object.proof_ack, + proofHeight: object?.proof_height ? Height.fromAmino(object.proof_height) : undefined, + signer: object.signer + }; + }, + toAmino(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAmino { + const obj: any = {}; + obj.connection_id = message.connectionId; + obj.proof_ack = message.proofAck; + obj.proof_height = message.proofHeight ? Height.toAmino(message.proofHeight) : {}; + obj.signer = message.signer; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenConfirmAminoMsg): MsgConnectionOpenConfirm { + return MsgConnectionOpenConfirm.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenConfirm", + value: MsgConnectionOpenConfirm.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenConfirmProtoMsg): MsgConnectionOpenConfirm { + return MsgConnectionOpenConfirm.decode(message.value); + }, + toProto(message: MsgConnectionOpenConfirm): Uint8Array { + return MsgConnectionOpenConfirm.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenConfirm): MsgConnectionOpenConfirmProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirm", + value: MsgConnectionOpenConfirm.encode(message).finish() + }; } }; function createBaseMsgConnectionOpenConfirmResponse(): MsgConnectionOpenConfirmResponse { return {}; } export const MsgConnectionOpenConfirmResponse = { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirmResponse", encode(_: MsgConnectionOpenConfirmResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -928,5 +1202,33 @@ export const MsgConnectionOpenConfirmResponse = { toSDK(_: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgConnectionOpenConfirmResponseAmino): MsgConnectionOpenConfirmResponse { + return {}; + }, + toAmino(_: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgConnectionOpenConfirmResponseAminoMsg): MsgConnectionOpenConfirmResponse { + return MsgConnectionOpenConfirmResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseAminoMsg { + return { + type: "cosmos-sdk/MsgConnectionOpenConfirmResponse", + value: MsgConnectionOpenConfirmResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgConnectionOpenConfirmResponseProtoMsg): MsgConnectionOpenConfirmResponse { + return MsgConnectionOpenConfirmResponse.decode(message.value); + }, + toProto(message: MsgConnectionOpenConfirmResponse): Uint8Array { + return MsgConnectionOpenConfirmResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgConnectionOpenConfirmResponse): MsgConnectionOpenConfirmResponseProtoMsg { + return { + typeUrl: "/ibc.core.connection.v1.MsgConnectionOpenConfirmResponse", + value: MsgConnectionOpenConfirmResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/port/v1/query.ts b/__fixtures__/v-next/outputosmojs/ibc/core/port/v1/query.ts index 1665018f6e..53c767187f 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/port/v1/query.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/port/v1/query.ts @@ -45,6 +45,7 @@ function createBaseQueryAppVersionRequest(): QueryAppVersionRequest { }; } export const QueryAppVersionRequest = { + typeUrl: "/ibc.core.port.v1.QueryAppVersionRequest", encode(message: QueryAppVersionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -145,6 +146,45 @@ export const QueryAppVersionRequest = { message.counterparty !== undefined && (obj.counterparty = message.counterparty ? Counterparty.toSDK(message.counterparty) : undefined); obj.proposed_version = message.proposedVersion; return obj; + }, + fromAmino(object: QueryAppVersionRequestAmino): QueryAppVersionRequest { + return { + portId: object.port_id, + connectionId: object.connection_id, + ordering: isSet(object.ordering) ? orderFromJSON(object.ordering) : -1, + counterparty: object?.counterparty ? Counterparty.fromAmino(object.counterparty) : undefined, + proposedVersion: object.proposed_version + }; + }, + toAmino(message: QueryAppVersionRequest): QueryAppVersionRequestAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.connection_id = message.connectionId; + obj.ordering = message.ordering; + obj.counterparty = message.counterparty ? Counterparty.toAmino(message.counterparty) : undefined; + obj.proposed_version = message.proposedVersion; + return obj; + }, + fromAminoMsg(object: QueryAppVersionRequestAminoMsg): QueryAppVersionRequest { + return QueryAppVersionRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryAppVersionRequest): QueryAppVersionRequestAminoMsg { + return { + type: "cosmos-sdk/QueryAppVersionRequest", + value: QueryAppVersionRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAppVersionRequestProtoMsg): QueryAppVersionRequest { + return QueryAppVersionRequest.decode(message.value); + }, + toProto(message: QueryAppVersionRequest): Uint8Array { + return QueryAppVersionRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryAppVersionRequest): QueryAppVersionRequestProtoMsg { + return { + typeUrl: "/ibc.core.port.v1.QueryAppVersionRequest", + value: QueryAppVersionRequest.encode(message).finish() + }; } }; function createBaseQueryAppVersionResponse(): QueryAppVersionResponse { @@ -154,6 +194,7 @@ function createBaseQueryAppVersionResponse(): QueryAppVersionResponse { }; } export const QueryAppVersionResponse = { + typeUrl: "/ibc.core.port.v1.QueryAppVersionResponse", encode(message: QueryAppVersionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.portId !== "") { writer.uint32(10).string(message.portId); @@ -218,5 +259,38 @@ export const QueryAppVersionResponse = { obj.port_id = message.portId; obj.version = message.version; return obj; + }, + fromAmino(object: QueryAppVersionResponseAmino): QueryAppVersionResponse { + return { + portId: object.port_id, + version: object.version + }; + }, + toAmino(message: QueryAppVersionResponse): QueryAppVersionResponseAmino { + const obj: any = {}; + obj.port_id = message.portId; + obj.version = message.version; + return obj; + }, + fromAminoMsg(object: QueryAppVersionResponseAminoMsg): QueryAppVersionResponse { + return QueryAppVersionResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryAppVersionResponse): QueryAppVersionResponseAminoMsg { + return { + type: "cosmos-sdk/QueryAppVersionResponse", + value: QueryAppVersionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryAppVersionResponseProtoMsg): QueryAppVersionResponse { + return QueryAppVersionResponse.decode(message.value); + }, + toProto(message: QueryAppVersionResponse): Uint8Array { + return QueryAppVersionResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryAppVersionResponse): QueryAppVersionResponseProtoMsg { + return { + typeUrl: "/ibc.core.port.v1.QueryAppVersionResponse", + value: QueryAppVersionResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/core/types/v1/genesis.ts b/__fixtures__/v-next/outputosmojs/ibc/core/types/v1/genesis.ts index e9df951d0f..dfa4d5ee23 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/core/types/v1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/core/types/v1/genesis.ts @@ -30,6 +30,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/ibc.core.types.v1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientGenesis !== undefined) { GenesisState1.encode(message.clientGenesis, writer.uint32(10).fork()).ldelim(); @@ -106,5 +107,40 @@ export const GenesisState = { message.connectionGenesis !== undefined && (obj.connection_genesis = message.connectionGenesis ? GenesisState2.toSDK(message.connectionGenesis) : undefined); message.channelGenesis !== undefined && (obj.channel_genesis = message.channelGenesis ? GenesisState3.toSDK(message.channelGenesis) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + clientGenesis: object?.client_genesis ? GenesisState1.fromAmino(object.client_genesis) : undefined, + connectionGenesis: object?.connection_genesis ? GenesisState2.fromAmino(object.connection_genesis) : undefined, + channelGenesis: object?.channel_genesis ? GenesisState3.fromAmino(object.channel_genesis) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.client_genesis = message.clientGenesis ? GenesisState1.toAmino(message.clientGenesis) : undefined; + obj.connection_genesis = message.connectionGenesis ? GenesisState2.toAmino(message.connectionGenesis) : undefined; + obj.channel_genesis = message.channelGenesis ? GenesisState3.toAmino(message.channelGenesis) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "cosmos-sdk/GenesisState", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/ibc.core.types.v1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v1/localhost.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v1/localhost.ts index e66dbc9f77..bd0e53506a 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v1/localhost.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v1/localhost.ts @@ -27,6 +27,7 @@ function createBaseClientState(): ClientState { }; } export const ClientState = { + typeUrl: "/ibc.lightclients.localhost.v1.ClientState", encode(message: ClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.chainId !== "") { writer.uint32(10).string(message.chainId); @@ -91,5 +92,38 @@ export const ClientState = { obj.chain_id = message.chainId; message.height !== undefined && (obj.height = message.height ? Height.toSDK(message.height) : undefined); return obj; + }, + fromAmino(object: ClientStateAmino): ClientState { + return { + chainId: object.chain_id, + height: object?.height ? Height.fromAmino(object.height) : undefined + }; + }, + toAmino(message: ClientState): ClientStateAmino { + const obj: any = {}; + obj.chain_id = message.chainId; + obj.height = message.height ? Height.toAmino(message.height) : {}; + return obj; + }, + fromAminoMsg(object: ClientStateAminoMsg): ClientState { + return ClientState.fromAmino(object.value); + }, + toAminoMsg(message: ClientState): ClientStateAminoMsg { + return { + type: "cosmos-sdk/ClientState", + value: ClientState.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateProtoMsg): ClientState { + return ClientState.decode(message.value); + }, + toProto(message: ClientState): Uint8Array { + return ClientState.encode(message).finish(); + }, + toProtoMsg(message: ClientState): ClientStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.localhost.v1.ClientState", + value: ClientState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v2/localhost.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v2/localhost.ts index 1223d4317d..07ac6287b3 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v2/localhost.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/localhost/v2/localhost.ts @@ -17,6 +17,7 @@ function createBaseClientState(): ClientState { }; } export const ClientState = { + typeUrl: "/ibc.lightclients.localhost.v2.ClientState", encode(message: ClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.latestHeight !== undefined) { Height.encode(message.latestHeight, writer.uint32(10).fork()).ldelim(); @@ -69,5 +70,36 @@ export const ClientState = { const obj: any = {}; message.latestHeight !== undefined && (obj.latest_height = message.latestHeight ? Height.toSDK(message.latestHeight) : undefined); return obj; + }, + fromAmino(object: ClientStateAmino): ClientState { + return { + latestHeight: object?.latest_height ? Height.fromAmino(object.latest_height) : undefined + }; + }, + toAmino(message: ClientState): ClientStateAmino { + const obj: any = {}; + obj.latest_height = message.latestHeight ? Height.toAmino(message.latestHeight) : {}; + return obj; + }, + fromAminoMsg(object: ClientStateAminoMsg): ClientState { + return ClientState.fromAmino(object.value); + }, + toAminoMsg(message: ClientState): ClientStateAminoMsg { + return { + type: "cosmos-sdk/ClientState", + value: ClientState.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateProtoMsg): ClientState { + return ClientState.decode(message.value); + }, + toProto(message: ClientState): Uint8Array { + return ClientState.encode(message).finish(); + }, + toProtoMsg(message: ClientState): ClientStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.localhost.v2.ClientState", + value: ClientState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v1/solomachine.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v1/solomachine.ts index 1486099eda..6c396137a3 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v1/solomachine.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v1/solomachine.ts @@ -381,6 +381,7 @@ function createBaseClientState(): ClientState { }; } export const ClientState = { + typeUrl: "/ibc.lightclients.solomachine.v1.ClientState", encode(message: ClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -469,6 +470,43 @@ export const ClientState = { message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? ConsensusState.toSDK(message.consensusState) : undefined); obj.allow_update_after_proposal = message.allowUpdateAfterProposal; return obj; + }, + fromAmino(object: ClientStateAmino): ClientState { + return { + sequence: BigInt(object.sequence), + frozenSequence: BigInt(object.frozen_sequence), + consensusState: object?.consensus_state ? ConsensusState.fromAmino(object.consensus_state) : undefined, + allowUpdateAfterProposal: object.allow_update_after_proposal + }; + }, + toAmino(message: ClientState): ClientStateAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.frozen_sequence = message.frozenSequence ? message.frozenSequence.toString() : undefined; + obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + return obj; + }, + fromAminoMsg(object: ClientStateAminoMsg): ClientState { + return ClientState.fromAmino(object.value); + }, + toAminoMsg(message: ClientState): ClientStateAminoMsg { + return { + type: "cosmos-sdk/ClientState", + value: ClientState.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateProtoMsg): ClientState { + return ClientState.decode(message.value); + }, + toProto(message: ClientState): Uint8Array { + return ClientState.encode(message).finish(); + }, + toProtoMsg(message: ClientState): ClientStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.ClientState", + value: ClientState.encode(message).finish() + }; } }; function createBaseConsensusState(): ConsensusState { @@ -479,6 +517,7 @@ function createBaseConsensusState(): ConsensusState { }; } export const ConsensusState = { + typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusState", encode(message: ConsensusState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); @@ -555,6 +594,41 @@ export const ConsensusState = { obj.diversifier = message.diversifier; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: ConsensusStateAmino): ConsensusState { + return { + publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, + diversifier: object.diversifier, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: ConsensusState): ConsensusStateAmino { + const obj: any = {}; + obj.public_key = message.publicKey ? Any.toAmino(message.publicKey) : undefined; + obj.diversifier = message.diversifier; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { + return ConsensusState.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg { + return { + type: "cosmos-sdk/ConsensusState", + value: ConsensusState.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState { + return ConsensusState.decode(message.value); + }, + toProto(message: ConsensusState): Uint8Array { + return ConsensusState.encode(message).finish(); + }, + toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusState", + value: ConsensusState.encode(message).finish() + }; } }; function createBaseHeader(): Header { @@ -567,6 +641,7 @@ function createBaseHeader(): Header { }; } export const Header = { + typeUrl: "/ibc.lightclients.solomachine.v1.Header", encode(message: Header, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -667,6 +742,45 @@ export const Header = { message.newPublicKey !== undefined && (obj.new_public_key = message.newPublicKey ? Any.toSDK(message.newPublicKey) : undefined); obj.new_diversifier = message.newDiversifier; return obj; + }, + fromAmino(object: HeaderAmino): Header { + return { + sequence: BigInt(object.sequence), + timestamp: BigInt(object.timestamp), + signature: object.signature, + newPublicKey: object?.new_public_key ? Any.fromAmino(object.new_public_key) : undefined, + newDiversifier: object.new_diversifier + }; + }, + toAmino(message: Header): HeaderAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.signature = message.signature; + obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; + obj.new_diversifier = message.newDiversifier; + return obj; + }, + fromAminoMsg(object: HeaderAminoMsg): Header { + return Header.fromAmino(object.value); + }, + toAminoMsg(message: Header): HeaderAminoMsg { + return { + type: "cosmos-sdk/Header", + value: Header.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderProtoMsg): Header { + return Header.decode(message.value); + }, + toProto(message: Header): Uint8Array { + return Header.encode(message).finish(); + }, + toProtoMsg(message: Header): HeaderProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.Header", + value: Header.encode(message).finish() + }; } }; function createBaseMisbehaviour(): Misbehaviour { @@ -678,6 +792,7 @@ function createBaseMisbehaviour(): Misbehaviour { }; } export const Misbehaviour = { + typeUrl: "/ibc.lightclients.solomachine.v1.Misbehaviour", encode(message: Misbehaviour, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -766,6 +881,43 @@ export const Misbehaviour = { message.signatureOne !== undefined && (obj.signature_one = message.signatureOne ? SignatureAndData.toSDK(message.signatureOne) : undefined); message.signatureTwo !== undefined && (obj.signature_two = message.signatureTwo ? SignatureAndData.toSDK(message.signatureTwo) : undefined); return obj; + }, + fromAmino(object: MisbehaviourAmino): Misbehaviour { + return { + clientId: object.client_id, + sequence: BigInt(object.sequence), + signatureOne: object?.signature_one ? SignatureAndData.fromAmino(object.signature_one) : undefined, + signatureTwo: object?.signature_two ? SignatureAndData.fromAmino(object.signature_two) : undefined + }; + }, + toAmino(message: Misbehaviour): MisbehaviourAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne) : undefined; + obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo) : undefined; + return obj; + }, + fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour { + return Misbehaviour.fromAmino(object.value); + }, + toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg { + return { + type: "cosmos-sdk/Misbehaviour", + value: Misbehaviour.toAmino(message) + }; + }, + fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour { + return Misbehaviour.decode(message.value); + }, + toProto(message: Misbehaviour): Uint8Array { + return Misbehaviour.encode(message).finish(); + }, + toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.Misbehaviour", + value: Misbehaviour.encode(message).finish() + }; } }; function createBaseSignatureAndData(): SignatureAndData { @@ -777,6 +929,7 @@ function createBaseSignatureAndData(): SignatureAndData { }; } export const SignatureAndData = { + typeUrl: "/ibc.lightclients.solomachine.v1.SignatureAndData", encode(message: SignatureAndData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signature.length !== 0) { writer.uint32(10).bytes(message.signature); @@ -865,6 +1018,43 @@ export const SignatureAndData = { obj.data = message.data; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: SignatureAndDataAmino): SignatureAndData { + return { + signature: object.signature, + dataType: isSet(object.data_type) ? dataTypeFromJSON(object.data_type) : -1, + data: object.data, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: SignatureAndData): SignatureAndDataAmino { + const obj: any = {}; + obj.signature = message.signature; + obj.data_type = message.dataType; + obj.data = message.data; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { + return SignatureAndData.fromAmino(object.value); + }, + toAminoMsg(message: SignatureAndData): SignatureAndDataAminoMsg { + return { + type: "cosmos-sdk/SignatureAndData", + value: SignatureAndData.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureAndDataProtoMsg): SignatureAndData { + return SignatureAndData.decode(message.value); + }, + toProto(message: SignatureAndData): Uint8Array { + return SignatureAndData.encode(message).finish(); + }, + toProtoMsg(message: SignatureAndData): SignatureAndDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.SignatureAndData", + value: SignatureAndData.encode(message).finish() + }; } }; function createBaseTimestampedSignatureData(): TimestampedSignatureData { @@ -874,6 +1064,7 @@ function createBaseTimestampedSignatureData(): TimestampedSignatureData { }; } export const TimestampedSignatureData = { + typeUrl: "/ibc.lightclients.solomachine.v1.TimestampedSignatureData", encode(message: TimestampedSignatureData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signatureData.length !== 0) { writer.uint32(10).bytes(message.signatureData); @@ -938,6 +1129,39 @@ export const TimestampedSignatureData = { obj.signature_data = message.signatureData; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: TimestampedSignatureDataAmino): TimestampedSignatureData { + return { + signatureData: object.signature_data, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { + const obj: any = {}; + obj.signature_data = message.signatureData; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { + return TimestampedSignatureData.fromAmino(object.value); + }, + toAminoMsg(message: TimestampedSignatureData): TimestampedSignatureDataAminoMsg { + return { + type: "cosmos-sdk/TimestampedSignatureData", + value: TimestampedSignatureData.toAmino(message) + }; + }, + fromProtoMsg(message: TimestampedSignatureDataProtoMsg): TimestampedSignatureData { + return TimestampedSignatureData.decode(message.value); + }, + toProto(message: TimestampedSignatureData): Uint8Array { + return TimestampedSignatureData.encode(message).finish(); + }, + toProtoMsg(message: TimestampedSignatureData): TimestampedSignatureDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.TimestampedSignatureData", + value: TimestampedSignatureData.encode(message).finish() + }; } }; function createBaseSignBytes(): SignBytes { @@ -950,6 +1174,7 @@ function createBaseSignBytes(): SignBytes { }; } export const SignBytes = { + typeUrl: "/ibc.lightclients.solomachine.v1.SignBytes", encode(message: SignBytes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -1050,6 +1275,45 @@ export const SignBytes = { message.dataType !== undefined && (obj.data_type = dataTypeToJSON(message.dataType)); obj.data = message.data; return obj; + }, + fromAmino(object: SignBytesAmino): SignBytes { + return { + sequence: BigInt(object.sequence), + timestamp: BigInt(object.timestamp), + diversifier: object.diversifier, + dataType: isSet(object.data_type) ? dataTypeFromJSON(object.data_type) : -1, + data: object.data + }; + }, + toAmino(message: SignBytes): SignBytesAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier; + obj.data_type = message.dataType; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: SignBytesAminoMsg): SignBytes { + return SignBytes.fromAmino(object.value); + }, + toAminoMsg(message: SignBytes): SignBytesAminoMsg { + return { + type: "cosmos-sdk/SignBytes", + value: SignBytes.toAmino(message) + }; + }, + fromProtoMsg(message: SignBytesProtoMsg): SignBytes { + return SignBytes.decode(message.value); + }, + toProto(message: SignBytes): Uint8Array { + return SignBytes.encode(message).finish(); + }, + toProtoMsg(message: SignBytes): SignBytesProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.SignBytes", + value: SignBytes.encode(message).finish() + }; } }; function createBaseHeaderData(): HeaderData { @@ -1059,6 +1323,7 @@ function createBaseHeaderData(): HeaderData { }; } export const HeaderData = { + typeUrl: "/ibc.lightclients.solomachine.v1.HeaderData", encode(message: HeaderData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newPubKey !== undefined) { Any.encode(message.newPubKey, writer.uint32(10).fork()).ldelim(); @@ -1123,6 +1388,39 @@ export const HeaderData = { message.newPubKey !== undefined && (obj.new_pub_key = message.newPubKey ? Any.toSDK(message.newPubKey) : undefined); obj.new_diversifier = message.newDiversifier; return obj; + }, + fromAmino(object: HeaderDataAmino): HeaderData { + return { + newPubKey: object?.new_pub_key ? Any.fromAmino(object.new_pub_key) : undefined, + newDiversifier: object.new_diversifier + }; + }, + toAmino(message: HeaderData): HeaderDataAmino { + const obj: any = {}; + obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; + obj.new_diversifier = message.newDiversifier; + return obj; + }, + fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { + return HeaderData.fromAmino(object.value); + }, + toAminoMsg(message: HeaderData): HeaderDataAminoMsg { + return { + type: "cosmos-sdk/HeaderData", + value: HeaderData.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderDataProtoMsg): HeaderData { + return HeaderData.decode(message.value); + }, + toProto(message: HeaderData): Uint8Array { + return HeaderData.encode(message).finish(); + }, + toProtoMsg(message: HeaderData): HeaderDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.HeaderData", + value: HeaderData.encode(message).finish() + }; } }; function createBaseClientStateData(): ClientStateData { @@ -1132,6 +1430,7 @@ function createBaseClientStateData(): ClientStateData { }; } export const ClientStateData = { + typeUrl: "/ibc.lightclients.solomachine.v1.ClientStateData", encode(message: ClientStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1196,6 +1495,39 @@ export const ClientStateData = { obj.path = message.path; message.clientState !== undefined && (obj.client_state = message.clientState ? Any.toSDK(message.clientState) : undefined); return obj; + }, + fromAmino(object: ClientStateDataAmino): ClientStateData { + return { + path: object.path, + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined + }; + }, + toAmino(message: ClientStateData): ClientStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + return obj; + }, + fromAminoMsg(object: ClientStateDataAminoMsg): ClientStateData { + return ClientStateData.fromAmino(object.value); + }, + toAminoMsg(message: ClientStateData): ClientStateDataAminoMsg { + return { + type: "cosmos-sdk/ClientStateData", + value: ClientStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateDataProtoMsg): ClientStateData { + return ClientStateData.decode(message.value); + }, + toProto(message: ClientStateData): Uint8Array { + return ClientStateData.encode(message).finish(); + }, + toProtoMsg(message: ClientStateData): ClientStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.ClientStateData", + value: ClientStateData.encode(message).finish() + }; } }; function createBaseConsensusStateData(): ConsensusStateData { @@ -1205,6 +1537,7 @@ function createBaseConsensusStateData(): ConsensusStateData { }; } export const ConsensusStateData = { + typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusStateData", encode(message: ConsensusStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1269,6 +1602,39 @@ export const ConsensusStateData = { obj.path = message.path; message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? Any.toSDK(message.consensusState) : undefined); return obj; + }, + fromAmino(object: ConsensusStateDataAmino): ConsensusStateData { + return { + path: object.path, + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined + }; + }, + toAmino(message: ConsensusStateData): ConsensusStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusStateDataAminoMsg): ConsensusStateData { + return ConsensusStateData.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusStateData): ConsensusStateDataAminoMsg { + return { + type: "cosmos-sdk/ConsensusStateData", + value: ConsensusStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateDataProtoMsg): ConsensusStateData { + return ConsensusStateData.decode(message.value); + }, + toProto(message: ConsensusStateData): Uint8Array { + return ConsensusStateData.encode(message).finish(); + }, + toProtoMsg(message: ConsensusStateData): ConsensusStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.ConsensusStateData", + value: ConsensusStateData.encode(message).finish() + }; } }; function createBaseConnectionStateData(): ConnectionStateData { @@ -1278,6 +1644,7 @@ function createBaseConnectionStateData(): ConnectionStateData { }; } export const ConnectionStateData = { + typeUrl: "/ibc.lightclients.solomachine.v1.ConnectionStateData", encode(message: ConnectionStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1342,6 +1709,39 @@ export const ConnectionStateData = { obj.path = message.path; message.connection !== undefined && (obj.connection = message.connection ? ConnectionEnd.toSDK(message.connection) : undefined); return obj; + }, + fromAmino(object: ConnectionStateDataAmino): ConnectionStateData { + return { + path: object.path, + connection: object?.connection ? ConnectionEnd.fromAmino(object.connection) : undefined + }; + }, + toAmino(message: ConnectionStateData): ConnectionStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.connection = message.connection ? ConnectionEnd.toAmino(message.connection) : undefined; + return obj; + }, + fromAminoMsg(object: ConnectionStateDataAminoMsg): ConnectionStateData { + return ConnectionStateData.fromAmino(object.value); + }, + toAminoMsg(message: ConnectionStateData): ConnectionStateDataAminoMsg { + return { + type: "cosmos-sdk/ConnectionStateData", + value: ConnectionStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ConnectionStateDataProtoMsg): ConnectionStateData { + return ConnectionStateData.decode(message.value); + }, + toProto(message: ConnectionStateData): Uint8Array { + return ConnectionStateData.encode(message).finish(); + }, + toProtoMsg(message: ConnectionStateData): ConnectionStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.ConnectionStateData", + value: ConnectionStateData.encode(message).finish() + }; } }; function createBaseChannelStateData(): ChannelStateData { @@ -1351,6 +1751,7 @@ function createBaseChannelStateData(): ChannelStateData { }; } export const ChannelStateData = { + typeUrl: "/ibc.lightclients.solomachine.v1.ChannelStateData", encode(message: ChannelStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1415,6 +1816,39 @@ export const ChannelStateData = { obj.path = message.path; message.channel !== undefined && (obj.channel = message.channel ? Channel.toSDK(message.channel) : undefined); return obj; + }, + fromAmino(object: ChannelStateDataAmino): ChannelStateData { + return { + path: object.path, + channel: object?.channel ? Channel.fromAmino(object.channel) : undefined + }; + }, + toAmino(message: ChannelStateData): ChannelStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; + return obj; + }, + fromAminoMsg(object: ChannelStateDataAminoMsg): ChannelStateData { + return ChannelStateData.fromAmino(object.value); + }, + toAminoMsg(message: ChannelStateData): ChannelStateDataAminoMsg { + return { + type: "cosmos-sdk/ChannelStateData", + value: ChannelStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ChannelStateDataProtoMsg): ChannelStateData { + return ChannelStateData.decode(message.value); + }, + toProto(message: ChannelStateData): Uint8Array { + return ChannelStateData.encode(message).finish(); + }, + toProtoMsg(message: ChannelStateData): ChannelStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.ChannelStateData", + value: ChannelStateData.encode(message).finish() + }; } }; function createBasePacketCommitmentData(): PacketCommitmentData { @@ -1424,6 +1858,7 @@ function createBasePacketCommitmentData(): PacketCommitmentData { }; } export const PacketCommitmentData = { + typeUrl: "/ibc.lightclients.solomachine.v1.PacketCommitmentData", encode(message: PacketCommitmentData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1488,6 +1923,39 @@ export const PacketCommitmentData = { obj.path = message.path; obj.commitment = message.commitment; return obj; + }, + fromAmino(object: PacketCommitmentDataAmino): PacketCommitmentData { + return { + path: object.path, + commitment: object.commitment + }; + }, + toAmino(message: PacketCommitmentData): PacketCommitmentDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.commitment = message.commitment; + return obj; + }, + fromAminoMsg(object: PacketCommitmentDataAminoMsg): PacketCommitmentData { + return PacketCommitmentData.fromAmino(object.value); + }, + toAminoMsg(message: PacketCommitmentData): PacketCommitmentDataAminoMsg { + return { + type: "cosmos-sdk/PacketCommitmentData", + value: PacketCommitmentData.toAmino(message) + }; + }, + fromProtoMsg(message: PacketCommitmentDataProtoMsg): PacketCommitmentData { + return PacketCommitmentData.decode(message.value); + }, + toProto(message: PacketCommitmentData): Uint8Array { + return PacketCommitmentData.encode(message).finish(); + }, + toProtoMsg(message: PacketCommitmentData): PacketCommitmentDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.PacketCommitmentData", + value: PacketCommitmentData.encode(message).finish() + }; } }; function createBasePacketAcknowledgementData(): PacketAcknowledgementData { @@ -1497,6 +1965,7 @@ function createBasePacketAcknowledgementData(): PacketAcknowledgementData { }; } export const PacketAcknowledgementData = { + typeUrl: "/ibc.lightclients.solomachine.v1.PacketAcknowledgementData", encode(message: PacketAcknowledgementData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1561,6 +2030,39 @@ export const PacketAcknowledgementData = { obj.path = message.path; obj.acknowledgement = message.acknowledgement; return obj; + }, + fromAmino(object: PacketAcknowledgementDataAmino): PacketAcknowledgementData { + return { + path: object.path, + acknowledgement: object.acknowledgement + }; + }, + toAmino(message: PacketAcknowledgementData): PacketAcknowledgementDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.acknowledgement = message.acknowledgement; + return obj; + }, + fromAminoMsg(object: PacketAcknowledgementDataAminoMsg): PacketAcknowledgementData { + return PacketAcknowledgementData.fromAmino(object.value); + }, + toAminoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataAminoMsg { + return { + type: "cosmos-sdk/PacketAcknowledgementData", + value: PacketAcknowledgementData.toAmino(message) + }; + }, + fromProtoMsg(message: PacketAcknowledgementDataProtoMsg): PacketAcknowledgementData { + return PacketAcknowledgementData.decode(message.value); + }, + toProto(message: PacketAcknowledgementData): Uint8Array { + return PacketAcknowledgementData.encode(message).finish(); + }, + toProtoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.PacketAcknowledgementData", + value: PacketAcknowledgementData.encode(message).finish() + }; } }; function createBasePacketReceiptAbsenceData(): PacketReceiptAbsenceData { @@ -1569,6 +2071,7 @@ function createBasePacketReceiptAbsenceData(): PacketReceiptAbsenceData { }; } export const PacketReceiptAbsenceData = { + typeUrl: "/ibc.lightclients.solomachine.v1.PacketReceiptAbsenceData", encode(message: PacketReceiptAbsenceData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1621,6 +2124,37 @@ export const PacketReceiptAbsenceData = { const obj: any = {}; obj.path = message.path; return obj; + }, + fromAmino(object: PacketReceiptAbsenceDataAmino): PacketReceiptAbsenceData { + return { + path: object.path + }; + }, + toAmino(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataAmino { + const obj: any = {}; + obj.path = message.path; + return obj; + }, + fromAminoMsg(object: PacketReceiptAbsenceDataAminoMsg): PacketReceiptAbsenceData { + return PacketReceiptAbsenceData.fromAmino(object.value); + }, + toAminoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataAminoMsg { + return { + type: "cosmos-sdk/PacketReceiptAbsenceData", + value: PacketReceiptAbsenceData.toAmino(message) + }; + }, + fromProtoMsg(message: PacketReceiptAbsenceDataProtoMsg): PacketReceiptAbsenceData { + return PacketReceiptAbsenceData.decode(message.value); + }, + toProto(message: PacketReceiptAbsenceData): Uint8Array { + return PacketReceiptAbsenceData.encode(message).finish(); + }, + toProtoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.PacketReceiptAbsenceData", + value: PacketReceiptAbsenceData.encode(message).finish() + }; } }; function createBaseNextSequenceRecvData(): NextSequenceRecvData { @@ -1630,6 +2164,7 @@ function createBaseNextSequenceRecvData(): NextSequenceRecvData { }; } export const NextSequenceRecvData = { + typeUrl: "/ibc.lightclients.solomachine.v1.NextSequenceRecvData", encode(message: NextSequenceRecvData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1694,5 +2229,38 @@ export const NextSequenceRecvData = { obj.path = message.path; obj.next_seq_recv = message.nextSeqRecv; return obj; + }, + fromAmino(object: NextSequenceRecvDataAmino): NextSequenceRecvData { + return { + path: object.path, + nextSeqRecv: BigInt(object.next_seq_recv) + }; + }, + toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + return obj; + }, + fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { + return NextSequenceRecvData.fromAmino(object.value); + }, + toAminoMsg(message: NextSequenceRecvData): NextSequenceRecvDataAminoMsg { + return { + type: "cosmos-sdk/NextSequenceRecvData", + value: NextSequenceRecvData.toAmino(message) + }; + }, + fromProtoMsg(message: NextSequenceRecvDataProtoMsg): NextSequenceRecvData { + return NextSequenceRecvData.decode(message.value); + }, + toProto(message: NextSequenceRecvData): Uint8Array { + return NextSequenceRecvData.encode(message).finish(); + }, + toProtoMsg(message: NextSequenceRecvData): NextSequenceRecvDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v1.NextSequenceRecvData", + value: NextSequenceRecvData.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v2/solomachine.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v2/solomachine.ts index 92e0e0c3db..1eedd41a86 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v2/solomachine.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v2/solomachine.ts @@ -381,6 +381,7 @@ function createBaseClientState(): ClientState { }; } export const ClientState = { + typeUrl: "/ibc.lightclients.solomachine.v2.ClientState", encode(message: ClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -469,6 +470,43 @@ export const ClientState = { message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? ConsensusState.toSDK(message.consensusState) : undefined); obj.allow_update_after_proposal = message.allowUpdateAfterProposal; return obj; + }, + fromAmino(object: ClientStateAmino): ClientState { + return { + sequence: BigInt(object.sequence), + isFrozen: object.is_frozen, + consensusState: object?.consensus_state ? ConsensusState.fromAmino(object.consensus_state) : undefined, + allowUpdateAfterProposal: object.allow_update_after_proposal + }; + }, + toAmino(message: ClientState): ClientStateAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen; + obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; + obj.allow_update_after_proposal = message.allowUpdateAfterProposal; + return obj; + }, + fromAminoMsg(object: ClientStateAminoMsg): ClientState { + return ClientState.fromAmino(object.value); + }, + toAminoMsg(message: ClientState): ClientStateAminoMsg { + return { + type: "cosmos-sdk/ClientState", + value: ClientState.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateProtoMsg): ClientState { + return ClientState.decode(message.value); + }, + toProto(message: ClientState): Uint8Array { + return ClientState.encode(message).finish(); + }, + toProtoMsg(message: ClientState): ClientStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.ClientState", + value: ClientState.encode(message).finish() + }; } }; function createBaseConsensusState(): ConsensusState { @@ -479,6 +517,7 @@ function createBaseConsensusState(): ConsensusState { }; } export const ConsensusState = { + typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusState", encode(message: ConsensusState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); @@ -555,6 +594,41 @@ export const ConsensusState = { obj.diversifier = message.diversifier; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: ConsensusStateAmino): ConsensusState { + return { + publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, + diversifier: object.diversifier, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: ConsensusState): ConsensusStateAmino { + const obj: any = {}; + obj.public_key = message.publicKey ? Any.toAmino(message.publicKey) : undefined; + obj.diversifier = message.diversifier; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { + return ConsensusState.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg { + return { + type: "cosmos-sdk/ConsensusState", + value: ConsensusState.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState { + return ConsensusState.decode(message.value); + }, + toProto(message: ConsensusState): Uint8Array { + return ConsensusState.encode(message).finish(); + }, + toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusState", + value: ConsensusState.encode(message).finish() + }; } }; function createBaseHeader(): Header { @@ -567,6 +641,7 @@ function createBaseHeader(): Header { }; } export const Header = { + typeUrl: "/ibc.lightclients.solomachine.v2.Header", encode(message: Header, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -667,6 +742,45 @@ export const Header = { message.newPublicKey !== undefined && (obj.new_public_key = message.newPublicKey ? Any.toSDK(message.newPublicKey) : undefined); obj.new_diversifier = message.newDiversifier; return obj; + }, + fromAmino(object: HeaderAmino): Header { + return { + sequence: BigInt(object.sequence), + timestamp: BigInt(object.timestamp), + signature: object.signature, + newPublicKey: object?.new_public_key ? Any.fromAmino(object.new_public_key) : undefined, + newDiversifier: object.new_diversifier + }; + }, + toAmino(message: Header): HeaderAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.signature = message.signature; + obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; + obj.new_diversifier = message.newDiversifier; + return obj; + }, + fromAminoMsg(object: HeaderAminoMsg): Header { + return Header.fromAmino(object.value); + }, + toAminoMsg(message: Header): HeaderAminoMsg { + return { + type: "cosmos-sdk/Header", + value: Header.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderProtoMsg): Header { + return Header.decode(message.value); + }, + toProto(message: Header): Uint8Array { + return Header.encode(message).finish(); + }, + toProtoMsg(message: Header): HeaderProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.Header", + value: Header.encode(message).finish() + }; } }; function createBaseMisbehaviour(): Misbehaviour { @@ -678,6 +792,7 @@ function createBaseMisbehaviour(): Misbehaviour { }; } export const Misbehaviour = { + typeUrl: "/ibc.lightclients.solomachine.v2.Misbehaviour", encode(message: Misbehaviour, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -766,6 +881,43 @@ export const Misbehaviour = { message.signatureOne !== undefined && (obj.signature_one = message.signatureOne ? SignatureAndData.toSDK(message.signatureOne) : undefined); message.signatureTwo !== undefined && (obj.signature_two = message.signatureTwo ? SignatureAndData.toSDK(message.signatureTwo) : undefined); return obj; + }, + fromAmino(object: MisbehaviourAmino): Misbehaviour { + return { + clientId: object.client_id, + sequence: BigInt(object.sequence), + signatureOne: object?.signature_one ? SignatureAndData.fromAmino(object.signature_one) : undefined, + signatureTwo: object?.signature_two ? SignatureAndData.fromAmino(object.signature_two) : undefined + }; + }, + toAmino(message: Misbehaviour): MisbehaviourAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne) : undefined; + obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo) : undefined; + return obj; + }, + fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour { + return Misbehaviour.fromAmino(object.value); + }, + toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg { + return { + type: "cosmos-sdk/Misbehaviour", + value: Misbehaviour.toAmino(message) + }; + }, + fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour { + return Misbehaviour.decode(message.value); + }, + toProto(message: Misbehaviour): Uint8Array { + return Misbehaviour.encode(message).finish(); + }, + toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.Misbehaviour", + value: Misbehaviour.encode(message).finish() + }; } }; function createBaseSignatureAndData(): SignatureAndData { @@ -777,6 +929,7 @@ function createBaseSignatureAndData(): SignatureAndData { }; } export const SignatureAndData = { + typeUrl: "/ibc.lightclients.solomachine.v2.SignatureAndData", encode(message: SignatureAndData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signature.length !== 0) { writer.uint32(10).bytes(message.signature); @@ -865,6 +1018,43 @@ export const SignatureAndData = { obj.data = message.data; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: SignatureAndDataAmino): SignatureAndData { + return { + signature: object.signature, + dataType: isSet(object.data_type) ? dataTypeFromJSON(object.data_type) : -1, + data: object.data, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: SignatureAndData): SignatureAndDataAmino { + const obj: any = {}; + obj.signature = message.signature; + obj.data_type = message.dataType; + obj.data = message.data; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { + return SignatureAndData.fromAmino(object.value); + }, + toAminoMsg(message: SignatureAndData): SignatureAndDataAminoMsg { + return { + type: "cosmos-sdk/SignatureAndData", + value: SignatureAndData.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureAndDataProtoMsg): SignatureAndData { + return SignatureAndData.decode(message.value); + }, + toProto(message: SignatureAndData): Uint8Array { + return SignatureAndData.encode(message).finish(); + }, + toProtoMsg(message: SignatureAndData): SignatureAndDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.SignatureAndData", + value: SignatureAndData.encode(message).finish() + }; } }; function createBaseTimestampedSignatureData(): TimestampedSignatureData { @@ -874,6 +1064,7 @@ function createBaseTimestampedSignatureData(): TimestampedSignatureData { }; } export const TimestampedSignatureData = { + typeUrl: "/ibc.lightclients.solomachine.v2.TimestampedSignatureData", encode(message: TimestampedSignatureData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signatureData.length !== 0) { writer.uint32(10).bytes(message.signatureData); @@ -938,6 +1129,39 @@ export const TimestampedSignatureData = { obj.signature_data = message.signatureData; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: TimestampedSignatureDataAmino): TimestampedSignatureData { + return { + signatureData: object.signature_data, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { + const obj: any = {}; + obj.signature_data = message.signatureData; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { + return TimestampedSignatureData.fromAmino(object.value); + }, + toAminoMsg(message: TimestampedSignatureData): TimestampedSignatureDataAminoMsg { + return { + type: "cosmos-sdk/TimestampedSignatureData", + value: TimestampedSignatureData.toAmino(message) + }; + }, + fromProtoMsg(message: TimestampedSignatureDataProtoMsg): TimestampedSignatureData { + return TimestampedSignatureData.decode(message.value); + }, + toProto(message: TimestampedSignatureData): Uint8Array { + return TimestampedSignatureData.encode(message).finish(); + }, + toProtoMsg(message: TimestampedSignatureData): TimestampedSignatureDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.TimestampedSignatureData", + value: TimestampedSignatureData.encode(message).finish() + }; } }; function createBaseSignBytes(): SignBytes { @@ -950,6 +1174,7 @@ function createBaseSignBytes(): SignBytes { }; } export const SignBytes = { + typeUrl: "/ibc.lightclients.solomachine.v2.SignBytes", encode(message: SignBytes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -1050,6 +1275,45 @@ export const SignBytes = { message.dataType !== undefined && (obj.data_type = dataTypeToJSON(message.dataType)); obj.data = message.data; return obj; + }, + fromAmino(object: SignBytesAmino): SignBytes { + return { + sequence: BigInt(object.sequence), + timestamp: BigInt(object.timestamp), + diversifier: object.diversifier, + dataType: isSet(object.data_type) ? dataTypeFromJSON(object.data_type) : -1, + data: object.data + }; + }, + toAmino(message: SignBytes): SignBytesAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier; + obj.data_type = message.dataType; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: SignBytesAminoMsg): SignBytes { + return SignBytes.fromAmino(object.value); + }, + toAminoMsg(message: SignBytes): SignBytesAminoMsg { + return { + type: "cosmos-sdk/SignBytes", + value: SignBytes.toAmino(message) + }; + }, + fromProtoMsg(message: SignBytesProtoMsg): SignBytes { + return SignBytes.decode(message.value); + }, + toProto(message: SignBytes): Uint8Array { + return SignBytes.encode(message).finish(); + }, + toProtoMsg(message: SignBytes): SignBytesProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.SignBytes", + value: SignBytes.encode(message).finish() + }; } }; function createBaseHeaderData(): HeaderData { @@ -1059,6 +1323,7 @@ function createBaseHeaderData(): HeaderData { }; } export const HeaderData = { + typeUrl: "/ibc.lightclients.solomachine.v2.HeaderData", encode(message: HeaderData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newPubKey !== undefined) { Any.encode(message.newPubKey, writer.uint32(10).fork()).ldelim(); @@ -1123,6 +1388,39 @@ export const HeaderData = { message.newPubKey !== undefined && (obj.new_pub_key = message.newPubKey ? Any.toSDK(message.newPubKey) : undefined); obj.new_diversifier = message.newDiversifier; return obj; + }, + fromAmino(object: HeaderDataAmino): HeaderData { + return { + newPubKey: object?.new_pub_key ? Any.fromAmino(object.new_pub_key) : undefined, + newDiversifier: object.new_diversifier + }; + }, + toAmino(message: HeaderData): HeaderDataAmino { + const obj: any = {}; + obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; + obj.new_diversifier = message.newDiversifier; + return obj; + }, + fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { + return HeaderData.fromAmino(object.value); + }, + toAminoMsg(message: HeaderData): HeaderDataAminoMsg { + return { + type: "cosmos-sdk/HeaderData", + value: HeaderData.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderDataProtoMsg): HeaderData { + return HeaderData.decode(message.value); + }, + toProto(message: HeaderData): Uint8Array { + return HeaderData.encode(message).finish(); + }, + toProtoMsg(message: HeaderData): HeaderDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.HeaderData", + value: HeaderData.encode(message).finish() + }; } }; function createBaseClientStateData(): ClientStateData { @@ -1132,6 +1430,7 @@ function createBaseClientStateData(): ClientStateData { }; } export const ClientStateData = { + typeUrl: "/ibc.lightclients.solomachine.v2.ClientStateData", encode(message: ClientStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1196,6 +1495,39 @@ export const ClientStateData = { obj.path = message.path; message.clientState !== undefined && (obj.client_state = message.clientState ? Any.toSDK(message.clientState) : undefined); return obj; + }, + fromAmino(object: ClientStateDataAmino): ClientStateData { + return { + path: object.path, + clientState: object?.client_state ? Any.fromAmino(object.client_state) : undefined + }; + }, + toAmino(message: ClientStateData): ClientStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.client_state = message.clientState ? Any.toAmino(message.clientState) : undefined; + return obj; + }, + fromAminoMsg(object: ClientStateDataAminoMsg): ClientStateData { + return ClientStateData.fromAmino(object.value); + }, + toAminoMsg(message: ClientStateData): ClientStateDataAminoMsg { + return { + type: "cosmos-sdk/ClientStateData", + value: ClientStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateDataProtoMsg): ClientStateData { + return ClientStateData.decode(message.value); + }, + toProto(message: ClientStateData): Uint8Array { + return ClientStateData.encode(message).finish(); + }, + toProtoMsg(message: ClientStateData): ClientStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.ClientStateData", + value: ClientStateData.encode(message).finish() + }; } }; function createBaseConsensusStateData(): ConsensusStateData { @@ -1205,6 +1537,7 @@ function createBaseConsensusStateData(): ConsensusStateData { }; } export const ConsensusStateData = { + typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusStateData", encode(message: ConsensusStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1269,6 +1602,39 @@ export const ConsensusStateData = { obj.path = message.path; message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? Any.toSDK(message.consensusState) : undefined); return obj; + }, + fromAmino(object: ConsensusStateDataAmino): ConsensusStateData { + return { + path: object.path, + consensusState: object?.consensus_state ? Any.fromAmino(object.consensus_state) : undefined + }; + }, + toAmino(message: ConsensusStateData): ConsensusStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.consensus_state = message.consensusState ? Any.toAmino(message.consensusState) : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusStateDataAminoMsg): ConsensusStateData { + return ConsensusStateData.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusStateData): ConsensusStateDataAminoMsg { + return { + type: "cosmos-sdk/ConsensusStateData", + value: ConsensusStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateDataProtoMsg): ConsensusStateData { + return ConsensusStateData.decode(message.value); + }, + toProto(message: ConsensusStateData): Uint8Array { + return ConsensusStateData.encode(message).finish(); + }, + toProtoMsg(message: ConsensusStateData): ConsensusStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.ConsensusStateData", + value: ConsensusStateData.encode(message).finish() + }; } }; function createBaseConnectionStateData(): ConnectionStateData { @@ -1278,6 +1644,7 @@ function createBaseConnectionStateData(): ConnectionStateData { }; } export const ConnectionStateData = { + typeUrl: "/ibc.lightclients.solomachine.v2.ConnectionStateData", encode(message: ConnectionStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1342,6 +1709,39 @@ export const ConnectionStateData = { obj.path = message.path; message.connection !== undefined && (obj.connection = message.connection ? ConnectionEnd.toSDK(message.connection) : undefined); return obj; + }, + fromAmino(object: ConnectionStateDataAmino): ConnectionStateData { + return { + path: object.path, + connection: object?.connection ? ConnectionEnd.fromAmino(object.connection) : undefined + }; + }, + toAmino(message: ConnectionStateData): ConnectionStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.connection = message.connection ? ConnectionEnd.toAmino(message.connection) : undefined; + return obj; + }, + fromAminoMsg(object: ConnectionStateDataAminoMsg): ConnectionStateData { + return ConnectionStateData.fromAmino(object.value); + }, + toAminoMsg(message: ConnectionStateData): ConnectionStateDataAminoMsg { + return { + type: "cosmos-sdk/ConnectionStateData", + value: ConnectionStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ConnectionStateDataProtoMsg): ConnectionStateData { + return ConnectionStateData.decode(message.value); + }, + toProto(message: ConnectionStateData): Uint8Array { + return ConnectionStateData.encode(message).finish(); + }, + toProtoMsg(message: ConnectionStateData): ConnectionStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.ConnectionStateData", + value: ConnectionStateData.encode(message).finish() + }; } }; function createBaseChannelStateData(): ChannelStateData { @@ -1351,6 +1751,7 @@ function createBaseChannelStateData(): ChannelStateData { }; } export const ChannelStateData = { + typeUrl: "/ibc.lightclients.solomachine.v2.ChannelStateData", encode(message: ChannelStateData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1415,6 +1816,39 @@ export const ChannelStateData = { obj.path = message.path; message.channel !== undefined && (obj.channel = message.channel ? Channel.toSDK(message.channel) : undefined); return obj; + }, + fromAmino(object: ChannelStateDataAmino): ChannelStateData { + return { + path: object.path, + channel: object?.channel ? Channel.fromAmino(object.channel) : undefined + }; + }, + toAmino(message: ChannelStateData): ChannelStateDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.channel = message.channel ? Channel.toAmino(message.channel) : undefined; + return obj; + }, + fromAminoMsg(object: ChannelStateDataAminoMsg): ChannelStateData { + return ChannelStateData.fromAmino(object.value); + }, + toAminoMsg(message: ChannelStateData): ChannelStateDataAminoMsg { + return { + type: "cosmos-sdk/ChannelStateData", + value: ChannelStateData.toAmino(message) + }; + }, + fromProtoMsg(message: ChannelStateDataProtoMsg): ChannelStateData { + return ChannelStateData.decode(message.value); + }, + toProto(message: ChannelStateData): Uint8Array { + return ChannelStateData.encode(message).finish(); + }, + toProtoMsg(message: ChannelStateData): ChannelStateDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.ChannelStateData", + value: ChannelStateData.encode(message).finish() + }; } }; function createBasePacketCommitmentData(): PacketCommitmentData { @@ -1424,6 +1858,7 @@ function createBasePacketCommitmentData(): PacketCommitmentData { }; } export const PacketCommitmentData = { + typeUrl: "/ibc.lightclients.solomachine.v2.PacketCommitmentData", encode(message: PacketCommitmentData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1488,6 +1923,39 @@ export const PacketCommitmentData = { obj.path = message.path; obj.commitment = message.commitment; return obj; + }, + fromAmino(object: PacketCommitmentDataAmino): PacketCommitmentData { + return { + path: object.path, + commitment: object.commitment + }; + }, + toAmino(message: PacketCommitmentData): PacketCommitmentDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.commitment = message.commitment; + return obj; + }, + fromAminoMsg(object: PacketCommitmentDataAminoMsg): PacketCommitmentData { + return PacketCommitmentData.fromAmino(object.value); + }, + toAminoMsg(message: PacketCommitmentData): PacketCommitmentDataAminoMsg { + return { + type: "cosmos-sdk/PacketCommitmentData", + value: PacketCommitmentData.toAmino(message) + }; + }, + fromProtoMsg(message: PacketCommitmentDataProtoMsg): PacketCommitmentData { + return PacketCommitmentData.decode(message.value); + }, + toProto(message: PacketCommitmentData): Uint8Array { + return PacketCommitmentData.encode(message).finish(); + }, + toProtoMsg(message: PacketCommitmentData): PacketCommitmentDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.PacketCommitmentData", + value: PacketCommitmentData.encode(message).finish() + }; } }; function createBasePacketAcknowledgementData(): PacketAcknowledgementData { @@ -1497,6 +1965,7 @@ function createBasePacketAcknowledgementData(): PacketAcknowledgementData { }; } export const PacketAcknowledgementData = { + typeUrl: "/ibc.lightclients.solomachine.v2.PacketAcknowledgementData", encode(message: PacketAcknowledgementData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1561,6 +2030,39 @@ export const PacketAcknowledgementData = { obj.path = message.path; obj.acknowledgement = message.acknowledgement; return obj; + }, + fromAmino(object: PacketAcknowledgementDataAmino): PacketAcknowledgementData { + return { + path: object.path, + acknowledgement: object.acknowledgement + }; + }, + toAmino(message: PacketAcknowledgementData): PacketAcknowledgementDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.acknowledgement = message.acknowledgement; + return obj; + }, + fromAminoMsg(object: PacketAcknowledgementDataAminoMsg): PacketAcknowledgementData { + return PacketAcknowledgementData.fromAmino(object.value); + }, + toAminoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataAminoMsg { + return { + type: "cosmos-sdk/PacketAcknowledgementData", + value: PacketAcknowledgementData.toAmino(message) + }; + }, + fromProtoMsg(message: PacketAcknowledgementDataProtoMsg): PacketAcknowledgementData { + return PacketAcknowledgementData.decode(message.value); + }, + toProto(message: PacketAcknowledgementData): Uint8Array { + return PacketAcknowledgementData.encode(message).finish(); + }, + toProtoMsg(message: PacketAcknowledgementData): PacketAcknowledgementDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.PacketAcknowledgementData", + value: PacketAcknowledgementData.encode(message).finish() + }; } }; function createBasePacketReceiptAbsenceData(): PacketReceiptAbsenceData { @@ -1569,6 +2071,7 @@ function createBasePacketReceiptAbsenceData(): PacketReceiptAbsenceData { }; } export const PacketReceiptAbsenceData = { + typeUrl: "/ibc.lightclients.solomachine.v2.PacketReceiptAbsenceData", encode(message: PacketReceiptAbsenceData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1621,6 +2124,37 @@ export const PacketReceiptAbsenceData = { const obj: any = {}; obj.path = message.path; return obj; + }, + fromAmino(object: PacketReceiptAbsenceDataAmino): PacketReceiptAbsenceData { + return { + path: object.path + }; + }, + toAmino(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataAmino { + const obj: any = {}; + obj.path = message.path; + return obj; + }, + fromAminoMsg(object: PacketReceiptAbsenceDataAminoMsg): PacketReceiptAbsenceData { + return PacketReceiptAbsenceData.fromAmino(object.value); + }, + toAminoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataAminoMsg { + return { + type: "cosmos-sdk/PacketReceiptAbsenceData", + value: PacketReceiptAbsenceData.toAmino(message) + }; + }, + fromProtoMsg(message: PacketReceiptAbsenceDataProtoMsg): PacketReceiptAbsenceData { + return PacketReceiptAbsenceData.decode(message.value); + }, + toProto(message: PacketReceiptAbsenceData): Uint8Array { + return PacketReceiptAbsenceData.encode(message).finish(); + }, + toProtoMsg(message: PacketReceiptAbsenceData): PacketReceiptAbsenceDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.PacketReceiptAbsenceData", + value: PacketReceiptAbsenceData.encode(message).finish() + }; } }; function createBaseNextSequenceRecvData(): NextSequenceRecvData { @@ -1630,6 +2164,7 @@ function createBaseNextSequenceRecvData(): NextSequenceRecvData { }; } export const NextSequenceRecvData = { + typeUrl: "/ibc.lightclients.solomachine.v2.NextSequenceRecvData", encode(message: NextSequenceRecvData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path.length !== 0) { writer.uint32(10).bytes(message.path); @@ -1694,5 +2229,38 @@ export const NextSequenceRecvData = { obj.path = message.path; obj.next_seq_recv = message.nextSeqRecv; return obj; + }, + fromAmino(object: NextSequenceRecvDataAmino): NextSequenceRecvData { + return { + path: object.path, + nextSeqRecv: BigInt(object.next_seq_recv) + }; + }, + toAmino(message: NextSequenceRecvData): NextSequenceRecvDataAmino { + const obj: any = {}; + obj.path = message.path; + obj.next_seq_recv = message.nextSeqRecv ? message.nextSeqRecv.toString() : undefined; + return obj; + }, + fromAminoMsg(object: NextSequenceRecvDataAminoMsg): NextSequenceRecvData { + return NextSequenceRecvData.fromAmino(object.value); + }, + toAminoMsg(message: NextSequenceRecvData): NextSequenceRecvDataAminoMsg { + return { + type: "cosmos-sdk/NextSequenceRecvData", + value: NextSequenceRecvData.toAmino(message) + }; + }, + fromProtoMsg(message: NextSequenceRecvDataProtoMsg): NextSequenceRecvData { + return NextSequenceRecvData.decode(message.value); + }, + toProto(message: NextSequenceRecvData): Uint8Array { + return NextSequenceRecvData.encode(message).finish(); + }, + toProtoMsg(message: NextSequenceRecvData): NextSequenceRecvDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v2.NextSequenceRecvData", + value: NextSequenceRecvData.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v3/solomachine.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v3/solomachine.ts index 89fd991306..3f6b03459d 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v3/solomachine.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/solomachine/v3/solomachine.ts @@ -157,6 +157,7 @@ function createBaseClientState(): ClientState { }; } export const ClientState = { + typeUrl: "/ibc.lightclients.solomachine.v3.ClientState", encode(message: ClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -233,6 +234,41 @@ export const ClientState = { obj.is_frozen = message.isFrozen; message.consensusState !== undefined && (obj.consensus_state = message.consensusState ? ConsensusState.toSDK(message.consensusState) : undefined); return obj; + }, + fromAmino(object: ClientStateAmino): ClientState { + return { + sequence: BigInt(object.sequence), + isFrozen: object.is_frozen, + consensusState: object?.consensus_state ? ConsensusState.fromAmino(object.consensus_state) : undefined + }; + }, + toAmino(message: ClientState): ClientStateAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.is_frozen = message.isFrozen; + obj.consensus_state = message.consensusState ? ConsensusState.toAmino(message.consensusState) : undefined; + return obj; + }, + fromAminoMsg(object: ClientStateAminoMsg): ClientState { + return ClientState.fromAmino(object.value); + }, + toAminoMsg(message: ClientState): ClientStateAminoMsg { + return { + type: "cosmos-sdk/ClientState", + value: ClientState.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateProtoMsg): ClientState { + return ClientState.decode(message.value); + }, + toProto(message: ClientState): Uint8Array { + return ClientState.encode(message).finish(); + }, + toProtoMsg(message: ClientState): ClientStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.ClientState", + value: ClientState.encode(message).finish() + }; } }; function createBaseConsensusState(): ConsensusState { @@ -243,6 +279,7 @@ function createBaseConsensusState(): ConsensusState { }; } export const ConsensusState = { + typeUrl: "/ibc.lightclients.solomachine.v3.ConsensusState", encode(message: ConsensusState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); @@ -319,6 +356,41 @@ export const ConsensusState = { obj.diversifier = message.diversifier; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: ConsensusStateAmino): ConsensusState { + return { + publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, + diversifier: object.diversifier, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: ConsensusState): ConsensusStateAmino { + const obj: any = {}; + obj.public_key = message.publicKey ? Any.toAmino(message.publicKey) : undefined; + obj.diversifier = message.diversifier; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { + return ConsensusState.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg { + return { + type: "cosmos-sdk/ConsensusState", + value: ConsensusState.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState { + return ConsensusState.decode(message.value); + }, + toProto(message: ConsensusState): Uint8Array { + return ConsensusState.encode(message).finish(); + }, + toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.ConsensusState", + value: ConsensusState.encode(message).finish() + }; } }; function createBaseHeader(): Header { @@ -330,6 +402,7 @@ function createBaseHeader(): Header { }; } export const Header = { + typeUrl: "/ibc.lightclients.solomachine.v3.Header", encode(message: Header, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.timestamp !== BigInt(0)) { writer.uint32(8).uint64(message.timestamp); @@ -418,6 +491,43 @@ export const Header = { message.newPublicKey !== undefined && (obj.new_public_key = message.newPublicKey ? Any.toSDK(message.newPublicKey) : undefined); obj.new_diversifier = message.newDiversifier; return obj; + }, + fromAmino(object: HeaderAmino): Header { + return { + timestamp: BigInt(object.timestamp), + signature: object.signature, + newPublicKey: object?.new_public_key ? Any.fromAmino(object.new_public_key) : undefined, + newDiversifier: object.new_diversifier + }; + }, + toAmino(message: Header): HeaderAmino { + const obj: any = {}; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.signature = message.signature; + obj.new_public_key = message.newPublicKey ? Any.toAmino(message.newPublicKey) : undefined; + obj.new_diversifier = message.newDiversifier; + return obj; + }, + fromAminoMsg(object: HeaderAminoMsg): Header { + return Header.fromAmino(object.value); + }, + toAminoMsg(message: Header): HeaderAminoMsg { + return { + type: "cosmos-sdk/Header", + value: Header.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderProtoMsg): Header { + return Header.decode(message.value); + }, + toProto(message: Header): Uint8Array { + return Header.encode(message).finish(); + }, + toProtoMsg(message: Header): HeaderProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.Header", + value: Header.encode(message).finish() + }; } }; function createBaseMisbehaviour(): Misbehaviour { @@ -428,6 +538,7 @@ function createBaseMisbehaviour(): Misbehaviour { }; } export const Misbehaviour = { + typeUrl: "/ibc.lightclients.solomachine.v3.Misbehaviour", encode(message: Misbehaviour, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -504,6 +615,41 @@ export const Misbehaviour = { message.signatureOne !== undefined && (obj.signature_one = message.signatureOne ? SignatureAndData.toSDK(message.signatureOne) : undefined); message.signatureTwo !== undefined && (obj.signature_two = message.signatureTwo ? SignatureAndData.toSDK(message.signatureTwo) : undefined); return obj; + }, + fromAmino(object: MisbehaviourAmino): Misbehaviour { + return { + sequence: BigInt(object.sequence), + signatureOne: object?.signature_one ? SignatureAndData.fromAmino(object.signature_one) : undefined, + signatureTwo: object?.signature_two ? SignatureAndData.fromAmino(object.signature_two) : undefined + }; + }, + toAmino(message: Misbehaviour): MisbehaviourAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.signature_one = message.signatureOne ? SignatureAndData.toAmino(message.signatureOne) : undefined; + obj.signature_two = message.signatureTwo ? SignatureAndData.toAmino(message.signatureTwo) : undefined; + return obj; + }, + fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour { + return Misbehaviour.fromAmino(object.value); + }, + toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg { + return { + type: "cosmos-sdk/Misbehaviour", + value: Misbehaviour.toAmino(message) + }; + }, + fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour { + return Misbehaviour.decode(message.value); + }, + toProto(message: Misbehaviour): Uint8Array { + return Misbehaviour.encode(message).finish(); + }, + toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.Misbehaviour", + value: Misbehaviour.encode(message).finish() + }; } }; function createBaseSignatureAndData(): SignatureAndData { @@ -515,6 +661,7 @@ function createBaseSignatureAndData(): SignatureAndData { }; } export const SignatureAndData = { + typeUrl: "/ibc.lightclients.solomachine.v3.SignatureAndData", encode(message: SignatureAndData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signature.length !== 0) { writer.uint32(10).bytes(message.signature); @@ -603,6 +750,43 @@ export const SignatureAndData = { obj.data = message.data; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: SignatureAndDataAmino): SignatureAndData { + return { + signature: object.signature, + path: object.path, + data: object.data, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: SignatureAndData): SignatureAndDataAmino { + const obj: any = {}; + obj.signature = message.signature; + obj.path = message.path; + obj.data = message.data; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SignatureAndDataAminoMsg): SignatureAndData { + return SignatureAndData.fromAmino(object.value); + }, + toAminoMsg(message: SignatureAndData): SignatureAndDataAminoMsg { + return { + type: "cosmos-sdk/SignatureAndData", + value: SignatureAndData.toAmino(message) + }; + }, + fromProtoMsg(message: SignatureAndDataProtoMsg): SignatureAndData { + return SignatureAndData.decode(message.value); + }, + toProto(message: SignatureAndData): Uint8Array { + return SignatureAndData.encode(message).finish(); + }, + toProtoMsg(message: SignatureAndData): SignatureAndDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.SignatureAndData", + value: SignatureAndData.encode(message).finish() + }; } }; function createBaseTimestampedSignatureData(): TimestampedSignatureData { @@ -612,6 +796,7 @@ function createBaseTimestampedSignatureData(): TimestampedSignatureData { }; } export const TimestampedSignatureData = { + typeUrl: "/ibc.lightclients.solomachine.v3.TimestampedSignatureData", encode(message: TimestampedSignatureData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signatureData.length !== 0) { writer.uint32(10).bytes(message.signatureData); @@ -676,6 +861,39 @@ export const TimestampedSignatureData = { obj.signature_data = message.signatureData; obj.timestamp = message.timestamp; return obj; + }, + fromAmino(object: TimestampedSignatureDataAmino): TimestampedSignatureData { + return { + signatureData: object.signature_data, + timestamp: BigInt(object.timestamp) + }; + }, + toAmino(message: TimestampedSignatureData): TimestampedSignatureDataAmino { + const obj: any = {}; + obj.signature_data = message.signatureData; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + return obj; + }, + fromAminoMsg(object: TimestampedSignatureDataAminoMsg): TimestampedSignatureData { + return TimestampedSignatureData.fromAmino(object.value); + }, + toAminoMsg(message: TimestampedSignatureData): TimestampedSignatureDataAminoMsg { + return { + type: "cosmos-sdk/TimestampedSignatureData", + value: TimestampedSignatureData.toAmino(message) + }; + }, + fromProtoMsg(message: TimestampedSignatureDataProtoMsg): TimestampedSignatureData { + return TimestampedSignatureData.decode(message.value); + }, + toProto(message: TimestampedSignatureData): Uint8Array { + return TimestampedSignatureData.encode(message).finish(); + }, + toProtoMsg(message: TimestampedSignatureData): TimestampedSignatureDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.TimestampedSignatureData", + value: TimestampedSignatureData.encode(message).finish() + }; } }; function createBaseSignBytes(): SignBytes { @@ -688,6 +906,7 @@ function createBaseSignBytes(): SignBytes { }; } export const SignBytes = { + typeUrl: "/ibc.lightclients.solomachine.v3.SignBytes", encode(message: SignBytes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sequence !== BigInt(0)) { writer.uint32(8).uint64(message.sequence); @@ -788,6 +1007,45 @@ export const SignBytes = { obj.path = message.path; obj.data = message.data; return obj; + }, + fromAmino(object: SignBytesAmino): SignBytes { + return { + sequence: BigInt(object.sequence), + timestamp: BigInt(object.timestamp), + diversifier: object.diversifier, + path: object.path, + data: object.data + }; + }, + toAmino(message: SignBytes): SignBytesAmino { + const obj: any = {}; + obj.sequence = message.sequence ? message.sequence.toString() : undefined; + obj.timestamp = message.timestamp ? message.timestamp.toString() : undefined; + obj.diversifier = message.diversifier; + obj.path = message.path; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: SignBytesAminoMsg): SignBytes { + return SignBytes.fromAmino(object.value); + }, + toAminoMsg(message: SignBytes): SignBytesAminoMsg { + return { + type: "cosmos-sdk/SignBytes", + value: SignBytes.toAmino(message) + }; + }, + fromProtoMsg(message: SignBytesProtoMsg): SignBytes { + return SignBytes.decode(message.value); + }, + toProto(message: SignBytes): Uint8Array { + return SignBytes.encode(message).finish(); + }, + toProtoMsg(message: SignBytes): SignBytesProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.SignBytes", + value: SignBytes.encode(message).finish() + }; } }; function createBaseHeaderData(): HeaderData { @@ -797,6 +1055,7 @@ function createBaseHeaderData(): HeaderData { }; } export const HeaderData = { + typeUrl: "/ibc.lightclients.solomachine.v3.HeaderData", encode(message: HeaderData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newPubKey !== undefined) { Any.encode(message.newPubKey, writer.uint32(10).fork()).ldelim(); @@ -861,5 +1120,38 @@ export const HeaderData = { message.newPubKey !== undefined && (obj.new_pub_key = message.newPubKey ? Any.toSDK(message.newPubKey) : undefined); obj.new_diversifier = message.newDiversifier; return obj; + }, + fromAmino(object: HeaderDataAmino): HeaderData { + return { + newPubKey: object?.new_pub_key ? Any.fromAmino(object.new_pub_key) : undefined, + newDiversifier: object.new_diversifier + }; + }, + toAmino(message: HeaderData): HeaderDataAmino { + const obj: any = {}; + obj.new_pub_key = message.newPubKey ? Any.toAmino(message.newPubKey) : undefined; + obj.new_diversifier = message.newDiversifier; + return obj; + }, + fromAminoMsg(object: HeaderDataAminoMsg): HeaderData { + return HeaderData.fromAmino(object.value); + }, + toAminoMsg(message: HeaderData): HeaderDataAminoMsg { + return { + type: "cosmos-sdk/HeaderData", + value: HeaderData.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderDataProtoMsg): HeaderData { + return HeaderData.decode(message.value); + }, + toProto(message: HeaderData): Uint8Array { + return HeaderData.encode(message).finish(); + }, + toProtoMsg(message: HeaderData): HeaderDataProtoMsg { + return { + typeUrl: "/ibc.lightclients.solomachine.v3.HeaderData", + value: HeaderData.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts index 3e4974f0a0..f3a9d54eca 100644 --- a/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts +++ b/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts @@ -175,6 +175,7 @@ function createBaseClientState(): ClientState { }; } export const ClientState = { + typeUrl: "/ibc.lightclients.tendermint.v1.ClientState", encode(message: ClientState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.chainId !== "") { writer.uint32(10).string(message.chainId); @@ -363,6 +364,65 @@ export const ClientState = { obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; return obj; + }, + fromAmino(object: ClientStateAmino): ClientState { + return { + chainId: object.chain_id, + trustLevel: object?.trust_level ? Fraction.fromAmino(object.trust_level) : undefined, + trustingPeriod: object?.trusting_period ? Duration.fromAmino(object.trusting_period) : undefined, + unbondingPeriod: object?.unbonding_period ? Duration.fromAmino(object.unbonding_period) : undefined, + maxClockDrift: object?.max_clock_drift ? Duration.fromAmino(object.max_clock_drift) : undefined, + frozenHeight: object?.frozen_height ? Height.fromAmino(object.frozen_height) : undefined, + latestHeight: object?.latest_height ? Height.fromAmino(object.latest_height) : undefined, + proofSpecs: Array.isArray(object?.proof_specs) ? object.proof_specs.map((e: any) => ProofSpec.fromAmino(e)) : [], + upgradePath: Array.isArray(object?.upgrade_path) ? object.upgrade_path.map((e: any) => e) : [], + allowUpdateAfterExpiry: object.allow_update_after_expiry, + allowUpdateAfterMisbehaviour: object.allow_update_after_misbehaviour + }; + }, + toAmino(message: ClientState): ClientStateAmino { + const obj: any = {}; + obj.chain_id = message.chainId; + obj.trust_level = message.trustLevel ? Fraction.toAmino(message.trustLevel) : undefined; + obj.trusting_period = message.trustingPeriod ? Duration.toAmino(message.trustingPeriod) : undefined; + obj.unbonding_period = message.unbondingPeriod ? Duration.toAmino(message.unbondingPeriod) : undefined; + obj.max_clock_drift = message.maxClockDrift ? Duration.toAmino(message.maxClockDrift) : undefined; + obj.frozen_height = message.frozenHeight ? Height.toAmino(message.frozenHeight) : {}; + obj.latest_height = message.latestHeight ? Height.toAmino(message.latestHeight) : {}; + if (message.proofSpecs) { + obj.proof_specs = message.proofSpecs.map(e => e ? ProofSpec.toAmino(e) : undefined); + } else { + obj.proof_specs = []; + } + if (message.upgradePath) { + obj.upgrade_path = message.upgradePath.map(e => e); + } else { + obj.upgrade_path = []; + } + obj.allow_update_after_expiry = message.allowUpdateAfterExpiry; + obj.allow_update_after_misbehaviour = message.allowUpdateAfterMisbehaviour; + return obj; + }, + fromAminoMsg(object: ClientStateAminoMsg): ClientState { + return ClientState.fromAmino(object.value); + }, + toAminoMsg(message: ClientState): ClientStateAminoMsg { + return { + type: "cosmos-sdk/ClientState", + value: ClientState.toAmino(message) + }; + }, + fromProtoMsg(message: ClientStateProtoMsg): ClientState { + return ClientState.decode(message.value); + }, + toProto(message: ClientState): Uint8Array { + return ClientState.encode(message).finish(); + }, + toProtoMsg(message: ClientState): ClientStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.tendermint.v1.ClientState", + value: ClientState.encode(message).finish() + }; } }; function createBaseConsensusState(): ConsensusState { @@ -373,6 +433,7 @@ function createBaseConsensusState(): ConsensusState { }; } export const ConsensusState = { + typeUrl: "/ibc.lightclients.tendermint.v1.ConsensusState", encode(message: ConsensusState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.timestamp !== undefined) { Timestamp.encode(toTimestamp(message.timestamp), writer.uint32(10).fork()).ldelim(); @@ -449,6 +510,41 @@ export const ConsensusState = { message.root !== undefined && (obj.root = message.root ? MerkleRoot.toSDK(message.root) : undefined); obj.next_validators_hash = message.nextValidatorsHash; return obj; + }, + fromAmino(object: ConsensusStateAmino): ConsensusState { + return { + timestamp: object.timestamp, + root: object?.root ? MerkleRoot.fromAmino(object.root) : undefined, + nextValidatorsHash: object.next_validators_hash + }; + }, + toAmino(message: ConsensusState): ConsensusStateAmino { + const obj: any = {}; + obj.timestamp = message.timestamp; + obj.root = message.root ? MerkleRoot.toAmino(message.root) : undefined; + obj.next_validators_hash = message.nextValidatorsHash; + return obj; + }, + fromAminoMsg(object: ConsensusStateAminoMsg): ConsensusState { + return ConsensusState.fromAmino(object.value); + }, + toAminoMsg(message: ConsensusState): ConsensusStateAminoMsg { + return { + type: "cosmos-sdk/ConsensusState", + value: ConsensusState.toAmino(message) + }; + }, + fromProtoMsg(message: ConsensusStateProtoMsg): ConsensusState { + return ConsensusState.decode(message.value); + }, + toProto(message: ConsensusState): Uint8Array { + return ConsensusState.encode(message).finish(); + }, + toProtoMsg(message: ConsensusState): ConsensusStateProtoMsg { + return { + typeUrl: "/ibc.lightclients.tendermint.v1.ConsensusState", + value: ConsensusState.encode(message).finish() + }; } }; function createBaseMisbehaviour(): Misbehaviour { @@ -459,6 +555,7 @@ function createBaseMisbehaviour(): Misbehaviour { }; } export const Misbehaviour = { + typeUrl: "/ibc.lightclients.tendermint.v1.Misbehaviour", encode(message: Misbehaviour, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.clientId !== "") { writer.uint32(10).string(message.clientId); @@ -535,6 +632,41 @@ export const Misbehaviour = { message.header1 !== undefined && (obj.header_1 = message.header1 ? Header.toSDK(message.header1) : undefined); message.header2 !== undefined && (obj.header_2 = message.header2 ? Header.toSDK(message.header2) : undefined); return obj; + }, + fromAmino(object: MisbehaviourAmino): Misbehaviour { + return { + clientId: object.client_id, + header1: object?.header_1 ? Header.fromAmino(object.header_1) : undefined, + header2: object?.header_2 ? Header.fromAmino(object.header_2) : undefined + }; + }, + toAmino(message: Misbehaviour): MisbehaviourAmino { + const obj: any = {}; + obj.client_id = message.clientId; + obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined; + obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined; + return obj; + }, + fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour { + return Misbehaviour.fromAmino(object.value); + }, + toAminoMsg(message: Misbehaviour): MisbehaviourAminoMsg { + return { + type: "cosmos-sdk/Misbehaviour", + value: Misbehaviour.toAmino(message) + }; + }, + fromProtoMsg(message: MisbehaviourProtoMsg): Misbehaviour { + return Misbehaviour.decode(message.value); + }, + toProto(message: Misbehaviour): Uint8Array { + return Misbehaviour.encode(message).finish(); + }, + toProtoMsg(message: Misbehaviour): MisbehaviourProtoMsg { + return { + typeUrl: "/ibc.lightclients.tendermint.v1.Misbehaviour", + value: Misbehaviour.encode(message).finish() + }; } }; function createBaseHeader(): Header { @@ -546,6 +678,7 @@ function createBaseHeader(): Header { }; } export const Header = { + typeUrl: "/ibc.lightclients.tendermint.v1.Header", encode(message: Header, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedHeader !== undefined) { SignedHeader.encode(message.signedHeader, writer.uint32(10).fork()).ldelim(); @@ -634,6 +767,43 @@ export const Header = { message.trustedHeight !== undefined && (obj.trusted_height = message.trustedHeight ? Height.toSDK(message.trustedHeight) : undefined); message.trustedValidators !== undefined && (obj.trusted_validators = message.trustedValidators ? ValidatorSet.toSDK(message.trustedValidators) : undefined); return obj; + }, + fromAmino(object: HeaderAmino): Header { + return { + signedHeader: object?.signed_header ? SignedHeader.fromAmino(object.signed_header) : undefined, + validatorSet: object?.validator_set ? ValidatorSet.fromAmino(object.validator_set) : undefined, + trustedHeight: object?.trusted_height ? Height.fromAmino(object.trusted_height) : undefined, + trustedValidators: object?.trusted_validators ? ValidatorSet.fromAmino(object.trusted_validators) : undefined + }; + }, + toAmino(message: Header): HeaderAmino { + const obj: any = {}; + obj.signed_header = message.signedHeader ? SignedHeader.toAmino(message.signedHeader) : undefined; + obj.validator_set = message.validatorSet ? ValidatorSet.toAmino(message.validatorSet) : undefined; + obj.trusted_height = message.trustedHeight ? Height.toAmino(message.trustedHeight) : {}; + obj.trusted_validators = message.trustedValidators ? ValidatorSet.toAmino(message.trustedValidators) : undefined; + return obj; + }, + fromAminoMsg(object: HeaderAminoMsg): Header { + return Header.fromAmino(object.value); + }, + toAminoMsg(message: Header): HeaderAminoMsg { + return { + type: "cosmos-sdk/Header", + value: Header.toAmino(message) + }; + }, + fromProtoMsg(message: HeaderProtoMsg): Header { + return Header.decode(message.value); + }, + toProto(message: Header): Uint8Array { + return Header.encode(message).finish(); + }, + toProtoMsg(message: Header): HeaderProtoMsg { + return { + typeUrl: "/ibc.lightclients.tendermint.v1.Header", + value: Header.encode(message).finish() + }; } }; function createBaseFraction(): Fraction { @@ -643,6 +813,7 @@ function createBaseFraction(): Fraction { }; } export const Fraction = { + typeUrl: "/ibc.lightclients.tendermint.v1.Fraction", encode(message: Fraction, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numerator !== BigInt(0)) { writer.uint32(8).uint64(message.numerator); @@ -707,5 +878,38 @@ export const Fraction = { obj.numerator = message.numerator; obj.denominator = message.denominator; return obj; + }, + fromAmino(object: FractionAmino): Fraction { + return { + numerator: BigInt(object.numerator), + denominator: BigInt(object.denominator) + }; + }, + toAmino(message: Fraction): FractionAmino { + const obj: any = {}; + obj.numerator = message.numerator ? message.numerator.toString() : undefined; + obj.denominator = message.denominator ? message.denominator.toString() : undefined; + return obj; + }, + fromAminoMsg(object: FractionAminoMsg): Fraction { + return Fraction.fromAmino(object.value); + }, + toAminoMsg(message: Fraction): FractionAminoMsg { + return { + type: "cosmos-sdk/Fraction", + value: Fraction.toAmino(message) + }; + }, + fromProtoMsg(message: FractionProtoMsg): Fraction { + return Fraction.decode(message.value); + }, + toProto(message: Fraction): Uint8Array { + return Fraction.encode(message).finish(); + }, + toProtoMsg(message: Fraction): FractionProtoMsg { + return { + typeUrl: "/ibc.lightclients.tendermint.v1.Fraction", + value: Fraction.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts b/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts index 461f21c305..a1f71289a3 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/accum/v1beta1/accum.ts @@ -32,6 +32,7 @@ function createBaseAccumulatorContent(): AccumulatorContent { }; } export const AccumulatorContent = { + typeUrl: "/osmosis.accum.v1beta1.AccumulatorContent", encode(message: AccumulatorContent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accumValue) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -104,12 +105,50 @@ export const AccumulatorContent = { } obj.total_shares = message.totalShares; return obj; + }, + fromAmino(object: AccumulatorContentAmino): AccumulatorContent { + return { + accumValue: Array.isArray(object?.accum_value) ? object.accum_value.map((e: any) => DecCoin.fromAmino(e)) : [], + totalShares: object.total_shares + }; + }, + toAmino(message: AccumulatorContent): AccumulatorContentAmino { + const obj: any = {}; + if (message.accumValue) { + obj.accum_value = message.accumValue.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.accum_value = []; + } + obj.total_shares = message.totalShares; + return obj; + }, + fromAminoMsg(object: AccumulatorContentAminoMsg): AccumulatorContent { + return AccumulatorContent.fromAmino(object.value); + }, + toAminoMsg(message: AccumulatorContent): AccumulatorContentAminoMsg { + return { + type: "osmosis/accum/accumulator-content", + value: AccumulatorContent.toAmino(message) + }; + }, + fromProtoMsg(message: AccumulatorContentProtoMsg): AccumulatorContent { + return AccumulatorContent.decode(message.value); + }, + toProto(message: AccumulatorContent): Uint8Array { + return AccumulatorContent.encode(message).finish(); + }, + toProtoMsg(message: AccumulatorContent): AccumulatorContentProtoMsg { + return { + typeUrl: "/osmosis.accum.v1beta1.AccumulatorContent", + value: AccumulatorContent.encode(message).finish() + }; } }; function createBaseOptions(): Options { return {}; } export const Options = { + typeUrl: "/osmosis.accum.v1beta1.Options", encode(_: Options, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -147,6 +186,34 @@ export const Options = { toSDK(_: Options): OptionsSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: OptionsAmino): Options { + return {}; + }, + toAmino(_: Options): OptionsAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: OptionsAminoMsg): Options { + return Options.fromAmino(object.value); + }, + toAminoMsg(message: Options): OptionsAminoMsg { + return { + type: "osmosis/accum/options", + value: Options.toAmino(message) + }; + }, + fromProtoMsg(message: OptionsProtoMsg): Options { + return Options.decode(message.value); + }, + toProto(message: Options): Uint8Array { + return Options.encode(message).finish(); + }, + toProtoMsg(message: Options): OptionsProtoMsg { + return { + typeUrl: "/osmosis.accum.v1beta1.Options", + value: Options.encode(message).finish() + }; } }; function createBaseRecord(): Record { @@ -158,6 +225,7 @@ function createBaseRecord(): Record { }; } export const Record = { + typeUrl: "/osmosis.accum.v1beta1.Record", encode(message: Record, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numShares !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.numShares, 18).atomics); @@ -262,5 +330,50 @@ export const Record = { } message.options !== undefined && (obj.options = message.options ? Options.toSDK(message.options) : undefined); return obj; + }, + fromAmino(object: RecordAmino): Record { + return { + numShares: object.num_shares, + initAccumValue: Array.isArray(object?.init_accum_value) ? object.init_accum_value.map((e: any) => DecCoin.fromAmino(e)) : [], + unclaimedRewards: Array.isArray(object?.unclaimed_rewards) ? object.unclaimed_rewards.map((e: any) => DecCoin.fromAmino(e)) : [], + options: object?.options ? Options.fromAmino(object.options) : undefined + }; + }, + toAmino(message: Record): RecordAmino { + const obj: any = {}; + obj.num_shares = message.numShares; + if (message.initAccumValue) { + obj.init_accum_value = message.initAccumValue.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.init_accum_value = []; + } + if (message.unclaimedRewards) { + obj.unclaimed_rewards = message.unclaimedRewards.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.unclaimed_rewards = []; + } + obj.options = message.options ? Options.toAmino(message.options) : undefined; + return obj; + }, + fromAminoMsg(object: RecordAminoMsg): Record { + return Record.fromAmino(object.value); + }, + toAminoMsg(message: Record): RecordAminoMsg { + return { + type: "osmosis/accum/record", + value: Record.toAmino(message) + }; + }, + fromProtoMsg(message: RecordProtoMsg): Record { + return Record.decode(message.value); + }, + toProto(message: Record): Uint8Array { + return Record.encode(message).finish(); + }, + toProtoMsg(message: Record): RecordProtoMsg { + return { + typeUrl: "/osmosis.accum.v1beta1.Record", + value: Record.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts index 16158a685e..24273c32df 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/claim.ts @@ -71,6 +71,7 @@ function createBaseClaimRecord(): ClaimRecord { }; } export const ClaimRecord = { + typeUrl: "/osmosis.claim.v1beta1.ClaimRecord", encode(message: ClaimRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -172,5 +173,48 @@ export const ClaimRecord = { obj.action_completed = []; } return obj; + }, + fromAmino(object: ClaimRecordAmino): ClaimRecord { + return { + address: object.address, + initialClaimableAmount: Array.isArray(object?.initial_claimable_amount) ? object.initial_claimable_amount.map((e: any) => Coin.fromAmino(e)) : [], + actionCompleted: Array.isArray(object?.action_completed) ? object.action_completed.map((e: any) => e) : [] + }; + }, + toAmino(message: ClaimRecord): ClaimRecordAmino { + const obj: any = {}; + obj.address = message.address; + if (message.initialClaimableAmount) { + obj.initial_claimable_amount = message.initialClaimableAmount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.initial_claimable_amount = []; + } + if (message.actionCompleted) { + obj.action_completed = message.actionCompleted.map(e => e); + } else { + obj.action_completed = []; + } + return obj; + }, + fromAminoMsg(object: ClaimRecordAminoMsg): ClaimRecord { + return ClaimRecord.fromAmino(object.value); + }, + toAminoMsg(message: ClaimRecord): ClaimRecordAminoMsg { + return { + type: "osmosis/claim/claim-record", + value: ClaimRecord.toAmino(message) + }; + }, + fromProtoMsg(message: ClaimRecordProtoMsg): ClaimRecord { + return ClaimRecord.decode(message.value); + }, + toProto(message: ClaimRecord): Uint8Array { + return ClaimRecord.encode(message).finish(); + }, + toProtoMsg(message: ClaimRecord): ClaimRecordProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.ClaimRecord", + value: ClaimRecord.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts index c3247af45c..cb66c9c24b 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/genesis.ts @@ -27,6 +27,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.claim.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.moduleAccountBalance !== undefined) { Coin.encode(message.moduleAccountBalance, writer.uint32(10).fork()).ldelim(); @@ -111,5 +112,44 @@ export const GenesisState = { obj.claim_records = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + moduleAccountBalance: object?.module_account_balance ? Coin.fromAmino(object.module_account_balance) : undefined, + params: object?.params ? Params.fromAmino(object.params) : undefined, + claimRecords: Array.isArray(object?.claim_records) ? object.claim_records.map((e: any) => ClaimRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.module_account_balance = message.moduleAccountBalance ? Coin.toAmino(message.moduleAccountBalance) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.claimRecords) { + obj.claim_records = message.claimRecords.map(e => e ? ClaimRecord.toAmino(e) : undefined); + } else { + obj.claim_records = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/claim/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts index 357d50fd57..ddfe413db7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/params.ts @@ -27,6 +27,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.claim.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.airdropStartTime !== undefined) { Timestamp.encode(toTimestamp(message.airdropStartTime), writer.uint32(10).fork()).ldelim(); @@ -115,5 +116,42 @@ export const Params = { message.durationOfDecay !== undefined && (obj.duration_of_decay = message.durationOfDecay ? Duration.toSDK(message.durationOfDecay) : undefined); obj.claim_denom = message.claimDenom; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + airdropStartTime: object.airdrop_start_time, + durationUntilDecay: object?.duration_until_decay ? Duration.fromAmino(object.duration_until_decay) : undefined, + durationOfDecay: object?.duration_of_decay ? Duration.fromAmino(object.duration_of_decay) : undefined, + claimDenom: object.claim_denom + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.airdrop_start_time = message.airdropStartTime; + obj.duration_until_decay = message.durationUntilDecay ? Duration.toAmino(message.durationUntilDecay) : undefined; + obj.duration_of_decay = message.durationOfDecay ? Duration.toAmino(message.durationOfDecay) : undefined; + obj.claim_denom = message.claimDenom; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/claim/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts index 5155543c80..e0866ec947 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/claim/v1beta1/query.ts @@ -72,6 +72,7 @@ function createBaseQueryModuleAccountBalanceRequest(): QueryModuleAccountBalance return {}; } export const QueryModuleAccountBalanceRequest = { + typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceRequest", encode(_: QueryModuleAccountBalanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -109,6 +110,34 @@ export const QueryModuleAccountBalanceRequest = { toSDK(_: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryModuleAccountBalanceRequestAmino): QueryModuleAccountBalanceRequest { + return {}; + }, + toAmino(_: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryModuleAccountBalanceRequestAminoMsg): QueryModuleAccountBalanceRequest { + return QueryModuleAccountBalanceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestAminoMsg { + return { + type: "osmosis/claim/query-module-account-balance-request", + value: QueryModuleAccountBalanceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryModuleAccountBalanceRequestProtoMsg): QueryModuleAccountBalanceRequest { + return QueryModuleAccountBalanceRequest.decode(message.value); + }, + toProto(message: QueryModuleAccountBalanceRequest): Uint8Array { + return QueryModuleAccountBalanceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryModuleAccountBalanceRequest): QueryModuleAccountBalanceRequestProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceRequest", + value: QueryModuleAccountBalanceRequest.encode(message).finish() + }; } }; function createBaseQueryModuleAccountBalanceResponse(): QueryModuleAccountBalanceResponse { @@ -117,6 +146,7 @@ function createBaseQueryModuleAccountBalanceResponse(): QueryModuleAccountBalanc }; } export const QueryModuleAccountBalanceResponse = { + typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceResponse", encode(message: QueryModuleAccountBalanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.moduleAccountBalance) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -177,12 +207,48 @@ export const QueryModuleAccountBalanceResponse = { obj.moduleAccountBalance = []; } return obj; + }, + fromAmino(object: QueryModuleAccountBalanceResponseAmino): QueryModuleAccountBalanceResponse { + return { + moduleAccountBalance: Array.isArray(object?.moduleAccountBalance) ? object.moduleAccountBalance.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryModuleAccountBalanceResponse): QueryModuleAccountBalanceResponseAmino { + const obj: any = {}; + if (message.moduleAccountBalance) { + obj.moduleAccountBalance = message.moduleAccountBalance.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.moduleAccountBalance = []; + } + return obj; + }, + fromAminoMsg(object: QueryModuleAccountBalanceResponseAminoMsg): QueryModuleAccountBalanceResponse { + return QueryModuleAccountBalanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryModuleAccountBalanceResponse): QueryModuleAccountBalanceResponseAminoMsg { + return { + type: "osmosis/claim/query-module-account-balance-response", + value: QueryModuleAccountBalanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryModuleAccountBalanceResponseProtoMsg): QueryModuleAccountBalanceResponse { + return QueryModuleAccountBalanceResponse.decode(message.value); + }, + toProto(message: QueryModuleAccountBalanceResponse): Uint8Array { + return QueryModuleAccountBalanceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryModuleAccountBalanceResponse): QueryModuleAccountBalanceResponseProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryModuleAccountBalanceResponse", + value: QueryModuleAccountBalanceResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.claim.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -220,6 +286,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/claim/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -228,6 +322,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.claim.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -280,6 +375,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/claim/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryClaimRecordRequest(): QueryClaimRecordRequest { @@ -288,6 +414,7 @@ function createBaseQueryClaimRecordRequest(): QueryClaimRecordRequest { }; } export const QueryClaimRecordRequest = { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordRequest", encode(message: QueryClaimRecordRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -340,6 +467,37 @@ export const QueryClaimRecordRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryClaimRecordRequestAmino): QueryClaimRecordRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryClaimRecordRequest): QueryClaimRecordRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryClaimRecordRequestAminoMsg): QueryClaimRecordRequest { + return QueryClaimRecordRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClaimRecordRequest): QueryClaimRecordRequestAminoMsg { + return { + type: "osmosis/claim/query-claim-record-request", + value: QueryClaimRecordRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClaimRecordRequestProtoMsg): QueryClaimRecordRequest { + return QueryClaimRecordRequest.decode(message.value); + }, + toProto(message: QueryClaimRecordRequest): Uint8Array { + return QueryClaimRecordRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimRecordRequest): QueryClaimRecordRequestProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordRequest", + value: QueryClaimRecordRequest.encode(message).finish() + }; } }; function createBaseQueryClaimRecordResponse(): QueryClaimRecordResponse { @@ -348,6 +506,7 @@ function createBaseQueryClaimRecordResponse(): QueryClaimRecordResponse { }; } export const QueryClaimRecordResponse = { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordResponse", encode(message: QueryClaimRecordResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.claimRecord !== undefined) { ClaimRecord.encode(message.claimRecord, writer.uint32(10).fork()).ldelim(); @@ -400,6 +559,37 @@ export const QueryClaimRecordResponse = { const obj: any = {}; message.claimRecord !== undefined && (obj.claim_record = message.claimRecord ? ClaimRecord.toSDK(message.claimRecord) : undefined); return obj; + }, + fromAmino(object: QueryClaimRecordResponseAmino): QueryClaimRecordResponse { + return { + claimRecord: object?.claim_record ? ClaimRecord.fromAmino(object.claim_record) : undefined + }; + }, + toAmino(message: QueryClaimRecordResponse): QueryClaimRecordResponseAmino { + const obj: any = {}; + obj.claim_record = message.claimRecord ? ClaimRecord.toAmino(message.claimRecord) : undefined; + return obj; + }, + fromAminoMsg(object: QueryClaimRecordResponseAminoMsg): QueryClaimRecordResponse { + return QueryClaimRecordResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClaimRecordResponse): QueryClaimRecordResponseAminoMsg { + return { + type: "osmosis/claim/query-claim-record-response", + value: QueryClaimRecordResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClaimRecordResponseProtoMsg): QueryClaimRecordResponse { + return QueryClaimRecordResponse.decode(message.value); + }, + toProto(message: QueryClaimRecordResponse): Uint8Array { + return QueryClaimRecordResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimRecordResponse): QueryClaimRecordResponseProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimRecordResponse", + value: QueryClaimRecordResponse.encode(message).finish() + }; } }; function createBaseQueryClaimableForActionRequest(): QueryClaimableForActionRequest { @@ -409,6 +599,7 @@ function createBaseQueryClaimableForActionRequest(): QueryClaimableForActionRequ }; } export const QueryClaimableForActionRequest = { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionRequest", encode(message: QueryClaimableForActionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -473,6 +664,39 @@ export const QueryClaimableForActionRequest = { obj.address = message.address; message.action !== undefined && (obj.action = actionToJSON(message.action)); return obj; + }, + fromAmino(object: QueryClaimableForActionRequestAmino): QueryClaimableForActionRequest { + return { + address: object.address, + action: isSet(object.action) ? actionFromJSON(object.action) : -1 + }; + }, + toAmino(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.action = message.action; + return obj; + }, + fromAminoMsg(object: QueryClaimableForActionRequestAminoMsg): QueryClaimableForActionRequest { + return QueryClaimableForActionRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestAminoMsg { + return { + type: "osmosis/claim/query-claimable-for-action-request", + value: QueryClaimableForActionRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClaimableForActionRequestProtoMsg): QueryClaimableForActionRequest { + return QueryClaimableForActionRequest.decode(message.value); + }, + toProto(message: QueryClaimableForActionRequest): Uint8Array { + return QueryClaimableForActionRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimableForActionRequest): QueryClaimableForActionRequestProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionRequest", + value: QueryClaimableForActionRequest.encode(message).finish() + }; } }; function createBaseQueryClaimableForActionResponse(): QueryClaimableForActionResponse { @@ -481,6 +705,7 @@ function createBaseQueryClaimableForActionResponse(): QueryClaimableForActionRes }; } export const QueryClaimableForActionResponse = { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionResponse", encode(message: QueryClaimableForActionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -541,6 +766,41 @@ export const QueryClaimableForActionResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: QueryClaimableForActionResponseAmino): QueryClaimableForActionResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryClaimableForActionResponse): QueryClaimableForActionResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: QueryClaimableForActionResponseAminoMsg): QueryClaimableForActionResponse { + return QueryClaimableForActionResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClaimableForActionResponse): QueryClaimableForActionResponseAminoMsg { + return { + type: "osmosis/claim/query-claimable-for-action-response", + value: QueryClaimableForActionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClaimableForActionResponseProtoMsg): QueryClaimableForActionResponse { + return QueryClaimableForActionResponse.decode(message.value); + }, + toProto(message: QueryClaimableForActionResponse): Uint8Array { + return QueryClaimableForActionResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimableForActionResponse): QueryClaimableForActionResponseProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryClaimableForActionResponse", + value: QueryClaimableForActionResponse.encode(message).finish() + }; } }; function createBaseQueryTotalClaimableRequest(): QueryTotalClaimableRequest { @@ -549,6 +809,7 @@ function createBaseQueryTotalClaimableRequest(): QueryTotalClaimableRequest { }; } export const QueryTotalClaimableRequest = { + typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableRequest", encode(message: QueryTotalClaimableRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -601,6 +862,37 @@ export const QueryTotalClaimableRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: QueryTotalClaimableRequestAmino): QueryTotalClaimableRequest { + return { + address: object.address + }; + }, + toAmino(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: QueryTotalClaimableRequestAminoMsg): QueryTotalClaimableRequest { + return QueryTotalClaimableRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestAminoMsg { + return { + type: "osmosis/claim/query-total-claimable-request", + value: QueryTotalClaimableRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalClaimableRequestProtoMsg): QueryTotalClaimableRequest { + return QueryTotalClaimableRequest.decode(message.value); + }, + toProto(message: QueryTotalClaimableRequest): Uint8Array { + return QueryTotalClaimableRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalClaimableRequest): QueryTotalClaimableRequestProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableRequest", + value: QueryTotalClaimableRequest.encode(message).finish() + }; } }; function createBaseQueryTotalClaimableResponse(): QueryTotalClaimableResponse { @@ -609,6 +901,7 @@ function createBaseQueryTotalClaimableResponse(): QueryTotalClaimableResponse { }; } export const QueryTotalClaimableResponse = { + typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableResponse", encode(message: QueryTotalClaimableResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -669,5 +962,40 @@ export const QueryTotalClaimableResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: QueryTotalClaimableResponseAmino): QueryTotalClaimableResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalClaimableResponse): QueryTotalClaimableResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalClaimableResponseAminoMsg): QueryTotalClaimableResponse { + return QueryTotalClaimableResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalClaimableResponse): QueryTotalClaimableResponseAminoMsg { + return { + type: "osmosis/claim/query-total-claimable-response", + value: QueryTotalClaimableResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalClaimableResponseProtoMsg): QueryTotalClaimableResponse { + return QueryTotalClaimableResponse.decode(message.value); + }, + toProto(message: QueryTotalClaimableResponse): Uint8Array { + return QueryTotalClaimableResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalClaimableResponse): QueryTotalClaimableResponseProtoMsg { + return { + typeUrl: "/osmosis.claim.v1beta1.QueryTotalClaimableResponse", + value: QueryTotalClaimableResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts index 8aba1ed8f7..43173c0c52 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/genesis.ts @@ -86,6 +86,7 @@ function createBaseFullTick(): FullTick { }; } export const FullTick = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.FullTick", encode(message: FullTick, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -162,6 +163,41 @@ export const FullTick = { obj.tick_index = message.tickIndex; message.info !== undefined && (obj.info = message.info ? TickInfo.toSDK(message.info) : undefined); return obj; + }, + fromAmino(object: FullTickAmino): FullTick { + return { + poolId: BigInt(object.pool_id), + tickIndex: BigInt(object.tick_index), + info: object?.info ? TickInfo.fromAmino(object.info) : undefined + }; + }, + toAmino(message: FullTick): FullTickAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.tick_index = message.tickIndex ? message.tickIndex.toString() : undefined; + obj.info = message.info ? TickInfo.toAmino(message.info) : undefined; + return obj; + }, + fromAminoMsg(object: FullTickAminoMsg): FullTick { + return FullTick.fromAmino(object.value); + }, + toAminoMsg(message: FullTick): FullTickAminoMsg { + return { + type: "osmosis/concentratedliquidity/full-tick", + value: FullTick.toAmino(message) + }; + }, + fromProtoMsg(message: FullTickProtoMsg): FullTick { + return FullTick.decode(message.value); + }, + toProto(message: FullTick): Uint8Array { + return FullTick.encode(message).finish(); + }, + toProtoMsg(message: FullTick): FullTickProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.FullTick", + value: FullTick.encode(message).finish() + }; } }; function createBasePoolData(): PoolData { @@ -174,6 +210,7 @@ function createBasePoolData(): PoolData { }; } export const PoolData = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.PoolData", encode(message: PoolData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pool !== undefined) { Any.encode(message.pool, writer.uint32(10).fork()).ldelim(); @@ -298,6 +335,57 @@ export const PoolData = { obj.incentive_records = []; } return obj; + }, + fromAmino(object: PoolDataAmino): PoolData { + return { + pool: object?.pool ? Any.fromAmino(object.pool) : undefined, + ticks: Array.isArray(object?.ticks) ? object.ticks.map((e: any) => FullTick.fromAmino(e)) : [], + feeAccumulator: object?.fee_accumulator ? AccumObject.fromAmino(object.fee_accumulator) : undefined, + incentivesAccumulators: Array.isArray(object?.incentives_accumulators) ? object.incentives_accumulators.map((e: any) => AccumObject.fromAmino(e)) : [], + incentiveRecords: Array.isArray(object?.incentive_records) ? object.incentive_records.map((e: any) => IncentiveRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: PoolData): PoolDataAmino { + const obj: any = {}; + obj.pool = message.pool ? Any.toAmino(message.pool) : undefined; + if (message.ticks) { + obj.ticks = message.ticks.map(e => e ? FullTick.toAmino(e) : undefined); + } else { + obj.ticks = []; + } + obj.fee_accumulator = message.feeAccumulator ? AccumObject.toAmino(message.feeAccumulator) : undefined; + if (message.incentivesAccumulators) { + obj.incentives_accumulators = message.incentivesAccumulators.map(e => e ? AccumObject.toAmino(e) : undefined); + } else { + obj.incentives_accumulators = []; + } + if (message.incentiveRecords) { + obj.incentive_records = message.incentiveRecords.map(e => e ? IncentiveRecord.toAmino(e) : undefined); + } else { + obj.incentive_records = []; + } + return obj; + }, + fromAminoMsg(object: PoolDataAminoMsg): PoolData { + return PoolData.fromAmino(object.value); + }, + toAminoMsg(message: PoolData): PoolDataAminoMsg { + return { + type: "osmosis/concentratedliquidity/pool-data", + value: PoolData.toAmino(message) + }; + }, + fromProtoMsg(message: PoolDataProtoMsg): PoolData { + return PoolData.decode(message.value); + }, + toProto(message: PoolData): Uint8Array { + return PoolData.encode(message).finish(); + }, + toProtoMsg(message: PoolData): PoolDataProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.PoolData", + value: PoolData.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -309,6 +397,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -413,6 +502,51 @@ export const GenesisState = { } obj.next_position_id = message.nextPositionId; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + poolData: Array.isArray(object?.pool_data) ? object.pool_data.map((e: any) => PoolData.fromAmino(e)) : [], + positions: Array.isArray(object?.positions) ? object.positions.map((e: any) => Position.fromAmino(e)) : [], + nextPositionId: BigInt(object.next_position_id) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.poolData) { + obj.pool_data = message.poolData.map(e => e ? PoolData.toAmino(e) : undefined); + } else { + obj.pool_data = []; + } + if (message.positions) { + obj.positions = message.positions.map(e => e ? Position.toAmino(e) : undefined); + } else { + obj.positions = []; + } + obj.next_position_id = message.nextPositionId ? message.nextPositionId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/concentratedliquidity/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseAccumObject(): AccumObject { @@ -422,6 +556,7 @@ function createBaseAccumObject(): AccumObject { }; } export const AccumObject = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.AccumObject", encode(message: AccumObject, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); @@ -486,5 +621,38 @@ export const AccumObject = { obj.name = message.name; message.accumContent !== undefined && (obj.accum_content = message.accumContent ? AccumulatorContent.toSDK(message.accumContent) : undefined); return obj; + }, + fromAmino(object: AccumObjectAmino): AccumObject { + return { + name: object.name, + accumContent: object?.accum_content ? AccumulatorContent.fromAmino(object.accum_content) : undefined + }; + }, + toAmino(message: AccumObject): AccumObjectAmino { + const obj: any = {}; + obj.name = message.name; + obj.accum_content = message.accumContent ? AccumulatorContent.toAmino(message.accumContent) : undefined; + return obj; + }, + fromAminoMsg(object: AccumObjectAminoMsg): AccumObject { + return AccumObject.fromAmino(object.value); + }, + toAminoMsg(message: AccumObject): AccumObjectAminoMsg { + return { + type: "osmosis/concentratedliquidity/accum-object", + value: AccumObject.toAmino(message) + }; + }, + fromProtoMsg(message: AccumObjectProtoMsg): AccumObject { + return AccumObject.decode(message.value); + }, + toProto(message: AccumObject): Uint8Array { + return AccumObject.encode(message).finish(); + }, + toProtoMsg(message: AccumObject): AccumObjectProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.AccumObject", + value: AccumObject.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/incentive_record.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/incentive_record.ts index 7f7bfc0f53..f0ffb41b79 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/incentive_record.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/incentive_record.ts @@ -76,6 +76,7 @@ function createBaseIncentiveRecord(): IncentiveRecord { }; } export const IncentiveRecord = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.IncentiveRecord", encode(message: IncentiveRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -176,6 +177,45 @@ export const IncentiveRecord = { message.incentiveRecordBody !== undefined && (obj.incentive_record_body = message.incentiveRecordBody ? IncentiveRecordBody.toSDK(message.incentiveRecordBody) : undefined); message.minUptime !== undefined && (obj.min_uptime = message.minUptime ? Duration.toSDK(message.minUptime) : undefined); return obj; + }, + fromAmino(object: IncentiveRecordAmino): IncentiveRecord { + return { + poolId: BigInt(object.pool_id), + incentiveDenom: object.incentive_denom, + incentiveCreatorAddr: object.incentive_creator_addr, + incentiveRecordBody: object?.incentive_record_body ? IncentiveRecordBody.fromAmino(object.incentive_record_body) : undefined, + minUptime: object?.min_uptime ? Duration.fromAmino(object.min_uptime) : undefined + }; + }, + toAmino(message: IncentiveRecord): IncentiveRecordAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.incentive_denom = message.incentiveDenom; + obj.incentive_creator_addr = message.incentiveCreatorAddr; + obj.incentive_record_body = message.incentiveRecordBody ? IncentiveRecordBody.toAmino(message.incentiveRecordBody) : undefined; + obj.min_uptime = message.minUptime ? Duration.toAmino(message.minUptime) : undefined; + return obj; + }, + fromAminoMsg(object: IncentiveRecordAminoMsg): IncentiveRecord { + return IncentiveRecord.fromAmino(object.value); + }, + toAminoMsg(message: IncentiveRecord): IncentiveRecordAminoMsg { + return { + type: "osmosis/concentratedliquidity/incentive-record", + value: IncentiveRecord.toAmino(message) + }; + }, + fromProtoMsg(message: IncentiveRecordProtoMsg): IncentiveRecord { + return IncentiveRecord.decode(message.value); + }, + toProto(message: IncentiveRecord): Uint8Array { + return IncentiveRecord.encode(message).finish(); + }, + toProtoMsg(message: IncentiveRecord): IncentiveRecordProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.IncentiveRecord", + value: IncentiveRecord.encode(message).finish() + }; } }; function createBaseIncentiveRecordBody(): IncentiveRecordBody { @@ -186,6 +226,7 @@ function createBaseIncentiveRecordBody(): IncentiveRecordBody { }; } export const IncentiveRecordBody = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.IncentiveRecordBody", encode(message: IncentiveRecordBody, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.remainingAmount !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.remainingAmount, 18).atomics); @@ -262,5 +303,40 @@ export const IncentiveRecordBody = { obj.emission_rate = message.emissionRate; message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); return obj; + }, + fromAmino(object: IncentiveRecordBodyAmino): IncentiveRecordBody { + return { + remainingAmount: object.remaining_amount, + emissionRate: object.emission_rate, + startTime: object.start_time + }; + }, + toAmino(message: IncentiveRecordBody): IncentiveRecordBodyAmino { + const obj: any = {}; + obj.remaining_amount = message.remainingAmount; + obj.emission_rate = message.emissionRate; + obj.start_time = message.startTime; + return obj; + }, + fromAminoMsg(object: IncentiveRecordBodyAminoMsg): IncentiveRecordBody { + return IncentiveRecordBody.fromAmino(object.value); + }, + toAminoMsg(message: IncentiveRecordBody): IncentiveRecordBodyAminoMsg { + return { + type: "osmosis/concentratedliquidity/incentive-record-body", + value: IncentiveRecordBody.toAmino(message) + }; + }, + fromProtoMsg(message: IncentiveRecordBodyProtoMsg): IncentiveRecordBody { + return IncentiveRecordBody.decode(message.value); + }, + toProto(message: IncentiveRecordBody): Uint8Array { + return IncentiveRecordBody.encode(message).finish(); + }, + toProtoMsg(message: IncentiveRecordBody): IncentiveRecordBodyProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.IncentiveRecordBody", + value: IncentiveRecordBody.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts index 570f392235..2e9fe71df4 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/params.ts @@ -23,6 +23,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.concentratedliquidity.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.authorizedTickSpacing) { @@ -112,5 +113,46 @@ export const Params = { obj.authorized_swap_fees = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + authorizedTickSpacing: Array.isArray(object?.authorized_tick_spacing) ? object.authorized_tick_spacing.map((e: any) => BigInt(e)) : [], + authorizedSwapFees: Array.isArray(object?.authorized_swap_fees) ? object.authorized_swap_fees.map((e: any) => e) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.authorizedTickSpacing) { + obj.authorized_tick_spacing = message.authorizedTickSpacing.map(e => e.toString()); + } else { + obj.authorized_tick_spacing = []; + } + if (message.authorizedSwapFees) { + obj.authorized_swap_fees = message.authorizedSwapFees.map(e => e); + } else { + obj.authorized_swap_fees = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/concentratedliquidity/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/query.ts index 81dc1a7d89..052cdb7dc0 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/query.ts @@ -142,6 +142,7 @@ function createBaseQueryUserPositionsRequest(): QueryUserPositionsRequest { }; } export const QueryUserPositionsRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryUserPositionsRequest", encode(message: QueryUserPositionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -206,6 +207,39 @@ export const QueryUserPositionsRequest = { obj.address = message.address; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryUserPositionsRequestAmino): QueryUserPositionsRequest { + return { + address: object.address, + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryUserPositionsRequest): QueryUserPositionsRequestAmino { + const obj: any = {}; + obj.address = message.address; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryUserPositionsRequestAminoMsg): QueryUserPositionsRequest { + return QueryUserPositionsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUserPositionsRequest): QueryUserPositionsRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-user-positions-request", + value: QueryUserPositionsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUserPositionsRequestProtoMsg): QueryUserPositionsRequest { + return QueryUserPositionsRequest.decode(message.value); + }, + toProto(message: QueryUserPositionsRequest): Uint8Array { + return QueryUserPositionsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUserPositionsRequest): QueryUserPositionsRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryUserPositionsRequest", + value: QueryUserPositionsRequest.encode(message).finish() + }; } }; function createBaseQueryUserPositionsResponse(): QueryUserPositionsResponse { @@ -214,6 +248,7 @@ function createBaseQueryUserPositionsResponse(): QueryUserPositionsResponse { }; } export const QueryUserPositionsResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryUserPositionsResponse", encode(message: QueryUserPositionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.positions) { PositionWithUnderlyingAssetBreakdown.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -274,6 +309,41 @@ export const QueryUserPositionsResponse = { obj.positions = []; } return obj; + }, + fromAmino(object: QueryUserPositionsResponseAmino): QueryUserPositionsResponse { + return { + positions: Array.isArray(object?.positions) ? object.positions.map((e: any) => PositionWithUnderlyingAssetBreakdown.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryUserPositionsResponse): QueryUserPositionsResponseAmino { + const obj: any = {}; + if (message.positions) { + obj.positions = message.positions.map(e => e ? PositionWithUnderlyingAssetBreakdown.toAmino(e) : undefined); + } else { + obj.positions = []; + } + return obj; + }, + fromAminoMsg(object: QueryUserPositionsResponseAminoMsg): QueryUserPositionsResponse { + return QueryUserPositionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUserPositionsResponse): QueryUserPositionsResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-user-positions-response", + value: QueryUserPositionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUserPositionsResponseProtoMsg): QueryUserPositionsResponse { + return QueryUserPositionsResponse.decode(message.value); + }, + toProto(message: QueryUserPositionsResponse): Uint8Array { + return QueryUserPositionsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUserPositionsResponse): QueryUserPositionsResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryUserPositionsResponse", + value: QueryUserPositionsResponse.encode(message).finish() + }; } }; function createBaseQueryPositionByIdRequest(): QueryPositionByIdRequest { @@ -282,6 +352,7 @@ function createBaseQueryPositionByIdRequest(): QueryPositionByIdRequest { }; } export const QueryPositionByIdRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPositionByIdRequest", encode(message: QueryPositionByIdRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.positionId !== BigInt(0)) { writer.uint32(8).uint64(message.positionId); @@ -334,6 +405,37 @@ export const QueryPositionByIdRequest = { const obj: any = {}; obj.position_id = message.positionId; return obj; + }, + fromAmino(object: QueryPositionByIdRequestAmino): QueryPositionByIdRequest { + return { + positionId: BigInt(object.position_id) + }; + }, + toAmino(message: QueryPositionByIdRequest): QueryPositionByIdRequestAmino { + const obj: any = {}; + obj.position_id = message.positionId ? message.positionId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPositionByIdRequestAminoMsg): QueryPositionByIdRequest { + return QueryPositionByIdRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPositionByIdRequest): QueryPositionByIdRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-position-by-id-request", + value: QueryPositionByIdRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPositionByIdRequestProtoMsg): QueryPositionByIdRequest { + return QueryPositionByIdRequest.decode(message.value); + }, + toProto(message: QueryPositionByIdRequest): Uint8Array { + return QueryPositionByIdRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPositionByIdRequest): QueryPositionByIdRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPositionByIdRequest", + value: QueryPositionByIdRequest.encode(message).finish() + }; } }; function createBaseQueryPositionByIdResponse(): QueryPositionByIdResponse { @@ -342,6 +444,7 @@ function createBaseQueryPositionByIdResponse(): QueryPositionByIdResponse { }; } export const QueryPositionByIdResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPositionByIdResponse", encode(message: QueryPositionByIdResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.position !== undefined) { PositionWithUnderlyingAssetBreakdown.encode(message.position, writer.uint32(10).fork()).ldelim(); @@ -394,6 +497,37 @@ export const QueryPositionByIdResponse = { const obj: any = {}; message.position !== undefined && (obj.position = message.position ? PositionWithUnderlyingAssetBreakdown.toSDK(message.position) : undefined); return obj; + }, + fromAmino(object: QueryPositionByIdResponseAmino): QueryPositionByIdResponse { + return { + position: object?.position ? PositionWithUnderlyingAssetBreakdown.fromAmino(object.position) : undefined + }; + }, + toAmino(message: QueryPositionByIdResponse): QueryPositionByIdResponseAmino { + const obj: any = {}; + obj.position = message.position ? PositionWithUnderlyingAssetBreakdown.toAmino(message.position) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPositionByIdResponseAminoMsg): QueryPositionByIdResponse { + return QueryPositionByIdResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPositionByIdResponse): QueryPositionByIdResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-position-by-id-response", + value: QueryPositionByIdResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPositionByIdResponseProtoMsg): QueryPositionByIdResponse { + return QueryPositionByIdResponse.decode(message.value); + }, + toProto(message: QueryPositionByIdResponse): Uint8Array { + return QueryPositionByIdResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPositionByIdResponse): QueryPositionByIdResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPositionByIdResponse", + value: QueryPositionByIdResponse.encode(message).finish() + }; } }; function createBaseQueryPoolsRequest(): QueryPoolsRequest { @@ -402,6 +536,7 @@ function createBaseQueryPoolsRequest(): QueryPoolsRequest { }; } export const QueryPoolsRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPoolsRequest", encode(message: QueryPoolsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim(); @@ -454,6 +589,37 @@ export const QueryPoolsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPoolsRequestAmino): QueryPoolsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPoolsRequest): QueryPoolsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolsRequestAminoMsg): QueryPoolsRequest { + return QueryPoolsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolsRequest): QueryPoolsRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-pools-request", + value: QueryPoolsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolsRequestProtoMsg): QueryPoolsRequest { + return QueryPoolsRequest.decode(message.value); + }, + toProto(message: QueryPoolsRequest): Uint8Array { + return QueryPoolsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolsRequest): QueryPoolsRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPoolsRequest", + value: QueryPoolsRequest.encode(message).finish() + }; } }; function createBaseQueryPoolsResponse(): QueryPoolsResponse { @@ -463,6 +629,7 @@ function createBaseQueryPoolsResponse(): QueryPoolsResponse { }; } export const QueryPoolsResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPoolsResponse", encode(message: QueryPoolsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pools) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -535,12 +702,50 @@ export const QueryPoolsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPoolsResponseAmino): QueryPoolsResponse { + return { + pools: Array.isArray(object?.pools) ? object.pools.map((e: any) => Any.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPoolsResponse): QueryPoolsResponseAmino { + const obj: any = {}; + if (message.pools) { + obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.pools = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolsResponseAminoMsg): QueryPoolsResponse { + return QueryPoolsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolsResponse): QueryPoolsResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-pools-response", + value: QueryPoolsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolsResponseProtoMsg): QueryPoolsResponse { + return QueryPoolsResponse.decode(message.value); + }, + toProto(message: QueryPoolsResponse): Uint8Array { + return QueryPoolsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolsResponse): QueryPoolsResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryPoolsResponse", + value: QueryPoolsResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -578,6 +783,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -586,6 +819,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -638,6 +872,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseTickLiquidityNet(): TickLiquidityNet { @@ -647,6 +912,7 @@ function createBaseTickLiquidityNet(): TickLiquidityNet { }; } export const TickLiquidityNet = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.TickLiquidityNet", encode(message: TickLiquidityNet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.liquidityNet !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.liquidityNet, 18).atomics); @@ -711,6 +977,39 @@ export const TickLiquidityNet = { obj.liquidity_net = message.liquidityNet; obj.tick_index = message.tickIndex; return obj; + }, + fromAmino(object: TickLiquidityNetAmino): TickLiquidityNet { + return { + liquidityNet: object.liquidity_net, + tickIndex: object.tick_index + }; + }, + toAmino(message: TickLiquidityNet): TickLiquidityNetAmino { + const obj: any = {}; + obj.liquidity_net = message.liquidityNet; + obj.tick_index = message.tickIndex; + return obj; + }, + fromAminoMsg(object: TickLiquidityNetAminoMsg): TickLiquidityNet { + return TickLiquidityNet.fromAmino(object.value); + }, + toAminoMsg(message: TickLiquidityNet): TickLiquidityNetAminoMsg { + return { + type: "osmosis/concentratedliquidity/tick-liquidity-net", + value: TickLiquidityNet.toAmino(message) + }; + }, + fromProtoMsg(message: TickLiquidityNetProtoMsg): TickLiquidityNet { + return TickLiquidityNet.decode(message.value); + }, + toProto(message: TickLiquidityNet): Uint8Array { + return TickLiquidityNet.encode(message).finish(); + }, + toProtoMsg(message: TickLiquidityNet): TickLiquidityNetProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.TickLiquidityNet", + value: TickLiquidityNet.encode(message).finish() + }; } }; function createBaseLiquidityDepthWithRange(): LiquidityDepthWithRange { @@ -721,6 +1020,7 @@ function createBaseLiquidityDepthWithRange(): LiquidityDepthWithRange { }; } export const LiquidityDepthWithRange = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.LiquidityDepthWithRange", encode(message: LiquidityDepthWithRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.liquidityAmount !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.liquidityAmount, 18).atomics); @@ -797,6 +1097,41 @@ export const LiquidityDepthWithRange = { obj.lower_tick = message.lowerTick; obj.upper_tick = message.upperTick; return obj; + }, + fromAmino(object: LiquidityDepthWithRangeAmino): LiquidityDepthWithRange { + return { + liquidityAmount: object.liquidity_amount, + lowerTick: object.lower_tick, + upperTick: object.upper_tick + }; + }, + toAmino(message: LiquidityDepthWithRange): LiquidityDepthWithRangeAmino { + const obj: any = {}; + obj.liquidity_amount = message.liquidityAmount; + obj.lower_tick = message.lowerTick; + obj.upper_tick = message.upperTick; + return obj; + }, + fromAminoMsg(object: LiquidityDepthWithRangeAminoMsg): LiquidityDepthWithRange { + return LiquidityDepthWithRange.fromAmino(object.value); + }, + toAminoMsg(message: LiquidityDepthWithRange): LiquidityDepthWithRangeAminoMsg { + return { + type: "osmosis/concentratedliquidity/liquidity-depth-with-range", + value: LiquidityDepthWithRange.toAmino(message) + }; + }, + fromProtoMsg(message: LiquidityDepthWithRangeProtoMsg): LiquidityDepthWithRange { + return LiquidityDepthWithRange.decode(message.value); + }, + toProto(message: LiquidityDepthWithRange): Uint8Array { + return LiquidityDepthWithRange.encode(message).finish(); + }, + toProtoMsg(message: LiquidityDepthWithRange): LiquidityDepthWithRangeProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.LiquidityDepthWithRange", + value: LiquidityDepthWithRange.encode(message).finish() + }; } }; function createBaseQueryLiquidityNetInDirectionRequest(): QueryLiquidityNetInDirectionRequest { @@ -808,6 +1143,7 @@ function createBaseQueryLiquidityNetInDirectionRequest(): QueryLiquidityNetInDir }; } export const QueryLiquidityNetInDirectionRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryLiquidityNetInDirectionRequest", encode(message: QueryLiquidityNetInDirectionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -896,6 +1232,43 @@ export const QueryLiquidityNetInDirectionRequest = { obj.start_tick = message.startTick; obj.bound_tick = message.boundTick; return obj; + }, + fromAmino(object: QueryLiquidityNetInDirectionRequestAmino): QueryLiquidityNetInDirectionRequest { + return { + poolId: BigInt(object.pool_id), + tokenIn: object.token_in, + startTick: object?.start_tick, + boundTick: object?.bound_tick + }; + }, + toAmino(message: QueryLiquidityNetInDirectionRequest): QueryLiquidityNetInDirectionRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn; + obj.start_tick = message.startTick; + obj.bound_tick = message.boundTick; + return obj; + }, + fromAminoMsg(object: QueryLiquidityNetInDirectionRequestAminoMsg): QueryLiquidityNetInDirectionRequest { + return QueryLiquidityNetInDirectionRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryLiquidityNetInDirectionRequest): QueryLiquidityNetInDirectionRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-liquidity-net-in-direction-request", + value: QueryLiquidityNetInDirectionRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLiquidityNetInDirectionRequestProtoMsg): QueryLiquidityNetInDirectionRequest { + return QueryLiquidityNetInDirectionRequest.decode(message.value); + }, + toProto(message: QueryLiquidityNetInDirectionRequest): Uint8Array { + return QueryLiquidityNetInDirectionRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryLiquidityNetInDirectionRequest): QueryLiquidityNetInDirectionRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryLiquidityNetInDirectionRequest", + value: QueryLiquidityNetInDirectionRequest.encode(message).finish() + }; } }; function createBaseQueryLiquidityNetInDirectionResponse(): QueryLiquidityNetInDirectionResponse { @@ -906,6 +1279,7 @@ function createBaseQueryLiquidityNetInDirectionResponse(): QueryLiquidityNetInDi }; } export const QueryLiquidityNetInDirectionResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryLiquidityNetInDirectionResponse", encode(message: QueryLiquidityNetInDirectionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.liquidityDepths) { TickLiquidityNet.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -990,6 +1364,45 @@ export const QueryLiquidityNetInDirectionResponse = { obj.current_tick = message.currentTick; obj.current_liquidity = message.currentLiquidity; return obj; + }, + fromAmino(object: QueryLiquidityNetInDirectionResponseAmino): QueryLiquidityNetInDirectionResponse { + return { + liquidityDepths: Array.isArray(object?.liquidity_depths) ? object.liquidity_depths.map((e: any) => TickLiquidityNet.fromAmino(e)) : [], + currentTick: BigInt(object.current_tick), + currentLiquidity: object.current_liquidity + }; + }, + toAmino(message: QueryLiquidityNetInDirectionResponse): QueryLiquidityNetInDirectionResponseAmino { + const obj: any = {}; + if (message.liquidityDepths) { + obj.liquidity_depths = message.liquidityDepths.map(e => e ? TickLiquidityNet.toAmino(e) : undefined); + } else { + obj.liquidity_depths = []; + } + obj.current_tick = message.currentTick ? message.currentTick.toString() : undefined; + obj.current_liquidity = message.currentLiquidity; + return obj; + }, + fromAminoMsg(object: QueryLiquidityNetInDirectionResponseAminoMsg): QueryLiquidityNetInDirectionResponse { + return QueryLiquidityNetInDirectionResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryLiquidityNetInDirectionResponse): QueryLiquidityNetInDirectionResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-liquidity-net-in-direction-response", + value: QueryLiquidityNetInDirectionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLiquidityNetInDirectionResponseProtoMsg): QueryLiquidityNetInDirectionResponse { + return QueryLiquidityNetInDirectionResponse.decode(message.value); + }, + toProto(message: QueryLiquidityNetInDirectionResponse): Uint8Array { + return QueryLiquidityNetInDirectionResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryLiquidityNetInDirectionResponse): QueryLiquidityNetInDirectionResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryLiquidityNetInDirectionResponse", + value: QueryLiquidityNetInDirectionResponse.encode(message).finish() + }; } }; function createBaseQueryTotalLiquidityForRangeRequest(): QueryTotalLiquidityForRangeRequest { @@ -998,6 +1411,7 @@ function createBaseQueryTotalLiquidityForRangeRequest(): QueryTotalLiquidityForR }; } export const QueryTotalLiquidityForRangeRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryTotalLiquidityForRangeRequest", encode(message: QueryTotalLiquidityForRangeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1050,6 +1464,37 @@ export const QueryTotalLiquidityForRangeRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryTotalLiquidityForRangeRequestAmino): QueryTotalLiquidityForRangeRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryTotalLiquidityForRangeRequest): QueryTotalLiquidityForRangeRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalLiquidityForRangeRequestAminoMsg): QueryTotalLiquidityForRangeRequest { + return QueryTotalLiquidityForRangeRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalLiquidityForRangeRequest): QueryTotalLiquidityForRangeRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-total-liquidity-for-range-request", + value: QueryTotalLiquidityForRangeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalLiquidityForRangeRequestProtoMsg): QueryTotalLiquidityForRangeRequest { + return QueryTotalLiquidityForRangeRequest.decode(message.value); + }, + toProto(message: QueryTotalLiquidityForRangeRequest): Uint8Array { + return QueryTotalLiquidityForRangeRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalLiquidityForRangeRequest): QueryTotalLiquidityForRangeRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryTotalLiquidityForRangeRequest", + value: QueryTotalLiquidityForRangeRequest.encode(message).finish() + }; } }; function createBaseQueryTotalLiquidityForRangeResponse(): QueryTotalLiquidityForRangeResponse { @@ -1058,6 +1503,7 @@ function createBaseQueryTotalLiquidityForRangeResponse(): QueryTotalLiquidityFor }; } export const QueryTotalLiquidityForRangeResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryTotalLiquidityForRangeResponse", encode(message: QueryTotalLiquidityForRangeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.liquidity) { LiquidityDepthWithRange.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1118,6 +1564,41 @@ export const QueryTotalLiquidityForRangeResponse = { obj.liquidity = []; } return obj; + }, + fromAmino(object: QueryTotalLiquidityForRangeResponseAmino): QueryTotalLiquidityForRangeResponse { + return { + liquidity: Array.isArray(object?.liquidity) ? object.liquidity.map((e: any) => LiquidityDepthWithRange.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalLiquidityForRangeResponse): QueryTotalLiquidityForRangeResponseAmino { + const obj: any = {}; + if (message.liquidity) { + obj.liquidity = message.liquidity.map(e => e ? LiquidityDepthWithRange.toAmino(e) : undefined); + } else { + obj.liquidity = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalLiquidityForRangeResponseAminoMsg): QueryTotalLiquidityForRangeResponse { + return QueryTotalLiquidityForRangeResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalLiquidityForRangeResponse): QueryTotalLiquidityForRangeResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-total-liquidity-for-range-response", + value: QueryTotalLiquidityForRangeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalLiquidityForRangeResponseProtoMsg): QueryTotalLiquidityForRangeResponse { + return QueryTotalLiquidityForRangeResponse.decode(message.value); + }, + toProto(message: QueryTotalLiquidityForRangeResponse): Uint8Array { + return QueryTotalLiquidityForRangeResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalLiquidityForRangeResponse): QueryTotalLiquidityForRangeResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryTotalLiquidityForRangeResponse", + value: QueryTotalLiquidityForRangeResponse.encode(message).finish() + }; } }; function createBaseQueryClaimableFeesRequest(): QueryClaimableFeesRequest { @@ -1126,6 +1607,7 @@ function createBaseQueryClaimableFeesRequest(): QueryClaimableFeesRequest { }; } export const QueryClaimableFeesRequest = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryClaimableFeesRequest", encode(message: QueryClaimableFeesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.positionId !== BigInt(0)) { writer.uint32(8).uint64(message.positionId); @@ -1178,6 +1660,37 @@ export const QueryClaimableFeesRequest = { const obj: any = {}; obj.position_id = message.positionId; return obj; + }, + fromAmino(object: QueryClaimableFeesRequestAmino): QueryClaimableFeesRequest { + return { + positionId: BigInt(object.position_id) + }; + }, + toAmino(message: QueryClaimableFeesRequest): QueryClaimableFeesRequestAmino { + const obj: any = {}; + obj.position_id = message.positionId ? message.positionId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryClaimableFeesRequestAminoMsg): QueryClaimableFeesRequest { + return QueryClaimableFeesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryClaimableFeesRequest): QueryClaimableFeesRequestAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-claimable-fees-request", + value: QueryClaimableFeesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClaimableFeesRequestProtoMsg): QueryClaimableFeesRequest { + return QueryClaimableFeesRequest.decode(message.value); + }, + toProto(message: QueryClaimableFeesRequest): Uint8Array { + return QueryClaimableFeesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimableFeesRequest): QueryClaimableFeesRequestProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryClaimableFeesRequest", + value: QueryClaimableFeesRequest.encode(message).finish() + }; } }; function createBaseQueryClaimableFeesResponse(): QueryClaimableFeesResponse { @@ -1186,6 +1699,7 @@ function createBaseQueryClaimableFeesResponse(): QueryClaimableFeesResponse { }; } export const QueryClaimableFeesResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryClaimableFeesResponse", encode(message: QueryClaimableFeesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.claimableFees) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1246,5 +1760,40 @@ export const QueryClaimableFeesResponse = { obj.claimable_fees = []; } return obj; + }, + fromAmino(object: QueryClaimableFeesResponseAmino): QueryClaimableFeesResponse { + return { + claimableFees: Array.isArray(object?.claimable_fees) ? object.claimable_fees.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryClaimableFeesResponse): QueryClaimableFeesResponseAmino { + const obj: any = {}; + if (message.claimableFees) { + obj.claimable_fees = message.claimableFees.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.claimable_fees = []; + } + return obj; + }, + fromAminoMsg(object: QueryClaimableFeesResponseAminoMsg): QueryClaimableFeesResponse { + return QueryClaimableFeesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryClaimableFeesResponse): QueryClaimableFeesResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/query-claimable-fees-response", + value: QueryClaimableFeesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryClaimableFeesResponseProtoMsg): QueryClaimableFeesResponse { + return QueryClaimableFeesResponse.decode(message.value); + }, + toProto(message: QueryClaimableFeesResponse): Uint8Array { + return QueryClaimableFeesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryClaimableFeesResponse): QueryClaimableFeesResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.QueryClaimableFeesResponse", + value: QueryClaimableFeesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/tx.ts index 8ef0071afc..515d82f13d 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool-model/tx.ts @@ -39,6 +39,7 @@ function createBaseMsgCreateConcentratedPool(): MsgCreateConcentratedPool { }; } export const MsgCreateConcentratedPool = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateConcentratedPool", encode(message: MsgCreateConcentratedPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -151,6 +152,47 @@ export const MsgCreateConcentratedPool = { obj.exponent_at_price_one = message.exponentAtPriceOne; obj.swap_fee = message.swapFee; return obj; + }, + fromAmino(object: MsgCreateConcentratedPoolAmino): MsgCreateConcentratedPool { + return { + sender: object.sender, + denom0: object.denom0, + denom1: object.denom1, + tickSpacing: BigInt(object.tick_spacing), + exponentAtPriceOne: object.exponent_at_price_one, + swapFee: object.swap_fee + }; + }, + toAmino(message: MsgCreateConcentratedPool): MsgCreateConcentratedPoolAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.denom0 = message.denom0; + obj.denom1 = message.denom1; + obj.tick_spacing = message.tickSpacing ? message.tickSpacing.toString() : undefined; + obj.exponent_at_price_one = message.exponentAtPriceOne; + obj.swap_fee = message.swapFee; + return obj; + }, + fromAminoMsg(object: MsgCreateConcentratedPoolAminoMsg): MsgCreateConcentratedPool { + return MsgCreateConcentratedPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateConcentratedPool): MsgCreateConcentratedPoolAminoMsg { + return { + type: "osmosis/concentratedliquidity/create-concentrated-pool", + value: MsgCreateConcentratedPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateConcentratedPoolProtoMsg): MsgCreateConcentratedPool { + return MsgCreateConcentratedPool.decode(message.value); + }, + toProto(message: MsgCreateConcentratedPool): Uint8Array { + return MsgCreateConcentratedPool.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateConcentratedPool): MsgCreateConcentratedPoolProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateConcentratedPool", + value: MsgCreateConcentratedPool.encode(message).finish() + }; } }; function createBaseMsgCreateConcentratedPoolResponse(): MsgCreateConcentratedPoolResponse { @@ -159,6 +201,7 @@ function createBaseMsgCreateConcentratedPoolResponse(): MsgCreateConcentratedPoo }; } export const MsgCreateConcentratedPoolResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateConcentratedPoolResponse", encode(message: MsgCreateConcentratedPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -211,5 +254,36 @@ export const MsgCreateConcentratedPoolResponse = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: MsgCreateConcentratedPoolResponseAmino): MsgCreateConcentratedPoolResponse { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: MsgCreateConcentratedPoolResponse): MsgCreateConcentratedPoolResponseAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateConcentratedPoolResponseAminoMsg): MsgCreateConcentratedPoolResponse { + return MsgCreateConcentratedPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateConcentratedPoolResponse): MsgCreateConcentratedPoolResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/create-concentrated-pool-response", + value: MsgCreateConcentratedPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateConcentratedPoolResponseProtoMsg): MsgCreateConcentratedPoolResponse { + return MsgCreateConcentratedPoolResponse.decode(message.value); + }, + toProto(message: MsgCreateConcentratedPoolResponse): Uint8Array { + return MsgCreateConcentratedPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateConcentratedPoolResponse): MsgCreateConcentratedPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateConcentratedPoolResponse", + value: MsgCreateConcentratedPoolResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts index aa051be41a..c4938532e0 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/pool.ts @@ -60,6 +60,7 @@ function createBasePool(): Pool { }; } export const Pool = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.Pool", encode(message: Pool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -244,5 +245,58 @@ export const Pool = { obj.swap_fee = message.swapFee; message.lastLiquidityUpdate !== undefined && (obj.last_liquidity_update = message.lastLiquidityUpdate ?? undefined); return obj; + }, + fromAmino(object: PoolAmino): Pool { + return { + address: object.address, + incentivesAddress: object.incentives_address, + id: BigInt(object.id), + currentTickLiquidity: object.current_tick_liquidity, + token0: object.token0, + token1: object.token1, + currentSqrtPrice: object.current_sqrt_price, + currentTick: object.current_tick, + tickSpacing: BigInt(object.tick_spacing), + exponentAtPriceOne: object.exponent_at_price_one, + swapFee: object.swap_fee, + lastLiquidityUpdate: object.last_liquidity_update + }; + }, + toAmino(message: Pool): PoolAmino { + const obj: any = {}; + obj.address = message.address; + obj.incentives_address = message.incentivesAddress; + obj.id = message.id ? message.id.toString() : undefined; + obj.current_tick_liquidity = message.currentTickLiquidity; + obj.token0 = message.token0; + obj.token1 = message.token1; + obj.current_sqrt_price = message.currentSqrtPrice; + obj.current_tick = message.currentTick; + obj.tick_spacing = message.tickSpacing ? message.tickSpacing.toString() : undefined; + obj.exponent_at_price_one = message.exponentAtPriceOne; + obj.swap_fee = message.swapFee; + obj.last_liquidity_update = message.lastLiquidityUpdate; + return obj; + }, + fromAminoMsg(object: PoolAminoMsg): Pool { + return Pool.fromAmino(object.value); + }, + toAminoMsg(message: Pool): PoolAminoMsg { + return { + type: "osmosis/concentratedliquidity/pool", + value: Pool.toAmino(message) + }; + }, + fromProtoMsg(message: PoolProtoMsg): Pool { + return Pool.decode(message.value); + }, + toProto(message: Pool): Uint8Array { + return Pool.encode(message).finish(); + }, + toProtoMsg(message: Pool): PoolProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.Pool", + value: Pool.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts index c82bd77c56..1b52e7baee 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/position.ts @@ -52,6 +52,7 @@ function createBasePosition(): Position { }; } export const Position = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.Position", encode(message: Position, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.positionId !== BigInt(0)) { writer.uint32(8).uint64(message.positionId); @@ -176,6 +177,49 @@ export const Position = { message.joinTime !== undefined && (obj.join_time = message.joinTime ?? undefined); obj.liquidity = message.liquidity; return obj; + }, + fromAmino(object: PositionAmino): Position { + return { + positionId: BigInt(object.position_id), + address: object.address, + poolId: BigInt(object.pool_id), + lowerTick: BigInt(object.lower_tick), + upperTick: BigInt(object.upper_tick), + joinTime: object.join_time, + liquidity: object.liquidity + }; + }, + toAmino(message: Position): PositionAmino { + const obj: any = {}; + obj.position_id = message.positionId ? message.positionId.toString() : undefined; + obj.address = message.address; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.lower_tick = message.lowerTick ? message.lowerTick.toString() : undefined; + obj.upper_tick = message.upperTick ? message.upperTick.toString() : undefined; + obj.join_time = message.joinTime; + obj.liquidity = message.liquidity; + return obj; + }, + fromAminoMsg(object: PositionAminoMsg): Position { + return Position.fromAmino(object.value); + }, + toAminoMsg(message: Position): PositionAminoMsg { + return { + type: "osmosis/concentratedliquidity/position", + value: Position.toAmino(message) + }; + }, + fromProtoMsg(message: PositionProtoMsg): Position { + return Position.decode(message.value); + }, + toProto(message: Position): Uint8Array { + return Position.encode(message).finish(); + }, + toProtoMsg(message: Position): PositionProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.Position", + value: Position.encode(message).finish() + }; } }; function createBasePositionWithUnderlyingAssetBreakdown(): PositionWithUnderlyingAssetBreakdown { @@ -186,6 +230,7 @@ function createBasePositionWithUnderlyingAssetBreakdown(): PositionWithUnderlyin }; } export const PositionWithUnderlyingAssetBreakdown = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.PositionWithUnderlyingAssetBreakdown", encode(message: PositionWithUnderlyingAssetBreakdown, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.position !== undefined) { Position.encode(message.position, writer.uint32(10).fork()).ldelim(); @@ -262,5 +307,40 @@ export const PositionWithUnderlyingAssetBreakdown = { message.asset0 !== undefined && (obj.asset0 = message.asset0 ? Coin.toSDK(message.asset0) : undefined); message.asset1 !== undefined && (obj.asset1 = message.asset1 ? Coin.toSDK(message.asset1) : undefined); return obj; + }, + fromAmino(object: PositionWithUnderlyingAssetBreakdownAmino): PositionWithUnderlyingAssetBreakdown { + return { + position: object?.position ? Position.fromAmino(object.position) : undefined, + asset0: object?.asset0 ? Coin.fromAmino(object.asset0) : undefined, + asset1: object?.asset1 ? Coin.fromAmino(object.asset1) : undefined + }; + }, + toAmino(message: PositionWithUnderlyingAssetBreakdown): PositionWithUnderlyingAssetBreakdownAmino { + const obj: any = {}; + obj.position = message.position ? Position.toAmino(message.position) : undefined; + obj.asset0 = message.asset0 ? Coin.toAmino(message.asset0) : undefined; + obj.asset1 = message.asset1 ? Coin.toAmino(message.asset1) : undefined; + return obj; + }, + fromAminoMsg(object: PositionWithUnderlyingAssetBreakdownAminoMsg): PositionWithUnderlyingAssetBreakdown { + return PositionWithUnderlyingAssetBreakdown.fromAmino(object.value); + }, + toAminoMsg(message: PositionWithUnderlyingAssetBreakdown): PositionWithUnderlyingAssetBreakdownAminoMsg { + return { + type: "osmosis/concentratedliquidity/position-with-underlying-asset-breakdown", + value: PositionWithUnderlyingAssetBreakdown.toAmino(message) + }; + }, + fromProtoMsg(message: PositionWithUnderlyingAssetBreakdownProtoMsg): PositionWithUnderlyingAssetBreakdown { + return PositionWithUnderlyingAssetBreakdown.decode(message.value); + }, + toProto(message: PositionWithUnderlyingAssetBreakdown): Uint8Array { + return PositionWithUnderlyingAssetBreakdown.encode(message).finish(); + }, + toProtoMsg(message: PositionWithUnderlyingAssetBreakdown): PositionWithUnderlyingAssetBreakdownProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.PositionWithUnderlyingAssetBreakdown", + value: PositionWithUnderlyingAssetBreakdown.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts index 5aaa77f91f..680d94e5c7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tickInfo.ts @@ -30,6 +30,7 @@ function createBaseTickInfo(): TickInfo { }; } export const TickInfo = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.TickInfo", encode(message: TickInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.liquidityGross !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.liquidityGross, 18).atomics); @@ -134,6 +135,51 @@ export const TickInfo = { obj.uptime_trackers = []; } return obj; + }, + fromAmino(object: TickInfoAmino): TickInfo { + return { + liquidityGross: object.liquidity_gross, + liquidityNet: object.liquidity_net, + feeGrowthOutside: Array.isArray(object?.fee_growth_outside) ? object.fee_growth_outside.map((e: any) => DecCoin.fromAmino(e)) : [], + uptimeTrackers: Array.isArray(object?.uptime_trackers) ? object.uptime_trackers.map((e: any) => UptimeTracker.fromAmino(e)) : [] + }; + }, + toAmino(message: TickInfo): TickInfoAmino { + const obj: any = {}; + obj.liquidity_gross = message.liquidityGross; + obj.liquidity_net = message.liquidityNet; + if (message.feeGrowthOutside) { + obj.fee_growth_outside = message.feeGrowthOutside.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.fee_growth_outside = []; + } + if (message.uptimeTrackers) { + obj.uptime_trackers = message.uptimeTrackers.map(e => e ? UptimeTracker.toAmino(e) : undefined); + } else { + obj.uptime_trackers = []; + } + return obj; + }, + fromAminoMsg(object: TickInfoAminoMsg): TickInfo { + return TickInfo.fromAmino(object.value); + }, + toAminoMsg(message: TickInfo): TickInfoAminoMsg { + return { + type: "osmosis/concentratedliquidity/tick-info", + value: TickInfo.toAmino(message) + }; + }, + fromProtoMsg(message: TickInfoProtoMsg): TickInfo { + return TickInfo.decode(message.value); + }, + toProto(message: TickInfo): Uint8Array { + return TickInfo.encode(message).finish(); + }, + toProtoMsg(message: TickInfo): TickInfoProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.TickInfo", + value: TickInfo.encode(message).finish() + }; } }; function createBaseUptimeTracker(): UptimeTracker { @@ -142,6 +188,7 @@ function createBaseUptimeTracker(): UptimeTracker { }; } export const UptimeTracker = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.UptimeTracker", encode(message: UptimeTracker, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.uptimeGrowthOutside) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -202,5 +249,40 @@ export const UptimeTracker = { obj.uptime_growth_outside = []; } return obj; + }, + fromAmino(object: UptimeTrackerAmino): UptimeTracker { + return { + uptimeGrowthOutside: Array.isArray(object?.uptime_growth_outside) ? object.uptime_growth_outside.map((e: any) => DecCoin.fromAmino(e)) : [] + }; + }, + toAmino(message: UptimeTracker): UptimeTrackerAmino { + const obj: any = {}; + if (message.uptimeGrowthOutside) { + obj.uptime_growth_outside = message.uptimeGrowthOutside.map(e => e ? DecCoin.toAmino(e) : undefined); + } else { + obj.uptime_growth_outside = []; + } + return obj; + }, + fromAminoMsg(object: UptimeTrackerAminoMsg): UptimeTracker { + return UptimeTracker.fromAmino(object.value); + }, + toAminoMsg(message: UptimeTracker): UptimeTrackerAminoMsg { + return { + type: "osmosis/concentratedliquidity/uptime-tracker", + value: UptimeTracker.toAmino(message) + }; + }, + fromProtoMsg(message: UptimeTrackerProtoMsg): UptimeTracker { + return UptimeTracker.decode(message.value); + }, + toProto(message: UptimeTracker): Uint8Array { + return UptimeTracker.encode(message).finish(); + }, + toProtoMsg(message: UptimeTracker): UptimeTrackerProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.UptimeTracker", + value: UptimeTracker.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts index 98bb5e225f..a458344a65 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/concentrated-liquidity/tx.ts @@ -156,6 +156,7 @@ function createBaseMsgCreatePosition(): MsgCreatePosition { }; } export const MsgCreatePosition = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreatePosition", encode(message: MsgCreatePosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -292,6 +293,51 @@ export const MsgCreatePosition = { obj.token_min_amount0 = message.tokenMinAmount0; obj.token_min_amount1 = message.tokenMinAmount1; return obj; + }, + fromAmino(object: MsgCreatePositionAmino): MsgCreatePosition { + return { + poolId: BigInt(object.pool_id), + sender: object.sender, + lowerTick: BigInt(object.lower_tick), + upperTick: BigInt(object.upper_tick), + tokenDesired0: object?.token_desired0 ? Coin.fromAmino(object.token_desired0) : undefined, + tokenDesired1: object?.token_desired1 ? Coin.fromAmino(object.token_desired1) : undefined, + tokenMinAmount0: object.token_min_amount0, + tokenMinAmount1: object.token_min_amount1 + }; + }, + toAmino(message: MsgCreatePosition): MsgCreatePositionAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender; + obj.lower_tick = message.lowerTick ? message.lowerTick.toString() : undefined; + obj.upper_tick = message.upperTick ? message.upperTick.toString() : undefined; + obj.token_desired0 = message.tokenDesired0 ? Coin.toAmino(message.tokenDesired0) : undefined; + obj.token_desired1 = message.tokenDesired1 ? Coin.toAmino(message.tokenDesired1) : undefined; + obj.token_min_amount0 = message.tokenMinAmount0; + obj.token_min_amount1 = message.tokenMinAmount1; + return obj; + }, + fromAminoMsg(object: MsgCreatePositionAminoMsg): MsgCreatePosition { + return MsgCreatePosition.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreatePosition): MsgCreatePositionAminoMsg { + return { + type: "osmosis/concentratedliquidity/create-position", + value: MsgCreatePosition.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreatePositionProtoMsg): MsgCreatePosition { + return MsgCreatePosition.decode(message.value); + }, + toProto(message: MsgCreatePosition): Uint8Array { + return MsgCreatePosition.encode(message).finish(); + }, + toProtoMsg(message: MsgCreatePosition): MsgCreatePositionProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreatePosition", + value: MsgCreatePosition.encode(message).finish() + }; } }; function createBaseMsgCreatePositionResponse(): MsgCreatePositionResponse { @@ -304,6 +350,7 @@ function createBaseMsgCreatePositionResponse(): MsgCreatePositionResponse { }; } export const MsgCreatePositionResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreatePositionResponse", encode(message: MsgCreatePositionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.positionId !== BigInt(0)) { writer.uint32(8).uint64(message.positionId); @@ -404,6 +451,45 @@ export const MsgCreatePositionResponse = { message.joinTime !== undefined && (obj.join_time = message.joinTime ?? undefined); obj.liquidity_created = message.liquidityCreated; return obj; + }, + fromAmino(object: MsgCreatePositionResponseAmino): MsgCreatePositionResponse { + return { + positionId: BigInt(object.position_id), + amount0: object.amount0, + amount1: object.amount1, + joinTime: object.join_time, + liquidityCreated: object.liquidity_created + }; + }, + toAmino(message: MsgCreatePositionResponse): MsgCreatePositionResponseAmino { + const obj: any = {}; + obj.position_id = message.positionId ? message.positionId.toString() : undefined; + obj.amount0 = message.amount0; + obj.amount1 = message.amount1; + obj.join_time = message.joinTime; + obj.liquidity_created = message.liquidityCreated; + return obj; + }, + fromAminoMsg(object: MsgCreatePositionResponseAminoMsg): MsgCreatePositionResponse { + return MsgCreatePositionResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreatePositionResponse): MsgCreatePositionResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/create-position-response", + value: MsgCreatePositionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreatePositionResponseProtoMsg): MsgCreatePositionResponse { + return MsgCreatePositionResponse.decode(message.value); + }, + toProto(message: MsgCreatePositionResponse): Uint8Array { + return MsgCreatePositionResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreatePositionResponse): MsgCreatePositionResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreatePositionResponse", + value: MsgCreatePositionResponse.encode(message).finish() + }; } }; function createBaseMsgWithdrawPosition(): MsgWithdrawPosition { @@ -414,6 +500,7 @@ function createBaseMsgWithdrawPosition(): MsgWithdrawPosition { }; } export const MsgWithdrawPosition = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgWithdrawPosition", encode(message: MsgWithdrawPosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.positionId !== BigInt(0)) { writer.uint32(8).uint64(message.positionId); @@ -490,6 +577,41 @@ export const MsgWithdrawPosition = { obj.sender = message.sender; obj.liquidity_amount = message.liquidityAmount; return obj; + }, + fromAmino(object: MsgWithdrawPositionAmino): MsgWithdrawPosition { + return { + positionId: BigInt(object.position_id), + sender: object.sender, + liquidityAmount: object.liquidity_amount + }; + }, + toAmino(message: MsgWithdrawPosition): MsgWithdrawPositionAmino { + const obj: any = {}; + obj.position_id = message.positionId ? message.positionId.toString() : undefined; + obj.sender = message.sender; + obj.liquidity_amount = message.liquidityAmount; + return obj; + }, + fromAminoMsg(object: MsgWithdrawPositionAminoMsg): MsgWithdrawPosition { + return MsgWithdrawPosition.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawPosition): MsgWithdrawPositionAminoMsg { + return { + type: "osmosis/concentratedliquidity/withdraw-position", + value: MsgWithdrawPosition.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawPositionProtoMsg): MsgWithdrawPosition { + return MsgWithdrawPosition.decode(message.value); + }, + toProto(message: MsgWithdrawPosition): Uint8Array { + return MsgWithdrawPosition.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawPosition): MsgWithdrawPositionProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgWithdrawPosition", + value: MsgWithdrawPosition.encode(message).finish() + }; } }; function createBaseMsgWithdrawPositionResponse(): MsgWithdrawPositionResponse { @@ -499,6 +621,7 @@ function createBaseMsgWithdrawPositionResponse(): MsgWithdrawPositionResponse { }; } export const MsgWithdrawPositionResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgWithdrawPositionResponse", encode(message: MsgWithdrawPositionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.amount0 !== "") { writer.uint32(10).string(message.amount0); @@ -563,6 +686,39 @@ export const MsgWithdrawPositionResponse = { obj.amount0 = message.amount0; obj.amount1 = message.amount1; return obj; + }, + fromAmino(object: MsgWithdrawPositionResponseAmino): MsgWithdrawPositionResponse { + return { + amount0: object.amount0, + amount1: object.amount1 + }; + }, + toAmino(message: MsgWithdrawPositionResponse): MsgWithdrawPositionResponseAmino { + const obj: any = {}; + obj.amount0 = message.amount0; + obj.amount1 = message.amount1; + return obj; + }, + fromAminoMsg(object: MsgWithdrawPositionResponseAminoMsg): MsgWithdrawPositionResponse { + return MsgWithdrawPositionResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawPositionResponse): MsgWithdrawPositionResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/withdraw-position-response", + value: MsgWithdrawPositionResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawPositionResponseProtoMsg): MsgWithdrawPositionResponse { + return MsgWithdrawPositionResponse.decode(message.value); + }, + toProto(message: MsgWithdrawPositionResponse): Uint8Array { + return MsgWithdrawPositionResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawPositionResponse): MsgWithdrawPositionResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgWithdrawPositionResponse", + value: MsgWithdrawPositionResponse.encode(message).finish() + }; } }; function createBaseMsgCollectFees(): MsgCollectFees { @@ -572,6 +728,7 @@ function createBaseMsgCollectFees(): MsgCollectFees { }; } export const MsgCollectFees = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectFees", encode(message: MsgCollectFees, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.positionIds) { @@ -653,6 +810,43 @@ export const MsgCollectFees = { } obj.sender = message.sender; return obj; + }, + fromAmino(object: MsgCollectFeesAmino): MsgCollectFees { + return { + positionIds: Array.isArray(object?.position_ids) ? object.position_ids.map((e: any) => BigInt(e)) : [], + sender: object.sender + }; + }, + toAmino(message: MsgCollectFees): MsgCollectFeesAmino { + const obj: any = {}; + if (message.positionIds) { + obj.position_ids = message.positionIds.map(e => e.toString()); + } else { + obj.position_ids = []; + } + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: MsgCollectFeesAminoMsg): MsgCollectFees { + return MsgCollectFees.fromAmino(object.value); + }, + toAminoMsg(message: MsgCollectFees): MsgCollectFeesAminoMsg { + return { + type: "osmosis/concentratedliquidity/collect-fees", + value: MsgCollectFees.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCollectFeesProtoMsg): MsgCollectFees { + return MsgCollectFees.decode(message.value); + }, + toProto(message: MsgCollectFees): Uint8Array { + return MsgCollectFees.encode(message).finish(); + }, + toProtoMsg(message: MsgCollectFees): MsgCollectFeesProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectFees", + value: MsgCollectFees.encode(message).finish() + }; } }; function createBaseMsgCollectFeesResponse(): MsgCollectFeesResponse { @@ -661,6 +855,7 @@ function createBaseMsgCollectFeesResponse(): MsgCollectFeesResponse { }; } export const MsgCollectFeesResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectFeesResponse", encode(message: MsgCollectFeesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.collectedFees) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -721,6 +916,41 @@ export const MsgCollectFeesResponse = { obj.collected_fees = []; } return obj; + }, + fromAmino(object: MsgCollectFeesResponseAmino): MsgCollectFeesResponse { + return { + collectedFees: Array.isArray(object?.collected_fees) ? object.collected_fees.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgCollectFeesResponse): MsgCollectFeesResponseAmino { + const obj: any = {}; + if (message.collectedFees) { + obj.collected_fees = message.collectedFees.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.collected_fees = []; + } + return obj; + }, + fromAminoMsg(object: MsgCollectFeesResponseAminoMsg): MsgCollectFeesResponse { + return MsgCollectFeesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCollectFeesResponse): MsgCollectFeesResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/collect-fees-response", + value: MsgCollectFeesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCollectFeesResponseProtoMsg): MsgCollectFeesResponse { + return MsgCollectFeesResponse.decode(message.value); + }, + toProto(message: MsgCollectFeesResponse): Uint8Array { + return MsgCollectFeesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCollectFeesResponse): MsgCollectFeesResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectFeesResponse", + value: MsgCollectFeesResponse.encode(message).finish() + }; } }; function createBaseMsgCollectIncentives(): MsgCollectIncentives { @@ -730,6 +960,7 @@ function createBaseMsgCollectIncentives(): MsgCollectIncentives { }; } export const MsgCollectIncentives = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectIncentives", encode(message: MsgCollectIncentives, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.positionIds) { @@ -811,6 +1042,43 @@ export const MsgCollectIncentives = { } obj.sender = message.sender; return obj; + }, + fromAmino(object: MsgCollectIncentivesAmino): MsgCollectIncentives { + return { + positionIds: Array.isArray(object?.position_ids) ? object.position_ids.map((e: any) => BigInt(e)) : [], + sender: object.sender + }; + }, + toAmino(message: MsgCollectIncentives): MsgCollectIncentivesAmino { + const obj: any = {}; + if (message.positionIds) { + obj.position_ids = message.positionIds.map(e => e.toString()); + } else { + obj.position_ids = []; + } + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: MsgCollectIncentivesAminoMsg): MsgCollectIncentives { + return MsgCollectIncentives.fromAmino(object.value); + }, + toAminoMsg(message: MsgCollectIncentives): MsgCollectIncentivesAminoMsg { + return { + type: "osmosis/concentratedliquidity/collect-incentives", + value: MsgCollectIncentives.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCollectIncentivesProtoMsg): MsgCollectIncentives { + return MsgCollectIncentives.decode(message.value); + }, + toProto(message: MsgCollectIncentives): Uint8Array { + return MsgCollectIncentives.encode(message).finish(); + }, + toProtoMsg(message: MsgCollectIncentives): MsgCollectIncentivesProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectIncentives", + value: MsgCollectIncentives.encode(message).finish() + }; } }; function createBaseMsgCollectIncentivesResponse(): MsgCollectIncentivesResponse { @@ -819,6 +1087,7 @@ function createBaseMsgCollectIncentivesResponse(): MsgCollectIncentivesResponse }; } export const MsgCollectIncentivesResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectIncentivesResponse", encode(message: MsgCollectIncentivesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.collectedIncentives) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -879,6 +1148,41 @@ export const MsgCollectIncentivesResponse = { obj.collected_incentives = []; } return obj; + }, + fromAmino(object: MsgCollectIncentivesResponseAmino): MsgCollectIncentivesResponse { + return { + collectedIncentives: Array.isArray(object?.collected_incentives) ? object.collected_incentives.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgCollectIncentivesResponse): MsgCollectIncentivesResponseAmino { + const obj: any = {}; + if (message.collectedIncentives) { + obj.collected_incentives = message.collectedIncentives.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.collected_incentives = []; + } + return obj; + }, + fromAminoMsg(object: MsgCollectIncentivesResponseAminoMsg): MsgCollectIncentivesResponse { + return MsgCollectIncentivesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCollectIncentivesResponse): MsgCollectIncentivesResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/collect-incentives-response", + value: MsgCollectIncentivesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCollectIncentivesResponseProtoMsg): MsgCollectIncentivesResponse { + return MsgCollectIncentivesResponse.decode(message.value); + }, + toProto(message: MsgCollectIncentivesResponse): Uint8Array { + return MsgCollectIncentivesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCollectIncentivesResponse): MsgCollectIncentivesResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCollectIncentivesResponse", + value: MsgCollectIncentivesResponse.encode(message).finish() + }; } }; function createBaseMsgCreateIncentive(): MsgCreateIncentive { @@ -893,6 +1197,7 @@ function createBaseMsgCreateIncentive(): MsgCreateIncentive { }; } export const MsgCreateIncentive = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateIncentive", encode(message: MsgCreateIncentive, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1017,6 +1322,49 @@ export const MsgCreateIncentive = { message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); message.minUptime !== undefined && (obj.min_uptime = message.minUptime ? Duration.toSDK(message.minUptime) : undefined); return obj; + }, + fromAmino(object: MsgCreateIncentiveAmino): MsgCreateIncentive { + return { + poolId: BigInt(object.pool_id), + sender: object.sender, + incentiveDenom: object.incentive_denom, + incentiveAmount: object.incentive_amount, + emissionRate: object.emission_rate, + startTime: object.start_time, + minUptime: object?.min_uptime ? Duration.fromAmino(object.min_uptime) : undefined + }; + }, + toAmino(message: MsgCreateIncentive): MsgCreateIncentiveAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.sender = message.sender; + obj.incentive_denom = message.incentiveDenom; + obj.incentive_amount = message.incentiveAmount; + obj.emission_rate = message.emissionRate; + obj.start_time = message.startTime; + obj.min_uptime = message.minUptime ? Duration.toAmino(message.minUptime) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateIncentiveAminoMsg): MsgCreateIncentive { + return MsgCreateIncentive.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateIncentive): MsgCreateIncentiveAminoMsg { + return { + type: "osmosis/concentratedliquidity/create-incentive", + value: MsgCreateIncentive.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateIncentiveProtoMsg): MsgCreateIncentive { + return MsgCreateIncentive.decode(message.value); + }, + toProto(message: MsgCreateIncentive): Uint8Array { + return MsgCreateIncentive.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateIncentive): MsgCreateIncentiveProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateIncentive", + value: MsgCreateIncentive.encode(message).finish() + }; } }; function createBaseMsgCreateIncentiveResponse(): MsgCreateIncentiveResponse { @@ -1029,6 +1377,7 @@ function createBaseMsgCreateIncentiveResponse(): MsgCreateIncentiveResponse { }; } export const MsgCreateIncentiveResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateIncentiveResponse", encode(message: MsgCreateIncentiveResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.incentiveDenom !== "") { writer.uint32(10).string(message.incentiveDenom); @@ -1129,6 +1478,45 @@ export const MsgCreateIncentiveResponse = { message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); message.minUptime !== undefined && (obj.min_uptime = message.minUptime ? Duration.toSDK(message.minUptime) : undefined); return obj; + }, + fromAmino(object: MsgCreateIncentiveResponseAmino): MsgCreateIncentiveResponse { + return { + incentiveDenom: object.incentive_denom, + incentiveAmount: object.incentive_amount, + emissionRate: object.emission_rate, + startTime: object.start_time, + minUptime: object?.min_uptime ? Duration.fromAmino(object.min_uptime) : undefined + }; + }, + toAmino(message: MsgCreateIncentiveResponse): MsgCreateIncentiveResponseAmino { + const obj: any = {}; + obj.incentive_denom = message.incentiveDenom; + obj.incentive_amount = message.incentiveAmount; + obj.emission_rate = message.emissionRate; + obj.start_time = message.startTime; + obj.min_uptime = message.minUptime ? Duration.toAmino(message.minUptime) : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateIncentiveResponseAminoMsg): MsgCreateIncentiveResponse { + return MsgCreateIncentiveResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateIncentiveResponse): MsgCreateIncentiveResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/create-incentive-response", + value: MsgCreateIncentiveResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateIncentiveResponseProtoMsg): MsgCreateIncentiveResponse { + return MsgCreateIncentiveResponse.decode(message.value); + }, + toProto(message: MsgCreateIncentiveResponse): Uint8Array { + return MsgCreateIncentiveResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateIncentiveResponse): MsgCreateIncentiveResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgCreateIncentiveResponse", + value: MsgCreateIncentiveResponse.encode(message).finish() + }; } }; function createBaseMsgFungifyChargedPositions(): MsgFungifyChargedPositions { @@ -1138,6 +1526,7 @@ function createBaseMsgFungifyChargedPositions(): MsgFungifyChargedPositions { }; } export const MsgFungifyChargedPositions = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgFungifyChargedPositions", encode(message: MsgFungifyChargedPositions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.positionIds) { @@ -1219,6 +1608,43 @@ export const MsgFungifyChargedPositions = { } obj.sender = message.sender; return obj; + }, + fromAmino(object: MsgFungifyChargedPositionsAmino): MsgFungifyChargedPositions { + return { + positionIds: Array.isArray(object?.position_ids) ? object.position_ids.map((e: any) => BigInt(e)) : [], + sender: object.sender + }; + }, + toAmino(message: MsgFungifyChargedPositions): MsgFungifyChargedPositionsAmino { + const obj: any = {}; + if (message.positionIds) { + obj.position_ids = message.positionIds.map(e => e.toString()); + } else { + obj.position_ids = []; + } + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: MsgFungifyChargedPositionsAminoMsg): MsgFungifyChargedPositions { + return MsgFungifyChargedPositions.fromAmino(object.value); + }, + toAminoMsg(message: MsgFungifyChargedPositions): MsgFungifyChargedPositionsAminoMsg { + return { + type: "osmosis/concentratedliquidity/fungify-charged-positions", + value: MsgFungifyChargedPositions.toAmino(message) + }; + }, + fromProtoMsg(message: MsgFungifyChargedPositionsProtoMsg): MsgFungifyChargedPositions { + return MsgFungifyChargedPositions.decode(message.value); + }, + toProto(message: MsgFungifyChargedPositions): Uint8Array { + return MsgFungifyChargedPositions.encode(message).finish(); + }, + toProtoMsg(message: MsgFungifyChargedPositions): MsgFungifyChargedPositionsProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgFungifyChargedPositions", + value: MsgFungifyChargedPositions.encode(message).finish() + }; } }; function createBaseMsgFungifyChargedPositionsResponse(): MsgFungifyChargedPositionsResponse { @@ -1227,6 +1653,7 @@ function createBaseMsgFungifyChargedPositionsResponse(): MsgFungifyChargedPositi }; } export const MsgFungifyChargedPositionsResponse = { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgFungifyChargedPositionsResponse", encode(message: MsgFungifyChargedPositionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newPositionId !== BigInt(0)) { writer.uint32(8).uint64(message.newPositionId); @@ -1279,5 +1706,36 @@ export const MsgFungifyChargedPositionsResponse = { const obj: any = {}; obj.new_position_id = message.newPositionId; return obj; + }, + fromAmino(object: MsgFungifyChargedPositionsResponseAmino): MsgFungifyChargedPositionsResponse { + return { + newPositionId: BigInt(object.new_position_id) + }; + }, + toAmino(message: MsgFungifyChargedPositionsResponse): MsgFungifyChargedPositionsResponseAmino { + const obj: any = {}; + obj.new_position_id = message.newPositionId ? message.newPositionId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgFungifyChargedPositionsResponseAminoMsg): MsgFungifyChargedPositionsResponse { + return MsgFungifyChargedPositionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgFungifyChargedPositionsResponse): MsgFungifyChargedPositionsResponseAminoMsg { + return { + type: "osmosis/concentratedliquidity/fungify-charged-positions-response", + value: MsgFungifyChargedPositionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgFungifyChargedPositionsResponseProtoMsg): MsgFungifyChargedPositionsResponse { + return MsgFungifyChargedPositionsResponse.decode(message.value); + }, + toProto(message: MsgFungifyChargedPositionsResponse): Uint8Array { + return MsgFungifyChargedPositionsResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgFungifyChargedPositionsResponse): MsgFungifyChargedPositionsResponseProtoMsg { + return { + typeUrl: "/osmosis.concentratedliquidity.v1beta1.MsgFungifyChargedPositionsResponse", + value: MsgFungifyChargedPositionsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/genesis.ts index 8a1f0321db..09351ffcd2 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/genesis.ts @@ -18,6 +18,7 @@ function createBaseParams(): Params { return {}; } export const Params = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.Params", encode(_: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -55,6 +56,34 @@ export const Params = { toSDK(_: Params): ParamsSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ParamsAmino): Params { + return {}; + }, + toAmino(_: Params): ParamsAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/cosmwasmpool/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -63,6 +92,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -115,5 +145,36 @@ export const GenesisState = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/cosmwasmpool/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/pool.ts b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/pool.ts index 11c76d8876..849f603c42 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/pool.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/pool.ts @@ -22,6 +22,7 @@ function createBaseCosmWasmPool(): CosmWasmPool { }; } export const CosmWasmPool = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.CosmWasmPool", encode(message: CosmWasmPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolAddress !== "") { writer.uint32(10).string(message.poolAddress); @@ -110,5 +111,42 @@ export const CosmWasmPool = { obj.pool_id = message.poolId; obj.code_id = message.codeId; return obj; + }, + fromAmino(object: CosmWasmPoolAmino): CosmWasmPool { + return { + poolAddress: object.pool_address, + contractAddress: object.contract_address, + poolId: BigInt(object.pool_id), + codeId: BigInt(object.code_id) + }; + }, + toAmino(message: CosmWasmPool): CosmWasmPoolAmino { + const obj: any = {}; + obj.pool_address = message.poolAddress; + obj.contract_address = message.contractAddress; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: CosmWasmPoolAminoMsg): CosmWasmPool { + return CosmWasmPool.fromAmino(object.value); + }, + toAminoMsg(message: CosmWasmPool): CosmWasmPoolAminoMsg { + return { + type: "osmosis/cosmwasmpool/cosm-wasm-pool", + value: CosmWasmPool.toAmino(message) + }; + }, + fromProtoMsg(message: CosmWasmPoolProtoMsg): CosmWasmPool { + return CosmWasmPool.decode(message.value); + }, + toProto(message: CosmWasmPool): Uint8Array { + return CosmWasmPool.encode(message).finish(); + }, + toProtoMsg(message: CosmWasmPool): CosmWasmPoolProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.CosmWasmPool", + value: CosmWasmPool.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/tx.ts index 9cc1702231..6c28271f01 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/model/tx.ts @@ -29,6 +29,7 @@ function createBaseMsgCreateCosmWasmPool(): MsgCreateCosmWasmPool { }; } export const MsgCreateCosmWasmPool = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.MsgCreateCosmWasmPool", encode(message: MsgCreateCosmWasmPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); @@ -105,6 +106,41 @@ export const MsgCreateCosmWasmPool = { obj.instantiate_msg = message.instantiateMsg; obj.sender = message.sender; return obj; + }, + fromAmino(object: MsgCreateCosmWasmPoolAmino): MsgCreateCosmWasmPool { + return { + codeId: BigInt(object.code_id), + instantiateMsg: object.instantiate_msg, + sender: object.sender + }; + }, + toAmino(message: MsgCreateCosmWasmPool): MsgCreateCosmWasmPoolAmino { + const obj: any = {}; + obj.code_id = message.codeId ? message.codeId.toString() : undefined; + obj.instantiate_msg = message.instantiateMsg; + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: MsgCreateCosmWasmPoolAminoMsg): MsgCreateCosmWasmPool { + return MsgCreateCosmWasmPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateCosmWasmPool): MsgCreateCosmWasmPoolAminoMsg { + return { + type: "osmosis/cosmwasmpool/create-cosm-wasm-pool", + value: MsgCreateCosmWasmPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateCosmWasmPoolProtoMsg): MsgCreateCosmWasmPool { + return MsgCreateCosmWasmPool.decode(message.value); + }, + toProto(message: MsgCreateCosmWasmPool): Uint8Array { + return MsgCreateCosmWasmPool.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateCosmWasmPool): MsgCreateCosmWasmPoolProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.MsgCreateCosmWasmPool", + value: MsgCreateCosmWasmPool.encode(message).finish() + }; } }; function createBaseMsgCreateCosmWasmPoolResponse(): MsgCreateCosmWasmPoolResponse { @@ -113,6 +149,7 @@ function createBaseMsgCreateCosmWasmPoolResponse(): MsgCreateCosmWasmPoolRespons }; } export const MsgCreateCosmWasmPoolResponse = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.MsgCreateCosmWasmPoolResponse", encode(message: MsgCreateCosmWasmPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -165,5 +202,36 @@ export const MsgCreateCosmWasmPoolResponse = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: MsgCreateCosmWasmPoolResponseAmino): MsgCreateCosmWasmPoolResponse { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: MsgCreateCosmWasmPoolResponse): MsgCreateCosmWasmPoolResponseAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateCosmWasmPoolResponseAminoMsg): MsgCreateCosmWasmPoolResponse { + return MsgCreateCosmWasmPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateCosmWasmPoolResponse): MsgCreateCosmWasmPoolResponseAminoMsg { + return { + type: "osmosis/cosmwasmpool/create-cosm-wasm-pool-response", + value: MsgCreateCosmWasmPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateCosmWasmPoolResponseProtoMsg): MsgCreateCosmWasmPoolResponse { + return MsgCreateCosmWasmPoolResponse.decode(message.value); + }, + toProto(message: MsgCreateCosmWasmPoolResponse): Uint8Array { + return MsgCreateCosmWasmPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateCosmWasmPoolResponse): MsgCreateCosmWasmPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.MsgCreateCosmWasmPoolResponse", + value: MsgCreateCosmWasmPoolResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/query.ts index bcdab912ef..4d1fc9e455 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/cosmwasmpool/v1beta1/query.ts @@ -16,6 +16,7 @@ function createBaseParamsRequest(): ParamsRequest { return {}; } export const ParamsRequest = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.ParamsRequest", encode(_: ParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -53,6 +54,34 @@ export const ParamsRequest = { toSDK(_: ParamsRequest): ParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ParamsRequestAmino): ParamsRequest { + return {}; + }, + toAmino(_: ParamsRequest): ParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ParamsRequestAminoMsg): ParamsRequest { + return ParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: ParamsRequest): ParamsRequestAminoMsg { + return { + type: "osmosis/cosmwasmpool/params-request", + value: ParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsRequestProtoMsg): ParamsRequest { + return ParamsRequest.decode(message.value); + }, + toProto(message: ParamsRequest): Uint8Array { + return ParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: ParamsRequest): ParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.ParamsRequest", + value: ParamsRequest.encode(message).finish() + }; } }; function createBaseParamsResponse(): ParamsResponse { @@ -61,6 +90,7 @@ function createBaseParamsResponse(): ParamsResponse { }; } export const ParamsResponse = { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.ParamsResponse", encode(message: ParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -113,5 +143,36 @@ export const ParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: ParamsResponseAmino): ParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: ParamsResponse): ParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsResponseAminoMsg): ParamsResponse { + return ParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: ParamsResponse): ParamsResponseAminoMsg { + return { + type: "osmosis/cosmwasmpool/params-response", + value: ParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsResponseProtoMsg): ParamsResponse { + return ParamsResponse.decode(message.value); + }, + toProto(message: ParamsResponse): Uint8Array { + return ParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: ParamsResponse): ParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.cosmwasmpool.v1beta1.ParamsResponse", + value: ParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/genesis.ts index e28550036c..e6e1176073 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/genesis.ts @@ -28,6 +28,7 @@ function createBaseGenesisDowntimeEntry(): GenesisDowntimeEntry { }; } export const GenesisDowntimeEntry = { + typeUrl: "/osmosis.downtimedetector.v1beta1.GenesisDowntimeEntry", encode(message: GenesisDowntimeEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.duration !== 0) { writer.uint32(8).int32(message.duration); @@ -92,6 +93,39 @@ export const GenesisDowntimeEntry = { message.duration !== undefined && (obj.duration = downtimeToJSON(message.duration)); message.lastDowntime !== undefined && (obj.last_downtime = message.lastDowntime ?? undefined); return obj; + }, + fromAmino(object: GenesisDowntimeEntryAmino): GenesisDowntimeEntry { + return { + duration: isSet(object.duration) ? downtimeFromJSON(object.duration) : -1, + lastDowntime: object.last_downtime + }; + }, + toAmino(message: GenesisDowntimeEntry): GenesisDowntimeEntryAmino { + const obj: any = {}; + obj.duration = message.duration; + obj.last_downtime = message.lastDowntime; + return obj; + }, + fromAminoMsg(object: GenesisDowntimeEntryAminoMsg): GenesisDowntimeEntry { + return GenesisDowntimeEntry.fromAmino(object.value); + }, + toAminoMsg(message: GenesisDowntimeEntry): GenesisDowntimeEntryAminoMsg { + return { + type: "osmosis/downtimedetector/genesis-downtime-entry", + value: GenesisDowntimeEntry.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisDowntimeEntryProtoMsg): GenesisDowntimeEntry { + return GenesisDowntimeEntry.decode(message.value); + }, + toProto(message: GenesisDowntimeEntry): Uint8Array { + return GenesisDowntimeEntry.encode(message).finish(); + }, + toProtoMsg(message: GenesisDowntimeEntry): GenesisDowntimeEntryProtoMsg { + return { + typeUrl: "/osmosis.downtimedetector.v1beta1.GenesisDowntimeEntry", + value: GenesisDowntimeEntry.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -101,6 +135,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.downtimedetector.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.downtimes) { GenesisDowntimeEntry.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -173,5 +208,42 @@ export const GenesisState = { } message.lastBlockTime !== undefined && (obj.last_block_time = message.lastBlockTime ?? undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + downtimes: Array.isArray(object?.downtimes) ? object.downtimes.map((e: any) => GenesisDowntimeEntry.fromAmino(e)) : [], + lastBlockTime: object.last_block_time + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.downtimes) { + obj.downtimes = message.downtimes.map(e => e ? GenesisDowntimeEntry.toAmino(e) : undefined); + } else { + obj.downtimes = []; + } + obj.last_block_time = message.lastBlockTime; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/downtimedetector/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.downtimedetector.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/query.ts index 8baca4d2ad..ab52244475 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/downtime-detector/v1beta1/query.ts @@ -32,6 +32,7 @@ function createBaseRecoveredSinceDowntimeOfLengthRequest(): RecoveredSinceDownti }; } export const RecoveredSinceDowntimeOfLengthRequest = { + typeUrl: "/osmosis.downtimedetector.v1beta1.RecoveredSinceDowntimeOfLengthRequest", encode(message: RecoveredSinceDowntimeOfLengthRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.downtime !== 0) { writer.uint32(8).int32(message.downtime); @@ -96,6 +97,39 @@ export const RecoveredSinceDowntimeOfLengthRequest = { message.downtime !== undefined && (obj.downtime = downtimeToJSON(message.downtime)); message.recovery !== undefined && (obj.recovery = message.recovery ? Duration.toSDK(message.recovery) : undefined); return obj; + }, + fromAmino(object: RecoveredSinceDowntimeOfLengthRequestAmino): RecoveredSinceDowntimeOfLengthRequest { + return { + downtime: isSet(object.downtime) ? downtimeFromJSON(object.downtime) : -1, + recovery: object?.recovery ? Duration.fromAmino(object.recovery) : undefined + }; + }, + toAmino(message: RecoveredSinceDowntimeOfLengthRequest): RecoveredSinceDowntimeOfLengthRequestAmino { + const obj: any = {}; + obj.downtime = message.downtime; + obj.recovery = message.recovery ? Duration.toAmino(message.recovery) : undefined; + return obj; + }, + fromAminoMsg(object: RecoveredSinceDowntimeOfLengthRequestAminoMsg): RecoveredSinceDowntimeOfLengthRequest { + return RecoveredSinceDowntimeOfLengthRequest.fromAmino(object.value); + }, + toAminoMsg(message: RecoveredSinceDowntimeOfLengthRequest): RecoveredSinceDowntimeOfLengthRequestAminoMsg { + return { + type: "osmosis/downtimedetector/recovered-since-downtime-of-length-request", + value: RecoveredSinceDowntimeOfLengthRequest.toAmino(message) + }; + }, + fromProtoMsg(message: RecoveredSinceDowntimeOfLengthRequestProtoMsg): RecoveredSinceDowntimeOfLengthRequest { + return RecoveredSinceDowntimeOfLengthRequest.decode(message.value); + }, + toProto(message: RecoveredSinceDowntimeOfLengthRequest): Uint8Array { + return RecoveredSinceDowntimeOfLengthRequest.encode(message).finish(); + }, + toProtoMsg(message: RecoveredSinceDowntimeOfLengthRequest): RecoveredSinceDowntimeOfLengthRequestProtoMsg { + return { + typeUrl: "/osmosis.downtimedetector.v1beta1.RecoveredSinceDowntimeOfLengthRequest", + value: RecoveredSinceDowntimeOfLengthRequest.encode(message).finish() + }; } }; function createBaseRecoveredSinceDowntimeOfLengthResponse(): RecoveredSinceDowntimeOfLengthResponse { @@ -104,6 +138,7 @@ function createBaseRecoveredSinceDowntimeOfLengthResponse(): RecoveredSinceDownt }; } export const RecoveredSinceDowntimeOfLengthResponse = { + typeUrl: "/osmosis.downtimedetector.v1beta1.RecoveredSinceDowntimeOfLengthResponse", encode(message: RecoveredSinceDowntimeOfLengthResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.succesfullyRecovered === true) { writer.uint32(8).bool(message.succesfullyRecovered); @@ -156,5 +191,36 @@ export const RecoveredSinceDowntimeOfLengthResponse = { const obj: any = {}; obj.succesfully_recovered = message.succesfullyRecovered; return obj; + }, + fromAmino(object: RecoveredSinceDowntimeOfLengthResponseAmino): RecoveredSinceDowntimeOfLengthResponse { + return { + succesfullyRecovered: object.succesfully_recovered + }; + }, + toAmino(message: RecoveredSinceDowntimeOfLengthResponse): RecoveredSinceDowntimeOfLengthResponseAmino { + const obj: any = {}; + obj.succesfully_recovered = message.succesfullyRecovered; + return obj; + }, + fromAminoMsg(object: RecoveredSinceDowntimeOfLengthResponseAminoMsg): RecoveredSinceDowntimeOfLengthResponse { + return RecoveredSinceDowntimeOfLengthResponse.fromAmino(object.value); + }, + toAminoMsg(message: RecoveredSinceDowntimeOfLengthResponse): RecoveredSinceDowntimeOfLengthResponseAminoMsg { + return { + type: "osmosis/downtimedetector/recovered-since-downtime-of-length-response", + value: RecoveredSinceDowntimeOfLengthResponse.toAmino(message) + }; + }, + fromProtoMsg(message: RecoveredSinceDowntimeOfLengthResponseProtoMsg): RecoveredSinceDowntimeOfLengthResponse { + return RecoveredSinceDowntimeOfLengthResponse.decode(message.value); + }, + toProto(message: RecoveredSinceDowntimeOfLengthResponse): Uint8Array { + return RecoveredSinceDowntimeOfLengthResponse.encode(message).finish(); + }, + toProtoMsg(message: RecoveredSinceDowntimeOfLengthResponse): RecoveredSinceDowntimeOfLengthResponseProtoMsg { + return { + typeUrl: "/osmosis.downtimedetector.v1beta1.RecoveredSinceDowntimeOfLengthResponse", + value: RecoveredSinceDowntimeOfLengthResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts index ce410c8f67..afd78e5bb6 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/epochs/genesis.ts @@ -94,6 +94,7 @@ function createBaseEpochInfo(): EpochInfo { }; } export const EpochInfo = { + typeUrl: "/osmosis.epochs.v1beta1.EpochInfo", encode(message: EpochInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); @@ -218,6 +219,49 @@ export const EpochInfo = { obj.epoch_counting_started = message.epochCountingStarted; obj.current_epoch_start_height = message.currentEpochStartHeight; return obj; + }, + fromAmino(object: EpochInfoAmino): EpochInfo { + return { + identifier: object.identifier, + startTime: object.start_time, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + currentEpoch: BigInt(object.current_epoch), + currentEpochStartTime: object.current_epoch_start_time, + epochCountingStarted: object.epoch_counting_started, + currentEpochStartHeight: BigInt(object.current_epoch_start_height) + }; + }, + toAmino(message: EpochInfo): EpochInfoAmino { + const obj: any = {}; + obj.identifier = message.identifier; + obj.start_time = message.startTime; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + obj.current_epoch_start_time = message.currentEpochStartTime; + obj.epoch_counting_started = message.epochCountingStarted; + obj.current_epoch_start_height = message.currentEpochStartHeight ? message.currentEpochStartHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EpochInfoAminoMsg): EpochInfo { + return EpochInfo.fromAmino(object.value); + }, + toAminoMsg(message: EpochInfo): EpochInfoAminoMsg { + return { + type: "osmosis/epochs/epoch-info", + value: EpochInfo.toAmino(message) + }; + }, + fromProtoMsg(message: EpochInfoProtoMsg): EpochInfo { + return EpochInfo.decode(message.value); + }, + toProto(message: EpochInfo): Uint8Array { + return EpochInfo.encode(message).finish(); + }, + toProtoMsg(message: EpochInfo): EpochInfoProtoMsg { + return { + typeUrl: "/osmosis.epochs.v1beta1.EpochInfo", + value: EpochInfo.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -226,6 +270,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.epochs.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.epochs) { EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -286,5 +331,40 @@ export const GenesisState = { obj.epochs = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + epochs: Array.isArray(object?.epochs) ? object.epochs.map((e: any) => EpochInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.epochs) { + obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); + } else { + obj.epochs = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/epochs/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.epochs.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts index e306e82b4a..269394c401 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/epochs/query.ts @@ -26,6 +26,7 @@ function createBaseQueryEpochsInfoRequest(): QueryEpochsInfoRequest { return {}; } export const QueryEpochsInfoRequest = { + typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoRequest", encode(_: QueryEpochsInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -63,6 +64,34 @@ export const QueryEpochsInfoRequest = { toSDK(_: QueryEpochsInfoRequest): QueryEpochsInfoRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryEpochsInfoRequestAmino): QueryEpochsInfoRequest { + return {}; + }, + toAmino(_: QueryEpochsInfoRequest): QueryEpochsInfoRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryEpochsInfoRequestAminoMsg): QueryEpochsInfoRequest { + return QueryEpochsInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestAminoMsg { + return { + type: "osmosis/epochs/query-epochs-info-request", + value: QueryEpochsInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryEpochsInfoRequestProtoMsg): QueryEpochsInfoRequest { + return QueryEpochsInfoRequest.decode(message.value); + }, + toProto(message: QueryEpochsInfoRequest): Uint8Array { + return QueryEpochsInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochsInfoRequest): QueryEpochsInfoRequestProtoMsg { + return { + typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoRequest", + value: QueryEpochsInfoRequest.encode(message).finish() + }; } }; function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse { @@ -71,6 +100,7 @@ function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse { }; } export const QueryEpochsInfoResponse = { + typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoResponse", encode(message: QueryEpochsInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.epochs) { EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -131,6 +161,41 @@ export const QueryEpochsInfoResponse = { obj.epochs = []; } return obj; + }, + fromAmino(object: QueryEpochsInfoResponseAmino): QueryEpochsInfoResponse { + return { + epochs: Array.isArray(object?.epochs) ? object.epochs.map((e: any) => EpochInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseAmino { + const obj: any = {}; + if (message.epochs) { + obj.epochs = message.epochs.map(e => e ? EpochInfo.toAmino(e) : undefined); + } else { + obj.epochs = []; + } + return obj; + }, + fromAminoMsg(object: QueryEpochsInfoResponseAminoMsg): QueryEpochsInfoResponse { + return QueryEpochsInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseAminoMsg { + return { + type: "osmosis/epochs/query-epochs-info-response", + value: QueryEpochsInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryEpochsInfoResponseProtoMsg): QueryEpochsInfoResponse { + return QueryEpochsInfoResponse.decode(message.value); + }, + toProto(message: QueryEpochsInfoResponse): Uint8Array { + return QueryEpochsInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochsInfoResponse): QueryEpochsInfoResponseProtoMsg { + return { + typeUrl: "/osmosis.epochs.v1beta1.QueryEpochsInfoResponse", + value: QueryEpochsInfoResponse.encode(message).finish() + }; } }; function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest { @@ -139,6 +204,7 @@ function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest { }; } export const QueryCurrentEpochRequest = { + typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochRequest", encode(message: QueryCurrentEpochRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); @@ -191,6 +257,37 @@ export const QueryCurrentEpochRequest = { const obj: any = {}; obj.identifier = message.identifier; return obj; + }, + fromAmino(object: QueryCurrentEpochRequestAmino): QueryCurrentEpochRequest { + return { + identifier: object.identifier + }; + }, + toAmino(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAmino { + const obj: any = {}; + obj.identifier = message.identifier; + return obj; + }, + fromAminoMsg(object: QueryCurrentEpochRequestAminoMsg): QueryCurrentEpochRequest { + return QueryCurrentEpochRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestAminoMsg { + return { + type: "osmosis/epochs/query-current-epoch-request", + value: QueryCurrentEpochRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCurrentEpochRequestProtoMsg): QueryCurrentEpochRequest { + return QueryCurrentEpochRequest.decode(message.value); + }, + toProto(message: QueryCurrentEpochRequest): Uint8Array { + return QueryCurrentEpochRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCurrentEpochRequest): QueryCurrentEpochRequestProtoMsg { + return { + typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochRequest", + value: QueryCurrentEpochRequest.encode(message).finish() + }; } }; function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse { @@ -199,6 +296,7 @@ function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse { }; } export const QueryCurrentEpochResponse = { + typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochResponse", encode(message: QueryCurrentEpochResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.currentEpoch !== BigInt(0)) { writer.uint32(8).int64(message.currentEpoch); @@ -251,5 +349,36 @@ export const QueryCurrentEpochResponse = { const obj: any = {}; obj.current_epoch = message.currentEpoch; return obj; + }, + fromAmino(object: QueryCurrentEpochResponseAmino): QueryCurrentEpochResponse { + return { + currentEpoch: BigInt(object.current_epoch) + }; + }, + toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { + const obj: any = {}; + obj.current_epoch = message.currentEpoch ? message.currentEpoch.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryCurrentEpochResponseAminoMsg): QueryCurrentEpochResponse { + return QueryCurrentEpochResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAminoMsg { + return { + type: "osmosis/epochs/query-current-epoch-response", + value: QueryCurrentEpochResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCurrentEpochResponseProtoMsg): QueryCurrentEpochResponse { + return QueryCurrentEpochResponse.decode(message.value); + }, + toProto(message: QueryCurrentEpochResponse): Uint8Array { + return QueryCurrentEpochResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseProtoMsg { + return { + typeUrl: "/osmosis.epochs.v1beta1.QueryCurrentEpochResponse", + value: QueryCurrentEpochResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/balancerPool.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/balancerPool.ts index 7354332ede..7e33865601 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/balancerPool.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/balancerPool.ts @@ -153,6 +153,7 @@ function createBaseSmoothWeightChangeParams(): SmoothWeightChangeParams { }; } export const SmoothWeightChangeParams = { + typeUrl: "/osmosis.gamm.v1beta1.SmoothWeightChangeParams", encode(message: SmoothWeightChangeParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.startTime !== undefined) { Timestamp.encode(toTimestamp(message.startTime), writer.uint32(10).fork()).ldelim(); @@ -257,6 +258,51 @@ export const SmoothWeightChangeParams = { obj.target_pool_weights = []; } return obj; + }, + fromAmino(object: SmoothWeightChangeParamsAmino): SmoothWeightChangeParams { + return { + startTime: object.start_time, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + initialPoolWeights: Array.isArray(object?.initial_pool_weights) ? object.initial_pool_weights.map((e: any) => PoolAsset.fromAmino(e)) : [], + targetPoolWeights: Array.isArray(object?.target_pool_weights) ? object.target_pool_weights.map((e: any) => PoolAsset.fromAmino(e)) : [] + }; + }, + toAmino(message: SmoothWeightChangeParams): SmoothWeightChangeParamsAmino { + const obj: any = {}; + obj.start_time = message.startTime; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + if (message.initialPoolWeights) { + obj.initial_pool_weights = message.initialPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); + } else { + obj.initial_pool_weights = []; + } + if (message.targetPoolWeights) { + obj.target_pool_weights = message.targetPoolWeights.map(e => e ? PoolAsset.toAmino(e) : undefined); + } else { + obj.target_pool_weights = []; + } + return obj; + }, + fromAminoMsg(object: SmoothWeightChangeParamsAminoMsg): SmoothWeightChangeParams { + return SmoothWeightChangeParams.fromAmino(object.value); + }, + toAminoMsg(message: SmoothWeightChangeParams): SmoothWeightChangeParamsAminoMsg { + return { + type: "osmosis/gamm/smooth-weight-change-params", + value: SmoothWeightChangeParams.toAmino(message) + }; + }, + fromProtoMsg(message: SmoothWeightChangeParamsProtoMsg): SmoothWeightChangeParams { + return SmoothWeightChangeParams.decode(message.value); + }, + toProto(message: SmoothWeightChangeParams): Uint8Array { + return SmoothWeightChangeParams.encode(message).finish(); + }, + toProtoMsg(message: SmoothWeightChangeParams): SmoothWeightChangeParamsProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.SmoothWeightChangeParams", + value: SmoothWeightChangeParams.encode(message).finish() + }; } }; function createBasePoolParams(): PoolParams { @@ -267,6 +313,7 @@ function createBasePoolParams(): PoolParams { }; } export const PoolParams = { + typeUrl: "/osmosis.gamm.v1beta1.PoolParams", encode(message: PoolParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.swapFee !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.swapFee, 18).atomics); @@ -343,6 +390,41 @@ export const PoolParams = { obj.exit_fee = message.exitFee; message.smoothWeightChangeParams !== undefined && (obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toSDK(message.smoothWeightChangeParams) : undefined); return obj; + }, + fromAmino(object: PoolParamsAmino): PoolParams { + return { + swapFee: object.swap_fee, + exitFee: object.exit_fee, + smoothWeightChangeParams: object?.smooth_weight_change_params ? SmoothWeightChangeParams.fromAmino(object.smooth_weight_change_params) : undefined + }; + }, + toAmino(message: PoolParams): PoolParamsAmino { + const obj: any = {}; + obj.swap_fee = message.swapFee; + obj.exit_fee = message.exitFee; + obj.smooth_weight_change_params = message.smoothWeightChangeParams ? SmoothWeightChangeParams.toAmino(message.smoothWeightChangeParams) : undefined; + return obj; + }, + fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { + return PoolParams.fromAmino(object.value); + }, + toAminoMsg(message: PoolParams): PoolParamsAminoMsg { + return { + type: "osmosis/gamm/pool-params", + value: PoolParams.toAmino(message) + }; + }, + fromProtoMsg(message: PoolParamsProtoMsg): PoolParams { + return PoolParams.decode(message.value); + }, + toProto(message: PoolParams): Uint8Array { + return PoolParams.encode(message).finish(); + }, + toProtoMsg(message: PoolParams): PoolParamsProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.PoolParams", + value: PoolParams.encode(message).finish() + }; } }; function createBasePoolAsset(): PoolAsset { @@ -352,6 +434,7 @@ function createBasePoolAsset(): PoolAsset { }; } export const PoolAsset = { + typeUrl: "/osmosis.gamm.v1beta1.PoolAsset", encode(message: PoolAsset, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.token !== undefined) { Coin.encode(message.token, writer.uint32(10).fork()).ldelim(); @@ -416,6 +499,39 @@ export const PoolAsset = { message.token !== undefined && (obj.token = message.token ? Coin.toSDK(message.token) : undefined); obj.weight = message.weight; return obj; + }, + fromAmino(object: PoolAssetAmino): PoolAsset { + return { + token: object?.token ? Coin.fromAmino(object.token) : undefined, + weight: object.weight + }; + }, + toAmino(message: PoolAsset): PoolAssetAmino { + const obj: any = {}; + obj.token = message.token ? Coin.toAmino(message.token) : undefined; + obj.weight = message.weight; + return obj; + }, + fromAminoMsg(object: PoolAssetAminoMsg): PoolAsset { + return PoolAsset.fromAmino(object.value); + }, + toAminoMsg(message: PoolAsset): PoolAssetAminoMsg { + return { + type: "osmosis/gamm/pool-asset", + value: PoolAsset.toAmino(message) + }; + }, + fromProtoMsg(message: PoolAssetProtoMsg): PoolAsset { + return PoolAsset.decode(message.value); + }, + toProto(message: PoolAsset): Uint8Array { + return PoolAsset.encode(message).finish(); + }, + toProtoMsg(message: PoolAsset): PoolAssetProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.PoolAsset", + value: PoolAsset.encode(message).finish() + }; } }; function createBasePool(): Pool { @@ -430,6 +546,7 @@ function createBasePool(): Pool { }; } export const Pool = { + typeUrl: "/osmosis.gamm.v1beta1.Pool", encode(message: Pool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -562,5 +679,52 @@ export const Pool = { } obj.total_weight = message.totalWeight; return obj; + }, + fromAmino(object: PoolAmino): Pool { + return { + address: object.address, + id: BigInt(object.id), + poolParams: object?.pool_params ? PoolParams.fromAmino(object.pool_params) : undefined, + futurePoolGovernor: object.future_pool_governor, + totalShares: object?.total_shares ? Coin.fromAmino(object.total_shares) : undefined, + poolAssets: Array.isArray(object?.pool_assets) ? object.pool_assets.map((e: any) => PoolAsset.fromAmino(e)) : [], + totalWeight: object.total_weight + }; + }, + toAmino(message: Pool): PoolAmino { + const obj: any = {}; + obj.address = message.address; + obj.id = message.id ? message.id.toString() : undefined; + obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; + obj.future_pool_governor = message.futurePoolGovernor; + obj.total_shares = message.totalShares ? Coin.toAmino(message.totalShares) : undefined; + if (message.poolAssets) { + obj.pool_assets = message.poolAssets.map(e => e ? PoolAsset.toAmino(e) : undefined); + } else { + obj.pool_assets = []; + } + obj.total_weight = message.totalWeight; + return obj; + }, + fromAminoMsg(object: PoolAminoMsg): Pool { + return Pool.fromAmino(object.value); + }, + toAminoMsg(message: Pool): PoolAminoMsg { + return { + type: "osmosis/gamm/pool", + value: Pool.toAmino(message) + }; + }, + fromProtoMsg(message: PoolProtoMsg): Pool { + return Pool.decode(message.value); + }, + toProto(message: Pool): Uint8Array { + return Pool.encode(message).finish(); + }, + toProtoMsg(message: Pool): PoolProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.Pool", + value: Pool.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/tx/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/tx/tx.ts index 60d1b3f9a1..cd33076caf 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/tx/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/balancer/tx/tx.ts @@ -33,6 +33,7 @@ function createBaseMsgCreateBalancerPool(): MsgCreateBalancerPool { }; } export const MsgCreateBalancerPool = { + typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool", encode(message: MsgCreateBalancerPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -129,6 +130,47 @@ export const MsgCreateBalancerPool = { } obj.future_pool_governor = message.futurePoolGovernor; return obj; + }, + fromAmino(object: MsgCreateBalancerPoolAmino): MsgCreateBalancerPool { + return { + sender: object.sender, + poolParams: object?.pool_params ? PoolParams.fromAmino(object.pool_params) : undefined, + poolAssets: Array.isArray(object?.pool_assets) ? object.pool_assets.map((e: any) => PoolAsset.fromAmino(e)) : [], + futurePoolGovernor: object.future_pool_governor + }; + }, + toAmino(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; + if (message.poolAssets) { + obj.pool_assets = message.poolAssets.map(e => e ? PoolAsset.toAmino(e) : undefined); + } else { + obj.pool_assets = []; + } + obj.future_pool_governor = message.futurePoolGovernor; + return obj; + }, + fromAminoMsg(object: MsgCreateBalancerPoolAminoMsg): MsgCreateBalancerPool { + return MsgCreateBalancerPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateBalancerPool): MsgCreateBalancerPoolAminoMsg { + return { + type: "osmosis/gamm/poolmodels/balancer/create-balancer-pool", + value: MsgCreateBalancerPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateBalancerPoolProtoMsg): MsgCreateBalancerPool { + return MsgCreateBalancerPool.decode(message.value); + }, + toProto(message: MsgCreateBalancerPool): Uint8Array { + return MsgCreateBalancerPool.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateBalancerPool): MsgCreateBalancerPoolProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPool", + value: MsgCreateBalancerPool.encode(message).finish() + }; } }; function createBaseMsgCreateBalancerPoolResponse(): MsgCreateBalancerPoolResponse { @@ -137,6 +179,7 @@ function createBaseMsgCreateBalancerPoolResponse(): MsgCreateBalancerPoolRespons }; } export const MsgCreateBalancerPoolResponse = { + typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPoolResponse", encode(message: MsgCreateBalancerPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -189,5 +232,36 @@ export const MsgCreateBalancerPoolResponse = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: MsgCreateBalancerPoolResponseAmino): MsgCreateBalancerPoolResponse { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateBalancerPoolResponseAminoMsg): MsgCreateBalancerPoolResponse { + return MsgCreateBalancerPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseAminoMsg { + return { + type: "osmosis/gamm/poolmodels/balancer/create-balancer-pool-response", + value: MsgCreateBalancerPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateBalancerPoolResponseProtoMsg): MsgCreateBalancerPoolResponse { + return MsgCreateBalancerPoolResponse.decode(message.value); + }, + toProto(message: MsgCreateBalancerPoolResponse): Uint8Array { + return MsgCreateBalancerPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateBalancerPoolResponse): MsgCreateBalancerPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.balancer.v1beta1.MsgCreateBalancerPoolResponse", + value: MsgCreateBalancerPoolResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts index c4080fd084..af7ea81f30 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/stableswap_pool.ts @@ -66,6 +66,7 @@ function createBasePoolParams(): PoolParams { }; } export const PoolParams = { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.PoolParams", encode(message: PoolParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.swapFee !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.swapFee, 18).atomics); @@ -130,6 +131,39 @@ export const PoolParams = { obj.swap_fee = message.swapFee; obj.exit_fee = message.exitFee; return obj; + }, + fromAmino(object: PoolParamsAmino): PoolParams { + return { + swapFee: object.swap_fee, + exitFee: object.exit_fee + }; + }, + toAmino(message: PoolParams): PoolParamsAmino { + const obj: any = {}; + obj.swap_fee = message.swapFee; + obj.exit_fee = message.exitFee; + return obj; + }, + fromAminoMsg(object: PoolParamsAminoMsg): PoolParams { + return PoolParams.fromAmino(object.value); + }, + toAminoMsg(message: PoolParams): PoolParamsAminoMsg { + return { + type: "osmosis/gamm/pool-params", + value: PoolParams.toAmino(message) + }; + }, + fromProtoMsg(message: PoolParamsProtoMsg): PoolParams { + return PoolParams.decode(message.value); + }, + toProto(message: PoolParams): Uint8Array { + return PoolParams.encode(message).finish(); + }, + toProtoMsg(message: PoolParams): PoolParamsProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.PoolParams", + value: PoolParams.encode(message).finish() + }; } }; function createBasePool(): Pool { @@ -145,6 +179,7 @@ function createBasePool(): Pool { }; } export const Pool = { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.Pool", encode(message: Pool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -306,5 +341,58 @@ export const Pool = { } obj.scaling_factor_controller = message.scalingFactorController; return obj; + }, + fromAmino(object: PoolAmino): Pool { + return { + address: object.address, + id: BigInt(object.id), + poolParams: object?.pool_params ? PoolParams.fromAmino(object.pool_params) : undefined, + futurePoolGovernor: object.future_pool_governor, + totalShares: object?.total_shares ? Coin.fromAmino(object.total_shares) : undefined, + poolLiquidity: Array.isArray(object?.pool_liquidity) ? object.pool_liquidity.map((e: any) => Coin.fromAmino(e)) : [], + scalingFactors: Array.isArray(object?.scaling_factors) ? object.scaling_factors.map((e: any) => BigInt(e)) : [], + scalingFactorController: object.scaling_factor_controller + }; + }, + toAmino(message: Pool): PoolAmino { + const obj: any = {}; + obj.address = message.address; + obj.id = message.id ? message.id.toString() : undefined; + obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; + obj.future_pool_governor = message.futurePoolGovernor; + obj.total_shares = message.totalShares ? Coin.toAmino(message.totalShares) : undefined; + if (message.poolLiquidity) { + obj.pool_liquidity = message.poolLiquidity.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.pool_liquidity = []; + } + if (message.scalingFactors) { + obj.scaling_factors = message.scalingFactors.map(e => e.toString()); + } else { + obj.scaling_factors = []; + } + obj.scaling_factor_controller = message.scalingFactorController; + return obj; + }, + fromAminoMsg(object: PoolAminoMsg): Pool { + return Pool.fromAmino(object.value); + }, + toAminoMsg(message: Pool): PoolAminoMsg { + return { + type: "osmosis/gamm/pool", + value: Pool.toAmino(message) + }; + }, + fromProtoMsg(message: PoolProtoMsg): Pool { + return Pool.decode(message.value); + }, + toProto(message: Pool): Uint8Array { + return Pool.encode(message).finish(); + }, + toProtoMsg(message: Pool): PoolProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.Pool", + value: Pool.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/tx.ts index 4526b6f6f8..6573a4ddf9 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/pool-models/stableswap/tx.ts @@ -60,6 +60,7 @@ function createBaseMsgCreateStableswapPool(): MsgCreateStableswapPool { }; } export const MsgCreateStableswapPool = { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool", encode(message: MsgCreateStableswapPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -197,6 +198,55 @@ export const MsgCreateStableswapPool = { obj.future_pool_governor = message.futurePoolGovernor; obj.scaling_factor_controller = message.scalingFactorController; return obj; + }, + fromAmino(object: MsgCreateStableswapPoolAmino): MsgCreateStableswapPool { + return { + sender: object.sender, + poolParams: object?.pool_params ? PoolParams.fromAmino(object.pool_params) : undefined, + initialPoolLiquidity: Array.isArray(object?.initial_pool_liquidity) ? object.initial_pool_liquidity.map((e: any) => Coin.fromAmino(e)) : [], + scalingFactors: Array.isArray(object?.scaling_factors) ? object.scaling_factors.map((e: any) => BigInt(e)) : [], + futurePoolGovernor: object.future_pool_governor, + scalingFactorController: object.scaling_factor_controller + }; + }, + toAmino(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_params = message.poolParams ? PoolParams.toAmino(message.poolParams) : undefined; + if (message.initialPoolLiquidity) { + obj.initial_pool_liquidity = message.initialPoolLiquidity.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.initial_pool_liquidity = []; + } + if (message.scalingFactors) { + obj.scaling_factors = message.scalingFactors.map(e => e.toString()); + } else { + obj.scaling_factors = []; + } + obj.future_pool_governor = message.futurePoolGovernor; + obj.scaling_factor_controller = message.scalingFactorController; + return obj; + }, + fromAminoMsg(object: MsgCreateStableswapPoolAminoMsg): MsgCreateStableswapPool { + return MsgCreateStableswapPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateStableswapPool): MsgCreateStableswapPoolAminoMsg { + return { + type: "osmosis/gamm/create-stableswap-pool", + value: MsgCreateStableswapPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateStableswapPoolProtoMsg): MsgCreateStableswapPool { + return MsgCreateStableswapPool.decode(message.value); + }, + toProto(message: MsgCreateStableswapPool): Uint8Array { + return MsgCreateStableswapPool.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateStableswapPool): MsgCreateStableswapPoolProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPool", + value: MsgCreateStableswapPool.encode(message).finish() + }; } }; function createBaseMsgCreateStableswapPoolResponse(): MsgCreateStableswapPoolResponse { @@ -205,6 +255,7 @@ function createBaseMsgCreateStableswapPoolResponse(): MsgCreateStableswapPoolRes }; } export const MsgCreateStableswapPoolResponse = { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPoolResponse", encode(message: MsgCreateStableswapPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -257,6 +308,37 @@ export const MsgCreateStableswapPoolResponse = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: MsgCreateStableswapPoolResponseAmino): MsgCreateStableswapPoolResponse { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateStableswapPoolResponseAminoMsg): MsgCreateStableswapPoolResponse { + return MsgCreateStableswapPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseAminoMsg { + return { + type: "osmosis/gamm/create-stableswap-pool-response", + value: MsgCreateStableswapPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateStableswapPoolResponseProtoMsg): MsgCreateStableswapPoolResponse { + return MsgCreateStableswapPoolResponse.decode(message.value); + }, + toProto(message: MsgCreateStableswapPoolResponse): Uint8Array { + return MsgCreateStableswapPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateStableswapPoolResponse): MsgCreateStableswapPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgCreateStableswapPoolResponse", + value: MsgCreateStableswapPoolResponse.encode(message).finish() + }; } }; function createBaseMsgStableSwapAdjustScalingFactors(): MsgStableSwapAdjustScalingFactors { @@ -267,6 +349,7 @@ function createBaseMsgStableSwapAdjustScalingFactors(): MsgStableSwapAdjustScali }; } export const MsgStableSwapAdjustScalingFactors = { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactors", encode(message: MsgStableSwapAdjustScalingFactors, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -360,12 +443,52 @@ export const MsgStableSwapAdjustScalingFactors = { obj.scaling_factors = []; } return obj; + }, + fromAmino(object: MsgStableSwapAdjustScalingFactorsAmino): MsgStableSwapAdjustScalingFactors { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + scalingFactors: Array.isArray(object?.scaling_factors) ? object.scaling_factors.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + if (message.scalingFactors) { + obj.scaling_factors = message.scalingFactors.map(e => e.toString()); + } else { + obj.scaling_factors = []; + } + return obj; + }, + fromAminoMsg(object: MsgStableSwapAdjustScalingFactorsAminoMsg): MsgStableSwapAdjustScalingFactors { + return MsgStableSwapAdjustScalingFactors.fromAmino(object.value); + }, + toAminoMsg(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsAminoMsg { + return { + type: "osmosis/gamm/stable-swap-adjust-scaling-factors", + value: MsgStableSwapAdjustScalingFactors.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStableSwapAdjustScalingFactorsProtoMsg): MsgStableSwapAdjustScalingFactors { + return MsgStableSwapAdjustScalingFactors.decode(message.value); + }, + toProto(message: MsgStableSwapAdjustScalingFactors): Uint8Array { + return MsgStableSwapAdjustScalingFactors.encode(message).finish(); + }, + toProtoMsg(message: MsgStableSwapAdjustScalingFactors): MsgStableSwapAdjustScalingFactorsProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactors", + value: MsgStableSwapAdjustScalingFactors.encode(message).finish() + }; } }; function createBaseMsgStableSwapAdjustScalingFactorsResponse(): MsgStableSwapAdjustScalingFactorsResponse { return {}; } export const MsgStableSwapAdjustScalingFactorsResponse = { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactorsResponse", encode(_: MsgStableSwapAdjustScalingFactorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -403,5 +526,33 @@ export const MsgStableSwapAdjustScalingFactorsResponse = { toSDK(_: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgStableSwapAdjustScalingFactorsResponseAmino): MsgStableSwapAdjustScalingFactorsResponse { + return {}; + }, + toAmino(_: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgStableSwapAdjustScalingFactorsResponseAminoMsg): MsgStableSwapAdjustScalingFactorsResponse { + return MsgStableSwapAdjustScalingFactorsResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseAminoMsg { + return { + type: "osmosis/gamm/stable-swap-adjust-scaling-factors-response", + value: MsgStableSwapAdjustScalingFactorsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgStableSwapAdjustScalingFactorsResponseProtoMsg): MsgStableSwapAdjustScalingFactorsResponse { + return MsgStableSwapAdjustScalingFactorsResponse.decode(message.value); + }, + toProto(message: MsgStableSwapAdjustScalingFactorsResponse): Uint8Array { + return MsgStableSwapAdjustScalingFactorsResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgStableSwapAdjustScalingFactorsResponse): MsgStableSwapAdjustScalingFactorsResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.poolmodels.stableswap.v1beta1.MsgStableSwapAdjustScalingFactorsResponse", + value: MsgStableSwapAdjustScalingFactorsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts index 52559c9b82..4ca509a447 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/genesis.ts @@ -30,6 +30,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.gamm.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.poolCreationFee) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -90,6 +91,41 @@ export const Params = { obj.pool_creation_fee = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + poolCreationFee: Array.isArray(object?.pool_creation_fee) ? object.pool_creation_fee.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.poolCreationFee) { + obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.pool_creation_fee = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/gamm/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -100,6 +136,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.gamm.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pools) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -184,5 +221,44 @@ export const GenesisState = { obj.next_pool_number = message.nextPoolNumber; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + pools: Array.isArray(object?.pools) ? object.pools.map((e: any) => Any.fromAmino(e)) : [], + nextPoolNumber: BigInt(object.next_pool_number), + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.pools) { + obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.pools = []; + } + obj.next_pool_number = message.nextPoolNumber ? message.nextPoolNumber.toString() : undefined; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/gamm/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts index 896228cd63..096db289d8 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/gov.ts @@ -58,6 +58,7 @@ function createBaseReplaceMigrationRecordsProposal(): ReplaceMigrationRecordsPro }; } export const ReplaceMigrationRecordsProposal = { + typeUrl: "/osmosis.gamm.v1beta1.ReplaceMigrationRecordsProposal", encode(message: ReplaceMigrationRecordsProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -122,6 +123,39 @@ export const ReplaceMigrationRecordsProposal = { obj.title = message.title; obj.description = message.description; return obj; + }, + fromAmino(object: ReplaceMigrationRecordsProposalAmino): ReplaceMigrationRecordsProposal { + return { + title: object.title, + description: object.description + }; + }, + toAmino(message: ReplaceMigrationRecordsProposal): ReplaceMigrationRecordsProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: ReplaceMigrationRecordsProposalAminoMsg): ReplaceMigrationRecordsProposal { + return ReplaceMigrationRecordsProposal.fromAmino(object.value); + }, + toAminoMsg(message: ReplaceMigrationRecordsProposal): ReplaceMigrationRecordsProposalAminoMsg { + return { + type: "osmosis/gamm/replace-migration-records-proposal", + value: ReplaceMigrationRecordsProposal.toAmino(message) + }; + }, + fromProtoMsg(message: ReplaceMigrationRecordsProposalProtoMsg): ReplaceMigrationRecordsProposal { + return ReplaceMigrationRecordsProposal.decode(message.value); + }, + toProto(message: ReplaceMigrationRecordsProposal): Uint8Array { + return ReplaceMigrationRecordsProposal.encode(message).finish(); + }, + toProtoMsg(message: ReplaceMigrationRecordsProposal): ReplaceMigrationRecordsProposalProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.ReplaceMigrationRecordsProposal", + value: ReplaceMigrationRecordsProposal.encode(message).finish() + }; } }; function createBaseUpdateMigrationRecordsProposal(): UpdateMigrationRecordsProposal { @@ -131,6 +165,7 @@ function createBaseUpdateMigrationRecordsProposal(): UpdateMigrationRecordsPropo }; } export const UpdateMigrationRecordsProposal = { + typeUrl: "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal", encode(message: UpdateMigrationRecordsProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -195,5 +230,38 @@ export const UpdateMigrationRecordsProposal = { obj.title = message.title; obj.description = message.description; return obj; + }, + fromAmino(object: UpdateMigrationRecordsProposalAmino): UpdateMigrationRecordsProposal { + return { + title: object.title, + description: object.description + }; + }, + toAmino(message: UpdateMigrationRecordsProposal): UpdateMigrationRecordsProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + return obj; + }, + fromAminoMsg(object: UpdateMigrationRecordsProposalAminoMsg): UpdateMigrationRecordsProposal { + return UpdateMigrationRecordsProposal.fromAmino(object.value); + }, + toAminoMsg(message: UpdateMigrationRecordsProposal): UpdateMigrationRecordsProposalAminoMsg { + return { + type: "osmosis/gamm/update-migration-records-proposal", + value: UpdateMigrationRecordsProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UpdateMigrationRecordsProposalProtoMsg): UpdateMigrationRecordsProposal { + return UpdateMigrationRecordsProposal.decode(message.value); + }, + toProto(message: UpdateMigrationRecordsProposal): Uint8Array { + return UpdateMigrationRecordsProposal.encode(message).finish(); + }, + toProtoMsg(message: UpdateMigrationRecordsProposal): UpdateMigrationRecordsProposalProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.UpdateMigrationRecordsProposal", + value: UpdateMigrationRecordsProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts index a63c08d04e..3f74418960 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/query.ts @@ -267,6 +267,7 @@ function createBaseQueryPoolRequest(): QueryPoolRequest { }; } export const QueryPoolRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolRequest", encode(message: QueryPoolRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -319,6 +320,37 @@ export const QueryPoolRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryPoolRequestAmino): QueryPoolRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryPoolRequest): QueryPoolRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolRequestAminoMsg): QueryPoolRequest { + return QueryPoolRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolRequest): QueryPoolRequestAminoMsg { + return { + type: "osmosis/gamm/query-pool-request", + value: QueryPoolRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolRequestProtoMsg): QueryPoolRequest { + return QueryPoolRequest.decode(message.value); + }, + toProto(message: QueryPoolRequest): Uint8Array { + return QueryPoolRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolRequest): QueryPoolRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolRequest", + value: QueryPoolRequest.encode(message).finish() + }; } }; function createBaseQueryPoolResponse(): QueryPoolResponse { @@ -327,6 +359,7 @@ function createBaseQueryPoolResponse(): QueryPoolResponse { }; } export const QueryPoolResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse", encode(message: QueryPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pool !== undefined) { Any.encode(message.pool, writer.uint32(10).fork()).ldelim(); @@ -379,6 +412,37 @@ export const QueryPoolResponse = { const obj: any = {}; message.pool !== undefined && (obj.pool = message.pool ? Any.toSDK(message.pool) : undefined); return obj; + }, + fromAmino(object: QueryPoolResponseAmino): QueryPoolResponse { + return { + pool: object?.pool ? Any.fromAmino(object.pool) : undefined + }; + }, + toAmino(message: QueryPoolResponse): QueryPoolResponseAmino { + const obj: any = {}; + obj.pool = message.pool ? Any.toAmino(message.pool) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolResponseAminoMsg): QueryPoolResponse { + return QueryPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolResponse): QueryPoolResponseAminoMsg { + return { + type: "osmosis/gamm/query-pool-response", + value: QueryPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolResponseProtoMsg): QueryPoolResponse { + return QueryPoolResponse.decode(message.value); + }, + toProto(message: QueryPoolResponse): Uint8Array { + return QueryPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolResponse): QueryPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolResponse", + value: QueryPoolResponse.encode(message).finish() + }; } }; function createBaseQueryPoolsRequest(): QueryPoolsRequest { @@ -387,6 +451,7 @@ function createBaseQueryPoolsRequest(): QueryPoolsRequest { }; } export const QueryPoolsRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsRequest", encode(message: QueryPoolsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim(); @@ -439,6 +504,37 @@ export const QueryPoolsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPoolsRequestAmino): QueryPoolsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPoolsRequest): QueryPoolsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolsRequestAminoMsg): QueryPoolsRequest { + return QueryPoolsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolsRequest): QueryPoolsRequestAminoMsg { + return { + type: "osmosis/gamm/query-pools-request", + value: QueryPoolsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolsRequestProtoMsg): QueryPoolsRequest { + return QueryPoolsRequest.decode(message.value); + }, + toProto(message: QueryPoolsRequest): Uint8Array { + return QueryPoolsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolsRequest): QueryPoolsRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsRequest", + value: QueryPoolsRequest.encode(message).finish() + }; } }; function createBaseQueryPoolsResponse(): QueryPoolsResponse { @@ -448,6 +544,7 @@ function createBaseQueryPoolsResponse(): QueryPoolsResponse { }; } export const QueryPoolsResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse", encode(message: QueryPoolsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pools) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -520,12 +617,50 @@ export const QueryPoolsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPoolsResponseAmino): QueryPoolsResponse { + return { + pools: Array.isArray(object?.pools) ? object.pools.map((e: any) => Any.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPoolsResponse): QueryPoolsResponseAmino { + const obj: any = {}; + if (message.pools) { + obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.pools = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolsResponseAminoMsg): QueryPoolsResponse { + return QueryPoolsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolsResponse): QueryPoolsResponseAminoMsg { + return { + type: "osmosis/gamm/query-pools-response", + value: QueryPoolsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolsResponseProtoMsg): QueryPoolsResponse { + return QueryPoolsResponse.decode(message.value); + }, + toProto(message: QueryPoolsResponse): Uint8Array { + return QueryPoolsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolsResponse): QueryPoolsResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsResponse", + value: QueryPoolsResponse.encode(message).finish() + }; } }; function createBaseQueryNumPoolsRequest(): QueryNumPoolsRequest { return {}; } export const QueryNumPoolsRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsRequest", encode(_: QueryNumPoolsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -563,6 +698,34 @@ export const QueryNumPoolsRequest = { toSDK(_: QueryNumPoolsRequest): QueryNumPoolsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryNumPoolsRequestAmino): QueryNumPoolsRequest { + return {}; + }, + toAmino(_: QueryNumPoolsRequest): QueryNumPoolsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryNumPoolsRequestAminoMsg): QueryNumPoolsRequest { + return QueryNumPoolsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryNumPoolsRequest): QueryNumPoolsRequestAminoMsg { + return { + type: "osmosis/gamm/query-num-pools-request", + value: QueryNumPoolsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNumPoolsRequestProtoMsg): QueryNumPoolsRequest { + return QueryNumPoolsRequest.decode(message.value); + }, + toProto(message: QueryNumPoolsRequest): Uint8Array { + return QueryNumPoolsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryNumPoolsRequest): QueryNumPoolsRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsRequest", + value: QueryNumPoolsRequest.encode(message).finish() + }; } }; function createBaseQueryNumPoolsResponse(): QueryNumPoolsResponse { @@ -571,6 +734,7 @@ function createBaseQueryNumPoolsResponse(): QueryNumPoolsResponse { }; } export const QueryNumPoolsResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsResponse", encode(message: QueryNumPoolsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numPools !== BigInt(0)) { writer.uint32(8).uint64(message.numPools); @@ -623,6 +787,37 @@ export const QueryNumPoolsResponse = { const obj: any = {}; obj.num_pools = message.numPools; return obj; + }, + fromAmino(object: QueryNumPoolsResponseAmino): QueryNumPoolsResponse { + return { + numPools: BigInt(object.num_pools) + }; + }, + toAmino(message: QueryNumPoolsResponse): QueryNumPoolsResponseAmino { + const obj: any = {}; + obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryNumPoolsResponseAminoMsg): QueryNumPoolsResponse { + return QueryNumPoolsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryNumPoolsResponse): QueryNumPoolsResponseAminoMsg { + return { + type: "osmosis/gamm/query-num-pools-response", + value: QueryNumPoolsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryNumPoolsResponseProtoMsg): QueryNumPoolsResponse { + return QueryNumPoolsResponse.decode(message.value); + }, + toProto(message: QueryNumPoolsResponse): Uint8Array { + return QueryNumPoolsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryNumPoolsResponse): QueryNumPoolsResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryNumPoolsResponse", + value: QueryNumPoolsResponse.encode(message).finish() + }; } }; function createBaseQueryPoolTypeRequest(): QueryPoolTypeRequest { @@ -631,6 +826,7 @@ function createBaseQueryPoolTypeRequest(): QueryPoolTypeRequest { }; } export const QueryPoolTypeRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeRequest", encode(message: QueryPoolTypeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -683,6 +879,37 @@ export const QueryPoolTypeRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryPoolTypeRequestAmino): QueryPoolTypeRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryPoolTypeRequest): QueryPoolTypeRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolTypeRequestAminoMsg): QueryPoolTypeRequest { + return QueryPoolTypeRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolTypeRequest): QueryPoolTypeRequestAminoMsg { + return { + type: "osmosis/gamm/query-pool-type-request", + value: QueryPoolTypeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolTypeRequestProtoMsg): QueryPoolTypeRequest { + return QueryPoolTypeRequest.decode(message.value); + }, + toProto(message: QueryPoolTypeRequest): Uint8Array { + return QueryPoolTypeRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolTypeRequest): QueryPoolTypeRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeRequest", + value: QueryPoolTypeRequest.encode(message).finish() + }; } }; function createBaseQueryPoolTypeResponse(): QueryPoolTypeResponse { @@ -691,6 +918,7 @@ function createBaseQueryPoolTypeResponse(): QueryPoolTypeResponse { }; } export const QueryPoolTypeResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeResponse", encode(message: QueryPoolTypeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolType !== "") { writer.uint32(10).string(message.poolType); @@ -743,6 +971,37 @@ export const QueryPoolTypeResponse = { const obj: any = {}; obj.pool_type = message.poolType; return obj; + }, + fromAmino(object: QueryPoolTypeResponseAmino): QueryPoolTypeResponse { + return { + poolType: object.pool_type + }; + }, + toAmino(message: QueryPoolTypeResponse): QueryPoolTypeResponseAmino { + const obj: any = {}; + obj.pool_type = message.poolType; + return obj; + }, + fromAminoMsg(object: QueryPoolTypeResponseAminoMsg): QueryPoolTypeResponse { + return QueryPoolTypeResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolTypeResponse): QueryPoolTypeResponseAminoMsg { + return { + type: "osmosis/gamm/query-pool-type-response", + value: QueryPoolTypeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolTypeResponseProtoMsg): QueryPoolTypeResponse { + return QueryPoolTypeResponse.decode(message.value); + }, + toProto(message: QueryPoolTypeResponse): Uint8Array { + return QueryPoolTypeResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolTypeResponse): QueryPoolTypeResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolTypeResponse", + value: QueryPoolTypeResponse.encode(message).finish() + }; } }; function createBaseQueryCalcJoinPoolSharesRequest(): QueryCalcJoinPoolSharesRequest { @@ -752,6 +1011,7 @@ function createBaseQueryCalcJoinPoolSharesRequest(): QueryCalcJoinPoolSharesRequ }; } export const QueryCalcJoinPoolSharesRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesRequest", encode(message: QueryCalcJoinPoolSharesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -824,6 +1084,43 @@ export const QueryCalcJoinPoolSharesRequest = { obj.tokens_in = []; } return obj; + }, + fromAmino(object: QueryCalcJoinPoolSharesRequestAmino): QueryCalcJoinPoolSharesRequest { + return { + poolId: BigInt(object.pool_id), + tokensIn: Array.isArray(object?.tokens_in) ? object.tokens_in.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + if (message.tokensIn) { + obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.tokens_in = []; + } + return obj; + }, + fromAminoMsg(object: QueryCalcJoinPoolSharesRequestAminoMsg): QueryCalcJoinPoolSharesRequest { + return QueryCalcJoinPoolSharesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestAminoMsg { + return { + type: "osmosis/gamm/query-calc-join-pool-shares-request", + value: QueryCalcJoinPoolSharesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCalcJoinPoolSharesRequestProtoMsg): QueryCalcJoinPoolSharesRequest { + return QueryCalcJoinPoolSharesRequest.decode(message.value); + }, + toProto(message: QueryCalcJoinPoolSharesRequest): Uint8Array { + return QueryCalcJoinPoolSharesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCalcJoinPoolSharesRequest): QueryCalcJoinPoolSharesRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesRequest", + value: QueryCalcJoinPoolSharesRequest.encode(message).finish() + }; } }; function createBaseQueryCalcJoinPoolSharesResponse(): QueryCalcJoinPoolSharesResponse { @@ -833,6 +1130,7 @@ function createBaseQueryCalcJoinPoolSharesResponse(): QueryCalcJoinPoolSharesRes }; } export const QueryCalcJoinPoolSharesResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesResponse", encode(message: QueryCalcJoinPoolSharesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.shareOutAmount !== "") { writer.uint32(10).string(message.shareOutAmount); @@ -905,6 +1203,43 @@ export const QueryCalcJoinPoolSharesResponse = { obj.tokens_out = []; } return obj; + }, + fromAmino(object: QueryCalcJoinPoolSharesResponseAmino): QueryCalcJoinPoolSharesResponse { + return { + shareOutAmount: object.share_out_amount, + tokensOut: Array.isArray(object?.tokens_out) ? object.tokens_out.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAmino { + const obj: any = {}; + obj.share_out_amount = message.shareOutAmount; + if (message.tokensOut) { + obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.tokens_out = []; + } + return obj; + }, + fromAminoMsg(object: QueryCalcJoinPoolSharesResponseAminoMsg): QueryCalcJoinPoolSharesResponse { + return QueryCalcJoinPoolSharesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseAminoMsg { + return { + type: "osmosis/gamm/query-calc-join-pool-shares-response", + value: QueryCalcJoinPoolSharesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCalcJoinPoolSharesResponseProtoMsg): QueryCalcJoinPoolSharesResponse { + return QueryCalcJoinPoolSharesResponse.decode(message.value); + }, + toProto(message: QueryCalcJoinPoolSharesResponse): Uint8Array { + return QueryCalcJoinPoolSharesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCalcJoinPoolSharesResponse): QueryCalcJoinPoolSharesResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolSharesResponse", + value: QueryCalcJoinPoolSharesResponse.encode(message).finish() + }; } }; function createBaseQueryCalcExitPoolCoinsFromSharesRequest(): QueryCalcExitPoolCoinsFromSharesRequest { @@ -914,6 +1249,7 @@ function createBaseQueryCalcExitPoolCoinsFromSharesRequest(): QueryCalcExitPoolC }; } export const QueryCalcExitPoolCoinsFromSharesRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesRequest", encode(message: QueryCalcExitPoolCoinsFromSharesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -978,6 +1314,39 @@ export const QueryCalcExitPoolCoinsFromSharesRequest = { obj.pool_id = message.poolId; obj.share_in_amount = message.shareInAmount; return obj; + }, + fromAmino(object: QueryCalcExitPoolCoinsFromSharesRequestAmino): QueryCalcExitPoolCoinsFromSharesRequest { + return { + poolId: BigInt(object.pool_id), + shareInAmount: object.share_in_amount + }; + }, + toAmino(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount; + return obj; + }, + fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesRequestAminoMsg): QueryCalcExitPoolCoinsFromSharesRequest { + return QueryCalcExitPoolCoinsFromSharesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestAminoMsg { + return { + type: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-request", + value: QueryCalcExitPoolCoinsFromSharesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCalcExitPoolCoinsFromSharesRequestProtoMsg): QueryCalcExitPoolCoinsFromSharesRequest { + return QueryCalcExitPoolCoinsFromSharesRequest.decode(message.value); + }, + toProto(message: QueryCalcExitPoolCoinsFromSharesRequest): Uint8Array { + return QueryCalcExitPoolCoinsFromSharesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCalcExitPoolCoinsFromSharesRequest): QueryCalcExitPoolCoinsFromSharesRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesRequest", + value: QueryCalcExitPoolCoinsFromSharesRequest.encode(message).finish() + }; } }; function createBaseQueryCalcExitPoolCoinsFromSharesResponse(): QueryCalcExitPoolCoinsFromSharesResponse { @@ -986,6 +1355,7 @@ function createBaseQueryCalcExitPoolCoinsFromSharesResponse(): QueryCalcExitPool }; } export const QueryCalcExitPoolCoinsFromSharesResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesResponse", encode(message: QueryCalcExitPoolCoinsFromSharesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.tokensOut) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1046,6 +1416,41 @@ export const QueryCalcExitPoolCoinsFromSharesResponse = { obj.tokens_out = []; } return obj; + }, + fromAmino(object: QueryCalcExitPoolCoinsFromSharesResponseAmino): QueryCalcExitPoolCoinsFromSharesResponse { + return { + tokensOut: Array.isArray(object?.tokens_out) ? object.tokens_out.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryCalcExitPoolCoinsFromSharesResponse): QueryCalcExitPoolCoinsFromSharesResponseAmino { + const obj: any = {}; + if (message.tokensOut) { + obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.tokens_out = []; + } + return obj; + }, + fromAminoMsg(object: QueryCalcExitPoolCoinsFromSharesResponseAminoMsg): QueryCalcExitPoolCoinsFromSharesResponse { + return QueryCalcExitPoolCoinsFromSharesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCalcExitPoolCoinsFromSharesResponse): QueryCalcExitPoolCoinsFromSharesResponseAminoMsg { + return { + type: "osmosis/gamm/query-calc-exit-pool-coins-from-shares-response", + value: QueryCalcExitPoolCoinsFromSharesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCalcExitPoolCoinsFromSharesResponseProtoMsg): QueryCalcExitPoolCoinsFromSharesResponse { + return QueryCalcExitPoolCoinsFromSharesResponse.decode(message.value); + }, + toProto(message: QueryCalcExitPoolCoinsFromSharesResponse): Uint8Array { + return QueryCalcExitPoolCoinsFromSharesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCalcExitPoolCoinsFromSharesResponse): QueryCalcExitPoolCoinsFromSharesResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcExitPoolCoinsFromSharesResponse", + value: QueryCalcExitPoolCoinsFromSharesResponse.encode(message).finish() + }; } }; function createBaseQueryPoolParamsRequest(): QueryPoolParamsRequest { @@ -1054,6 +1459,7 @@ function createBaseQueryPoolParamsRequest(): QueryPoolParamsRequest { }; } export const QueryPoolParamsRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsRequest", encode(message: QueryPoolParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1106,6 +1512,37 @@ export const QueryPoolParamsRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryPoolParamsRequestAmino): QueryPoolParamsRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryPoolParamsRequest): QueryPoolParamsRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolParamsRequestAminoMsg): QueryPoolParamsRequest { + return QueryPoolParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolParamsRequest): QueryPoolParamsRequestAminoMsg { + return { + type: "osmosis/gamm/query-pool-params-request", + value: QueryPoolParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolParamsRequestProtoMsg): QueryPoolParamsRequest { + return QueryPoolParamsRequest.decode(message.value); + }, + toProto(message: QueryPoolParamsRequest): Uint8Array { + return QueryPoolParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolParamsRequest): QueryPoolParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsRequest", + value: QueryPoolParamsRequest.encode(message).finish() + }; } }; function createBaseQueryPoolParamsResponse(): QueryPoolParamsResponse { @@ -1114,6 +1551,7 @@ function createBaseQueryPoolParamsResponse(): QueryPoolParamsResponse { }; } export const QueryPoolParamsResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsResponse", encode(message: QueryPoolParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Any.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -1166,6 +1604,37 @@ export const QueryPoolParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Any.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryPoolParamsResponseAmino): QueryPoolParamsResponse { + return { + params: object?.params ? Any.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryPoolParamsResponse): QueryPoolParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Any.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolParamsResponseAminoMsg): QueryPoolParamsResponse { + return QueryPoolParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolParamsResponse): QueryPoolParamsResponseAminoMsg { + return { + type: "osmosis/gamm/query-pool-params-response", + value: QueryPoolParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolParamsResponseProtoMsg): QueryPoolParamsResponse { + return QueryPoolParamsResponse.decode(message.value); + }, + toProto(message: QueryPoolParamsResponse): Uint8Array { + return QueryPoolParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolParamsResponse): QueryPoolParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolParamsResponse", + value: QueryPoolParamsResponse.encode(message).finish() + }; } }; function createBaseQueryTotalPoolLiquidityRequest(): QueryTotalPoolLiquidityRequest { @@ -1174,6 +1643,7 @@ function createBaseQueryTotalPoolLiquidityRequest(): QueryTotalPoolLiquidityRequ }; } export const QueryTotalPoolLiquidityRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityRequest", encode(message: QueryTotalPoolLiquidityRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1226,6 +1696,37 @@ export const QueryTotalPoolLiquidityRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryTotalPoolLiquidityRequestAmino): QueryTotalPoolLiquidityRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalPoolLiquidityRequestAminoMsg): QueryTotalPoolLiquidityRequest { + return QueryTotalPoolLiquidityRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestAminoMsg { + return { + type: "osmosis/gamm/query-total-pool-liquidity-request", + value: QueryTotalPoolLiquidityRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalPoolLiquidityRequestProtoMsg): QueryTotalPoolLiquidityRequest { + return QueryTotalPoolLiquidityRequest.decode(message.value); + }, + toProto(message: QueryTotalPoolLiquidityRequest): Uint8Array { + return QueryTotalPoolLiquidityRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalPoolLiquidityRequest): QueryTotalPoolLiquidityRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityRequest", + value: QueryTotalPoolLiquidityRequest.encode(message).finish() + }; } }; function createBaseQueryTotalPoolLiquidityResponse(): QueryTotalPoolLiquidityResponse { @@ -1234,6 +1735,7 @@ function createBaseQueryTotalPoolLiquidityResponse(): QueryTotalPoolLiquidityRes }; } export const QueryTotalPoolLiquidityResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityResponse", encode(message: QueryTotalPoolLiquidityResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.liquidity) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1294,6 +1796,41 @@ export const QueryTotalPoolLiquidityResponse = { obj.liquidity = []; } return obj; + }, + fromAmino(object: QueryTotalPoolLiquidityResponseAmino): QueryTotalPoolLiquidityResponse { + return { + liquidity: Array.isArray(object?.liquidity) ? object.liquidity.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalPoolLiquidityResponse): QueryTotalPoolLiquidityResponseAmino { + const obj: any = {}; + if (message.liquidity) { + obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.liquidity = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalPoolLiquidityResponseAminoMsg): QueryTotalPoolLiquidityResponse { + return QueryTotalPoolLiquidityResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalPoolLiquidityResponse): QueryTotalPoolLiquidityResponseAminoMsg { + return { + type: "osmosis/gamm/query-total-pool-liquidity-response", + value: QueryTotalPoolLiquidityResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalPoolLiquidityResponseProtoMsg): QueryTotalPoolLiquidityResponse { + return QueryTotalPoolLiquidityResponse.decode(message.value); + }, + toProto(message: QueryTotalPoolLiquidityResponse): Uint8Array { + return QueryTotalPoolLiquidityResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalPoolLiquidityResponse): QueryTotalPoolLiquidityResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalPoolLiquidityResponse", + value: QueryTotalPoolLiquidityResponse.encode(message).finish() + }; } }; function createBaseQueryTotalSharesRequest(): QueryTotalSharesRequest { @@ -1302,6 +1839,7 @@ function createBaseQueryTotalSharesRequest(): QueryTotalSharesRequest { }; } export const QueryTotalSharesRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesRequest", encode(message: QueryTotalSharesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1354,6 +1892,37 @@ export const QueryTotalSharesRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryTotalSharesRequestAmino): QueryTotalSharesRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryTotalSharesRequest): QueryTotalSharesRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalSharesRequestAminoMsg): QueryTotalSharesRequest { + return QueryTotalSharesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalSharesRequest): QueryTotalSharesRequestAminoMsg { + return { + type: "osmosis/gamm/query-total-shares-request", + value: QueryTotalSharesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalSharesRequestProtoMsg): QueryTotalSharesRequest { + return QueryTotalSharesRequest.decode(message.value); + }, + toProto(message: QueryTotalSharesRequest): Uint8Array { + return QueryTotalSharesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalSharesRequest): QueryTotalSharesRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesRequest", + value: QueryTotalSharesRequest.encode(message).finish() + }; } }; function createBaseQueryTotalSharesResponse(): QueryTotalSharesResponse { @@ -1362,6 +1931,7 @@ function createBaseQueryTotalSharesResponse(): QueryTotalSharesResponse { }; } export const QueryTotalSharesResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesResponse", encode(message: QueryTotalSharesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.totalShares !== undefined) { Coin.encode(message.totalShares, writer.uint32(10).fork()).ldelim(); @@ -1414,6 +1984,37 @@ export const QueryTotalSharesResponse = { const obj: any = {}; message.totalShares !== undefined && (obj.total_shares = message.totalShares ? Coin.toSDK(message.totalShares) : undefined); return obj; + }, + fromAmino(object: QueryTotalSharesResponseAmino): QueryTotalSharesResponse { + return { + totalShares: object?.total_shares ? Coin.fromAmino(object.total_shares) : undefined + }; + }, + toAmino(message: QueryTotalSharesResponse): QueryTotalSharesResponseAmino { + const obj: any = {}; + obj.total_shares = message.totalShares ? Coin.toAmino(message.totalShares) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalSharesResponseAminoMsg): QueryTotalSharesResponse { + return QueryTotalSharesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalSharesResponse): QueryTotalSharesResponseAminoMsg { + return { + type: "osmosis/gamm/query-total-shares-response", + value: QueryTotalSharesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalSharesResponseProtoMsg): QueryTotalSharesResponse { + return QueryTotalSharesResponse.decode(message.value); + }, + toProto(message: QueryTotalSharesResponse): Uint8Array { + return QueryTotalSharesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalSharesResponse): QueryTotalSharesResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalSharesResponse", + value: QueryTotalSharesResponse.encode(message).finish() + }; } }; function createBaseQueryCalcJoinPoolNoSwapSharesRequest(): QueryCalcJoinPoolNoSwapSharesRequest { @@ -1423,6 +2024,7 @@ function createBaseQueryCalcJoinPoolNoSwapSharesRequest(): QueryCalcJoinPoolNoSw }; } export const QueryCalcJoinPoolNoSwapSharesRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesRequest", encode(message: QueryCalcJoinPoolNoSwapSharesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1495,6 +2097,43 @@ export const QueryCalcJoinPoolNoSwapSharesRequest = { obj.tokens_in = []; } return obj; + }, + fromAmino(object: QueryCalcJoinPoolNoSwapSharesRequestAmino): QueryCalcJoinPoolNoSwapSharesRequest { + return { + poolId: BigInt(object.pool_id), + tokensIn: Array.isArray(object?.tokens_in) ? object.tokens_in.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + if (message.tokensIn) { + obj.tokens_in = message.tokensIn.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.tokens_in = []; + } + return obj; + }, + fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesRequestAminoMsg): QueryCalcJoinPoolNoSwapSharesRequest { + return QueryCalcJoinPoolNoSwapSharesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestAminoMsg { + return { + type: "osmosis/gamm/query-calc-join-pool-no-swap-shares-request", + value: QueryCalcJoinPoolNoSwapSharesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCalcJoinPoolNoSwapSharesRequestProtoMsg): QueryCalcJoinPoolNoSwapSharesRequest { + return QueryCalcJoinPoolNoSwapSharesRequest.decode(message.value); + }, + toProto(message: QueryCalcJoinPoolNoSwapSharesRequest): Uint8Array { + return QueryCalcJoinPoolNoSwapSharesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryCalcJoinPoolNoSwapSharesRequest): QueryCalcJoinPoolNoSwapSharesRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesRequest", + value: QueryCalcJoinPoolNoSwapSharesRequest.encode(message).finish() + }; } }; function createBaseQueryCalcJoinPoolNoSwapSharesResponse(): QueryCalcJoinPoolNoSwapSharesResponse { @@ -1504,6 +2143,7 @@ function createBaseQueryCalcJoinPoolNoSwapSharesResponse(): QueryCalcJoinPoolNoS }; } export const QueryCalcJoinPoolNoSwapSharesResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesResponse", encode(message: QueryCalcJoinPoolNoSwapSharesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.tokensOut) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1576,6 +2216,43 @@ export const QueryCalcJoinPoolNoSwapSharesResponse = { } obj.shares_out = message.sharesOut; return obj; + }, + fromAmino(object: QueryCalcJoinPoolNoSwapSharesResponseAmino): QueryCalcJoinPoolNoSwapSharesResponse { + return { + tokensOut: Array.isArray(object?.tokens_out) ? object.tokens_out.map((e: any) => Coin.fromAmino(e)) : [], + sharesOut: object.shares_out + }; + }, + toAmino(message: QueryCalcJoinPoolNoSwapSharesResponse): QueryCalcJoinPoolNoSwapSharesResponseAmino { + const obj: any = {}; + if (message.tokensOut) { + obj.tokens_out = message.tokensOut.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.tokens_out = []; + } + obj.shares_out = message.sharesOut; + return obj; + }, + fromAminoMsg(object: QueryCalcJoinPoolNoSwapSharesResponseAminoMsg): QueryCalcJoinPoolNoSwapSharesResponse { + return QueryCalcJoinPoolNoSwapSharesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryCalcJoinPoolNoSwapSharesResponse): QueryCalcJoinPoolNoSwapSharesResponseAminoMsg { + return { + type: "osmosis/gamm/query-calc-join-pool-no-swap-shares-response", + value: QueryCalcJoinPoolNoSwapSharesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryCalcJoinPoolNoSwapSharesResponseProtoMsg): QueryCalcJoinPoolNoSwapSharesResponse { + return QueryCalcJoinPoolNoSwapSharesResponse.decode(message.value); + }, + toProto(message: QueryCalcJoinPoolNoSwapSharesResponse): Uint8Array { + return QueryCalcJoinPoolNoSwapSharesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryCalcJoinPoolNoSwapSharesResponse): QueryCalcJoinPoolNoSwapSharesResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapSharesResponse", + value: QueryCalcJoinPoolNoSwapSharesResponse.encode(message).finish() + }; } }; function createBaseQuerySpotPriceRequest(): QuerySpotPriceRequest { @@ -1586,6 +2263,7 @@ function createBaseQuerySpotPriceRequest(): QuerySpotPriceRequest { }; } export const QuerySpotPriceRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceRequest", encode(message: QuerySpotPriceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1662,6 +2340,41 @@ export const QuerySpotPriceRequest = { obj.base_asset_denom = message.baseAssetDenom; obj.quote_asset_denom = message.quoteAssetDenom; return obj; + }, + fromAmino(object: QuerySpotPriceRequestAmino): QuerySpotPriceRequest { + return { + poolId: BigInt(object.pool_id), + baseAssetDenom: object.base_asset_denom, + quoteAssetDenom: object.quote_asset_denom + }; + }, + toAmino(message: QuerySpotPriceRequest): QuerySpotPriceRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom; + return obj; + }, + fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { + return QuerySpotPriceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestAminoMsg { + return { + type: "osmosis/gamm/query-spot-price-request", + value: QuerySpotPriceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySpotPriceRequestProtoMsg): QuerySpotPriceRequest { + return QuerySpotPriceRequest.decode(message.value); + }, + toProto(message: QuerySpotPriceRequest): Uint8Array { + return QuerySpotPriceRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceRequest", + value: QuerySpotPriceRequest.encode(message).finish() + }; } }; function createBaseQueryPoolsWithFilterRequest(): QueryPoolsWithFilterRequest { @@ -1672,6 +2385,7 @@ function createBaseQueryPoolsWithFilterRequest(): QueryPoolsWithFilterRequest { }; } export const QueryPoolsWithFilterRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterRequest", encode(message: QueryPoolsWithFilterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.minLiquidity) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1756,6 +2470,45 @@ export const QueryPoolsWithFilterRequest = { obj.pool_type = message.poolType; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPoolsWithFilterRequestAmino): QueryPoolsWithFilterRequest { + return { + minLiquidity: Array.isArray(object?.min_liquidity) ? object.min_liquidity.map((e: any) => Coin.fromAmino(e)) : [], + poolType: object.pool_type, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPoolsWithFilterRequest): QueryPoolsWithFilterRequestAmino { + const obj: any = {}; + if (message.minLiquidity) { + obj.min_liquidity = message.minLiquidity.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.min_liquidity = []; + } + obj.pool_type = message.poolType; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolsWithFilterRequestAminoMsg): QueryPoolsWithFilterRequest { + return QueryPoolsWithFilterRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolsWithFilterRequest): QueryPoolsWithFilterRequestAminoMsg { + return { + type: "osmosis/gamm/query-pools-with-filter-request", + value: QueryPoolsWithFilterRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolsWithFilterRequestProtoMsg): QueryPoolsWithFilterRequest { + return QueryPoolsWithFilterRequest.decode(message.value); + }, + toProto(message: QueryPoolsWithFilterRequest): Uint8Array { + return QueryPoolsWithFilterRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolsWithFilterRequest): QueryPoolsWithFilterRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterRequest", + value: QueryPoolsWithFilterRequest.encode(message).finish() + }; } }; function createBaseQueryPoolsWithFilterResponse(): QueryPoolsWithFilterResponse { @@ -1765,6 +2518,7 @@ function createBaseQueryPoolsWithFilterResponse(): QueryPoolsWithFilterResponse }; } export const QueryPoolsWithFilterResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterResponse", encode(message: QueryPoolsWithFilterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pools) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1837,6 +2591,43 @@ export const QueryPoolsWithFilterResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: QueryPoolsWithFilterResponseAmino): QueryPoolsWithFilterResponse { + return { + pools: Array.isArray(object?.pools) ? object.pools.map((e: any) => Any.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: QueryPoolsWithFilterResponse): QueryPoolsWithFilterResponseAmino { + const obj: any = {}; + if (message.pools) { + obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.pools = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: QueryPoolsWithFilterResponseAminoMsg): QueryPoolsWithFilterResponse { + return QueryPoolsWithFilterResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryPoolsWithFilterResponse): QueryPoolsWithFilterResponseAminoMsg { + return { + type: "osmosis/gamm/query-pools-with-filter-response", + value: QueryPoolsWithFilterResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryPoolsWithFilterResponseProtoMsg): QueryPoolsWithFilterResponse { + return QueryPoolsWithFilterResponse.decode(message.value); + }, + toProto(message: QueryPoolsWithFilterResponse): Uint8Array { + return QueryPoolsWithFilterResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryPoolsWithFilterResponse): QueryPoolsWithFilterResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryPoolsWithFilterResponse", + value: QueryPoolsWithFilterResponse.encode(message).finish() + }; } }; function createBaseQuerySpotPriceResponse(): QuerySpotPriceResponse { @@ -1845,6 +2636,7 @@ function createBaseQuerySpotPriceResponse(): QuerySpotPriceResponse { }; } export const QuerySpotPriceResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceResponse", encode(message: QuerySpotPriceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spotPrice !== "") { writer.uint32(10).string(message.spotPrice); @@ -1897,6 +2689,37 @@ export const QuerySpotPriceResponse = { const obj: any = {}; obj.spot_price = message.spotPrice; return obj; + }, + fromAmino(object: QuerySpotPriceResponseAmino): QuerySpotPriceResponse { + return { + spotPrice: object.spot_price + }; + }, + toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { + const obj: any = {}; + obj.spot_price = message.spotPrice; + return obj; + }, + fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { + return QuerySpotPriceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseAminoMsg { + return { + type: "osmosis/gamm/query-spot-price-response", + value: QuerySpotPriceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySpotPriceResponseProtoMsg): QuerySpotPriceResponse { + return QuerySpotPriceResponse.decode(message.value); + }, + toProto(message: QuerySpotPriceResponse): Uint8Array { + return QuerySpotPriceResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QuerySpotPriceResponse", + value: QuerySpotPriceResponse.encode(message).finish() + }; } }; function createBaseQuerySwapExactAmountInRequest(): QuerySwapExactAmountInRequest { @@ -1908,6 +2731,7 @@ function createBaseQuerySwapExactAmountInRequest(): QuerySwapExactAmountInReques }; } export const QuerySwapExactAmountInRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInRequest", encode(message: QuerySwapExactAmountInRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -2004,6 +2828,47 @@ export const QuerySwapExactAmountInRequest = { obj.routes = []; } return obj; + }, + fromAmino(object: QuerySwapExactAmountInRequestAmino): QuerySwapExactAmountInRequest { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + tokenIn: object.token_in, + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountInRoute.fromAmino(e)) : [] + }; + }, + toAmino(message: QuerySwapExactAmountInRequest): QuerySwapExactAmountInRequestAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + return obj; + }, + fromAminoMsg(object: QuerySwapExactAmountInRequestAminoMsg): QuerySwapExactAmountInRequest { + return QuerySwapExactAmountInRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySwapExactAmountInRequest): QuerySwapExactAmountInRequestAminoMsg { + return { + type: "osmosis/gamm/query-swap-exact-amount-in-request", + value: QuerySwapExactAmountInRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySwapExactAmountInRequestProtoMsg): QuerySwapExactAmountInRequest { + return QuerySwapExactAmountInRequest.decode(message.value); + }, + toProto(message: QuerySwapExactAmountInRequest): Uint8Array { + return QuerySwapExactAmountInRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySwapExactAmountInRequest): QuerySwapExactAmountInRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInRequest", + value: QuerySwapExactAmountInRequest.encode(message).finish() + }; } }; function createBaseQuerySwapExactAmountInResponse(): QuerySwapExactAmountInResponse { @@ -2012,6 +2877,7 @@ function createBaseQuerySwapExactAmountInResponse(): QuerySwapExactAmountInRespo }; } export const QuerySwapExactAmountInResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInResponse", encode(message: QuerySwapExactAmountInResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenOutAmount !== "") { writer.uint32(10).string(message.tokenOutAmount); @@ -2064,6 +2930,37 @@ export const QuerySwapExactAmountInResponse = { const obj: any = {}; obj.token_out_amount = message.tokenOutAmount; return obj; + }, + fromAmino(object: QuerySwapExactAmountInResponseAmino): QuerySwapExactAmountInResponse { + return { + tokenOutAmount: object.token_out_amount + }; + }, + toAmino(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAmino { + const obj: any = {}; + obj.token_out_amount = message.tokenOutAmount; + return obj; + }, + fromAminoMsg(object: QuerySwapExactAmountInResponseAminoMsg): QuerySwapExactAmountInResponse { + return QuerySwapExactAmountInResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseAminoMsg { + return { + type: "osmosis/gamm/query-swap-exact-amount-in-response", + value: QuerySwapExactAmountInResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySwapExactAmountInResponseProtoMsg): QuerySwapExactAmountInResponse { + return QuerySwapExactAmountInResponse.decode(message.value); + }, + toProto(message: QuerySwapExactAmountInResponse): Uint8Array { + return QuerySwapExactAmountInResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySwapExactAmountInResponse): QuerySwapExactAmountInResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountInResponse", + value: QuerySwapExactAmountInResponse.encode(message).finish() + }; } }; function createBaseQuerySwapExactAmountOutRequest(): QuerySwapExactAmountOutRequest { @@ -2075,6 +2972,7 @@ function createBaseQuerySwapExactAmountOutRequest(): QuerySwapExactAmountOutRequ }; } export const QuerySwapExactAmountOutRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutRequest", encode(message: QuerySwapExactAmountOutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -2171,6 +3069,47 @@ export const QuerySwapExactAmountOutRequest = { } obj.token_out = message.tokenOut; return obj; + }, + fromAmino(object: QuerySwapExactAmountOutRequestAmino): QuerySwapExactAmountOutRequest { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountOutRoute.fromAmino(e)) : [], + tokenOut: object.token_out + }; + }, + toAmino(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + obj.token_out = message.tokenOut; + return obj; + }, + fromAminoMsg(object: QuerySwapExactAmountOutRequestAminoMsg): QuerySwapExactAmountOutRequest { + return QuerySwapExactAmountOutRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestAminoMsg { + return { + type: "osmosis/gamm/query-swap-exact-amount-out-request", + value: QuerySwapExactAmountOutRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySwapExactAmountOutRequestProtoMsg): QuerySwapExactAmountOutRequest { + return QuerySwapExactAmountOutRequest.decode(message.value); + }, + toProto(message: QuerySwapExactAmountOutRequest): Uint8Array { + return QuerySwapExactAmountOutRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySwapExactAmountOutRequest): QuerySwapExactAmountOutRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutRequest", + value: QuerySwapExactAmountOutRequest.encode(message).finish() + }; } }; function createBaseQuerySwapExactAmountOutResponse(): QuerySwapExactAmountOutResponse { @@ -2179,6 +3118,7 @@ function createBaseQuerySwapExactAmountOutResponse(): QuerySwapExactAmountOutRes }; } export const QuerySwapExactAmountOutResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutResponse", encode(message: QuerySwapExactAmountOutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenInAmount !== "") { writer.uint32(10).string(message.tokenInAmount); @@ -2231,12 +3171,44 @@ export const QuerySwapExactAmountOutResponse = { const obj: any = {}; obj.token_in_amount = message.tokenInAmount; return obj; + }, + fromAmino(object: QuerySwapExactAmountOutResponseAmino): QuerySwapExactAmountOutResponse { + return { + tokenInAmount: object.token_in_amount + }; + }, + toAmino(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAmino { + const obj: any = {}; + obj.token_in_amount = message.tokenInAmount; + return obj; + }, + fromAminoMsg(object: QuerySwapExactAmountOutResponseAminoMsg): QuerySwapExactAmountOutResponse { + return QuerySwapExactAmountOutResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseAminoMsg { + return { + type: "osmosis/gamm/query-swap-exact-amount-out-response", + value: QuerySwapExactAmountOutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySwapExactAmountOutResponseProtoMsg): QuerySwapExactAmountOutResponse { + return QuerySwapExactAmountOutResponse.decode(message.value); + }, + toProto(message: QuerySwapExactAmountOutResponse): Uint8Array { + return QuerySwapExactAmountOutResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySwapExactAmountOutResponse): QuerySwapExactAmountOutResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QuerySwapExactAmountOutResponse", + value: QuerySwapExactAmountOutResponse.encode(message).finish() + }; } }; function createBaseQueryTotalLiquidityRequest(): QueryTotalLiquidityRequest { return {}; } export const QueryTotalLiquidityRequest = { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityRequest", encode(_: QueryTotalLiquidityRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2274,6 +3246,34 @@ export const QueryTotalLiquidityRequest = { toSDK(_: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryTotalLiquidityRequestAmino): QueryTotalLiquidityRequest { + return {}; + }, + toAmino(_: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryTotalLiquidityRequestAminoMsg): QueryTotalLiquidityRequest { + return QueryTotalLiquidityRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestAminoMsg { + return { + type: "osmosis/gamm/query-total-liquidity-request", + value: QueryTotalLiquidityRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalLiquidityRequestProtoMsg): QueryTotalLiquidityRequest { + return QueryTotalLiquidityRequest.decode(message.value); + }, + toProto(message: QueryTotalLiquidityRequest): Uint8Array { + return QueryTotalLiquidityRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalLiquidityRequest): QueryTotalLiquidityRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityRequest", + value: QueryTotalLiquidityRequest.encode(message).finish() + }; } }; function createBaseQueryTotalLiquidityResponse(): QueryTotalLiquidityResponse { @@ -2282,6 +3282,7 @@ function createBaseQueryTotalLiquidityResponse(): QueryTotalLiquidityResponse { }; } export const QueryTotalLiquidityResponse = { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityResponse", encode(message: QueryTotalLiquidityResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.liquidity) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2342,5 +3343,40 @@ export const QueryTotalLiquidityResponse = { obj.liquidity = []; } return obj; + }, + fromAmino(object: QueryTotalLiquidityResponseAmino): QueryTotalLiquidityResponse { + return { + liquidity: Array.isArray(object?.liquidity) ? object.liquidity.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalLiquidityResponse): QueryTotalLiquidityResponseAmino { + const obj: any = {}; + if (message.liquidity) { + obj.liquidity = message.liquidity.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.liquidity = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalLiquidityResponseAminoMsg): QueryTotalLiquidityResponse { + return QueryTotalLiquidityResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalLiquidityResponse): QueryTotalLiquidityResponseAminoMsg { + return { + type: "osmosis/gamm/query-total-liquidity-response", + value: QueryTotalLiquidityResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalLiquidityResponseProtoMsg): QueryTotalLiquidityResponse { + return QueryTotalLiquidityResponse.decode(message.value); + }, + toProto(message: QueryTotalLiquidityResponse): Uint8Array { + return QueryTotalLiquidityResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalLiquidityResponse): QueryTotalLiquidityResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.QueryTotalLiquidityResponse", + value: QueryTotalLiquidityResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts index 4971e8723e..35da20d6e8 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v1beta1/tx.ts @@ -205,6 +205,7 @@ function createBaseMsgJoinPool(): MsgJoinPool { }; } export const MsgJoinPool = { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPool", encode(message: MsgJoinPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -301,6 +302,47 @@ export const MsgJoinPool = { obj.token_in_maxs = []; } return obj; + }, + fromAmino(object: MsgJoinPoolAmino): MsgJoinPool { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + shareOutAmount: object.share_out_amount, + tokenInMaxs: Array.isArray(object?.token_in_maxs) ? object.token_in_maxs.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgJoinPool): MsgJoinPoolAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.share_out_amount = message.shareOutAmount; + if (message.tokenInMaxs) { + obj.token_in_maxs = message.tokenInMaxs.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.token_in_maxs = []; + } + return obj; + }, + fromAminoMsg(object: MsgJoinPoolAminoMsg): MsgJoinPool { + return MsgJoinPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgJoinPool): MsgJoinPoolAminoMsg { + return { + type: "osmosis/gamm/join-pool", + value: MsgJoinPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgJoinPoolProtoMsg): MsgJoinPool { + return MsgJoinPool.decode(message.value); + }, + toProto(message: MsgJoinPool): Uint8Array { + return MsgJoinPool.encode(message).finish(); + }, + toProtoMsg(message: MsgJoinPool): MsgJoinPoolProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPool", + value: MsgJoinPool.encode(message).finish() + }; } }; function createBaseMsgJoinPoolResponse(): MsgJoinPoolResponse { @@ -310,6 +352,7 @@ function createBaseMsgJoinPoolResponse(): MsgJoinPoolResponse { }; } export const MsgJoinPoolResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPoolResponse", encode(message: MsgJoinPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.shareOutAmount !== "") { writer.uint32(10).string(message.shareOutAmount); @@ -382,6 +425,43 @@ export const MsgJoinPoolResponse = { obj.token_in = []; } return obj; + }, + fromAmino(object: MsgJoinPoolResponseAmino): MsgJoinPoolResponse { + return { + shareOutAmount: object.share_out_amount, + tokenIn: Array.isArray(object?.token_in) ? object.token_in.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgJoinPoolResponse): MsgJoinPoolResponseAmino { + const obj: any = {}; + obj.share_out_amount = message.shareOutAmount; + if (message.tokenIn) { + obj.token_in = message.tokenIn.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.token_in = []; + } + return obj; + }, + fromAminoMsg(object: MsgJoinPoolResponseAminoMsg): MsgJoinPoolResponse { + return MsgJoinPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgJoinPoolResponse): MsgJoinPoolResponseAminoMsg { + return { + type: "osmosis/gamm/join-pool-response", + value: MsgJoinPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgJoinPoolResponseProtoMsg): MsgJoinPoolResponse { + return MsgJoinPoolResponse.decode(message.value); + }, + toProto(message: MsgJoinPoolResponse): Uint8Array { + return MsgJoinPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgJoinPoolResponse): MsgJoinPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinPoolResponse", + value: MsgJoinPoolResponse.encode(message).finish() + }; } }; function createBaseMsgExitPool(): MsgExitPool { @@ -393,6 +473,7 @@ function createBaseMsgExitPool(): MsgExitPool { }; } export const MsgExitPool = { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitPool", encode(message: MsgExitPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -489,6 +570,47 @@ export const MsgExitPool = { obj.token_out_mins = []; } return obj; + }, + fromAmino(object: MsgExitPoolAmino): MsgExitPool { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + shareInAmount: object.share_in_amount, + tokenOutMins: Array.isArray(object?.token_out_mins) ? object.token_out_mins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgExitPool): MsgExitPoolAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.share_in_amount = message.shareInAmount; + if (message.tokenOutMins) { + obj.token_out_mins = message.tokenOutMins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.token_out_mins = []; + } + return obj; + }, + fromAminoMsg(object: MsgExitPoolAminoMsg): MsgExitPool { + return MsgExitPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgExitPool): MsgExitPoolAminoMsg { + return { + type: "osmosis/gamm/exit-pool", + value: MsgExitPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExitPoolProtoMsg): MsgExitPool { + return MsgExitPool.decode(message.value); + }, + toProto(message: MsgExitPool): Uint8Array { + return MsgExitPool.encode(message).finish(); + }, + toProtoMsg(message: MsgExitPool): MsgExitPoolProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitPool", + value: MsgExitPool.encode(message).finish() + }; } }; function createBaseMsgExitPoolResponse(): MsgExitPoolResponse { @@ -497,6 +619,7 @@ function createBaseMsgExitPoolResponse(): MsgExitPoolResponse { }; } export const MsgExitPoolResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitPoolResponse", encode(message: MsgExitPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.tokenOut) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -557,6 +680,41 @@ export const MsgExitPoolResponse = { obj.token_out = []; } return obj; + }, + fromAmino(object: MsgExitPoolResponseAmino): MsgExitPoolResponse { + return { + tokenOut: Array.isArray(object?.token_out) ? object.token_out.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgExitPoolResponse): MsgExitPoolResponseAmino { + const obj: any = {}; + if (message.tokenOut) { + obj.token_out = message.tokenOut.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.token_out = []; + } + return obj; + }, + fromAminoMsg(object: MsgExitPoolResponseAminoMsg): MsgExitPoolResponse { + return MsgExitPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExitPoolResponse): MsgExitPoolResponseAminoMsg { + return { + type: "osmosis/gamm/exit-pool-response", + value: MsgExitPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExitPoolResponseProtoMsg): MsgExitPoolResponse { + return MsgExitPoolResponse.decode(message.value); + }, + toProto(message: MsgExitPoolResponse): Uint8Array { + return MsgExitPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExitPoolResponse): MsgExitPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitPoolResponse", + value: MsgExitPoolResponse.encode(message).finish() + }; } }; function createBaseSwapAmountInRoute(): SwapAmountInRoute { @@ -566,6 +724,7 @@ function createBaseSwapAmountInRoute(): SwapAmountInRoute { }; } export const SwapAmountInRoute = { + typeUrl: "/osmosis.gamm.v1beta1.SwapAmountInRoute", encode(message: SwapAmountInRoute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -630,6 +789,39 @@ export const SwapAmountInRoute = { obj.pool_id = message.poolId; obj.token_out_denom = message.tokenOutDenom; return obj; + }, + fromAmino(object: SwapAmountInRouteAmino): SwapAmountInRoute { + return { + poolId: BigInt(object.pool_id), + tokenOutDenom: object.token_out_denom + }; + }, + toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom; + return obj; + }, + fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { + return SwapAmountInRoute.fromAmino(object.value); + }, + toAminoMsg(message: SwapAmountInRoute): SwapAmountInRouteAminoMsg { + return { + type: "osmosis/gamm/swap-amount-in-route", + value: SwapAmountInRoute.toAmino(message) + }; + }, + fromProtoMsg(message: SwapAmountInRouteProtoMsg): SwapAmountInRoute { + return SwapAmountInRoute.decode(message.value); + }, + toProto(message: SwapAmountInRoute): Uint8Array { + return SwapAmountInRoute.encode(message).finish(); + }, + toProtoMsg(message: SwapAmountInRoute): SwapAmountInRouteProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.SwapAmountInRoute", + value: SwapAmountInRoute.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountIn(): MsgSwapExactAmountIn { @@ -641,6 +833,7 @@ function createBaseMsgSwapExactAmountIn(): MsgSwapExactAmountIn { }; } export const MsgSwapExactAmountIn = { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountIn", encode(message: MsgSwapExactAmountIn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -737,6 +930,47 @@ export const MsgSwapExactAmountIn = { message.tokenIn !== undefined && (obj.token_in = message.tokenIn ? Coin.toSDK(message.tokenIn) : undefined); obj.token_out_min_amount = message.tokenOutMinAmount; return obj; + }, + fromAmino(object: MsgSwapExactAmountInAmino): MsgSwapExactAmountIn { + return { + sender: object.sender, + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountInRoute.fromAmino(e)) : [], + tokenIn: object?.token_in ? Coin.fromAmino(object.token_in) : undefined, + tokenOutMinAmount: object.token_out_min_amount + }; + }, + toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { + const obj: any = {}; + obj.sender = message.sender; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; + obj.token_out_min_amount = message.tokenOutMinAmount; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { + return MsgSwapExactAmountIn.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAminoMsg { + return { + type: "osmosis/gamm/swap-exact-amount-in", + value: MsgSwapExactAmountIn.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountInProtoMsg): MsgSwapExactAmountIn { + return MsgSwapExactAmountIn.decode(message.value); + }, + toProto(message: MsgSwapExactAmountIn): Uint8Array { + return MsgSwapExactAmountIn.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountIn): MsgSwapExactAmountInProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountIn", + value: MsgSwapExactAmountIn.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountInResponse(): MsgSwapExactAmountInResponse { @@ -745,6 +979,7 @@ function createBaseMsgSwapExactAmountInResponse(): MsgSwapExactAmountInResponse }; } export const MsgSwapExactAmountInResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountInResponse", encode(message: MsgSwapExactAmountInResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenOutAmount !== "") { writer.uint32(10).string(message.tokenOutAmount); @@ -797,6 +1032,37 @@ export const MsgSwapExactAmountInResponse = { const obj: any = {}; obj.token_out_amount = message.tokenOutAmount; return obj; + }, + fromAmino(object: MsgSwapExactAmountInResponseAmino): MsgSwapExactAmountInResponse { + return { + tokenOutAmount: object.token_out_amount + }; + }, + toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { + const obj: any = {}; + obj.token_out_amount = message.tokenOutAmount; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { + return MsgSwapExactAmountInResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAminoMsg { + return { + type: "osmosis/gamm/swap-exact-amount-in-response", + value: MsgSwapExactAmountInResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountInResponseProtoMsg): MsgSwapExactAmountInResponse { + return MsgSwapExactAmountInResponse.decode(message.value); + }, + toProto(message: MsgSwapExactAmountInResponse): Uint8Array { + return MsgSwapExactAmountInResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountInResponse", + value: MsgSwapExactAmountInResponse.encode(message).finish() + }; } }; function createBaseSwapAmountOutRoute(): SwapAmountOutRoute { @@ -806,6 +1072,7 @@ function createBaseSwapAmountOutRoute(): SwapAmountOutRoute { }; } export const SwapAmountOutRoute = { + typeUrl: "/osmosis.gamm.v1beta1.SwapAmountOutRoute", encode(message: SwapAmountOutRoute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -870,6 +1137,39 @@ export const SwapAmountOutRoute = { obj.pool_id = message.poolId; obj.token_in_denom = message.tokenInDenom; return obj; + }, + fromAmino(object: SwapAmountOutRouteAmino): SwapAmountOutRoute { + return { + poolId: BigInt(object.pool_id), + tokenInDenom: object.token_in_denom + }; + }, + toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom; + return obj; + }, + fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { + return SwapAmountOutRoute.fromAmino(object.value); + }, + toAminoMsg(message: SwapAmountOutRoute): SwapAmountOutRouteAminoMsg { + return { + type: "osmosis/gamm/swap-amount-out-route", + value: SwapAmountOutRoute.toAmino(message) + }; + }, + fromProtoMsg(message: SwapAmountOutRouteProtoMsg): SwapAmountOutRoute { + return SwapAmountOutRoute.decode(message.value); + }, + toProto(message: SwapAmountOutRoute): Uint8Array { + return SwapAmountOutRoute.encode(message).finish(); + }, + toProtoMsg(message: SwapAmountOutRoute): SwapAmountOutRouteProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.SwapAmountOutRoute", + value: SwapAmountOutRoute.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountOut(): MsgSwapExactAmountOut { @@ -881,6 +1181,7 @@ function createBaseMsgSwapExactAmountOut(): MsgSwapExactAmountOut { }; } export const MsgSwapExactAmountOut = { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOut", encode(message: MsgSwapExactAmountOut, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -977,6 +1278,47 @@ export const MsgSwapExactAmountOut = { obj.token_in_max_amount = message.tokenInMaxAmount; message.tokenOut !== undefined && (obj.token_out = message.tokenOut ? Coin.toSDK(message.tokenOut) : undefined); return obj; + }, + fromAmino(object: MsgSwapExactAmountOutAmino): MsgSwapExactAmountOut { + return { + sender: object.sender, + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountOutRoute.fromAmino(e)) : [], + tokenInMaxAmount: object.token_in_max_amount, + tokenOut: object?.token_out ? Coin.fromAmino(object.token_out) : undefined + }; + }, + toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { + const obj: any = {}; + obj.sender = message.sender; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountOutAminoMsg): MsgSwapExactAmountOut { + return MsgSwapExactAmountOut.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAminoMsg { + return { + type: "osmosis/gamm/swap-exact-amount-out", + value: MsgSwapExactAmountOut.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountOutProtoMsg): MsgSwapExactAmountOut { + return MsgSwapExactAmountOut.decode(message.value); + }, + toProto(message: MsgSwapExactAmountOut): Uint8Array { + return MsgSwapExactAmountOut.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOut", + value: MsgSwapExactAmountOut.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountOutResponse(): MsgSwapExactAmountOutResponse { @@ -985,6 +1327,7 @@ function createBaseMsgSwapExactAmountOutResponse(): MsgSwapExactAmountOutRespons }; } export const MsgSwapExactAmountOutResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOutResponse", encode(message: MsgSwapExactAmountOutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenInAmount !== "") { writer.uint32(10).string(message.tokenInAmount); @@ -1037,6 +1380,37 @@ export const MsgSwapExactAmountOutResponse = { const obj: any = {}; obj.token_in_amount = message.tokenInAmount; return obj; + }, + fromAmino(object: MsgSwapExactAmountOutResponseAmino): MsgSwapExactAmountOutResponse { + return { + tokenInAmount: object.token_in_amount + }; + }, + toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { + const obj: any = {}; + obj.token_in_amount = message.tokenInAmount; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { + return MsgSwapExactAmountOutResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAminoMsg { + return { + type: "osmosis/gamm/swap-exact-amount-out-response", + value: MsgSwapExactAmountOutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountOutResponseProtoMsg): MsgSwapExactAmountOutResponse { + return MsgSwapExactAmountOutResponse.decode(message.value); + }, + toProto(message: MsgSwapExactAmountOutResponse): Uint8Array { + return MsgSwapExactAmountOutResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgSwapExactAmountOutResponse", + value: MsgSwapExactAmountOutResponse.encode(message).finish() + }; } }; function createBaseMsgJoinSwapExternAmountIn(): MsgJoinSwapExternAmountIn { @@ -1048,6 +1422,7 @@ function createBaseMsgJoinSwapExternAmountIn(): MsgJoinSwapExternAmountIn { }; } export const MsgJoinSwapExternAmountIn = { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountIn", encode(message: MsgJoinSwapExternAmountIn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -1136,6 +1511,43 @@ export const MsgJoinSwapExternAmountIn = { message.tokenIn !== undefined && (obj.token_in = message.tokenIn ? Coin.toSDK(message.tokenIn) : undefined); obj.share_out_min_amount = message.shareOutMinAmount; return obj; + }, + fromAmino(object: MsgJoinSwapExternAmountInAmino): MsgJoinSwapExternAmountIn { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + tokenIn: object?.token_in ? Coin.fromAmino(object.token_in) : undefined, + shareOutMinAmount: object.share_out_min_amount + }; + }, + toAmino(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; + obj.share_out_min_amount = message.shareOutMinAmount; + return obj; + }, + fromAminoMsg(object: MsgJoinSwapExternAmountInAminoMsg): MsgJoinSwapExternAmountIn { + return MsgJoinSwapExternAmountIn.fromAmino(object.value); + }, + toAminoMsg(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInAminoMsg { + return { + type: "osmosis/gamm/join-swap-extern-amount-in", + value: MsgJoinSwapExternAmountIn.toAmino(message) + }; + }, + fromProtoMsg(message: MsgJoinSwapExternAmountInProtoMsg): MsgJoinSwapExternAmountIn { + return MsgJoinSwapExternAmountIn.decode(message.value); + }, + toProto(message: MsgJoinSwapExternAmountIn): Uint8Array { + return MsgJoinSwapExternAmountIn.encode(message).finish(); + }, + toProtoMsg(message: MsgJoinSwapExternAmountIn): MsgJoinSwapExternAmountInProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountIn", + value: MsgJoinSwapExternAmountIn.encode(message).finish() + }; } }; function createBaseMsgJoinSwapExternAmountInResponse(): MsgJoinSwapExternAmountInResponse { @@ -1144,6 +1556,7 @@ function createBaseMsgJoinSwapExternAmountInResponse(): MsgJoinSwapExternAmountI }; } export const MsgJoinSwapExternAmountInResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountInResponse", encode(message: MsgJoinSwapExternAmountInResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.shareOutAmount !== "") { writer.uint32(10).string(message.shareOutAmount); @@ -1196,6 +1609,37 @@ export const MsgJoinSwapExternAmountInResponse = { const obj: any = {}; obj.share_out_amount = message.shareOutAmount; return obj; + }, + fromAmino(object: MsgJoinSwapExternAmountInResponseAmino): MsgJoinSwapExternAmountInResponse { + return { + shareOutAmount: object.share_out_amount + }; + }, + toAmino(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAmino { + const obj: any = {}; + obj.share_out_amount = message.shareOutAmount; + return obj; + }, + fromAminoMsg(object: MsgJoinSwapExternAmountInResponseAminoMsg): MsgJoinSwapExternAmountInResponse { + return MsgJoinSwapExternAmountInResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseAminoMsg { + return { + type: "osmosis/gamm/join-swap-extern-amount-in-response", + value: MsgJoinSwapExternAmountInResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgJoinSwapExternAmountInResponseProtoMsg): MsgJoinSwapExternAmountInResponse { + return MsgJoinSwapExternAmountInResponse.decode(message.value); + }, + toProto(message: MsgJoinSwapExternAmountInResponse): Uint8Array { + return MsgJoinSwapExternAmountInResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgJoinSwapExternAmountInResponse): MsgJoinSwapExternAmountInResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapExternAmountInResponse", + value: MsgJoinSwapExternAmountInResponse.encode(message).finish() + }; } }; function createBaseMsgJoinSwapShareAmountOut(): MsgJoinSwapShareAmountOut { @@ -1208,6 +1652,7 @@ function createBaseMsgJoinSwapShareAmountOut(): MsgJoinSwapShareAmountOut { }; } export const MsgJoinSwapShareAmountOut = { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOut", encode(message: MsgJoinSwapShareAmountOut, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -1308,6 +1753,45 @@ export const MsgJoinSwapShareAmountOut = { obj.share_out_amount = message.shareOutAmount; obj.token_in_max_amount = message.tokenInMaxAmount; return obj; + }, + fromAmino(object: MsgJoinSwapShareAmountOutAmino): MsgJoinSwapShareAmountOut { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + tokenInDenom: object.token_in_denom, + shareOutAmount: object.share_out_amount, + tokenInMaxAmount: object.token_in_max_amount + }; + }, + toAmino(message: MsgJoinSwapShareAmountOut): MsgJoinSwapShareAmountOutAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom; + obj.share_out_amount = message.shareOutAmount; + obj.token_in_max_amount = message.tokenInMaxAmount; + return obj; + }, + fromAminoMsg(object: MsgJoinSwapShareAmountOutAminoMsg): MsgJoinSwapShareAmountOut { + return MsgJoinSwapShareAmountOut.fromAmino(object.value); + }, + toAminoMsg(message: MsgJoinSwapShareAmountOut): MsgJoinSwapShareAmountOutAminoMsg { + return { + type: "osmosis/gamm/join-swap-share-amount-out", + value: MsgJoinSwapShareAmountOut.toAmino(message) + }; + }, + fromProtoMsg(message: MsgJoinSwapShareAmountOutProtoMsg): MsgJoinSwapShareAmountOut { + return MsgJoinSwapShareAmountOut.decode(message.value); + }, + toProto(message: MsgJoinSwapShareAmountOut): Uint8Array { + return MsgJoinSwapShareAmountOut.encode(message).finish(); + }, + toProtoMsg(message: MsgJoinSwapShareAmountOut): MsgJoinSwapShareAmountOutProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOut", + value: MsgJoinSwapShareAmountOut.encode(message).finish() + }; } }; function createBaseMsgJoinSwapShareAmountOutResponse(): MsgJoinSwapShareAmountOutResponse { @@ -1316,6 +1800,7 @@ function createBaseMsgJoinSwapShareAmountOutResponse(): MsgJoinSwapShareAmountOu }; } export const MsgJoinSwapShareAmountOutResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOutResponse", encode(message: MsgJoinSwapShareAmountOutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenInAmount !== "") { writer.uint32(10).string(message.tokenInAmount); @@ -1368,6 +1853,37 @@ export const MsgJoinSwapShareAmountOutResponse = { const obj: any = {}; obj.token_in_amount = message.tokenInAmount; return obj; + }, + fromAmino(object: MsgJoinSwapShareAmountOutResponseAmino): MsgJoinSwapShareAmountOutResponse { + return { + tokenInAmount: object.token_in_amount + }; + }, + toAmino(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAmino { + const obj: any = {}; + obj.token_in_amount = message.tokenInAmount; + return obj; + }, + fromAminoMsg(object: MsgJoinSwapShareAmountOutResponseAminoMsg): MsgJoinSwapShareAmountOutResponse { + return MsgJoinSwapShareAmountOutResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseAminoMsg { + return { + type: "osmosis/gamm/join-swap-share-amount-out-response", + value: MsgJoinSwapShareAmountOutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgJoinSwapShareAmountOutResponseProtoMsg): MsgJoinSwapShareAmountOutResponse { + return MsgJoinSwapShareAmountOutResponse.decode(message.value); + }, + toProto(message: MsgJoinSwapShareAmountOutResponse): Uint8Array { + return MsgJoinSwapShareAmountOutResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgJoinSwapShareAmountOutResponse): MsgJoinSwapShareAmountOutResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgJoinSwapShareAmountOutResponse", + value: MsgJoinSwapShareAmountOutResponse.encode(message).finish() + }; } }; function createBaseMsgExitSwapShareAmountIn(): MsgExitSwapShareAmountIn { @@ -1380,6 +1896,7 @@ function createBaseMsgExitSwapShareAmountIn(): MsgExitSwapShareAmountIn { }; } export const MsgExitSwapShareAmountIn = { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountIn", encode(message: MsgExitSwapShareAmountIn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -1480,6 +1997,45 @@ export const MsgExitSwapShareAmountIn = { obj.share_in_amount = message.shareInAmount; obj.token_out_min_amount = message.tokenOutMinAmount; return obj; + }, + fromAmino(object: MsgExitSwapShareAmountInAmino): MsgExitSwapShareAmountIn { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + tokenOutDenom: object.token_out_denom, + shareInAmount: object.share_in_amount, + tokenOutMinAmount: object.token_out_min_amount + }; + }, + toAmino(message: MsgExitSwapShareAmountIn): MsgExitSwapShareAmountInAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom; + obj.share_in_amount = message.shareInAmount; + obj.token_out_min_amount = message.tokenOutMinAmount; + return obj; + }, + fromAminoMsg(object: MsgExitSwapShareAmountInAminoMsg): MsgExitSwapShareAmountIn { + return MsgExitSwapShareAmountIn.fromAmino(object.value); + }, + toAminoMsg(message: MsgExitSwapShareAmountIn): MsgExitSwapShareAmountInAminoMsg { + return { + type: "osmosis/gamm/exit-swap-share-amount-in", + value: MsgExitSwapShareAmountIn.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExitSwapShareAmountInProtoMsg): MsgExitSwapShareAmountIn { + return MsgExitSwapShareAmountIn.decode(message.value); + }, + toProto(message: MsgExitSwapShareAmountIn): Uint8Array { + return MsgExitSwapShareAmountIn.encode(message).finish(); + }, + toProtoMsg(message: MsgExitSwapShareAmountIn): MsgExitSwapShareAmountInProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountIn", + value: MsgExitSwapShareAmountIn.encode(message).finish() + }; } }; function createBaseMsgExitSwapShareAmountInResponse(): MsgExitSwapShareAmountInResponse { @@ -1488,6 +2044,7 @@ function createBaseMsgExitSwapShareAmountInResponse(): MsgExitSwapShareAmountInR }; } export const MsgExitSwapShareAmountInResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountInResponse", encode(message: MsgExitSwapShareAmountInResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenOutAmount !== "") { writer.uint32(10).string(message.tokenOutAmount); @@ -1540,6 +2097,37 @@ export const MsgExitSwapShareAmountInResponse = { const obj: any = {}; obj.token_out_amount = message.tokenOutAmount; return obj; + }, + fromAmino(object: MsgExitSwapShareAmountInResponseAmino): MsgExitSwapShareAmountInResponse { + return { + tokenOutAmount: object.token_out_amount + }; + }, + toAmino(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAmino { + const obj: any = {}; + obj.token_out_amount = message.tokenOutAmount; + return obj; + }, + fromAminoMsg(object: MsgExitSwapShareAmountInResponseAminoMsg): MsgExitSwapShareAmountInResponse { + return MsgExitSwapShareAmountInResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseAminoMsg { + return { + type: "osmosis/gamm/exit-swap-share-amount-in-response", + value: MsgExitSwapShareAmountInResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExitSwapShareAmountInResponseProtoMsg): MsgExitSwapShareAmountInResponse { + return MsgExitSwapShareAmountInResponse.decode(message.value); + }, + toProto(message: MsgExitSwapShareAmountInResponse): Uint8Array { + return MsgExitSwapShareAmountInResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExitSwapShareAmountInResponse): MsgExitSwapShareAmountInResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapShareAmountInResponse", + value: MsgExitSwapShareAmountInResponse.encode(message).finish() + }; } }; function createBaseMsgExitSwapExternAmountOut(): MsgExitSwapExternAmountOut { @@ -1551,6 +2139,7 @@ function createBaseMsgExitSwapExternAmountOut(): MsgExitSwapExternAmountOut { }; } export const MsgExitSwapExternAmountOut = { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOut", encode(message: MsgExitSwapExternAmountOut, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -1639,6 +2228,43 @@ export const MsgExitSwapExternAmountOut = { message.tokenOut !== undefined && (obj.token_out = message.tokenOut ? Coin.toSDK(message.tokenOut) : undefined); obj.share_in_max_amount = message.shareInMaxAmount; return obj; + }, + fromAmino(object: MsgExitSwapExternAmountOutAmino): MsgExitSwapExternAmountOut { + return { + sender: object.sender, + poolId: BigInt(object.pool_id), + tokenOut: object?.token_out ? Coin.fromAmino(object.token_out) : undefined, + shareInMaxAmount: object.share_in_max_amount + }; + }, + toAmino(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; + obj.share_in_max_amount = message.shareInMaxAmount; + return obj; + }, + fromAminoMsg(object: MsgExitSwapExternAmountOutAminoMsg): MsgExitSwapExternAmountOut { + return MsgExitSwapExternAmountOut.fromAmino(object.value); + }, + toAminoMsg(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutAminoMsg { + return { + type: "osmosis/gamm/exit-swap-extern-amount-out", + value: MsgExitSwapExternAmountOut.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExitSwapExternAmountOutProtoMsg): MsgExitSwapExternAmountOut { + return MsgExitSwapExternAmountOut.decode(message.value); + }, + toProto(message: MsgExitSwapExternAmountOut): Uint8Array { + return MsgExitSwapExternAmountOut.encode(message).finish(); + }, + toProtoMsg(message: MsgExitSwapExternAmountOut): MsgExitSwapExternAmountOutProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOut", + value: MsgExitSwapExternAmountOut.encode(message).finish() + }; } }; function createBaseMsgExitSwapExternAmountOutResponse(): MsgExitSwapExternAmountOutResponse { @@ -1647,6 +2273,7 @@ function createBaseMsgExitSwapExternAmountOutResponse(): MsgExitSwapExternAmount }; } export const MsgExitSwapExternAmountOutResponse = { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOutResponse", encode(message: MsgExitSwapExternAmountOutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.shareInAmount !== "") { writer.uint32(10).string(message.shareInAmount); @@ -1699,5 +2326,36 @@ export const MsgExitSwapExternAmountOutResponse = { const obj: any = {}; obj.share_in_amount = message.shareInAmount; return obj; + }, + fromAmino(object: MsgExitSwapExternAmountOutResponseAmino): MsgExitSwapExternAmountOutResponse { + return { + shareInAmount: object.share_in_amount + }; + }, + toAmino(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAmino { + const obj: any = {}; + obj.share_in_amount = message.shareInAmount; + return obj; + }, + fromAminoMsg(object: MsgExitSwapExternAmountOutResponseAminoMsg): MsgExitSwapExternAmountOutResponse { + return MsgExitSwapExternAmountOutResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseAminoMsg { + return { + type: "osmosis/gamm/exit-swap-extern-amount-out-response", + value: MsgExitSwapExternAmountOutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExitSwapExternAmountOutResponseProtoMsg): MsgExitSwapExternAmountOutResponse { + return MsgExitSwapExternAmountOutResponse.decode(message.value); + }, + toProto(message: MsgExitSwapExternAmountOutResponse): Uint8Array { + return MsgExitSwapExternAmountOutResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExitSwapExternAmountOutResponse): MsgExitSwapExternAmountOutResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v1beta1.MsgExitSwapExternAmountOutResponse", + value: MsgExitSwapExternAmountOutResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts index e884df2793..7cb9257ec3 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/gamm/v2/query.ts @@ -42,6 +42,7 @@ function createBaseQuerySpotPriceRequest(): QuerySpotPriceRequest { }; } export const QuerySpotPriceRequest = { + typeUrl: "/osmosis.gamm.v2.QuerySpotPriceRequest", encode(message: QuerySpotPriceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -118,6 +119,41 @@ export const QuerySpotPriceRequest = { obj.base_asset_denom = message.baseAssetDenom; obj.quote_asset_denom = message.quoteAssetDenom; return obj; + }, + fromAmino(object: QuerySpotPriceRequestAmino): QuerySpotPriceRequest { + return { + poolId: BigInt(object.pool_id), + baseAssetDenom: object.base_asset_denom, + quoteAssetDenom: object.quote_asset_denom + }; + }, + toAmino(message: QuerySpotPriceRequest): QuerySpotPriceRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom; + return obj; + }, + fromAminoMsg(object: QuerySpotPriceRequestAminoMsg): QuerySpotPriceRequest { + return QuerySpotPriceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestAminoMsg { + return { + type: "osmosis/gamm/v2/query-spot-price-request", + value: QuerySpotPriceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySpotPriceRequestProtoMsg): QuerySpotPriceRequest { + return QuerySpotPriceRequest.decode(message.value); + }, + toProto(message: QuerySpotPriceRequest): Uint8Array { + return QuerySpotPriceRequest.encode(message).finish(); + }, + toProtoMsg(message: QuerySpotPriceRequest): QuerySpotPriceRequestProtoMsg { + return { + typeUrl: "/osmosis.gamm.v2.QuerySpotPriceRequest", + value: QuerySpotPriceRequest.encode(message).finish() + }; } }; function createBaseQuerySpotPriceResponse(): QuerySpotPriceResponse { @@ -126,6 +162,7 @@ function createBaseQuerySpotPriceResponse(): QuerySpotPriceResponse { }; } export const QuerySpotPriceResponse = { + typeUrl: "/osmosis.gamm.v2.QuerySpotPriceResponse", encode(message: QuerySpotPriceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spotPrice !== "") { writer.uint32(10).string(message.spotPrice); @@ -178,5 +215,36 @@ export const QuerySpotPriceResponse = { const obj: any = {}; obj.spot_price = message.spotPrice; return obj; + }, + fromAmino(object: QuerySpotPriceResponseAmino): QuerySpotPriceResponse { + return { + spotPrice: object.spot_price + }; + }, + toAmino(message: QuerySpotPriceResponse): QuerySpotPriceResponseAmino { + const obj: any = {}; + obj.spot_price = message.spotPrice; + return obj; + }, + fromAminoMsg(object: QuerySpotPriceResponseAminoMsg): QuerySpotPriceResponse { + return QuerySpotPriceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseAminoMsg { + return { + type: "osmosis/gamm/v2/query-spot-price-response", + value: QuerySpotPriceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QuerySpotPriceResponseProtoMsg): QuerySpotPriceResponse { + return QuerySpotPriceResponse.decode(message.value); + }, + toProto(message: QuerySpotPriceResponse): Uint8Array { + return QuerySpotPriceResponse.encode(message).finish(); + }, + toProtoMsg(message: QuerySpotPriceResponse): QuerySpotPriceResponseProtoMsg { + return { + typeUrl: "/osmosis.gamm.v2.QuerySpotPriceResponse", + value: QuerySpotPriceResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/genesis.ts index fc8000f101..7a0e2b202b 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/genesis.ts @@ -17,6 +17,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.ibcratelimit.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -69,5 +70,36 @@ export const GenesisState = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/ibcratelimit/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.ibcratelimit.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/params.ts index 5ac5a9a6ad..99b7344136 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/params.ts @@ -15,6 +15,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.ibcratelimit.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); @@ -67,5 +68,36 @@ export const Params = { const obj: any = {}; obj.contract_address = message.contractAddress; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + contractAddress: object.contract_address + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.contract_address = message.contractAddress; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/ibcratelimit/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.ibcratelimit.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/query.ts index e43d80196c..00db5d8735 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/ibc-rate-limit/v1beta1/query.ts @@ -19,6 +19,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -56,6 +57,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/ibcratelimit/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -64,6 +93,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -116,5 +146,36 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/ibcratelimit/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.ibcratelimit.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts index bb378dd27a..6fa94369f7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/gauge.ts @@ -81,6 +81,7 @@ function createBaseGauge(): Gauge { }; } export const Gauge = { + typeUrl: "/osmosis.incentives.Gauge", encode(message: Gauge, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); @@ -233,6 +234,59 @@ export const Gauge = { obj.distributed_coins = []; } return obj; + }, + fromAmino(object: GaugeAmino): Gauge { + return { + id: BigInt(object.id), + isPerpetual: object.is_perpetual, + distributeTo: object?.distribute_to ? QueryCondition.fromAmino(object.distribute_to) : undefined, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [], + startTime: object.start_time, + numEpochsPaidOver: BigInt(object.num_epochs_paid_over), + filledEpochs: BigInt(object.filled_epochs), + distributedCoins: Array.isArray(object?.distributed_coins) ? object.distributed_coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Gauge): GaugeAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + obj.is_perpetual = message.isPerpetual; + obj.distribute_to = message.distributeTo ? QueryCondition.toAmino(message.distributeTo) : undefined; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + obj.start_time = message.startTime; + obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + obj.filled_epochs = message.filledEpochs ? message.filledEpochs.toString() : undefined; + if (message.distributedCoins) { + obj.distributed_coins = message.distributedCoins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.distributed_coins = []; + } + return obj; + }, + fromAminoMsg(object: GaugeAminoMsg): Gauge { + return Gauge.fromAmino(object.value); + }, + toAminoMsg(message: Gauge): GaugeAminoMsg { + return { + type: "osmosis/incentives/gauge", + value: Gauge.toAmino(message) + }; + }, + fromProtoMsg(message: GaugeProtoMsg): Gauge { + return Gauge.decode(message.value); + }, + toProto(message: Gauge): Uint8Array { + return Gauge.encode(message).finish(); + }, + toProtoMsg(message: Gauge): GaugeProtoMsg { + return { + typeUrl: "/osmosis.incentives.Gauge", + value: Gauge.encode(message).finish() + }; } }; function createBaseLockableDurationsInfo(): LockableDurationsInfo { @@ -241,6 +295,7 @@ function createBaseLockableDurationsInfo(): LockableDurationsInfo { }; } export const LockableDurationsInfo = { + typeUrl: "/osmosis.incentives.LockableDurationsInfo", encode(message: LockableDurationsInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.lockableDurations) { Duration.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -301,5 +356,40 @@ export const LockableDurationsInfo = { obj.lockable_durations = []; } return obj; + }, + fromAmino(object: LockableDurationsInfoAmino): LockableDurationsInfo { + return { + lockableDurations: Array.isArray(object?.lockable_durations) ? object.lockable_durations.map((e: any) => Duration.fromAmino(e)) : [] + }; + }, + toAmino(message: LockableDurationsInfo): LockableDurationsInfoAmino { + const obj: any = {}; + if (message.lockableDurations) { + obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); + } else { + obj.lockable_durations = []; + } + return obj; + }, + fromAminoMsg(object: LockableDurationsInfoAminoMsg): LockableDurationsInfo { + return LockableDurationsInfo.fromAmino(object.value); + }, + toAminoMsg(message: LockableDurationsInfo): LockableDurationsInfoAminoMsg { + return { + type: "osmosis/incentives/lockable-durations-info", + value: LockableDurationsInfo.toAmino(message) + }; + }, + fromProtoMsg(message: LockableDurationsInfoProtoMsg): LockableDurationsInfo { + return LockableDurationsInfo.decode(message.value); + }, + toProto(message: LockableDurationsInfo): Uint8Array { + return LockableDurationsInfo.encode(message).finish(); + }, + toProtoMsg(message: LockableDurationsInfo): LockableDurationsInfoProtoMsg { + return { + typeUrl: "/osmosis.incentives.LockableDurationsInfo", + value: LockableDurationsInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts index 753d76cf2d..b238899782 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/genesis.ts @@ -43,6 +43,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.incentives.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -147,5 +148,50 @@ export const GenesisState = { } obj.last_gauge_id = message.lastGaugeId; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + gauges: Array.isArray(object?.gauges) ? object.gauges.map((e: any) => Gauge.fromAmino(e)) : [], + lockableDurations: Array.isArray(object?.lockable_durations) ? object.lockable_durations.map((e: any) => Duration.fromAmino(e)) : [], + lastGaugeId: BigInt(object.last_gauge_id) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.gauges) { + obj.gauges = message.gauges.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.gauges = []; + } + if (message.lockableDurations) { + obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); + } else { + obj.lockable_durations = []; + } + obj.last_gauge_id = message.lastGaugeId ? message.lastGaugeId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/incentives/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.incentives.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts index fbdd52aace..712954aff2 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/params.ts @@ -19,6 +19,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.incentives.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.distrEpochIdentifier !== "") { writer.uint32(10).string(message.distrEpochIdentifier); @@ -71,5 +72,36 @@ export const Params = { const obj: any = {}; obj.distr_epoch_identifier = message.distrEpochIdentifier; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + distrEpochIdentifier: object.distr_epoch_identifier + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.distr_epoch_identifier = message.distrEpochIdentifier; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/incentives/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.incentives.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts index 2b96c2017a..c0fcbffb40 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/query.ts @@ -158,6 +158,7 @@ function createBaseModuleToDistributeCoinsRequest(): ModuleToDistributeCoinsRequ return {}; } export const ModuleToDistributeCoinsRequest = { + typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsRequest", encode(_: ModuleToDistributeCoinsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -195,6 +196,34 @@ export const ModuleToDistributeCoinsRequest = { toSDK(_: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ModuleToDistributeCoinsRequestAmino): ModuleToDistributeCoinsRequest { + return {}; + }, + toAmino(_: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ModuleToDistributeCoinsRequestAminoMsg): ModuleToDistributeCoinsRequest { + return ModuleToDistributeCoinsRequest.fromAmino(object.value); + }, + toAminoMsg(message: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestAminoMsg { + return { + type: "osmosis/incentives/module-to-distribute-coins-request", + value: ModuleToDistributeCoinsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleToDistributeCoinsRequestProtoMsg): ModuleToDistributeCoinsRequest { + return ModuleToDistributeCoinsRequest.decode(message.value); + }, + toProto(message: ModuleToDistributeCoinsRequest): Uint8Array { + return ModuleToDistributeCoinsRequest.encode(message).finish(); + }, + toProtoMsg(message: ModuleToDistributeCoinsRequest): ModuleToDistributeCoinsRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsRequest", + value: ModuleToDistributeCoinsRequest.encode(message).finish() + }; } }; function createBaseModuleToDistributeCoinsResponse(): ModuleToDistributeCoinsResponse { @@ -203,6 +232,7 @@ function createBaseModuleToDistributeCoinsResponse(): ModuleToDistributeCoinsRes }; } export const ModuleToDistributeCoinsResponse = { + typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsResponse", encode(message: ModuleToDistributeCoinsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -263,6 +293,41 @@ export const ModuleToDistributeCoinsResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: ModuleToDistributeCoinsResponseAmino): ModuleToDistributeCoinsResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: ModuleToDistributeCoinsResponse): ModuleToDistributeCoinsResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: ModuleToDistributeCoinsResponseAminoMsg): ModuleToDistributeCoinsResponse { + return ModuleToDistributeCoinsResponse.fromAmino(object.value); + }, + toAminoMsg(message: ModuleToDistributeCoinsResponse): ModuleToDistributeCoinsResponseAminoMsg { + return { + type: "osmosis/incentives/module-to-distribute-coins-response", + value: ModuleToDistributeCoinsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleToDistributeCoinsResponseProtoMsg): ModuleToDistributeCoinsResponse { + return ModuleToDistributeCoinsResponse.decode(message.value); + }, + toProto(message: ModuleToDistributeCoinsResponse): Uint8Array { + return ModuleToDistributeCoinsResponse.encode(message).finish(); + }, + toProtoMsg(message: ModuleToDistributeCoinsResponse): ModuleToDistributeCoinsResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.ModuleToDistributeCoinsResponse", + value: ModuleToDistributeCoinsResponse.encode(message).finish() + }; } }; function createBaseGaugeByIDRequest(): GaugeByIDRequest { @@ -271,6 +336,7 @@ function createBaseGaugeByIDRequest(): GaugeByIDRequest { }; } export const GaugeByIDRequest = { + typeUrl: "/osmosis.incentives.GaugeByIDRequest", encode(message: GaugeByIDRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); @@ -323,6 +389,37 @@ export const GaugeByIDRequest = { const obj: any = {}; obj.id = message.id; return obj; + }, + fromAmino(object: GaugeByIDRequestAmino): GaugeByIDRequest { + return { + id: BigInt(object.id) + }; + }, + toAmino(message: GaugeByIDRequest): GaugeByIDRequestAmino { + const obj: any = {}; + obj.id = message.id ? message.id.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GaugeByIDRequestAminoMsg): GaugeByIDRequest { + return GaugeByIDRequest.fromAmino(object.value); + }, + toAminoMsg(message: GaugeByIDRequest): GaugeByIDRequestAminoMsg { + return { + type: "osmosis/incentives/gauge-by-id-request", + value: GaugeByIDRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GaugeByIDRequestProtoMsg): GaugeByIDRequest { + return GaugeByIDRequest.decode(message.value); + }, + toProto(message: GaugeByIDRequest): Uint8Array { + return GaugeByIDRequest.encode(message).finish(); + }, + toProtoMsg(message: GaugeByIDRequest): GaugeByIDRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.GaugeByIDRequest", + value: GaugeByIDRequest.encode(message).finish() + }; } }; function createBaseGaugeByIDResponse(): GaugeByIDResponse { @@ -331,6 +428,7 @@ function createBaseGaugeByIDResponse(): GaugeByIDResponse { }; } export const GaugeByIDResponse = { + typeUrl: "/osmosis.incentives.GaugeByIDResponse", encode(message: GaugeByIDResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gauge !== undefined) { Gauge.encode(message.gauge, writer.uint32(10).fork()).ldelim(); @@ -383,6 +481,37 @@ export const GaugeByIDResponse = { const obj: any = {}; message.gauge !== undefined && (obj.gauge = message.gauge ? Gauge.toSDK(message.gauge) : undefined); return obj; + }, + fromAmino(object: GaugeByIDResponseAmino): GaugeByIDResponse { + return { + gauge: object?.gauge ? Gauge.fromAmino(object.gauge) : undefined + }; + }, + toAmino(message: GaugeByIDResponse): GaugeByIDResponseAmino { + const obj: any = {}; + obj.gauge = message.gauge ? Gauge.toAmino(message.gauge) : undefined; + return obj; + }, + fromAminoMsg(object: GaugeByIDResponseAminoMsg): GaugeByIDResponse { + return GaugeByIDResponse.fromAmino(object.value); + }, + toAminoMsg(message: GaugeByIDResponse): GaugeByIDResponseAminoMsg { + return { + type: "osmosis/incentives/gauge-by-id-response", + value: GaugeByIDResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GaugeByIDResponseProtoMsg): GaugeByIDResponse { + return GaugeByIDResponse.decode(message.value); + }, + toProto(message: GaugeByIDResponse): Uint8Array { + return GaugeByIDResponse.encode(message).finish(); + }, + toProtoMsg(message: GaugeByIDResponse): GaugeByIDResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.GaugeByIDResponse", + value: GaugeByIDResponse.encode(message).finish() + }; } }; function createBaseGaugesRequest(): GaugesRequest { @@ -391,6 +520,7 @@ function createBaseGaugesRequest(): GaugesRequest { }; } export const GaugesRequest = { + typeUrl: "/osmosis.incentives.GaugesRequest", encode(message: GaugesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -443,6 +573,37 @@ export const GaugesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GaugesRequestAmino): GaugesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GaugesRequest): GaugesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GaugesRequestAminoMsg): GaugesRequest { + return GaugesRequest.fromAmino(object.value); + }, + toAminoMsg(message: GaugesRequest): GaugesRequestAminoMsg { + return { + type: "osmosis/incentives/gauges-request", + value: GaugesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: GaugesRequestProtoMsg): GaugesRequest { + return GaugesRequest.decode(message.value); + }, + toProto(message: GaugesRequest): Uint8Array { + return GaugesRequest.encode(message).finish(); + }, + toProtoMsg(message: GaugesRequest): GaugesRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.GaugesRequest", + value: GaugesRequest.encode(message).finish() + }; } }; function createBaseGaugesResponse(): GaugesResponse { @@ -452,6 +613,7 @@ function createBaseGaugesResponse(): GaugesResponse { }; } export const GaugesResponse = { + typeUrl: "/osmosis.incentives.GaugesResponse", encode(message: GaugesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { Gauge.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -524,6 +686,43 @@ export const GaugesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: GaugesResponseAmino): GaugesResponse { + return { + data: Array.isArray(object?.data) ? object.data.map((e: any) => Gauge.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: GaugesResponse): GaugesResponseAmino { + const obj: any = {}; + if (message.data) { + obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.data = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: GaugesResponseAminoMsg): GaugesResponse { + return GaugesResponse.fromAmino(object.value); + }, + toAminoMsg(message: GaugesResponse): GaugesResponseAminoMsg { + return { + type: "osmosis/incentives/gauges-response", + value: GaugesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: GaugesResponseProtoMsg): GaugesResponse { + return GaugesResponse.decode(message.value); + }, + toProto(message: GaugesResponse): Uint8Array { + return GaugesResponse.encode(message).finish(); + }, + toProtoMsg(message: GaugesResponse): GaugesResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.GaugesResponse", + value: GaugesResponse.encode(message).finish() + }; } }; function createBaseActiveGaugesRequest(): ActiveGaugesRequest { @@ -532,6 +731,7 @@ function createBaseActiveGaugesRequest(): ActiveGaugesRequest { }; } export const ActiveGaugesRequest = { + typeUrl: "/osmosis.incentives.ActiveGaugesRequest", encode(message: ActiveGaugesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -584,6 +784,37 @@ export const ActiveGaugesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: ActiveGaugesRequestAmino): ActiveGaugesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: ActiveGaugesRequest): ActiveGaugesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: ActiveGaugesRequestAminoMsg): ActiveGaugesRequest { + return ActiveGaugesRequest.fromAmino(object.value); + }, + toAminoMsg(message: ActiveGaugesRequest): ActiveGaugesRequestAminoMsg { + return { + type: "osmosis/incentives/active-gauges-request", + value: ActiveGaugesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ActiveGaugesRequestProtoMsg): ActiveGaugesRequest { + return ActiveGaugesRequest.decode(message.value); + }, + toProto(message: ActiveGaugesRequest): Uint8Array { + return ActiveGaugesRequest.encode(message).finish(); + }, + toProtoMsg(message: ActiveGaugesRequest): ActiveGaugesRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.ActiveGaugesRequest", + value: ActiveGaugesRequest.encode(message).finish() + }; } }; function createBaseActiveGaugesResponse(): ActiveGaugesResponse { @@ -593,6 +824,7 @@ function createBaseActiveGaugesResponse(): ActiveGaugesResponse { }; } export const ActiveGaugesResponse = { + typeUrl: "/osmosis.incentives.ActiveGaugesResponse", encode(message: ActiveGaugesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { Gauge.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -665,6 +897,43 @@ export const ActiveGaugesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: ActiveGaugesResponseAmino): ActiveGaugesResponse { + return { + data: Array.isArray(object?.data) ? object.data.map((e: any) => Gauge.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: ActiveGaugesResponse): ActiveGaugesResponseAmino { + const obj: any = {}; + if (message.data) { + obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.data = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: ActiveGaugesResponseAminoMsg): ActiveGaugesResponse { + return ActiveGaugesResponse.fromAmino(object.value); + }, + toAminoMsg(message: ActiveGaugesResponse): ActiveGaugesResponseAminoMsg { + return { + type: "osmosis/incentives/active-gauges-response", + value: ActiveGaugesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ActiveGaugesResponseProtoMsg): ActiveGaugesResponse { + return ActiveGaugesResponse.decode(message.value); + }, + toProto(message: ActiveGaugesResponse): Uint8Array { + return ActiveGaugesResponse.encode(message).finish(); + }, + toProtoMsg(message: ActiveGaugesResponse): ActiveGaugesResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.ActiveGaugesResponse", + value: ActiveGaugesResponse.encode(message).finish() + }; } }; function createBaseActiveGaugesPerDenomRequest(): ActiveGaugesPerDenomRequest { @@ -674,6 +943,7 @@ function createBaseActiveGaugesPerDenomRequest(): ActiveGaugesPerDenomRequest { }; } export const ActiveGaugesPerDenomRequest = { + typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomRequest", encode(message: ActiveGaugesPerDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -738,6 +1008,39 @@ export const ActiveGaugesPerDenomRequest = { obj.denom = message.denom; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: ActiveGaugesPerDenomRequestAmino): ActiveGaugesPerDenomRequest { + return { + denom: object.denom, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: ActiveGaugesPerDenomRequestAminoMsg): ActiveGaugesPerDenomRequest { + return ActiveGaugesPerDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestAminoMsg { + return { + type: "osmosis/incentives/active-gauges-per-denom-request", + value: ActiveGaugesPerDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ActiveGaugesPerDenomRequestProtoMsg): ActiveGaugesPerDenomRequest { + return ActiveGaugesPerDenomRequest.decode(message.value); + }, + toProto(message: ActiveGaugesPerDenomRequest): Uint8Array { + return ActiveGaugesPerDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: ActiveGaugesPerDenomRequest): ActiveGaugesPerDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomRequest", + value: ActiveGaugesPerDenomRequest.encode(message).finish() + }; } }; function createBaseActiveGaugesPerDenomResponse(): ActiveGaugesPerDenomResponse { @@ -747,6 +1050,7 @@ function createBaseActiveGaugesPerDenomResponse(): ActiveGaugesPerDenomResponse }; } export const ActiveGaugesPerDenomResponse = { + typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomResponse", encode(message: ActiveGaugesPerDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { Gauge.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -819,6 +1123,43 @@ export const ActiveGaugesPerDenomResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: ActiveGaugesPerDenomResponseAmino): ActiveGaugesPerDenomResponse { + return { + data: Array.isArray(object?.data) ? object.data.map((e: any) => Gauge.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: ActiveGaugesPerDenomResponse): ActiveGaugesPerDenomResponseAmino { + const obj: any = {}; + if (message.data) { + obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.data = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: ActiveGaugesPerDenomResponseAminoMsg): ActiveGaugesPerDenomResponse { + return ActiveGaugesPerDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: ActiveGaugesPerDenomResponse): ActiveGaugesPerDenomResponseAminoMsg { + return { + type: "osmosis/incentives/active-gauges-per-denom-response", + value: ActiveGaugesPerDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ActiveGaugesPerDenomResponseProtoMsg): ActiveGaugesPerDenomResponse { + return ActiveGaugesPerDenomResponse.decode(message.value); + }, + toProto(message: ActiveGaugesPerDenomResponse): Uint8Array { + return ActiveGaugesPerDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: ActiveGaugesPerDenomResponse): ActiveGaugesPerDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.ActiveGaugesPerDenomResponse", + value: ActiveGaugesPerDenomResponse.encode(message).finish() + }; } }; function createBaseUpcomingGaugesRequest(): UpcomingGaugesRequest { @@ -827,6 +1168,7 @@ function createBaseUpcomingGaugesRequest(): UpcomingGaugesRequest { }; } export const UpcomingGaugesRequest = { + typeUrl: "/osmosis.incentives.UpcomingGaugesRequest", encode(message: UpcomingGaugesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -879,6 +1221,37 @@ export const UpcomingGaugesRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: UpcomingGaugesRequestAmino): UpcomingGaugesRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: UpcomingGaugesRequest): UpcomingGaugesRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: UpcomingGaugesRequestAminoMsg): UpcomingGaugesRequest { + return UpcomingGaugesRequest.fromAmino(object.value); + }, + toAminoMsg(message: UpcomingGaugesRequest): UpcomingGaugesRequestAminoMsg { + return { + type: "osmosis/incentives/upcoming-gauges-request", + value: UpcomingGaugesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: UpcomingGaugesRequestProtoMsg): UpcomingGaugesRequest { + return UpcomingGaugesRequest.decode(message.value); + }, + toProto(message: UpcomingGaugesRequest): Uint8Array { + return UpcomingGaugesRequest.encode(message).finish(); + }, + toProtoMsg(message: UpcomingGaugesRequest): UpcomingGaugesRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.UpcomingGaugesRequest", + value: UpcomingGaugesRequest.encode(message).finish() + }; } }; function createBaseUpcomingGaugesResponse(): UpcomingGaugesResponse { @@ -888,6 +1261,7 @@ function createBaseUpcomingGaugesResponse(): UpcomingGaugesResponse { }; } export const UpcomingGaugesResponse = { + typeUrl: "/osmosis.incentives.UpcomingGaugesResponse", encode(message: UpcomingGaugesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { Gauge.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -960,6 +1334,43 @@ export const UpcomingGaugesResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: UpcomingGaugesResponseAmino): UpcomingGaugesResponse { + return { + data: Array.isArray(object?.data) ? object.data.map((e: any) => Gauge.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: UpcomingGaugesResponse): UpcomingGaugesResponseAmino { + const obj: any = {}; + if (message.data) { + obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.data = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: UpcomingGaugesResponseAminoMsg): UpcomingGaugesResponse { + return UpcomingGaugesResponse.fromAmino(object.value); + }, + toAminoMsg(message: UpcomingGaugesResponse): UpcomingGaugesResponseAminoMsg { + return { + type: "osmosis/incentives/upcoming-gauges-response", + value: UpcomingGaugesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: UpcomingGaugesResponseProtoMsg): UpcomingGaugesResponse { + return UpcomingGaugesResponse.decode(message.value); + }, + toProto(message: UpcomingGaugesResponse): Uint8Array { + return UpcomingGaugesResponse.encode(message).finish(); + }, + toProtoMsg(message: UpcomingGaugesResponse): UpcomingGaugesResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.UpcomingGaugesResponse", + value: UpcomingGaugesResponse.encode(message).finish() + }; } }; function createBaseUpcomingGaugesPerDenomRequest(): UpcomingGaugesPerDenomRequest { @@ -969,6 +1380,7 @@ function createBaseUpcomingGaugesPerDenomRequest(): UpcomingGaugesPerDenomReques }; } export const UpcomingGaugesPerDenomRequest = { + typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomRequest", encode(message: UpcomingGaugesPerDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -1033,6 +1445,39 @@ export const UpcomingGaugesPerDenomRequest = { obj.denom = message.denom; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: UpcomingGaugesPerDenomRequestAmino): UpcomingGaugesPerDenomRequest { + return { + denom: object.denom, + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: UpcomingGaugesPerDenomRequestAminoMsg): UpcomingGaugesPerDenomRequest { + return UpcomingGaugesPerDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestAminoMsg { + return { + type: "osmosis/incentives/upcoming-gauges-per-denom-request", + value: UpcomingGaugesPerDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: UpcomingGaugesPerDenomRequestProtoMsg): UpcomingGaugesPerDenomRequest { + return UpcomingGaugesPerDenomRequest.decode(message.value); + }, + toProto(message: UpcomingGaugesPerDenomRequest): Uint8Array { + return UpcomingGaugesPerDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: UpcomingGaugesPerDenomRequest): UpcomingGaugesPerDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomRequest", + value: UpcomingGaugesPerDenomRequest.encode(message).finish() + }; } }; function createBaseUpcomingGaugesPerDenomResponse(): UpcomingGaugesPerDenomResponse { @@ -1042,6 +1487,7 @@ function createBaseUpcomingGaugesPerDenomResponse(): UpcomingGaugesPerDenomRespo }; } export const UpcomingGaugesPerDenomResponse = { + typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomResponse", encode(message: UpcomingGaugesPerDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.upcomingGauges) { Gauge.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1114,6 +1560,43 @@ export const UpcomingGaugesPerDenomResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: UpcomingGaugesPerDenomResponseAmino): UpcomingGaugesPerDenomResponse { + return { + upcomingGauges: Array.isArray(object?.upcoming_gauges) ? object.upcoming_gauges.map((e: any) => Gauge.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: UpcomingGaugesPerDenomResponse): UpcomingGaugesPerDenomResponseAmino { + const obj: any = {}; + if (message.upcomingGauges) { + obj.upcoming_gauges = message.upcomingGauges.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.upcoming_gauges = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: UpcomingGaugesPerDenomResponseAminoMsg): UpcomingGaugesPerDenomResponse { + return UpcomingGaugesPerDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: UpcomingGaugesPerDenomResponse): UpcomingGaugesPerDenomResponseAminoMsg { + return { + type: "osmosis/incentives/upcoming-gauges-per-denom-response", + value: UpcomingGaugesPerDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: UpcomingGaugesPerDenomResponseProtoMsg): UpcomingGaugesPerDenomResponse { + return UpcomingGaugesPerDenomResponse.decode(message.value); + }, + toProto(message: UpcomingGaugesPerDenomResponse): Uint8Array { + return UpcomingGaugesPerDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: UpcomingGaugesPerDenomResponse): UpcomingGaugesPerDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.UpcomingGaugesPerDenomResponse", + value: UpcomingGaugesPerDenomResponse.encode(message).finish() + }; } }; function createBaseRewardsEstRequest(): RewardsEstRequest { @@ -1124,6 +1607,7 @@ function createBaseRewardsEstRequest(): RewardsEstRequest { }; } export const RewardsEstRequest = { + typeUrl: "/osmosis.incentives.RewardsEstRequest", encode(message: RewardsEstRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -1217,6 +1701,45 @@ export const RewardsEstRequest = { } obj.end_epoch = message.endEpoch; return obj; + }, + fromAmino(object: RewardsEstRequestAmino): RewardsEstRequest { + return { + owner: object.owner, + lockIds: Array.isArray(object?.lock_ids) ? object.lock_ids.map((e: any) => BigInt(e)) : [], + endEpoch: BigInt(object.end_epoch) + }; + }, + toAmino(message: RewardsEstRequest): RewardsEstRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + if (message.lockIds) { + obj.lock_ids = message.lockIds.map(e => e.toString()); + } else { + obj.lock_ids = []; + } + obj.end_epoch = message.endEpoch ? message.endEpoch.toString() : undefined; + return obj; + }, + fromAminoMsg(object: RewardsEstRequestAminoMsg): RewardsEstRequest { + return RewardsEstRequest.fromAmino(object.value); + }, + toAminoMsg(message: RewardsEstRequest): RewardsEstRequestAminoMsg { + return { + type: "osmosis/incentives/rewards-est-request", + value: RewardsEstRequest.toAmino(message) + }; + }, + fromProtoMsg(message: RewardsEstRequestProtoMsg): RewardsEstRequest { + return RewardsEstRequest.decode(message.value); + }, + toProto(message: RewardsEstRequest): Uint8Array { + return RewardsEstRequest.encode(message).finish(); + }, + toProtoMsg(message: RewardsEstRequest): RewardsEstRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.RewardsEstRequest", + value: RewardsEstRequest.encode(message).finish() + }; } }; function createBaseRewardsEstResponse(): RewardsEstResponse { @@ -1225,6 +1748,7 @@ function createBaseRewardsEstResponse(): RewardsEstResponse { }; } export const RewardsEstResponse = { + typeUrl: "/osmosis.incentives.RewardsEstResponse", encode(message: RewardsEstResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1285,12 +1809,48 @@ export const RewardsEstResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: RewardsEstResponseAmino): RewardsEstResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: RewardsEstResponse): RewardsEstResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: RewardsEstResponseAminoMsg): RewardsEstResponse { + return RewardsEstResponse.fromAmino(object.value); + }, + toAminoMsg(message: RewardsEstResponse): RewardsEstResponseAminoMsg { + return { + type: "osmosis/incentives/rewards-est-response", + value: RewardsEstResponse.toAmino(message) + }; + }, + fromProtoMsg(message: RewardsEstResponseProtoMsg): RewardsEstResponse { + return RewardsEstResponse.decode(message.value); + }, + toProto(message: RewardsEstResponse): Uint8Array { + return RewardsEstResponse.encode(message).finish(); + }, + toProtoMsg(message: RewardsEstResponse): RewardsEstResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.RewardsEstResponse", + value: RewardsEstResponse.encode(message).finish() + }; } }; function createBaseQueryLockableDurationsRequest(): QueryLockableDurationsRequest { return {}; } export const QueryLockableDurationsRequest = { + typeUrl: "/osmosis.incentives.QueryLockableDurationsRequest", encode(_: QueryLockableDurationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1328,6 +1888,34 @@ export const QueryLockableDurationsRequest = { toSDK(_: QueryLockableDurationsRequest): QueryLockableDurationsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryLockableDurationsRequestAmino): QueryLockableDurationsRequest { + return {}; + }, + toAmino(_: QueryLockableDurationsRequest): QueryLockableDurationsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryLockableDurationsRequestAminoMsg): QueryLockableDurationsRequest { + return QueryLockableDurationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestAminoMsg { + return { + type: "osmosis/incentives/query-lockable-durations-request", + value: QueryLockableDurationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLockableDurationsRequestProtoMsg): QueryLockableDurationsRequest { + return QueryLockableDurationsRequest.decode(message.value); + }, + toProto(message: QueryLockableDurationsRequest): Uint8Array { + return QueryLockableDurationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestProtoMsg { + return { + typeUrl: "/osmosis.incentives.QueryLockableDurationsRequest", + value: QueryLockableDurationsRequest.encode(message).finish() + }; } }; function createBaseQueryLockableDurationsResponse(): QueryLockableDurationsResponse { @@ -1336,6 +1924,7 @@ function createBaseQueryLockableDurationsResponse(): QueryLockableDurationsRespo }; } export const QueryLockableDurationsResponse = { + typeUrl: "/osmosis.incentives.QueryLockableDurationsResponse", encode(message: QueryLockableDurationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.lockableDurations) { Duration.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1396,5 +1985,40 @@ export const QueryLockableDurationsResponse = { obj.lockable_durations = []; } return obj; + }, + fromAmino(object: QueryLockableDurationsResponseAmino): QueryLockableDurationsResponse { + return { + lockableDurations: Array.isArray(object?.lockable_durations) ? object.lockable_durations.map((e: any) => Duration.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseAmino { + const obj: any = {}; + if (message.lockableDurations) { + obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); + } else { + obj.lockable_durations = []; + } + return obj; + }, + fromAminoMsg(object: QueryLockableDurationsResponseAminoMsg): QueryLockableDurationsResponse { + return QueryLockableDurationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseAminoMsg { + return { + type: "osmosis/incentives/query-lockable-durations-response", + value: QueryLockableDurationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLockableDurationsResponseProtoMsg): QueryLockableDurationsResponse { + return QueryLockableDurationsResponse.decode(message.value); + }, + toProto(message: QueryLockableDurationsResponse): Uint8Array { + return QueryLockableDurationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.QueryLockableDurationsResponse", + value: QueryLockableDurationsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts index c9cac08611..ac0e9de950 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/incentives/tx.ts @@ -70,6 +70,7 @@ function createBaseMsgCreateGauge(): MsgCreateGauge { }; } export const MsgCreateGauge = { + typeUrl: "/osmosis.incentives.MsgCreateGauge", encode(message: MsgCreateGauge, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.isPerpetual === true) { writer.uint32(8).bool(message.isPerpetual); @@ -190,12 +191,58 @@ export const MsgCreateGauge = { message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); obj.num_epochs_paid_over = message.numEpochsPaidOver; return obj; + }, + fromAmino(object: MsgCreateGaugeAmino): MsgCreateGauge { + return { + isPerpetual: object.is_perpetual, + owner: object.owner, + distributeTo: object?.distribute_to ? QueryCondition.fromAmino(object.distribute_to) : undefined, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [], + startTime: object.start_time, + numEpochsPaidOver: BigInt(object.num_epochs_paid_over) + }; + }, + toAmino(message: MsgCreateGauge): MsgCreateGaugeAmino { + const obj: any = {}; + obj.is_perpetual = message.isPerpetual; + obj.owner = message.owner; + obj.distribute_to = message.distributeTo ? QueryCondition.toAmino(message.distributeTo) : undefined; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + obj.start_time = message.startTime; + obj.num_epochs_paid_over = message.numEpochsPaidOver ? message.numEpochsPaidOver.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgCreateGaugeAminoMsg): MsgCreateGauge { + return MsgCreateGauge.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGauge): MsgCreateGaugeAminoMsg { + return { + type: "osmosis/incentives/create-gauge", + value: MsgCreateGauge.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGaugeProtoMsg): MsgCreateGauge { + return MsgCreateGauge.decode(message.value); + }, + toProto(message: MsgCreateGauge): Uint8Array { + return MsgCreateGauge.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGauge): MsgCreateGaugeProtoMsg { + return { + typeUrl: "/osmosis.incentives.MsgCreateGauge", + value: MsgCreateGauge.encode(message).finish() + }; } }; function createBaseMsgCreateGaugeResponse(): MsgCreateGaugeResponse { return {}; } export const MsgCreateGaugeResponse = { + typeUrl: "/osmosis.incentives.MsgCreateGaugeResponse", encode(_: MsgCreateGaugeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -233,6 +280,34 @@ export const MsgCreateGaugeResponse = { toSDK(_: MsgCreateGaugeResponse): MsgCreateGaugeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgCreateGaugeResponseAmino): MsgCreateGaugeResponse { + return {}; + }, + toAmino(_: MsgCreateGaugeResponse): MsgCreateGaugeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgCreateGaugeResponseAminoMsg): MsgCreateGaugeResponse { + return MsgCreateGaugeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateGaugeResponse): MsgCreateGaugeResponseAminoMsg { + return { + type: "osmosis/incentives/create-gauge-response", + value: MsgCreateGaugeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateGaugeResponseProtoMsg): MsgCreateGaugeResponse { + return MsgCreateGaugeResponse.decode(message.value); + }, + toProto(message: MsgCreateGaugeResponse): Uint8Array { + return MsgCreateGaugeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateGaugeResponse): MsgCreateGaugeResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.MsgCreateGaugeResponse", + value: MsgCreateGaugeResponse.encode(message).finish() + }; } }; function createBaseMsgAddToGauge(): MsgAddToGauge { @@ -243,6 +318,7 @@ function createBaseMsgAddToGauge(): MsgAddToGauge { }; } export const MsgAddToGauge = { + typeUrl: "/osmosis.incentives.MsgAddToGauge", encode(message: MsgAddToGauge, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -327,12 +403,52 @@ export const MsgAddToGauge = { obj.rewards = []; } return obj; + }, + fromAmino(object: MsgAddToGaugeAmino): MsgAddToGauge { + return { + owner: object.owner, + gaugeId: BigInt(object.gauge_id), + rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgAddToGauge): MsgAddToGaugeAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + if (message.rewards) { + obj.rewards = message.rewards.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.rewards = []; + } + return obj; + }, + fromAminoMsg(object: MsgAddToGaugeAminoMsg): MsgAddToGauge { + return MsgAddToGauge.fromAmino(object.value); + }, + toAminoMsg(message: MsgAddToGauge): MsgAddToGaugeAminoMsg { + return { + type: "osmosis/incentives/add-to-gauge", + value: MsgAddToGauge.toAmino(message) + }; + }, + fromProtoMsg(message: MsgAddToGaugeProtoMsg): MsgAddToGauge { + return MsgAddToGauge.decode(message.value); + }, + toProto(message: MsgAddToGauge): Uint8Array { + return MsgAddToGauge.encode(message).finish(); + }, + toProtoMsg(message: MsgAddToGauge): MsgAddToGaugeProtoMsg { + return { + typeUrl: "/osmosis.incentives.MsgAddToGauge", + value: MsgAddToGauge.encode(message).finish() + }; } }; function createBaseMsgAddToGaugeResponse(): MsgAddToGaugeResponse { return {}; } export const MsgAddToGaugeResponse = { + typeUrl: "/osmosis.incentives.MsgAddToGaugeResponse", encode(_: MsgAddToGaugeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -370,5 +486,33 @@ export const MsgAddToGaugeResponse = { toSDK(_: MsgAddToGaugeResponse): MsgAddToGaugeResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgAddToGaugeResponseAmino): MsgAddToGaugeResponse { + return {}; + }, + toAmino(_: MsgAddToGaugeResponse): MsgAddToGaugeResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgAddToGaugeResponseAminoMsg): MsgAddToGaugeResponse { + return MsgAddToGaugeResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgAddToGaugeResponse): MsgAddToGaugeResponseAminoMsg { + return { + type: "osmosis/incentives/add-to-gauge-response", + value: MsgAddToGaugeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgAddToGaugeResponseProtoMsg): MsgAddToGaugeResponse { + return MsgAddToGaugeResponse.decode(message.value); + }, + toProto(message: MsgAddToGaugeResponse): Uint8Array { + return MsgAddToGaugeResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgAddToGaugeResponse): MsgAddToGaugeResponseProtoMsg { + return { + typeUrl: "/osmosis.incentives.MsgAddToGaugeResponse", + value: MsgAddToGaugeResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts index 3bcb7a1504..e9294ca846 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/genesis.ts @@ -22,6 +22,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.lockup.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lastLockId !== BigInt(0)) { writer.uint32(8).uint64(message.lastLockId); @@ -114,5 +115,48 @@ export const GenesisState = { obj.synthetic_locks = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + lastLockId: BigInt(object.last_lock_id), + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [], + syntheticLocks: Array.isArray(object?.synthetic_locks) ? object.synthetic_locks.map((e: any) => SyntheticLock.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.last_lock_id = message.lastLockId ? message.lastLockId.toString() : undefined; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + if (message.syntheticLocks) { + obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); + } else { + obj.synthetic_locks = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/lockup/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.lockup.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts index be7796cf3e..ac4a26d23c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/lock.ts @@ -170,6 +170,7 @@ 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); @@ -278,6 +279,49 @@ export const PeriodLock = { obj.coins = []; } return obj; + }, + fromAmino(object: PeriodLockAmino): PeriodLock { + return { + ID: BigInt(object.ID), + owner: object.owner, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + endTime: object.end_time, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: PeriodLock): PeriodLockAmino { + const obj: any = {}; + obj.ID = message.ID ? message.ID.toString() : undefined; + obj.owner = message.owner; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + obj.end_time = message.endTime; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: PeriodLockAminoMsg): PeriodLock { + return PeriodLock.fromAmino(object.value); + }, + toAminoMsg(message: PeriodLock): PeriodLockAminoMsg { + return { + type: "osmosis/lockup/period-lock", + value: PeriodLock.toAmino(message) + }; + }, + fromProtoMsg(message: PeriodLockProtoMsg): PeriodLock { + return PeriodLock.decode(message.value); + }, + toProto(message: PeriodLock): Uint8Array { + return PeriodLock.encode(message).finish(); + }, + toProtoMsg(message: PeriodLock): PeriodLockProtoMsg { + return { + typeUrl: "/osmosis.lockup.PeriodLock", + value: PeriodLock.encode(message).finish() + }; } }; function createBaseQueryCondition(): QueryCondition { @@ -289,6 +333,7 @@ function createBaseQueryCondition(): QueryCondition { }; } export const QueryCondition = { + typeUrl: "/osmosis.lockup.QueryCondition", encode(message: QueryCondition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lockQueryType !== 0) { writer.uint32(8).int32(message.lockQueryType); @@ -377,6 +422,43 @@ export const QueryCondition = { message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); return obj; + }, + fromAmino(object: QueryConditionAmino): QueryCondition { + return { + lockQueryType: isSet(object.lock_query_type) ? lockQueryTypeFromJSON(object.lock_query_type) : -1, + denom: object.denom, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + timestamp: object.timestamp + }; + }, + toAmino(message: QueryCondition): QueryConditionAmino { + const obj: any = {}; + obj.lock_query_type = message.lockQueryType; + obj.denom = message.denom; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + obj.timestamp = message.timestamp; + return obj; + }, + fromAminoMsg(object: QueryConditionAminoMsg): QueryCondition { + return QueryCondition.fromAmino(object.value); + }, + toAminoMsg(message: QueryCondition): QueryConditionAminoMsg { + return { + type: "osmosis/lockup/query-condition", + value: QueryCondition.toAmino(message) + }; + }, + fromProtoMsg(message: QueryConditionProtoMsg): QueryCondition { + return QueryCondition.decode(message.value); + }, + toProto(message: QueryCondition): Uint8Array { + return QueryCondition.encode(message).finish(); + }, + toProtoMsg(message: QueryCondition): QueryConditionProtoMsg { + return { + typeUrl: "/osmosis.lockup.QueryCondition", + value: QueryCondition.encode(message).finish() + }; } }; function createBaseSyntheticLock(): SyntheticLock { @@ -388,6 +470,7 @@ function createBaseSyntheticLock(): SyntheticLock { }; } export const SyntheticLock = { + typeUrl: "/osmosis.lockup.SyntheticLock", encode(message: SyntheticLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.underlyingLockId !== BigInt(0)) { writer.uint32(8).uint64(message.underlyingLockId); @@ -476,5 +559,42 @@ export const SyntheticLock = { message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; + }, + fromAmino(object: SyntheticLockAmino): SyntheticLock { + return { + underlyingLockId: BigInt(object.underlying_lock_id), + synthDenom: object.synth_denom, + endTime: object.end_time, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: SyntheticLock): SyntheticLockAmino { + const obj: any = {}; + obj.underlying_lock_id = message.underlyingLockId ? message.underlyingLockId.toString() : undefined; + obj.synth_denom = message.synthDenom; + obj.end_time = message.endTime; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: SyntheticLockAminoMsg): SyntheticLock { + return SyntheticLock.fromAmino(object.value); + }, + toAminoMsg(message: SyntheticLock): SyntheticLockAminoMsg { + return { + type: "osmosis/lockup/synthetic-lock", + value: SyntheticLock.toAmino(message) + }; + }, + fromProtoMsg(message: SyntheticLockProtoMsg): SyntheticLock { + return SyntheticLock.decode(message.value); + }, + toProto(message: SyntheticLock): Uint8Array { + return SyntheticLock.encode(message).finish(); + }, + toProtoMsg(message: SyntheticLock): SyntheticLockProtoMsg { + return { + typeUrl: "/osmosis.lockup.SyntheticLock", + value: SyntheticLock.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts index 5a540bbba6..14d6e3ed01 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/params.ts @@ -13,6 +13,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.lockup.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.forceUnlockAllowedAddresses) { writer.uint32(10).string(v!); @@ -73,5 +74,40 @@ export const Params = { obj.force_unlock_allowed_addresses = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + forceUnlockAllowedAddresses: Array.isArray(object?.force_unlock_allowed_addresses) ? object.force_unlock_allowed_addresses.map((e: any) => e) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.forceUnlockAllowedAddresses) { + obj.force_unlock_allowed_addresses = message.forceUnlockAllowedAddresses.map(e => e); + } else { + obj.force_unlock_allowed_addresses = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/lockup/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.lockup.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts index cdd6a8c980..7756a903d1 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/query.ts @@ -224,6 +224,7 @@ function createBaseModuleBalanceRequest(): ModuleBalanceRequest { return {}; } export const ModuleBalanceRequest = { + typeUrl: "/osmosis.lockup.ModuleBalanceRequest", encode(_: ModuleBalanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -261,6 +262,34 @@ export const ModuleBalanceRequest = { toSDK(_: ModuleBalanceRequest): ModuleBalanceRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ModuleBalanceRequestAmino): ModuleBalanceRequest { + return {}; + }, + toAmino(_: ModuleBalanceRequest): ModuleBalanceRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ModuleBalanceRequestAminoMsg): ModuleBalanceRequest { + return ModuleBalanceRequest.fromAmino(object.value); + }, + toAminoMsg(message: ModuleBalanceRequest): ModuleBalanceRequestAminoMsg { + return { + type: "osmosis/lockup/module-balance-request", + value: ModuleBalanceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleBalanceRequestProtoMsg): ModuleBalanceRequest { + return ModuleBalanceRequest.decode(message.value); + }, + toProto(message: ModuleBalanceRequest): Uint8Array { + return ModuleBalanceRequest.encode(message).finish(); + }, + toProtoMsg(message: ModuleBalanceRequest): ModuleBalanceRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.ModuleBalanceRequest", + value: ModuleBalanceRequest.encode(message).finish() + }; } }; function createBaseModuleBalanceResponse(): ModuleBalanceResponse { @@ -269,6 +298,7 @@ function createBaseModuleBalanceResponse(): ModuleBalanceResponse { }; } export const ModuleBalanceResponse = { + typeUrl: "/osmosis.lockup.ModuleBalanceResponse", encode(message: ModuleBalanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -329,12 +359,48 @@ export const ModuleBalanceResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: ModuleBalanceResponseAmino): ModuleBalanceResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: ModuleBalanceResponse): ModuleBalanceResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: ModuleBalanceResponseAminoMsg): ModuleBalanceResponse { + return ModuleBalanceResponse.fromAmino(object.value); + }, + toAminoMsg(message: ModuleBalanceResponse): ModuleBalanceResponseAminoMsg { + return { + type: "osmosis/lockup/module-balance-response", + value: ModuleBalanceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleBalanceResponseProtoMsg): ModuleBalanceResponse { + return ModuleBalanceResponse.decode(message.value); + }, + toProto(message: ModuleBalanceResponse): Uint8Array { + return ModuleBalanceResponse.encode(message).finish(); + }, + toProtoMsg(message: ModuleBalanceResponse): ModuleBalanceResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.ModuleBalanceResponse", + value: ModuleBalanceResponse.encode(message).finish() + }; } }; function createBaseModuleLockedAmountRequest(): ModuleLockedAmountRequest { return {}; } export const ModuleLockedAmountRequest = { + typeUrl: "/osmosis.lockup.ModuleLockedAmountRequest", encode(_: ModuleLockedAmountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -372,6 +438,34 @@ export const ModuleLockedAmountRequest = { toSDK(_: ModuleLockedAmountRequest): ModuleLockedAmountRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ModuleLockedAmountRequestAmino): ModuleLockedAmountRequest { + return {}; + }, + toAmino(_: ModuleLockedAmountRequest): ModuleLockedAmountRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ModuleLockedAmountRequestAminoMsg): ModuleLockedAmountRequest { + return ModuleLockedAmountRequest.fromAmino(object.value); + }, + toAminoMsg(message: ModuleLockedAmountRequest): ModuleLockedAmountRequestAminoMsg { + return { + type: "osmosis/lockup/module-locked-amount-request", + value: ModuleLockedAmountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleLockedAmountRequestProtoMsg): ModuleLockedAmountRequest { + return ModuleLockedAmountRequest.decode(message.value); + }, + toProto(message: ModuleLockedAmountRequest): Uint8Array { + return ModuleLockedAmountRequest.encode(message).finish(); + }, + toProtoMsg(message: ModuleLockedAmountRequest): ModuleLockedAmountRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.ModuleLockedAmountRequest", + value: ModuleLockedAmountRequest.encode(message).finish() + }; } }; function createBaseModuleLockedAmountResponse(): ModuleLockedAmountResponse { @@ -380,6 +474,7 @@ function createBaseModuleLockedAmountResponse(): ModuleLockedAmountResponse { }; } export const ModuleLockedAmountResponse = { + typeUrl: "/osmosis.lockup.ModuleLockedAmountResponse", encode(message: ModuleLockedAmountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -440,6 +535,41 @@ export const ModuleLockedAmountResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: ModuleLockedAmountResponseAmino): ModuleLockedAmountResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: ModuleLockedAmountResponse): ModuleLockedAmountResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: ModuleLockedAmountResponseAminoMsg): ModuleLockedAmountResponse { + return ModuleLockedAmountResponse.fromAmino(object.value); + }, + toAminoMsg(message: ModuleLockedAmountResponse): ModuleLockedAmountResponseAminoMsg { + return { + type: "osmosis/lockup/module-locked-amount-response", + value: ModuleLockedAmountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleLockedAmountResponseProtoMsg): ModuleLockedAmountResponse { + return ModuleLockedAmountResponse.decode(message.value); + }, + toProto(message: ModuleLockedAmountResponse): Uint8Array { + return ModuleLockedAmountResponse.encode(message).finish(); + }, + toProtoMsg(message: ModuleLockedAmountResponse): ModuleLockedAmountResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.ModuleLockedAmountResponse", + value: ModuleLockedAmountResponse.encode(message).finish() + }; } }; function createBaseAccountUnlockableCoinsRequest(): AccountUnlockableCoinsRequest { @@ -448,6 +578,7 @@ function createBaseAccountUnlockableCoinsRequest(): AccountUnlockableCoinsReques }; } export const AccountUnlockableCoinsRequest = { + typeUrl: "/osmosis.lockup.AccountUnlockableCoinsRequest", encode(message: AccountUnlockableCoinsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -500,6 +631,37 @@ export const AccountUnlockableCoinsRequest = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: AccountUnlockableCoinsRequestAmino): AccountUnlockableCoinsRequest { + return { + owner: object.owner + }; + }, + toAmino(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: AccountUnlockableCoinsRequestAminoMsg): AccountUnlockableCoinsRequest { + return AccountUnlockableCoinsRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestAminoMsg { + return { + type: "osmosis/lockup/account-unlockable-coins-request", + value: AccountUnlockableCoinsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountUnlockableCoinsRequestProtoMsg): AccountUnlockableCoinsRequest { + return AccountUnlockableCoinsRequest.decode(message.value); + }, + toProto(message: AccountUnlockableCoinsRequest): Uint8Array { + return AccountUnlockableCoinsRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountUnlockableCoinsRequest): AccountUnlockableCoinsRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountUnlockableCoinsRequest", + value: AccountUnlockableCoinsRequest.encode(message).finish() + }; } }; function createBaseAccountUnlockableCoinsResponse(): AccountUnlockableCoinsResponse { @@ -508,6 +670,7 @@ function createBaseAccountUnlockableCoinsResponse(): AccountUnlockableCoinsRespo }; } export const AccountUnlockableCoinsResponse = { + typeUrl: "/osmosis.lockup.AccountUnlockableCoinsResponse", encode(message: AccountUnlockableCoinsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -568,6 +731,41 @@ export const AccountUnlockableCoinsResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: AccountUnlockableCoinsResponseAmino): AccountUnlockableCoinsResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountUnlockableCoinsResponse): AccountUnlockableCoinsResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: AccountUnlockableCoinsResponseAminoMsg): AccountUnlockableCoinsResponse { + return AccountUnlockableCoinsResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountUnlockableCoinsResponse): AccountUnlockableCoinsResponseAminoMsg { + return { + type: "osmosis/lockup/account-unlockable-coins-response", + value: AccountUnlockableCoinsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountUnlockableCoinsResponseProtoMsg): AccountUnlockableCoinsResponse { + return AccountUnlockableCoinsResponse.decode(message.value); + }, + toProto(message: AccountUnlockableCoinsResponse): Uint8Array { + return AccountUnlockableCoinsResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountUnlockableCoinsResponse): AccountUnlockableCoinsResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountUnlockableCoinsResponse", + value: AccountUnlockableCoinsResponse.encode(message).finish() + }; } }; function createBaseAccountUnlockingCoinsRequest(): AccountUnlockingCoinsRequest { @@ -576,6 +774,7 @@ function createBaseAccountUnlockingCoinsRequest(): AccountUnlockingCoinsRequest }; } export const AccountUnlockingCoinsRequest = { + typeUrl: "/osmosis.lockup.AccountUnlockingCoinsRequest", encode(message: AccountUnlockingCoinsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -628,6 +827,37 @@ export const AccountUnlockingCoinsRequest = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: AccountUnlockingCoinsRequestAmino): AccountUnlockingCoinsRequest { + return { + owner: object.owner + }; + }, + toAmino(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: AccountUnlockingCoinsRequestAminoMsg): AccountUnlockingCoinsRequest { + return AccountUnlockingCoinsRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestAminoMsg { + return { + type: "osmosis/lockup/account-unlocking-coins-request", + value: AccountUnlockingCoinsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountUnlockingCoinsRequestProtoMsg): AccountUnlockingCoinsRequest { + return AccountUnlockingCoinsRequest.decode(message.value); + }, + toProto(message: AccountUnlockingCoinsRequest): Uint8Array { + return AccountUnlockingCoinsRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountUnlockingCoinsRequest): AccountUnlockingCoinsRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountUnlockingCoinsRequest", + value: AccountUnlockingCoinsRequest.encode(message).finish() + }; } }; function createBaseAccountUnlockingCoinsResponse(): AccountUnlockingCoinsResponse { @@ -636,6 +866,7 @@ function createBaseAccountUnlockingCoinsResponse(): AccountUnlockingCoinsRespons }; } export const AccountUnlockingCoinsResponse = { + typeUrl: "/osmosis.lockup.AccountUnlockingCoinsResponse", encode(message: AccountUnlockingCoinsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -696,6 +927,41 @@ export const AccountUnlockingCoinsResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: AccountUnlockingCoinsResponseAmino): AccountUnlockingCoinsResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountUnlockingCoinsResponse): AccountUnlockingCoinsResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: AccountUnlockingCoinsResponseAminoMsg): AccountUnlockingCoinsResponse { + return AccountUnlockingCoinsResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountUnlockingCoinsResponse): AccountUnlockingCoinsResponseAminoMsg { + return { + type: "osmosis/lockup/account-unlocking-coins-response", + value: AccountUnlockingCoinsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountUnlockingCoinsResponseProtoMsg): AccountUnlockingCoinsResponse { + return AccountUnlockingCoinsResponse.decode(message.value); + }, + toProto(message: AccountUnlockingCoinsResponse): Uint8Array { + return AccountUnlockingCoinsResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountUnlockingCoinsResponse): AccountUnlockingCoinsResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountUnlockingCoinsResponse", + value: AccountUnlockingCoinsResponse.encode(message).finish() + }; } }; function createBaseAccountLockedCoinsRequest(): AccountLockedCoinsRequest { @@ -704,6 +970,7 @@ function createBaseAccountLockedCoinsRequest(): AccountLockedCoinsRequest { }; } export const AccountLockedCoinsRequest = { + typeUrl: "/osmosis.lockup.AccountLockedCoinsRequest", encode(message: AccountLockedCoinsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -756,6 +1023,37 @@ export const AccountLockedCoinsRequest = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: AccountLockedCoinsRequestAmino): AccountLockedCoinsRequest { + return { + owner: object.owner + }; + }, + toAmino(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: AccountLockedCoinsRequestAminoMsg): AccountLockedCoinsRequest { + return AccountLockedCoinsRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-coins-request", + value: AccountLockedCoinsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedCoinsRequestProtoMsg): AccountLockedCoinsRequest { + return AccountLockedCoinsRequest.decode(message.value); + }, + toProto(message: AccountLockedCoinsRequest): Uint8Array { + return AccountLockedCoinsRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedCoinsRequest): AccountLockedCoinsRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedCoinsRequest", + value: AccountLockedCoinsRequest.encode(message).finish() + }; } }; function createBaseAccountLockedCoinsResponse(): AccountLockedCoinsResponse { @@ -764,6 +1062,7 @@ function createBaseAccountLockedCoinsResponse(): AccountLockedCoinsResponse { }; } export const AccountLockedCoinsResponse = { + typeUrl: "/osmosis.lockup.AccountLockedCoinsResponse", encode(message: AccountLockedCoinsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -824,6 +1123,41 @@ export const AccountLockedCoinsResponse = { obj.coins = []; } return obj; + }, + fromAmino(object: AccountLockedCoinsResponseAmino): AccountLockedCoinsResponse { + return { + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedCoinsResponse): AccountLockedCoinsResponseAmino { + const obj: any = {}; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedCoinsResponseAminoMsg): AccountLockedCoinsResponse { + return AccountLockedCoinsResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedCoinsResponse): AccountLockedCoinsResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-coins-response", + value: AccountLockedCoinsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedCoinsResponseProtoMsg): AccountLockedCoinsResponse { + return AccountLockedCoinsResponse.decode(message.value); + }, + toProto(message: AccountLockedCoinsResponse): Uint8Array { + return AccountLockedCoinsResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedCoinsResponse): AccountLockedCoinsResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedCoinsResponse", + value: AccountLockedCoinsResponse.encode(message).finish() + }; } }; function createBaseAccountLockedPastTimeRequest(): AccountLockedPastTimeRequest { @@ -833,6 +1167,7 @@ function createBaseAccountLockedPastTimeRequest(): AccountLockedPastTimeRequest }; } export const AccountLockedPastTimeRequest = { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeRequest", encode(message: AccountLockedPastTimeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -897,6 +1232,39 @@ export const AccountLockedPastTimeRequest = { obj.owner = message.owner; message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); return obj; + }, + fromAmino(object: AccountLockedPastTimeRequestAmino): AccountLockedPastTimeRequest { + return { + owner: object.owner, + timestamp: object.timestamp + }; + }, + toAmino(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.timestamp = message.timestamp; + return obj; + }, + fromAminoMsg(object: AccountLockedPastTimeRequestAminoMsg): AccountLockedPastTimeRequest { + return AccountLockedPastTimeRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-past-time-request", + value: AccountLockedPastTimeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedPastTimeRequestProtoMsg): AccountLockedPastTimeRequest { + return AccountLockedPastTimeRequest.decode(message.value); + }, + toProto(message: AccountLockedPastTimeRequest): Uint8Array { + return AccountLockedPastTimeRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedPastTimeRequest): AccountLockedPastTimeRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeRequest", + value: AccountLockedPastTimeRequest.encode(message).finish() + }; } }; function createBaseAccountLockedPastTimeResponse(): AccountLockedPastTimeResponse { @@ -905,6 +1273,7 @@ function createBaseAccountLockedPastTimeResponse(): AccountLockedPastTimeRespons }; } export const AccountLockedPastTimeResponse = { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeResponse", encode(message: AccountLockedPastTimeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -965,6 +1334,41 @@ export const AccountLockedPastTimeResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedPastTimeResponseAmino): AccountLockedPastTimeResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedPastTimeResponse): AccountLockedPastTimeResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedPastTimeResponseAminoMsg): AccountLockedPastTimeResponse { + return AccountLockedPastTimeResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedPastTimeResponse): AccountLockedPastTimeResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-past-time-response", + value: AccountLockedPastTimeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedPastTimeResponseProtoMsg): AccountLockedPastTimeResponse { + return AccountLockedPastTimeResponse.decode(message.value); + }, + toProto(message: AccountLockedPastTimeResponse): Uint8Array { + return AccountLockedPastTimeResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedPastTimeResponse): AccountLockedPastTimeResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeResponse", + value: AccountLockedPastTimeResponse.encode(message).finish() + }; } }; function createBaseAccountLockedPastTimeNotUnlockingOnlyRequest(): AccountLockedPastTimeNotUnlockingOnlyRequest { @@ -974,6 +1378,7 @@ function createBaseAccountLockedPastTimeNotUnlockingOnlyRequest(): AccountLocked }; } export const AccountLockedPastTimeNotUnlockingOnlyRequest = { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyRequest", encode(message: AccountLockedPastTimeNotUnlockingOnlyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -1038,6 +1443,39 @@ export const AccountLockedPastTimeNotUnlockingOnlyRequest = { obj.owner = message.owner; message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); return obj; + }, + fromAmino(object: AccountLockedPastTimeNotUnlockingOnlyRequestAmino): AccountLockedPastTimeNotUnlockingOnlyRequest { + return { + owner: object.owner, + timestamp: object.timestamp + }; + }, + toAmino(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.timestamp = message.timestamp; + return obj; + }, + fromAminoMsg(object: AccountLockedPastTimeNotUnlockingOnlyRequestAminoMsg): AccountLockedPastTimeNotUnlockingOnlyRequest { + return AccountLockedPastTimeNotUnlockingOnlyRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-past-time-not-unlocking-only-request", + value: AccountLockedPastTimeNotUnlockingOnlyRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyRequestProtoMsg): AccountLockedPastTimeNotUnlockingOnlyRequest { + return AccountLockedPastTimeNotUnlockingOnlyRequest.decode(message.value); + }, + toProto(message: AccountLockedPastTimeNotUnlockingOnlyRequest): Uint8Array { + return AccountLockedPastTimeNotUnlockingOnlyRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyRequest): AccountLockedPastTimeNotUnlockingOnlyRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyRequest", + value: AccountLockedPastTimeNotUnlockingOnlyRequest.encode(message).finish() + }; } }; function createBaseAccountLockedPastTimeNotUnlockingOnlyResponse(): AccountLockedPastTimeNotUnlockingOnlyResponse { @@ -1046,6 +1484,7 @@ function createBaseAccountLockedPastTimeNotUnlockingOnlyResponse(): AccountLocke }; } export const AccountLockedPastTimeNotUnlockingOnlyResponse = { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyResponse", encode(message: AccountLockedPastTimeNotUnlockingOnlyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1106,6 +1545,41 @@ export const AccountLockedPastTimeNotUnlockingOnlyResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedPastTimeNotUnlockingOnlyResponseAmino): AccountLockedPastTimeNotUnlockingOnlyResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedPastTimeNotUnlockingOnlyResponse): AccountLockedPastTimeNotUnlockingOnlyResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedPastTimeNotUnlockingOnlyResponseAminoMsg): AccountLockedPastTimeNotUnlockingOnlyResponse { + return AccountLockedPastTimeNotUnlockingOnlyResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedPastTimeNotUnlockingOnlyResponse): AccountLockedPastTimeNotUnlockingOnlyResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-past-time-not-unlocking-only-response", + value: AccountLockedPastTimeNotUnlockingOnlyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyResponseProtoMsg): AccountLockedPastTimeNotUnlockingOnlyResponse { + return AccountLockedPastTimeNotUnlockingOnlyResponse.decode(message.value); + }, + toProto(message: AccountLockedPastTimeNotUnlockingOnlyResponse): Uint8Array { + return AccountLockedPastTimeNotUnlockingOnlyResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedPastTimeNotUnlockingOnlyResponse): AccountLockedPastTimeNotUnlockingOnlyResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeNotUnlockingOnlyResponse", + value: AccountLockedPastTimeNotUnlockingOnlyResponse.encode(message).finish() + }; } }; function createBaseAccountUnlockedBeforeTimeRequest(): AccountUnlockedBeforeTimeRequest { @@ -1115,6 +1589,7 @@ function createBaseAccountUnlockedBeforeTimeRequest(): AccountUnlockedBeforeTime }; } export const AccountUnlockedBeforeTimeRequest = { + typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeRequest", encode(message: AccountUnlockedBeforeTimeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -1179,6 +1654,39 @@ export const AccountUnlockedBeforeTimeRequest = { obj.owner = message.owner; message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); return obj; + }, + fromAmino(object: AccountUnlockedBeforeTimeRequestAmino): AccountUnlockedBeforeTimeRequest { + return { + owner: object.owner, + timestamp: object.timestamp + }; + }, + toAmino(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.timestamp = message.timestamp; + return obj; + }, + fromAminoMsg(object: AccountUnlockedBeforeTimeRequestAminoMsg): AccountUnlockedBeforeTimeRequest { + return AccountUnlockedBeforeTimeRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestAminoMsg { + return { + type: "osmosis/lockup/account-unlocked-before-time-request", + value: AccountUnlockedBeforeTimeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountUnlockedBeforeTimeRequestProtoMsg): AccountUnlockedBeforeTimeRequest { + return AccountUnlockedBeforeTimeRequest.decode(message.value); + }, + toProto(message: AccountUnlockedBeforeTimeRequest): Uint8Array { + return AccountUnlockedBeforeTimeRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountUnlockedBeforeTimeRequest): AccountUnlockedBeforeTimeRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeRequest", + value: AccountUnlockedBeforeTimeRequest.encode(message).finish() + }; } }; function createBaseAccountUnlockedBeforeTimeResponse(): AccountUnlockedBeforeTimeResponse { @@ -1187,6 +1695,7 @@ function createBaseAccountUnlockedBeforeTimeResponse(): AccountUnlockedBeforeTim }; } export const AccountUnlockedBeforeTimeResponse = { + typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeResponse", encode(message: AccountUnlockedBeforeTimeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1247,6 +1756,41 @@ export const AccountUnlockedBeforeTimeResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountUnlockedBeforeTimeResponseAmino): AccountUnlockedBeforeTimeResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountUnlockedBeforeTimeResponse): AccountUnlockedBeforeTimeResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountUnlockedBeforeTimeResponseAminoMsg): AccountUnlockedBeforeTimeResponse { + return AccountUnlockedBeforeTimeResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountUnlockedBeforeTimeResponse): AccountUnlockedBeforeTimeResponseAminoMsg { + return { + type: "osmosis/lockup/account-unlocked-before-time-response", + value: AccountUnlockedBeforeTimeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountUnlockedBeforeTimeResponseProtoMsg): AccountUnlockedBeforeTimeResponse { + return AccountUnlockedBeforeTimeResponse.decode(message.value); + }, + toProto(message: AccountUnlockedBeforeTimeResponse): Uint8Array { + return AccountUnlockedBeforeTimeResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountUnlockedBeforeTimeResponse): AccountUnlockedBeforeTimeResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountUnlockedBeforeTimeResponse", + value: AccountUnlockedBeforeTimeResponse.encode(message).finish() + }; } }; function createBaseAccountLockedPastTimeDenomRequest(): AccountLockedPastTimeDenomRequest { @@ -1257,6 +1801,7 @@ function createBaseAccountLockedPastTimeDenomRequest(): AccountLockedPastTimeDen }; } export const AccountLockedPastTimeDenomRequest = { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomRequest", encode(message: AccountLockedPastTimeDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -1333,6 +1878,41 @@ export const AccountLockedPastTimeDenomRequest = { message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); obj.denom = message.denom; return obj; + }, + fromAmino(object: AccountLockedPastTimeDenomRequestAmino): AccountLockedPastTimeDenomRequest { + return { + owner: object.owner, + timestamp: object.timestamp, + denom: object.denom + }; + }, + toAmino(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.timestamp = message.timestamp; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: AccountLockedPastTimeDenomRequestAminoMsg): AccountLockedPastTimeDenomRequest { + return AccountLockedPastTimeDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-past-time-denom-request", + value: AccountLockedPastTimeDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedPastTimeDenomRequestProtoMsg): AccountLockedPastTimeDenomRequest { + return AccountLockedPastTimeDenomRequest.decode(message.value); + }, + toProto(message: AccountLockedPastTimeDenomRequest): Uint8Array { + return AccountLockedPastTimeDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedPastTimeDenomRequest): AccountLockedPastTimeDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomRequest", + value: AccountLockedPastTimeDenomRequest.encode(message).finish() + }; } }; function createBaseAccountLockedPastTimeDenomResponse(): AccountLockedPastTimeDenomResponse { @@ -1341,6 +1921,7 @@ function createBaseAccountLockedPastTimeDenomResponse(): AccountLockedPastTimeDe }; } export const AccountLockedPastTimeDenomResponse = { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomResponse", encode(message: AccountLockedPastTimeDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1401,6 +1982,41 @@ export const AccountLockedPastTimeDenomResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedPastTimeDenomResponseAmino): AccountLockedPastTimeDenomResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedPastTimeDenomResponse): AccountLockedPastTimeDenomResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedPastTimeDenomResponseAminoMsg): AccountLockedPastTimeDenomResponse { + return AccountLockedPastTimeDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedPastTimeDenomResponse): AccountLockedPastTimeDenomResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-past-time-denom-response", + value: AccountLockedPastTimeDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedPastTimeDenomResponseProtoMsg): AccountLockedPastTimeDenomResponse { + return AccountLockedPastTimeDenomResponse.decode(message.value); + }, + toProto(message: AccountLockedPastTimeDenomResponse): Uint8Array { + return AccountLockedPastTimeDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedPastTimeDenomResponse): AccountLockedPastTimeDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedPastTimeDenomResponse", + value: AccountLockedPastTimeDenomResponse.encode(message).finish() + }; } }; function createBaseLockedDenomRequest(): LockedDenomRequest { @@ -1410,6 +2026,7 @@ function createBaseLockedDenomRequest(): LockedDenomRequest { }; } export const LockedDenomRequest = { + typeUrl: "/osmosis.lockup.LockedDenomRequest", encode(message: LockedDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -1468,12 +2085,45 @@ export const LockedDenomRequest = { denom: isSet(object.denom) ? String(object.denom) : "", duration: isSet(object.duration) ? Duration.fromSDKJSON(object.duration) : undefined }; - }, - toSDK(message: LockedDenomRequest): LockedDenomRequestSDKType { - const obj: any = {}; - obj.denom = message.denom; - message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); - return obj; + }, + toSDK(message: LockedDenomRequest): LockedDenomRequestSDKType { + const obj: any = {}; + obj.denom = message.denom; + message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); + return obj; + }, + fromAmino(object: LockedDenomRequestAmino): LockedDenomRequest { + return { + denom: object.denom, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: LockedDenomRequest): LockedDenomRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: LockedDenomRequestAminoMsg): LockedDenomRequest { + return LockedDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: LockedDenomRequest): LockedDenomRequestAminoMsg { + return { + type: "osmosis/lockup/locked-denom-request", + value: LockedDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: LockedDenomRequestProtoMsg): LockedDenomRequest { + return LockedDenomRequest.decode(message.value); + }, + toProto(message: LockedDenomRequest): Uint8Array { + return LockedDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: LockedDenomRequest): LockedDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.LockedDenomRequest", + value: LockedDenomRequest.encode(message).finish() + }; } }; function createBaseLockedDenomResponse(): LockedDenomResponse { @@ -1482,6 +2132,7 @@ function createBaseLockedDenomResponse(): LockedDenomResponse { }; } export const LockedDenomResponse = { + typeUrl: "/osmosis.lockup.LockedDenomResponse", encode(message: LockedDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.amount !== "") { writer.uint32(10).string(message.amount); @@ -1534,6 +2185,37 @@ export const LockedDenomResponse = { const obj: any = {}; obj.amount = message.amount; return obj; + }, + fromAmino(object: LockedDenomResponseAmino): LockedDenomResponse { + return { + amount: object.amount + }; + }, + toAmino(message: LockedDenomResponse): LockedDenomResponseAmino { + const obj: any = {}; + obj.amount = message.amount; + return obj; + }, + fromAminoMsg(object: LockedDenomResponseAminoMsg): LockedDenomResponse { + return LockedDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: LockedDenomResponse): LockedDenomResponseAminoMsg { + return { + type: "osmosis/lockup/locked-denom-response", + value: LockedDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: LockedDenomResponseProtoMsg): LockedDenomResponse { + return LockedDenomResponse.decode(message.value); + }, + toProto(message: LockedDenomResponse): Uint8Array { + return LockedDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: LockedDenomResponse): LockedDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.LockedDenomResponse", + value: LockedDenomResponse.encode(message).finish() + }; } }; function createBaseLockedRequest(): LockedRequest { @@ -1542,6 +2224,7 @@ function createBaseLockedRequest(): LockedRequest { }; } export const LockedRequest = { + typeUrl: "/osmosis.lockup.LockedRequest", encode(message: LockedRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lockId !== BigInt(0)) { writer.uint32(8).uint64(message.lockId); @@ -1594,6 +2277,37 @@ export const LockedRequest = { const obj: any = {}; obj.lock_id = message.lockId; return obj; + }, + fromAmino(object: LockedRequestAmino): LockedRequest { + return { + lockId: BigInt(object.lock_id) + }; + }, + toAmino(message: LockedRequest): LockedRequestAmino { + const obj: any = {}; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: LockedRequestAminoMsg): LockedRequest { + return LockedRequest.fromAmino(object.value); + }, + toAminoMsg(message: LockedRequest): LockedRequestAminoMsg { + return { + type: "osmosis/lockup/locked-request", + value: LockedRequest.toAmino(message) + }; + }, + fromProtoMsg(message: LockedRequestProtoMsg): LockedRequest { + return LockedRequest.decode(message.value); + }, + toProto(message: LockedRequest): Uint8Array { + return LockedRequest.encode(message).finish(); + }, + toProtoMsg(message: LockedRequest): LockedRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.LockedRequest", + value: LockedRequest.encode(message).finish() + }; } }; function createBaseLockedResponse(): LockedResponse { @@ -1602,6 +2316,7 @@ function createBaseLockedResponse(): LockedResponse { }; } export const LockedResponse = { + typeUrl: "/osmosis.lockup.LockedResponse", encode(message: LockedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lock !== undefined) { PeriodLock.encode(message.lock, writer.uint32(10).fork()).ldelim(); @@ -1654,6 +2369,37 @@ export const LockedResponse = { const obj: any = {}; message.lock !== undefined && (obj.lock = message.lock ? PeriodLock.toSDK(message.lock) : undefined); return obj; + }, + fromAmino(object: LockedResponseAmino): LockedResponse { + return { + lock: object?.lock ? PeriodLock.fromAmino(object.lock) : undefined + }; + }, + toAmino(message: LockedResponse): LockedResponseAmino { + const obj: any = {}; + obj.lock = message.lock ? PeriodLock.toAmino(message.lock) : undefined; + return obj; + }, + fromAminoMsg(object: LockedResponseAminoMsg): LockedResponse { + return LockedResponse.fromAmino(object.value); + }, + toAminoMsg(message: LockedResponse): LockedResponseAminoMsg { + return { + type: "osmosis/lockup/locked-response", + value: LockedResponse.toAmino(message) + }; + }, + fromProtoMsg(message: LockedResponseProtoMsg): LockedResponse { + return LockedResponse.decode(message.value); + }, + toProto(message: LockedResponse): Uint8Array { + return LockedResponse.encode(message).finish(); + }, + toProtoMsg(message: LockedResponse): LockedResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.LockedResponse", + value: LockedResponse.encode(message).finish() + }; } }; function createBaseSyntheticLockupsByLockupIDRequest(): SyntheticLockupsByLockupIDRequest { @@ -1662,6 +2408,7 @@ function createBaseSyntheticLockupsByLockupIDRequest(): SyntheticLockupsByLockup }; } export const SyntheticLockupsByLockupIDRequest = { + typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDRequest", encode(message: SyntheticLockupsByLockupIDRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lockId !== BigInt(0)) { writer.uint32(8).uint64(message.lockId); @@ -1714,6 +2461,37 @@ export const SyntheticLockupsByLockupIDRequest = { const obj: any = {}; obj.lock_id = message.lockId; return obj; + }, + fromAmino(object: SyntheticLockupsByLockupIDRequestAmino): SyntheticLockupsByLockupIDRequest { + return { + lockId: BigInt(object.lock_id) + }; + }, + toAmino(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAmino { + const obj: any = {}; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SyntheticLockupsByLockupIDRequestAminoMsg): SyntheticLockupsByLockupIDRequest { + return SyntheticLockupsByLockupIDRequest.fromAmino(object.value); + }, + toAminoMsg(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestAminoMsg { + return { + type: "osmosis/lockup/synthetic-lockups-by-lockup-id-request", + value: SyntheticLockupsByLockupIDRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SyntheticLockupsByLockupIDRequestProtoMsg): SyntheticLockupsByLockupIDRequest { + return SyntheticLockupsByLockupIDRequest.decode(message.value); + }, + toProto(message: SyntheticLockupsByLockupIDRequest): Uint8Array { + return SyntheticLockupsByLockupIDRequest.encode(message).finish(); + }, + toProtoMsg(message: SyntheticLockupsByLockupIDRequest): SyntheticLockupsByLockupIDRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDRequest", + value: SyntheticLockupsByLockupIDRequest.encode(message).finish() + }; } }; function createBaseSyntheticLockupsByLockupIDResponse(): SyntheticLockupsByLockupIDResponse { @@ -1722,6 +2500,7 @@ function createBaseSyntheticLockupsByLockupIDResponse(): SyntheticLockupsByLocku }; } export const SyntheticLockupsByLockupIDResponse = { + typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDResponse", encode(message: SyntheticLockupsByLockupIDResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.syntheticLocks) { SyntheticLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1782,6 +2561,41 @@ export const SyntheticLockupsByLockupIDResponse = { obj.synthetic_locks = []; } return obj; + }, + fromAmino(object: SyntheticLockupsByLockupIDResponseAmino): SyntheticLockupsByLockupIDResponse { + return { + syntheticLocks: Array.isArray(object?.synthetic_locks) ? object.synthetic_locks.map((e: any) => SyntheticLock.fromAmino(e)) : [] + }; + }, + toAmino(message: SyntheticLockupsByLockupIDResponse): SyntheticLockupsByLockupIDResponseAmino { + const obj: any = {}; + if (message.syntheticLocks) { + obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); + } else { + obj.synthetic_locks = []; + } + return obj; + }, + fromAminoMsg(object: SyntheticLockupsByLockupIDResponseAminoMsg): SyntheticLockupsByLockupIDResponse { + return SyntheticLockupsByLockupIDResponse.fromAmino(object.value); + }, + toAminoMsg(message: SyntheticLockupsByLockupIDResponse): SyntheticLockupsByLockupIDResponseAminoMsg { + return { + type: "osmosis/lockup/synthetic-lockups-by-lockup-id-response", + value: SyntheticLockupsByLockupIDResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SyntheticLockupsByLockupIDResponseProtoMsg): SyntheticLockupsByLockupIDResponse { + return SyntheticLockupsByLockupIDResponse.decode(message.value); + }, + toProto(message: SyntheticLockupsByLockupIDResponse): Uint8Array { + return SyntheticLockupsByLockupIDResponse.encode(message).finish(); + }, + toProtoMsg(message: SyntheticLockupsByLockupIDResponse): SyntheticLockupsByLockupIDResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.SyntheticLockupsByLockupIDResponse", + value: SyntheticLockupsByLockupIDResponse.encode(message).finish() + }; } }; function createBaseAccountLockedLongerDurationRequest(): AccountLockedLongerDurationRequest { @@ -1791,6 +2605,7 @@ function createBaseAccountLockedLongerDurationRequest(): AccountLockedLongerDura }; } export const AccountLockedLongerDurationRequest = { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationRequest", encode(message: AccountLockedLongerDurationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -1855,6 +2670,39 @@ export const AccountLockedLongerDurationRequest = { obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; + }, + fromAmino(object: AccountLockedLongerDurationRequestAmino): AccountLockedLongerDurationRequest { + return { + owner: object.owner, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: AccountLockedLongerDurationRequestAminoMsg): AccountLockedLongerDurationRequest { + return AccountLockedLongerDurationRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-longer-duration-request", + value: AccountLockedLongerDurationRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedLongerDurationRequestProtoMsg): AccountLockedLongerDurationRequest { + return AccountLockedLongerDurationRequest.decode(message.value); + }, + toProto(message: AccountLockedLongerDurationRequest): Uint8Array { + return AccountLockedLongerDurationRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedLongerDurationRequest): AccountLockedLongerDurationRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationRequest", + value: AccountLockedLongerDurationRequest.encode(message).finish() + }; } }; function createBaseAccountLockedLongerDurationResponse(): AccountLockedLongerDurationResponse { @@ -1863,6 +2711,7 @@ function createBaseAccountLockedLongerDurationResponse(): AccountLockedLongerDur }; } export const AccountLockedLongerDurationResponse = { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationResponse", encode(message: AccountLockedLongerDurationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1923,6 +2772,41 @@ export const AccountLockedLongerDurationResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedLongerDurationResponseAmino): AccountLockedLongerDurationResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedLongerDurationResponse): AccountLockedLongerDurationResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedLongerDurationResponseAminoMsg): AccountLockedLongerDurationResponse { + return AccountLockedLongerDurationResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedLongerDurationResponse): AccountLockedLongerDurationResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-longer-duration-response", + value: AccountLockedLongerDurationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedLongerDurationResponseProtoMsg): AccountLockedLongerDurationResponse { + return AccountLockedLongerDurationResponse.decode(message.value); + }, + toProto(message: AccountLockedLongerDurationResponse): Uint8Array { + return AccountLockedLongerDurationResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedLongerDurationResponse): AccountLockedLongerDurationResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationResponse", + value: AccountLockedLongerDurationResponse.encode(message).finish() + }; } }; function createBaseAccountLockedDurationRequest(): AccountLockedDurationRequest { @@ -1932,6 +2816,7 @@ function createBaseAccountLockedDurationRequest(): AccountLockedDurationRequest }; } export const AccountLockedDurationRequest = { + typeUrl: "/osmosis.lockup.AccountLockedDurationRequest", encode(message: AccountLockedDurationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -1996,6 +2881,39 @@ export const AccountLockedDurationRequest = { obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; + }, + fromAmino(object: AccountLockedDurationRequestAmino): AccountLockedDurationRequest { + return { + owner: object.owner, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: AccountLockedDurationRequest): AccountLockedDurationRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: AccountLockedDurationRequestAminoMsg): AccountLockedDurationRequest { + return AccountLockedDurationRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedDurationRequest): AccountLockedDurationRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-duration-request", + value: AccountLockedDurationRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedDurationRequestProtoMsg): AccountLockedDurationRequest { + return AccountLockedDurationRequest.decode(message.value); + }, + toProto(message: AccountLockedDurationRequest): Uint8Array { + return AccountLockedDurationRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedDurationRequest): AccountLockedDurationRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedDurationRequest", + value: AccountLockedDurationRequest.encode(message).finish() + }; } }; function createBaseAccountLockedDurationResponse(): AccountLockedDurationResponse { @@ -2004,6 +2922,7 @@ function createBaseAccountLockedDurationResponse(): AccountLockedDurationRespons }; } export const AccountLockedDurationResponse = { + typeUrl: "/osmosis.lockup.AccountLockedDurationResponse", encode(message: AccountLockedDurationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2064,6 +2983,41 @@ export const AccountLockedDurationResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedDurationResponseAmino): AccountLockedDurationResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedDurationResponse): AccountLockedDurationResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedDurationResponseAminoMsg): AccountLockedDurationResponse { + return AccountLockedDurationResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedDurationResponse): AccountLockedDurationResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-duration-response", + value: AccountLockedDurationResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedDurationResponseProtoMsg): AccountLockedDurationResponse { + return AccountLockedDurationResponse.decode(message.value); + }, + toProto(message: AccountLockedDurationResponse): Uint8Array { + return AccountLockedDurationResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedDurationResponse): AccountLockedDurationResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedDurationResponse", + value: AccountLockedDurationResponse.encode(message).finish() + }; } }; function createBaseAccountLockedLongerDurationNotUnlockingOnlyRequest(): AccountLockedLongerDurationNotUnlockingOnlyRequest { @@ -2073,6 +3027,7 @@ function createBaseAccountLockedLongerDurationNotUnlockingOnlyRequest(): Account }; } export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyRequest", encode(message: AccountLockedLongerDurationNotUnlockingOnlyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -2137,6 +3092,39 @@ export const AccountLockedLongerDurationNotUnlockingOnlyRequest = { obj.owner = message.owner; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; + }, + fromAmino(object: AccountLockedLongerDurationNotUnlockingOnlyRequestAmino): AccountLockedLongerDurationNotUnlockingOnlyRequest { + return { + owner: object.owner, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: AccountLockedLongerDurationNotUnlockingOnlyRequestAminoMsg): AccountLockedLongerDurationNotUnlockingOnlyRequest { + return AccountLockedLongerDurationNotUnlockingOnlyRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-request", + value: AccountLockedLongerDurationNotUnlockingOnlyRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyRequestProtoMsg): AccountLockedLongerDurationNotUnlockingOnlyRequest { + return AccountLockedLongerDurationNotUnlockingOnlyRequest.decode(message.value); + }, + toProto(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): Uint8Array { + return AccountLockedLongerDurationNotUnlockingOnlyRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyRequest): AccountLockedLongerDurationNotUnlockingOnlyRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyRequest", + value: AccountLockedLongerDurationNotUnlockingOnlyRequest.encode(message).finish() + }; } }; function createBaseAccountLockedLongerDurationNotUnlockingOnlyResponse(): AccountLockedLongerDurationNotUnlockingOnlyResponse { @@ -2145,6 +3133,7 @@ function createBaseAccountLockedLongerDurationNotUnlockingOnlyResponse(): Accoun }; } export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyResponse", encode(message: AccountLockedLongerDurationNotUnlockingOnlyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2205,6 +3194,41 @@ export const AccountLockedLongerDurationNotUnlockingOnlyResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedLongerDurationNotUnlockingOnlyResponseAmino): AccountLockedLongerDurationNotUnlockingOnlyResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): AccountLockedLongerDurationNotUnlockingOnlyResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedLongerDurationNotUnlockingOnlyResponseAminoMsg): AccountLockedLongerDurationNotUnlockingOnlyResponse { + return AccountLockedLongerDurationNotUnlockingOnlyResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): AccountLockedLongerDurationNotUnlockingOnlyResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-longer-duration-not-unlocking-only-response", + value: AccountLockedLongerDurationNotUnlockingOnlyResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyResponseProtoMsg): AccountLockedLongerDurationNotUnlockingOnlyResponse { + return AccountLockedLongerDurationNotUnlockingOnlyResponse.decode(message.value); + }, + toProto(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): Uint8Array { + return AccountLockedLongerDurationNotUnlockingOnlyResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedLongerDurationNotUnlockingOnlyResponse): AccountLockedLongerDurationNotUnlockingOnlyResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationNotUnlockingOnlyResponse", + value: AccountLockedLongerDurationNotUnlockingOnlyResponse.encode(message).finish() + }; } }; function createBaseAccountLockedLongerDurationDenomRequest(): AccountLockedLongerDurationDenomRequest { @@ -2215,6 +3239,7 @@ function createBaseAccountLockedLongerDurationDenomRequest(): AccountLockedLonge }; } export const AccountLockedLongerDurationDenomRequest = { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomRequest", encode(message: AccountLockedLongerDurationDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -2291,6 +3316,41 @@ export const AccountLockedLongerDurationDenomRequest = { message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); obj.denom = message.denom; return obj; + }, + fromAmino(object: AccountLockedLongerDurationDenomRequestAmino): AccountLockedLongerDurationDenomRequest { + return { + owner: object.owner, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + denom: object.denom + }; + }, + toAmino(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: AccountLockedLongerDurationDenomRequestAminoMsg): AccountLockedLongerDurationDenomRequest { + return AccountLockedLongerDurationDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestAminoMsg { + return { + type: "osmosis/lockup/account-locked-longer-duration-denom-request", + value: AccountLockedLongerDurationDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedLongerDurationDenomRequestProtoMsg): AccountLockedLongerDurationDenomRequest { + return AccountLockedLongerDurationDenomRequest.decode(message.value); + }, + toProto(message: AccountLockedLongerDurationDenomRequest): Uint8Array { + return AccountLockedLongerDurationDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedLongerDurationDenomRequest): AccountLockedLongerDurationDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomRequest", + value: AccountLockedLongerDurationDenomRequest.encode(message).finish() + }; } }; function createBaseAccountLockedLongerDurationDenomResponse(): AccountLockedLongerDurationDenomResponse { @@ -2299,6 +3359,7 @@ function createBaseAccountLockedLongerDurationDenomResponse(): AccountLockedLong }; } export const AccountLockedLongerDurationDenomResponse = { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomResponse", encode(message: AccountLockedLongerDurationDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2359,12 +3420,48 @@ export const AccountLockedLongerDurationDenomResponse = { obj.locks = []; } return obj; + }, + fromAmino(object: AccountLockedLongerDurationDenomResponseAmino): AccountLockedLongerDurationDenomResponse { + return { + locks: Array.isArray(object?.locks) ? object.locks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: AccountLockedLongerDurationDenomResponse): AccountLockedLongerDurationDenomResponseAmino { + const obj: any = {}; + if (message.locks) { + obj.locks = message.locks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.locks = []; + } + return obj; + }, + fromAminoMsg(object: AccountLockedLongerDurationDenomResponseAminoMsg): AccountLockedLongerDurationDenomResponse { + return AccountLockedLongerDurationDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: AccountLockedLongerDurationDenomResponse): AccountLockedLongerDurationDenomResponseAminoMsg { + return { + type: "osmosis/lockup/account-locked-longer-duration-denom-response", + value: AccountLockedLongerDurationDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AccountLockedLongerDurationDenomResponseProtoMsg): AccountLockedLongerDurationDenomResponse { + return AccountLockedLongerDurationDenomResponse.decode(message.value); + }, + toProto(message: AccountLockedLongerDurationDenomResponse): Uint8Array { + return AccountLockedLongerDurationDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: AccountLockedLongerDurationDenomResponse): AccountLockedLongerDurationDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.AccountLockedLongerDurationDenomResponse", + value: AccountLockedLongerDurationDenomResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.lockup.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2402,6 +3499,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/lockup/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.lockup.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -2410,6 +3535,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.lockup.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -2462,5 +3588,36 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/lockup/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts index 53b41e7093..69a9fc1966 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/lockup/tx.ts @@ -110,6 +110,7 @@ function createBaseMsgLockTokens(): MsgLockTokens { }; } export const MsgLockTokens = { + typeUrl: "/osmosis.lockup.MsgLockTokens", encode(message: MsgLockTokens, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -194,6 +195,45 @@ export const MsgLockTokens = { obj.coins = []; } return obj; + }, + fromAmino(object: MsgLockTokensAmino): MsgLockTokens { + return { + owner: object.owner, + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgLockTokens): MsgLockTokensAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: MsgLockTokensAminoMsg): MsgLockTokens { + return MsgLockTokens.fromAmino(object.value); + }, + toAminoMsg(message: MsgLockTokens): MsgLockTokensAminoMsg { + return { + type: "osmosis/lockup/lock-tokens", + value: MsgLockTokens.toAmino(message) + }; + }, + fromProtoMsg(message: MsgLockTokensProtoMsg): MsgLockTokens { + return MsgLockTokens.decode(message.value); + }, + toProto(message: MsgLockTokens): Uint8Array { + return MsgLockTokens.encode(message).finish(); + }, + toProtoMsg(message: MsgLockTokens): MsgLockTokensProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgLockTokens", + value: MsgLockTokens.encode(message).finish() + }; } }; function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { @@ -202,6 +242,7 @@ function createBaseMsgLockTokensResponse(): MsgLockTokensResponse { }; } 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); @@ -254,6 +295,37 @@ export const MsgLockTokensResponse = { const obj: any = {}; obj.ID = message.ID; return obj; + }, + fromAmino(object: MsgLockTokensResponseAmino): MsgLockTokensResponse { + return { + ID: BigInt(object.ID) + }; + }, + toAmino(message: MsgLockTokensResponse): MsgLockTokensResponseAmino { + const obj: any = {}; + obj.ID = message.ID ? message.ID.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgLockTokensResponseAminoMsg): MsgLockTokensResponse { + return MsgLockTokensResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgLockTokensResponse): MsgLockTokensResponseAminoMsg { + return { + type: "osmosis/lockup/lock-tokens-response", + value: MsgLockTokensResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgLockTokensResponseProtoMsg): MsgLockTokensResponse { + return MsgLockTokensResponse.decode(message.value); + }, + toProto(message: MsgLockTokensResponse): Uint8Array { + return MsgLockTokensResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgLockTokensResponse): MsgLockTokensResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgLockTokensResponse", + value: MsgLockTokensResponse.encode(message).finish() + }; } }; function createBaseMsgBeginUnlockingAll(): MsgBeginUnlockingAll { @@ -262,6 +334,7 @@ function createBaseMsgBeginUnlockingAll(): MsgBeginUnlockingAll { }; } export const MsgBeginUnlockingAll = { + typeUrl: "/osmosis.lockup.MsgBeginUnlockingAll", encode(message: MsgBeginUnlockingAll, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -314,6 +387,37 @@ export const MsgBeginUnlockingAll = { const obj: any = {}; obj.owner = message.owner; return obj; + }, + fromAmino(object: MsgBeginUnlockingAllAmino): MsgBeginUnlockingAll { + return { + owner: object.owner + }; + }, + toAmino(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAmino { + const obj: any = {}; + obj.owner = message.owner; + return obj; + }, + fromAminoMsg(object: MsgBeginUnlockingAllAminoMsg): MsgBeginUnlockingAll { + return MsgBeginUnlockingAll.fromAmino(object.value); + }, + toAminoMsg(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllAminoMsg { + return { + type: "osmosis/lockup/begin-unlock-tokens", + value: MsgBeginUnlockingAll.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBeginUnlockingAllProtoMsg): MsgBeginUnlockingAll { + return MsgBeginUnlockingAll.decode(message.value); + }, + toProto(message: MsgBeginUnlockingAll): Uint8Array { + return MsgBeginUnlockingAll.encode(message).finish(); + }, + toProtoMsg(message: MsgBeginUnlockingAll): MsgBeginUnlockingAllProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgBeginUnlockingAll", + value: MsgBeginUnlockingAll.encode(message).finish() + }; } }; function createBaseMsgBeginUnlockingAllResponse(): MsgBeginUnlockingAllResponse { @@ -322,6 +426,7 @@ function createBaseMsgBeginUnlockingAllResponse(): MsgBeginUnlockingAllResponse }; } export const MsgBeginUnlockingAllResponse = { + typeUrl: "/osmosis.lockup.MsgBeginUnlockingAllResponse", encode(message: MsgBeginUnlockingAllResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unlocks) { PeriodLock.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -382,6 +487,41 @@ export const MsgBeginUnlockingAllResponse = { obj.unlocks = []; } return obj; + }, + fromAmino(object: MsgBeginUnlockingAllResponseAmino): MsgBeginUnlockingAllResponse { + return { + unlocks: Array.isArray(object?.unlocks) ? object.unlocks.map((e: any) => PeriodLock.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgBeginUnlockingAllResponse): MsgBeginUnlockingAllResponseAmino { + const obj: any = {}; + if (message.unlocks) { + obj.unlocks = message.unlocks.map(e => e ? PeriodLock.toAmino(e) : undefined); + } else { + obj.unlocks = []; + } + return obj; + }, + fromAminoMsg(object: MsgBeginUnlockingAllResponseAminoMsg): MsgBeginUnlockingAllResponse { + return MsgBeginUnlockingAllResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgBeginUnlockingAllResponse): MsgBeginUnlockingAllResponseAminoMsg { + return { + type: "osmosis/lockup/begin-unlocking-all-response", + value: MsgBeginUnlockingAllResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBeginUnlockingAllResponseProtoMsg): MsgBeginUnlockingAllResponse { + return MsgBeginUnlockingAllResponse.decode(message.value); + }, + toProto(message: MsgBeginUnlockingAllResponse): Uint8Array { + return MsgBeginUnlockingAllResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgBeginUnlockingAllResponse): MsgBeginUnlockingAllResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgBeginUnlockingAllResponse", + value: MsgBeginUnlockingAllResponse.encode(message).finish() + }; } }; function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { @@ -392,6 +532,7 @@ function createBaseMsgBeginUnlocking(): MsgBeginUnlocking { }; } export const MsgBeginUnlocking = { + typeUrl: "/osmosis.lockup.MsgBeginUnlocking", encode(message: MsgBeginUnlocking, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -476,6 +617,45 @@ export const MsgBeginUnlocking = { obj.coins = []; } return obj; + }, + fromAmino(object: MsgBeginUnlockingAmino): MsgBeginUnlocking { + return { + owner: object.owner, + ID: BigInt(object.ID), + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgBeginUnlocking): MsgBeginUnlockingAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.ID = message.ID ? message.ID.toString() : undefined; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: MsgBeginUnlockingAminoMsg): MsgBeginUnlocking { + return MsgBeginUnlocking.fromAmino(object.value); + }, + toAminoMsg(message: MsgBeginUnlocking): MsgBeginUnlockingAminoMsg { + return { + type: "osmosis/lockup/begin-unlock-period-lock", + value: MsgBeginUnlocking.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBeginUnlockingProtoMsg): MsgBeginUnlocking { + return MsgBeginUnlocking.decode(message.value); + }, + toProto(message: MsgBeginUnlocking): Uint8Array { + return MsgBeginUnlocking.encode(message).finish(); + }, + toProtoMsg(message: MsgBeginUnlocking): MsgBeginUnlockingProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgBeginUnlocking", + value: MsgBeginUnlocking.encode(message).finish() + }; } }; function createBaseMsgBeginUnlockingResponse(): MsgBeginUnlockingResponse { @@ -484,6 +664,7 @@ function createBaseMsgBeginUnlockingResponse(): MsgBeginUnlockingResponse { }; } export const MsgBeginUnlockingResponse = { + typeUrl: "/osmosis.lockup.MsgBeginUnlockingResponse", encode(message: MsgBeginUnlockingResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.success === true) { writer.uint32(8).bool(message.success); @@ -536,6 +717,37 @@ export const MsgBeginUnlockingResponse = { const obj: any = {}; obj.success = message.success; return obj; + }, + fromAmino(object: MsgBeginUnlockingResponseAmino): MsgBeginUnlockingResponse { + return { + success: object.success + }; + }, + toAmino(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAmino { + const obj: any = {}; + obj.success = message.success; + return obj; + }, + fromAminoMsg(object: MsgBeginUnlockingResponseAminoMsg): MsgBeginUnlockingResponse { + return MsgBeginUnlockingResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseAminoMsg { + return { + type: "osmosis/lockup/begin-unlocking-response", + value: MsgBeginUnlockingResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBeginUnlockingResponseProtoMsg): MsgBeginUnlockingResponse { + return MsgBeginUnlockingResponse.decode(message.value); + }, + toProto(message: MsgBeginUnlockingResponse): Uint8Array { + return MsgBeginUnlockingResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgBeginUnlockingResponse): MsgBeginUnlockingResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgBeginUnlockingResponse", + value: MsgBeginUnlockingResponse.encode(message).finish() + }; } }; function createBaseMsgExtendLockup(): MsgExtendLockup { @@ -546,6 +758,7 @@ function createBaseMsgExtendLockup(): MsgExtendLockup { }; } export const MsgExtendLockup = { + typeUrl: "/osmosis.lockup.MsgExtendLockup", encode(message: MsgExtendLockup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -622,6 +835,41 @@ export const MsgExtendLockup = { obj.ID = message.ID; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; + }, + fromAmino(object: MsgExtendLockupAmino): MsgExtendLockup { + return { + owner: object.owner, + ID: BigInt(object.ID), + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: MsgExtendLockup): MsgExtendLockupAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.ID = message.ID ? message.ID.toString() : undefined; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: MsgExtendLockupAminoMsg): MsgExtendLockup { + return MsgExtendLockup.fromAmino(object.value); + }, + toAminoMsg(message: MsgExtendLockup): MsgExtendLockupAminoMsg { + return { + type: "osmosis/lockup/extend-lockup", + value: MsgExtendLockup.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExtendLockupProtoMsg): MsgExtendLockup { + return MsgExtendLockup.decode(message.value); + }, + toProto(message: MsgExtendLockup): Uint8Array { + return MsgExtendLockup.encode(message).finish(); + }, + toProtoMsg(message: MsgExtendLockup): MsgExtendLockupProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgExtendLockup", + value: MsgExtendLockup.encode(message).finish() + }; } }; function createBaseMsgExtendLockupResponse(): MsgExtendLockupResponse { @@ -630,6 +878,7 @@ function createBaseMsgExtendLockupResponse(): MsgExtendLockupResponse { }; } export const MsgExtendLockupResponse = { + typeUrl: "/osmosis.lockup.MsgExtendLockupResponse", encode(message: MsgExtendLockupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.success === true) { writer.uint32(8).bool(message.success); @@ -682,6 +931,37 @@ export const MsgExtendLockupResponse = { const obj: any = {}; obj.success = message.success; return obj; + }, + fromAmino(object: MsgExtendLockupResponseAmino): MsgExtendLockupResponse { + return { + success: object.success + }; + }, + toAmino(message: MsgExtendLockupResponse): MsgExtendLockupResponseAmino { + const obj: any = {}; + obj.success = message.success; + return obj; + }, + fromAminoMsg(object: MsgExtendLockupResponseAminoMsg): MsgExtendLockupResponse { + return MsgExtendLockupResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgExtendLockupResponse): MsgExtendLockupResponseAminoMsg { + return { + type: "osmosis/lockup/extend-lockup-response", + value: MsgExtendLockupResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgExtendLockupResponseProtoMsg): MsgExtendLockupResponse { + return MsgExtendLockupResponse.decode(message.value); + }, + toProto(message: MsgExtendLockupResponse): Uint8Array { + return MsgExtendLockupResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgExtendLockupResponse): MsgExtendLockupResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgExtendLockupResponse", + value: MsgExtendLockupResponse.encode(message).finish() + }; } }; function createBaseMsgForceUnlock(): MsgForceUnlock { @@ -692,6 +972,7 @@ function createBaseMsgForceUnlock(): MsgForceUnlock { }; } export const MsgForceUnlock = { + typeUrl: "/osmosis.lockup.MsgForceUnlock", encode(message: MsgForceUnlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); @@ -776,6 +1057,45 @@ export const MsgForceUnlock = { obj.coins = []; } return obj; + }, + fromAmino(object: MsgForceUnlockAmino): MsgForceUnlock { + return { + owner: object.owner, + ID: BigInt(object.ID), + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgForceUnlock): MsgForceUnlockAmino { + const obj: any = {}; + obj.owner = message.owner; + obj.ID = message.ID ? message.ID.toString() : undefined; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + return obj; + }, + fromAminoMsg(object: MsgForceUnlockAminoMsg): MsgForceUnlock { + return MsgForceUnlock.fromAmino(object.value); + }, + toAminoMsg(message: MsgForceUnlock): MsgForceUnlockAminoMsg { + return { + type: "osmosis/lockup/force-unlock", + value: MsgForceUnlock.toAmino(message) + }; + }, + fromProtoMsg(message: MsgForceUnlockProtoMsg): MsgForceUnlock { + return MsgForceUnlock.decode(message.value); + }, + toProto(message: MsgForceUnlock): Uint8Array { + return MsgForceUnlock.encode(message).finish(); + }, + toProtoMsg(message: MsgForceUnlock): MsgForceUnlockProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgForceUnlock", + value: MsgForceUnlock.encode(message).finish() + }; } }; function createBaseMsgForceUnlockResponse(): MsgForceUnlockResponse { @@ -784,6 +1104,7 @@ function createBaseMsgForceUnlockResponse(): MsgForceUnlockResponse { }; } export const MsgForceUnlockResponse = { + typeUrl: "/osmosis.lockup.MsgForceUnlockResponse", encode(message: MsgForceUnlockResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.success === true) { writer.uint32(8).bool(message.success); @@ -836,5 +1157,36 @@ export const MsgForceUnlockResponse = { const obj: any = {}; obj.success = message.success; return obj; + }, + fromAmino(object: MsgForceUnlockResponseAmino): MsgForceUnlockResponse { + return { + success: object.success + }; + }, + toAmino(message: MsgForceUnlockResponse): MsgForceUnlockResponseAmino { + const obj: any = {}; + obj.success = message.success; + return obj; + }, + fromAminoMsg(object: MsgForceUnlockResponseAminoMsg): MsgForceUnlockResponse { + return MsgForceUnlockResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgForceUnlockResponse): MsgForceUnlockResponseAminoMsg { + return { + type: "osmosis/lockup/force-unlock-response", + value: MsgForceUnlockResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgForceUnlockResponseProtoMsg): MsgForceUnlockResponse { + return MsgForceUnlockResponse.decode(message.value); + }, + toProto(message: MsgForceUnlockResponse): Uint8Array { + return MsgForceUnlockResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgForceUnlockResponse): MsgForceUnlockResponseProtoMsg { + return { + typeUrl: "/osmosis.lockup.MsgForceUnlockResponse", + value: MsgForceUnlockResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts index 567fbeb2ce..41d0eab8b0 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/genesis.ts @@ -28,6 +28,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.mint.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.minter !== undefined) { Minter.encode(message.minter, writer.uint32(10).fork()).ldelim(); @@ -104,5 +105,40 @@ export const GenesisState = { message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); obj.reduction_started_epoch = message.reductionStartedEpoch; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + minter: object?.minter ? Minter.fromAmino(object.minter) : undefined, + params: object?.params ? Params.fromAmino(object.params) : undefined, + reductionStartedEpoch: BigInt(object.reduction_started_epoch) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.minter = message.minter ? Minter.toAmino(message.minter) : undefined; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + obj.reduction_started_epoch = message.reductionStartedEpoch ? message.reductionStartedEpoch.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/mint/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts index 185c43e492..df061dc4ea 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/mint.ts @@ -121,6 +121,7 @@ function createBaseMinter(): Minter { }; } export const Minter = { + typeUrl: "/osmosis.mint.v1beta1.Minter", encode(message: Minter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.epochProvisions !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.epochProvisions, 18).atomics); @@ -173,6 +174,37 @@ export const Minter = { const obj: any = {}; obj.epoch_provisions = message.epochProvisions; return obj; + }, + fromAmino(object: MinterAmino): Minter { + return { + epochProvisions: object.epoch_provisions + }; + }, + toAmino(message: Minter): MinterAmino { + const obj: any = {}; + obj.epoch_provisions = message.epochProvisions; + return obj; + }, + fromAminoMsg(object: MinterAminoMsg): Minter { + return Minter.fromAmino(object.value); + }, + toAminoMsg(message: Minter): MinterAminoMsg { + return { + type: "osmosis/mint/minter", + value: Minter.toAmino(message) + }; + }, + fromProtoMsg(message: MinterProtoMsg): Minter { + return Minter.decode(message.value); + }, + toProto(message: Minter): Uint8Array { + return Minter.encode(message).finish(); + }, + toProtoMsg(message: Minter): MinterProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.Minter", + value: Minter.encode(message).finish() + }; } }; function createBaseWeightedAddress(): WeightedAddress { @@ -182,6 +214,7 @@ function createBaseWeightedAddress(): WeightedAddress { }; } export const WeightedAddress = { + typeUrl: "/osmosis.mint.v1beta1.WeightedAddress", encode(message: WeightedAddress, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -246,6 +279,39 @@ export const WeightedAddress = { obj.address = message.address; obj.weight = message.weight; return obj; + }, + fromAmino(object: WeightedAddressAmino): WeightedAddress { + return { + address: object.address, + weight: object.weight + }; + }, + toAmino(message: WeightedAddress): WeightedAddressAmino { + const obj: any = {}; + obj.address = message.address; + obj.weight = message.weight; + return obj; + }, + fromAminoMsg(object: WeightedAddressAminoMsg): WeightedAddress { + return WeightedAddress.fromAmino(object.value); + }, + toAminoMsg(message: WeightedAddress): WeightedAddressAminoMsg { + return { + type: "osmosis/mint/weighted-address", + value: WeightedAddress.toAmino(message) + }; + }, + fromProtoMsg(message: WeightedAddressProtoMsg): WeightedAddress { + return WeightedAddress.decode(message.value); + }, + toProto(message: WeightedAddress): Uint8Array { + return WeightedAddress.encode(message).finish(); + }, + toProtoMsg(message: WeightedAddress): WeightedAddressProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.WeightedAddress", + value: WeightedAddress.encode(message).finish() + }; } }; function createBaseDistributionProportions(): DistributionProportions { @@ -257,6 +323,7 @@ function createBaseDistributionProportions(): DistributionProportions { }; } export const DistributionProportions = { + typeUrl: "/osmosis.mint.v1beta1.DistributionProportions", encode(message: DistributionProportions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.staking !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.staking, 18).atomics); @@ -345,6 +412,43 @@ export const DistributionProportions = { obj.developer_rewards = message.developerRewards; obj.community_pool = message.communityPool; return obj; + }, + fromAmino(object: DistributionProportionsAmino): DistributionProportions { + return { + staking: object.staking, + poolIncentives: object.pool_incentives, + developerRewards: object.developer_rewards, + communityPool: object.community_pool + }; + }, + toAmino(message: DistributionProportions): DistributionProportionsAmino { + const obj: any = {}; + obj.staking = message.staking; + obj.pool_incentives = message.poolIncentives; + obj.developer_rewards = message.developerRewards; + obj.community_pool = message.communityPool; + return obj; + }, + fromAminoMsg(object: DistributionProportionsAminoMsg): DistributionProportions { + return DistributionProportions.fromAmino(object.value); + }, + toAminoMsg(message: DistributionProportions): DistributionProportionsAminoMsg { + return { + type: "osmosis/mint/distribution-proportions", + value: DistributionProportions.toAmino(message) + }; + }, + fromProtoMsg(message: DistributionProportionsProtoMsg): DistributionProportions { + return DistributionProportions.decode(message.value); + }, + toProto(message: DistributionProportions): Uint8Array { + return DistributionProportions.encode(message).finish(); + }, + toProtoMsg(message: DistributionProportions): DistributionProportionsProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.DistributionProportions", + value: DistributionProportions.encode(message).finish() + }; } }; function createBaseParams(): Params { @@ -360,6 +464,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.mint.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mintDenom !== "") { writer.uint32(10).string(message.mintDenom); @@ -504,5 +609,54 @@ export const Params = { } obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + mintDenom: object.mint_denom, + genesisEpochProvisions: object.genesis_epoch_provisions, + epochIdentifier: object.epoch_identifier, + reductionPeriodInEpochs: BigInt(object.reduction_period_in_epochs), + reductionFactor: object.reduction_factor, + distributionProportions: object?.distribution_proportions ? DistributionProportions.fromAmino(object.distribution_proportions) : undefined, + weightedDeveloperRewardsReceivers: Array.isArray(object?.weighted_developer_rewards_receivers) ? object.weighted_developer_rewards_receivers.map((e: any) => WeightedAddress.fromAmino(e)) : [], + mintingRewardsDistributionStartEpoch: BigInt(object.minting_rewards_distribution_start_epoch) + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.mint_denom = message.mintDenom; + obj.genesis_epoch_provisions = message.genesisEpochProvisions; + obj.epoch_identifier = message.epochIdentifier; + obj.reduction_period_in_epochs = message.reductionPeriodInEpochs ? message.reductionPeriodInEpochs.toString() : undefined; + obj.reduction_factor = message.reductionFactor; + obj.distribution_proportions = message.distributionProportions ? DistributionProportions.toAmino(message.distributionProportions) : undefined; + if (message.weightedDeveloperRewardsReceivers) { + obj.weighted_developer_rewards_receivers = message.weightedDeveloperRewardsReceivers.map(e => e ? WeightedAddress.toAmino(e) : undefined); + } else { + obj.weighted_developer_rewards_receivers = []; + } + obj.minting_rewards_distribution_start_epoch = message.mintingRewardsDistributionStartEpoch ? message.mintingRewardsDistributionStartEpoch.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/mint/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/query.ts index e6be8d3da2..e7c273b8e0 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/mint/v1beta1/query.ts @@ -44,6 +44,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.mint.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -81,6 +82,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/mint/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -89,6 +118,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.mint.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -141,12 +171,44 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/mint/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryEpochProvisionsRequest(): QueryEpochProvisionsRequest { return {}; } export const QueryEpochProvisionsRequest = { + typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsRequest", encode(_: QueryEpochProvisionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -184,6 +246,34 @@ export const QueryEpochProvisionsRequest = { toSDK(_: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryEpochProvisionsRequestAmino): QueryEpochProvisionsRequest { + return {}; + }, + toAmino(_: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryEpochProvisionsRequestAminoMsg): QueryEpochProvisionsRequest { + return QueryEpochProvisionsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestAminoMsg { + return { + type: "osmosis/mint/query-epoch-provisions-request", + value: QueryEpochProvisionsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryEpochProvisionsRequestProtoMsg): QueryEpochProvisionsRequest { + return QueryEpochProvisionsRequest.decode(message.value); + }, + toProto(message: QueryEpochProvisionsRequest): Uint8Array { + return QueryEpochProvisionsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochProvisionsRequest): QueryEpochProvisionsRequestProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsRequest", + value: QueryEpochProvisionsRequest.encode(message).finish() + }; } }; function createBaseQueryEpochProvisionsResponse(): QueryEpochProvisionsResponse { @@ -192,6 +282,7 @@ function createBaseQueryEpochProvisionsResponse(): QueryEpochProvisionsResponse }; } export const QueryEpochProvisionsResponse = { + typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsResponse", encode(message: QueryEpochProvisionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.epochProvisions.length !== 0) { writer.uint32(10).bytes(message.epochProvisions); @@ -244,5 +335,36 @@ export const QueryEpochProvisionsResponse = { const obj: any = {}; obj.epoch_provisions = message.epochProvisions; return obj; + }, + fromAmino(object: QueryEpochProvisionsResponseAmino): QueryEpochProvisionsResponse { + return { + epochProvisions: object.epoch_provisions + }; + }, + toAmino(message: QueryEpochProvisionsResponse): QueryEpochProvisionsResponseAmino { + const obj: any = {}; + obj.epoch_provisions = message.epochProvisions; + return obj; + }, + fromAminoMsg(object: QueryEpochProvisionsResponseAminoMsg): QueryEpochProvisionsResponse { + return QueryEpochProvisionsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryEpochProvisionsResponse): QueryEpochProvisionsResponseAminoMsg { + return { + type: "osmosis/mint/query-epoch-provisions-response", + value: QueryEpochProvisionsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryEpochProvisionsResponseProtoMsg): QueryEpochProvisionsResponse { + return QueryEpochProvisionsResponse.decode(message.value); + }, + toProto(message: QueryEpochProvisionsResponse): Uint8Array { + return QueryEpochProvisionsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryEpochProvisionsResponse): QueryEpochProvisionsResponseProtoMsg { + return { + typeUrl: "/osmosis.mint.v1beta1.QueryEpochProvisionsResponse", + value: QueryEpochProvisionsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/genesis.ts index b22deda731..acdf902ad2 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/genesis.ts @@ -27,6 +27,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.poolincentives.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -123,5 +124,46 @@ export const GenesisState = { message.distrInfo !== undefined && (obj.distr_info = message.distrInfo ? DistrInfo.toSDK(message.distrInfo) : undefined); message.poolToGauges !== undefined && (obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toSDK(message.poolToGauges) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + lockableDurations: Array.isArray(object?.lockable_durations) ? object.lockable_durations.map((e: any) => Duration.fromAmino(e)) : [], + distrInfo: object?.distr_info ? DistrInfo.fromAmino(object.distr_info) : undefined, + poolToGauges: object?.pool_to_gauges ? PoolToGauges.fromAmino(object.pool_to_gauges) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.lockableDurations) { + obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); + } else { + obj.lockable_durations = []; + } + obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; + obj.pool_to_gauges = message.poolToGauges ? PoolToGauges.toAmino(message.poolToGauges) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/poolincentives/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/gov.ts index 2eced5ae41..f2efb65c85 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/gov.ts @@ -66,6 +66,7 @@ function createBaseReplacePoolIncentivesProposal(): ReplacePoolIncentivesProposa }; } export const ReplacePoolIncentivesProposal = { + typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal", encode(message: ReplacePoolIncentivesProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -150,6 +151,45 @@ export const ReplacePoolIncentivesProposal = { obj.records = []; } return obj; + }, + fromAmino(object: ReplacePoolIncentivesProposalAmino): ReplacePoolIncentivesProposal { + return { + title: object.title, + description: object.description, + records: Array.isArray(object?.records) ? object.records.map((e: any) => DistrRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.records) { + obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); + } else { + obj.records = []; + } + return obj; + }, + fromAminoMsg(object: ReplacePoolIncentivesProposalAminoMsg): ReplacePoolIncentivesProposal { + return ReplacePoolIncentivesProposal.fromAmino(object.value); + }, + toAminoMsg(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalAminoMsg { + return { + type: "osmosis/poolincentives/replace-pool-incentives-proposal", + value: ReplacePoolIncentivesProposal.toAmino(message) + }; + }, + fromProtoMsg(message: ReplacePoolIncentivesProposalProtoMsg): ReplacePoolIncentivesProposal { + return ReplacePoolIncentivesProposal.decode(message.value); + }, + toProto(message: ReplacePoolIncentivesProposal): Uint8Array { + return ReplacePoolIncentivesProposal.encode(message).finish(); + }, + toProtoMsg(message: ReplacePoolIncentivesProposal): ReplacePoolIncentivesProposalProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.ReplacePoolIncentivesProposal", + value: ReplacePoolIncentivesProposal.encode(message).finish() + }; } }; function createBaseUpdatePoolIncentivesProposal(): UpdatePoolIncentivesProposal { @@ -160,6 +200,7 @@ function createBaseUpdatePoolIncentivesProposal(): UpdatePoolIncentivesProposal }; } export const UpdatePoolIncentivesProposal = { + typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal", encode(message: UpdatePoolIncentivesProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -244,5 +285,44 @@ export const UpdatePoolIncentivesProposal = { obj.records = []; } return obj; + }, + fromAmino(object: UpdatePoolIncentivesProposalAmino): UpdatePoolIncentivesProposal { + return { + title: object.title, + description: object.description, + records: Array.isArray(object?.records) ? object.records.map((e: any) => DistrRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.records) { + obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); + } else { + obj.records = []; + } + return obj; + }, + fromAminoMsg(object: UpdatePoolIncentivesProposalAminoMsg): UpdatePoolIncentivesProposal { + return UpdatePoolIncentivesProposal.fromAmino(object.value); + }, + toAminoMsg(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalAminoMsg { + return { + type: "osmosis/poolincentives/update-pool-incentives-proposal", + value: UpdatePoolIncentivesProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UpdatePoolIncentivesProposalProtoMsg): UpdatePoolIncentivesProposal { + return UpdatePoolIncentivesProposal.decode(message.value); + }, + toProto(message: UpdatePoolIncentivesProposal): Uint8Array { + return UpdatePoolIncentivesProposal.encode(message).finish(); + }, + toProtoMsg(message: UpdatePoolIncentivesProposal): UpdatePoolIncentivesProposalProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.UpdatePoolIncentivesProposal", + value: UpdatePoolIncentivesProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/incentives.ts b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/incentives.ts index 86f6c5d230..5071971c38 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/incentives.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/incentives.ts @@ -58,6 +58,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.poolincentives.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mintedDenom !== "") { writer.uint32(10).string(message.mintedDenom); @@ -110,6 +111,37 @@ export const Params = { const obj: any = {}; obj.minted_denom = message.mintedDenom; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + mintedDenom: object.minted_denom + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.minted_denom = message.mintedDenom; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/poolincentives/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseLockableDurationsInfo(): LockableDurationsInfo { @@ -118,6 +150,7 @@ function createBaseLockableDurationsInfo(): LockableDurationsInfo { }; } export const LockableDurationsInfo = { + typeUrl: "/osmosis.poolincentives.v1beta1.LockableDurationsInfo", encode(message: LockableDurationsInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.lockableDurations) { Duration.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -178,6 +211,41 @@ export const LockableDurationsInfo = { obj.lockable_durations = []; } return obj; + }, + fromAmino(object: LockableDurationsInfoAmino): LockableDurationsInfo { + return { + lockableDurations: Array.isArray(object?.lockable_durations) ? object.lockable_durations.map((e: any) => Duration.fromAmino(e)) : [] + }; + }, + toAmino(message: LockableDurationsInfo): LockableDurationsInfoAmino { + const obj: any = {}; + if (message.lockableDurations) { + obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); + } else { + obj.lockable_durations = []; + } + return obj; + }, + fromAminoMsg(object: LockableDurationsInfoAminoMsg): LockableDurationsInfo { + return LockableDurationsInfo.fromAmino(object.value); + }, + toAminoMsg(message: LockableDurationsInfo): LockableDurationsInfoAminoMsg { + return { + type: "osmosis/poolincentives/lockable-durations-info", + value: LockableDurationsInfo.toAmino(message) + }; + }, + fromProtoMsg(message: LockableDurationsInfoProtoMsg): LockableDurationsInfo { + return LockableDurationsInfo.decode(message.value); + }, + toProto(message: LockableDurationsInfo): Uint8Array { + return LockableDurationsInfo.encode(message).finish(); + }, + toProtoMsg(message: LockableDurationsInfo): LockableDurationsInfoProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.LockableDurationsInfo", + value: LockableDurationsInfo.encode(message).finish() + }; } }; function createBaseDistrInfo(): DistrInfo { @@ -187,6 +255,7 @@ function createBaseDistrInfo(): DistrInfo { }; } export const DistrInfo = { + typeUrl: "/osmosis.poolincentives.v1beta1.DistrInfo", encode(message: DistrInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.totalWeight !== "") { writer.uint32(10).string(message.totalWeight); @@ -259,6 +328,43 @@ export const DistrInfo = { obj.records = []; } return obj; + }, + fromAmino(object: DistrInfoAmino): DistrInfo { + return { + totalWeight: object.total_weight, + records: Array.isArray(object?.records) ? object.records.map((e: any) => DistrRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: DistrInfo): DistrInfoAmino { + const obj: any = {}; + obj.total_weight = message.totalWeight; + if (message.records) { + obj.records = message.records.map(e => e ? DistrRecord.toAmino(e) : undefined); + } else { + obj.records = []; + } + return obj; + }, + fromAminoMsg(object: DistrInfoAminoMsg): DistrInfo { + return DistrInfo.fromAmino(object.value); + }, + toAminoMsg(message: DistrInfo): DistrInfoAminoMsg { + return { + type: "osmosis/poolincentives/distr-info", + value: DistrInfo.toAmino(message) + }; + }, + fromProtoMsg(message: DistrInfoProtoMsg): DistrInfo { + return DistrInfo.decode(message.value); + }, + toProto(message: DistrInfo): Uint8Array { + return DistrInfo.encode(message).finish(); + }, + toProtoMsg(message: DistrInfo): DistrInfoProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.DistrInfo", + value: DistrInfo.encode(message).finish() + }; } }; function createBaseDistrRecord(): DistrRecord { @@ -268,6 +374,7 @@ function createBaseDistrRecord(): DistrRecord { }; } export const DistrRecord = { + typeUrl: "/osmosis.poolincentives.v1beta1.DistrRecord", encode(message: DistrRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gaugeId !== BigInt(0)) { writer.uint32(8).uint64(message.gaugeId); @@ -332,6 +439,39 @@ export const DistrRecord = { obj.gauge_id = message.gaugeId; obj.weight = message.weight; return obj; + }, + fromAmino(object: DistrRecordAmino): DistrRecord { + return { + gaugeId: BigInt(object.gauge_id), + weight: object.weight + }; + }, + toAmino(message: DistrRecord): DistrRecordAmino { + const obj: any = {}; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.weight = message.weight; + return obj; + }, + fromAminoMsg(object: DistrRecordAminoMsg): DistrRecord { + return DistrRecord.fromAmino(object.value); + }, + toAminoMsg(message: DistrRecord): DistrRecordAminoMsg { + return { + type: "osmosis/poolincentives/distr-record", + value: DistrRecord.toAmino(message) + }; + }, + fromProtoMsg(message: DistrRecordProtoMsg): DistrRecord { + return DistrRecord.decode(message.value); + }, + toProto(message: DistrRecord): Uint8Array { + return DistrRecord.encode(message).finish(); + }, + toProtoMsg(message: DistrRecord): DistrRecordProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.DistrRecord", + value: DistrRecord.encode(message).finish() + }; } }; function createBasePoolToGauge(): PoolToGauge { @@ -342,6 +482,7 @@ function createBasePoolToGauge(): PoolToGauge { }; } export const PoolToGauge = { + typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauge", encode(message: PoolToGauge, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -418,6 +559,41 @@ export const PoolToGauge = { obj.gauge_id = message.gaugeId; message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); return obj; + }, + fromAmino(object: PoolToGaugeAmino): PoolToGauge { + return { + poolId: BigInt(object.pool_id), + gaugeId: BigInt(object.gauge_id), + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined + }; + }, + toAmino(message: PoolToGauge): PoolToGaugeAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + return obj; + }, + fromAminoMsg(object: PoolToGaugeAminoMsg): PoolToGauge { + return PoolToGauge.fromAmino(object.value); + }, + toAminoMsg(message: PoolToGauge): PoolToGaugeAminoMsg { + return { + type: "osmosis/poolincentives/pool-to-gauge", + value: PoolToGauge.toAmino(message) + }; + }, + fromProtoMsg(message: PoolToGaugeProtoMsg): PoolToGauge { + return PoolToGauge.decode(message.value); + }, + toProto(message: PoolToGauge): Uint8Array { + return PoolToGauge.encode(message).finish(); + }, + toProtoMsg(message: PoolToGauge): PoolToGaugeProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauge", + value: PoolToGauge.encode(message).finish() + }; } }; function createBasePoolToGauges(): PoolToGauges { @@ -426,6 +602,7 @@ function createBasePoolToGauges(): PoolToGauges { }; } export const PoolToGauges = { + typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauges", encode(message: PoolToGauges, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.poolToGauge) { PoolToGauge.encode(v!, writer.uint32(18).fork()).ldelim(); @@ -486,5 +663,40 @@ export const PoolToGauges = { obj.pool_to_gauge = []; } return obj; + }, + fromAmino(object: PoolToGaugesAmino): PoolToGauges { + return { + poolToGauge: Array.isArray(object?.pool_to_gauge) ? object.pool_to_gauge.map((e: any) => PoolToGauge.fromAmino(e)) : [] + }; + }, + toAmino(message: PoolToGauges): PoolToGaugesAmino { + const obj: any = {}; + if (message.poolToGauge) { + obj.pool_to_gauge = message.poolToGauge.map(e => e ? PoolToGauge.toAmino(e) : undefined); + } else { + obj.pool_to_gauge = []; + } + return obj; + }, + fromAminoMsg(object: PoolToGaugesAminoMsg): PoolToGauges { + return PoolToGauges.fromAmino(object.value); + }, + toAminoMsg(message: PoolToGauges): PoolToGaugesAminoMsg { + return { + type: "osmosis/poolincentives/pool-to-gauges", + value: PoolToGauges.toAmino(message) + }; + }, + fromProtoMsg(message: PoolToGaugesProtoMsg): PoolToGauges { + return PoolToGauges.decode(message.value); + }, + toProto(message: PoolToGauges): Uint8Array { + return PoolToGauges.encode(message).finish(); + }, + toProtoMsg(message: PoolToGauges): PoolToGaugesProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.PoolToGauges", + value: PoolToGauges.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/query.ts index c901c17222..798b5c1585 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/pool-incentives/v1beta1/query.ts @@ -82,6 +82,7 @@ function createBaseQueryGaugeIdsRequest(): QueryGaugeIdsRequest { }; } export const QueryGaugeIdsRequest = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsRequest", encode(message: QueryGaugeIdsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -134,6 +135,37 @@ export const QueryGaugeIdsRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: QueryGaugeIdsRequestAmino): QueryGaugeIdsRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryGaugeIdsRequestAminoMsg): QueryGaugeIdsRequest { + return QueryGaugeIdsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestAminoMsg { + return { + type: "osmosis/poolincentives/query-gauge-ids-request", + value: QueryGaugeIdsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGaugeIdsRequestProtoMsg): QueryGaugeIdsRequest { + return QueryGaugeIdsRequest.decode(message.value); + }, + toProto(message: QueryGaugeIdsRequest): Uint8Array { + return QueryGaugeIdsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGaugeIdsRequest): QueryGaugeIdsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsRequest", + value: QueryGaugeIdsRequest.encode(message).finish() + }; } }; function createBaseQueryGaugeIdsResponse(): QueryGaugeIdsResponse { @@ -142,6 +174,7 @@ function createBaseQueryGaugeIdsResponse(): QueryGaugeIdsResponse { }; } export const QueryGaugeIdsResponse = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsResponse", encode(message: QueryGaugeIdsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.gaugeIdsWithDuration) { QueryGaugeIdsResponse_GaugeIdWithDuration.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -202,6 +235,41 @@ export const QueryGaugeIdsResponse = { obj.gauge_ids_with_duration = []; } return obj; + }, + fromAmino(object: QueryGaugeIdsResponseAmino): QueryGaugeIdsResponse { + return { + gaugeIdsWithDuration: Array.isArray(object?.gauge_ids_with_duration) ? object.gauge_ids_with_duration.map((e: any) => QueryGaugeIdsResponse_GaugeIdWithDuration.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryGaugeIdsResponse): QueryGaugeIdsResponseAmino { + const obj: any = {}; + if (message.gaugeIdsWithDuration) { + obj.gauge_ids_with_duration = message.gaugeIdsWithDuration.map(e => e ? QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(e) : undefined); + } else { + obj.gauge_ids_with_duration = []; + } + return obj; + }, + fromAminoMsg(object: QueryGaugeIdsResponseAminoMsg): QueryGaugeIdsResponse { + return QueryGaugeIdsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGaugeIdsResponse): QueryGaugeIdsResponseAminoMsg { + return { + type: "osmosis/poolincentives/query-gauge-ids-response", + value: QueryGaugeIdsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGaugeIdsResponseProtoMsg): QueryGaugeIdsResponse { + return QueryGaugeIdsResponse.decode(message.value); + }, + toProto(message: QueryGaugeIdsResponse): Uint8Array { + return QueryGaugeIdsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGaugeIdsResponse): QueryGaugeIdsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryGaugeIdsResponse", + value: QueryGaugeIdsResponse.encode(message).finish() + }; } }; function createBaseQueryGaugeIdsResponse_GaugeIdWithDuration(): QueryGaugeIdsResponse_GaugeIdWithDuration { @@ -212,6 +280,7 @@ function createBaseQueryGaugeIdsResponse_GaugeIdWithDuration(): QueryGaugeIdsRes }; } export const QueryGaugeIdsResponse_GaugeIdWithDuration = { + typeUrl: "/osmosis.poolincentives.v1beta1.GaugeIdWithDuration", encode(message: QueryGaugeIdsResponse_GaugeIdWithDuration, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gaugeId !== BigInt(0)) { writer.uint32(8).uint64(message.gaugeId); @@ -288,12 +357,48 @@ export const QueryGaugeIdsResponse_GaugeIdWithDuration = { message.duration !== undefined && (obj.duration = message.duration ? Duration.toSDK(message.duration) : undefined); obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; return obj; + }, + fromAmino(object: QueryGaugeIdsResponse_GaugeIdWithDurationAmino): QueryGaugeIdsResponse_GaugeIdWithDuration { + return { + gaugeId: BigInt(object.gauge_id), + duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, + gaugeIncentivePercentage: object.gauge_incentive_percentage + }; + }, + toAmino(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAmino { + const obj: any = {}; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.duration = message.duration ? Duration.toAmino(message.duration) : undefined; + obj.gauge_incentive_percentage = message.gaugeIncentivePercentage; + return obj; + }, + fromAminoMsg(object: QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { + return QueryGaugeIdsResponse_GaugeIdWithDuration.fromAmino(object.value); + }, + toAminoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationAminoMsg { + return { + type: "osmosis/poolincentives/gauge-id-with-duration", + value: QueryGaugeIdsResponse_GaugeIdWithDuration.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDurationProtoMsg): QueryGaugeIdsResponse_GaugeIdWithDuration { + return QueryGaugeIdsResponse_GaugeIdWithDuration.decode(message.value); + }, + toProto(message: QueryGaugeIdsResponse_GaugeIdWithDuration): Uint8Array { + return QueryGaugeIdsResponse_GaugeIdWithDuration.encode(message).finish(); + }, + toProtoMsg(message: QueryGaugeIdsResponse_GaugeIdWithDuration): QueryGaugeIdsResponse_GaugeIdWithDurationProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.GaugeIdWithDuration", + value: QueryGaugeIdsResponse_GaugeIdWithDuration.encode(message).finish() + }; } }; function createBaseQueryDistrInfoRequest(): QueryDistrInfoRequest { return {}; } export const QueryDistrInfoRequest = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoRequest", encode(_: QueryDistrInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -331,6 +436,34 @@ export const QueryDistrInfoRequest = { toSDK(_: QueryDistrInfoRequest): QueryDistrInfoRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryDistrInfoRequestAmino): QueryDistrInfoRequest { + return {}; + }, + toAmino(_: QueryDistrInfoRequest): QueryDistrInfoRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryDistrInfoRequestAminoMsg): QueryDistrInfoRequest { + return QueryDistrInfoRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDistrInfoRequest): QueryDistrInfoRequestAminoMsg { + return { + type: "osmosis/poolincentives/query-distr-info-request", + value: QueryDistrInfoRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDistrInfoRequestProtoMsg): QueryDistrInfoRequest { + return QueryDistrInfoRequest.decode(message.value); + }, + toProto(message: QueryDistrInfoRequest): Uint8Array { + return QueryDistrInfoRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDistrInfoRequest): QueryDistrInfoRequestProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoRequest", + value: QueryDistrInfoRequest.encode(message).finish() + }; } }; function createBaseQueryDistrInfoResponse(): QueryDistrInfoResponse { @@ -339,6 +472,7 @@ function createBaseQueryDistrInfoResponse(): QueryDistrInfoResponse { }; } export const QueryDistrInfoResponse = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoResponse", encode(message: QueryDistrInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.distrInfo !== undefined) { DistrInfo.encode(message.distrInfo, writer.uint32(10).fork()).ldelim(); @@ -391,12 +525,44 @@ export const QueryDistrInfoResponse = { const obj: any = {}; message.distrInfo !== undefined && (obj.distr_info = message.distrInfo ? DistrInfo.toSDK(message.distrInfo) : undefined); return obj; + }, + fromAmino(object: QueryDistrInfoResponseAmino): QueryDistrInfoResponse { + return { + distrInfo: object?.distr_info ? DistrInfo.fromAmino(object.distr_info) : undefined + }; + }, + toAmino(message: QueryDistrInfoResponse): QueryDistrInfoResponseAmino { + const obj: any = {}; + obj.distr_info = message.distrInfo ? DistrInfo.toAmino(message.distrInfo) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDistrInfoResponseAminoMsg): QueryDistrInfoResponse { + return QueryDistrInfoResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDistrInfoResponse): QueryDistrInfoResponseAminoMsg { + return { + type: "osmosis/poolincentives/query-distr-info-response", + value: QueryDistrInfoResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDistrInfoResponseProtoMsg): QueryDistrInfoResponse { + return QueryDistrInfoResponse.decode(message.value); + }, + toProto(message: QueryDistrInfoResponse): Uint8Array { + return QueryDistrInfoResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDistrInfoResponse): QueryDistrInfoResponseProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryDistrInfoResponse", + value: QueryDistrInfoResponse.encode(message).finish() + }; } }; function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -434,6 +600,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/poolincentives/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -442,6 +636,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -494,12 +689,44 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/poolincentives/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryLockableDurationsRequest(): QueryLockableDurationsRequest { return {}; } export const QueryLockableDurationsRequest = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsRequest", encode(_: QueryLockableDurationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -537,6 +764,34 @@ export const QueryLockableDurationsRequest = { toSDK(_: QueryLockableDurationsRequest): QueryLockableDurationsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryLockableDurationsRequestAmino): QueryLockableDurationsRequest { + return {}; + }, + toAmino(_: QueryLockableDurationsRequest): QueryLockableDurationsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryLockableDurationsRequestAminoMsg): QueryLockableDurationsRequest { + return QueryLockableDurationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestAminoMsg { + return { + type: "osmosis/poolincentives/query-lockable-durations-request", + value: QueryLockableDurationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLockableDurationsRequestProtoMsg): QueryLockableDurationsRequest { + return QueryLockableDurationsRequest.decode(message.value); + }, + toProto(message: QueryLockableDurationsRequest): Uint8Array { + return QueryLockableDurationsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryLockableDurationsRequest): QueryLockableDurationsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsRequest", + value: QueryLockableDurationsRequest.encode(message).finish() + }; } }; function createBaseQueryLockableDurationsResponse(): QueryLockableDurationsResponse { @@ -545,6 +800,7 @@ function createBaseQueryLockableDurationsResponse(): QueryLockableDurationsRespo }; } export const QueryLockableDurationsResponse = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsResponse", encode(message: QueryLockableDurationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.lockableDurations) { Duration.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -605,12 +861,48 @@ export const QueryLockableDurationsResponse = { obj.lockable_durations = []; } return obj; + }, + fromAmino(object: QueryLockableDurationsResponseAmino): QueryLockableDurationsResponse { + return { + lockableDurations: Array.isArray(object?.lockable_durations) ? object.lockable_durations.map((e: any) => Duration.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseAmino { + const obj: any = {}; + if (message.lockableDurations) { + obj.lockable_durations = message.lockableDurations.map(e => e ? Duration.toAmino(e) : undefined); + } else { + obj.lockable_durations = []; + } + return obj; + }, + fromAminoMsg(object: QueryLockableDurationsResponseAminoMsg): QueryLockableDurationsResponse { + return QueryLockableDurationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseAminoMsg { + return { + type: "osmosis/poolincentives/query-lockable-durations-response", + value: QueryLockableDurationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryLockableDurationsResponseProtoMsg): QueryLockableDurationsResponse { + return QueryLockableDurationsResponse.decode(message.value); + }, + toProto(message: QueryLockableDurationsResponse): Uint8Array { + return QueryLockableDurationsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryLockableDurationsResponse): QueryLockableDurationsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryLockableDurationsResponse", + value: QueryLockableDurationsResponse.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPoolsRequest(): QueryIncentivizedPoolsRequest { return {}; } export const QueryIncentivizedPoolsRequest = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsRequest", encode(_: QueryIncentivizedPoolsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -648,6 +940,34 @@ export const QueryIncentivizedPoolsRequest = { toSDK(_: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryIncentivizedPoolsRequestAmino): QueryIncentivizedPoolsRequest { + return {}; + }, + toAmino(_: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPoolsRequestAminoMsg): QueryIncentivizedPoolsRequest { + return QueryIncentivizedPoolsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestAminoMsg { + return { + type: "osmosis/poolincentives/query-incentivized-pools-request", + value: QueryIncentivizedPoolsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPoolsRequestProtoMsg): QueryIncentivizedPoolsRequest { + return QueryIncentivizedPoolsRequest.decode(message.value); + }, + toProto(message: QueryIncentivizedPoolsRequest): Uint8Array { + return QueryIncentivizedPoolsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPoolsRequest): QueryIncentivizedPoolsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsRequest", + value: QueryIncentivizedPoolsRequest.encode(message).finish() + }; } }; function createBaseIncentivizedPool(): IncentivizedPool { @@ -658,6 +978,7 @@ function createBaseIncentivizedPool(): IncentivizedPool { }; } export const IncentivizedPool = { + typeUrl: "/osmosis.poolincentives.v1beta1.IncentivizedPool", encode(message: IncentivizedPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -734,6 +1055,41 @@ export const IncentivizedPool = { message.lockableDuration !== undefined && (obj.lockable_duration = message.lockableDuration ? Duration.toSDK(message.lockableDuration) : undefined); obj.gauge_id = message.gaugeId; return obj; + }, + fromAmino(object: IncentivizedPoolAmino): IncentivizedPool { + return { + poolId: BigInt(object.pool_id), + lockableDuration: object?.lockable_duration ? Duration.fromAmino(object.lockable_duration) : undefined, + gaugeId: BigInt(object.gauge_id) + }; + }, + toAmino(message: IncentivizedPool): IncentivizedPoolAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.lockable_duration = message.lockableDuration ? Duration.toAmino(message.lockableDuration) : undefined; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: IncentivizedPoolAminoMsg): IncentivizedPool { + return IncentivizedPool.fromAmino(object.value); + }, + toAminoMsg(message: IncentivizedPool): IncentivizedPoolAminoMsg { + return { + type: "osmosis/poolincentives/incentivized-pool", + value: IncentivizedPool.toAmino(message) + }; + }, + fromProtoMsg(message: IncentivizedPoolProtoMsg): IncentivizedPool { + return IncentivizedPool.decode(message.value); + }, + toProto(message: IncentivizedPool): Uint8Array { + return IncentivizedPool.encode(message).finish(); + }, + toProtoMsg(message: IncentivizedPool): IncentivizedPoolProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.IncentivizedPool", + value: IncentivizedPool.encode(message).finish() + }; } }; function createBaseQueryIncentivizedPoolsResponse(): QueryIncentivizedPoolsResponse { @@ -742,6 +1098,7 @@ function createBaseQueryIncentivizedPoolsResponse(): QueryIncentivizedPoolsRespo }; } export const QueryIncentivizedPoolsResponse = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsResponse", encode(message: QueryIncentivizedPoolsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.incentivizedPools) { IncentivizedPool.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -802,12 +1159,48 @@ export const QueryIncentivizedPoolsResponse = { obj.incentivized_pools = []; } return obj; + }, + fromAmino(object: QueryIncentivizedPoolsResponseAmino): QueryIncentivizedPoolsResponse { + return { + incentivizedPools: Array.isArray(object?.incentivized_pools) ? object.incentivized_pools.map((e: any) => IncentivizedPool.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryIncentivizedPoolsResponse): QueryIncentivizedPoolsResponseAmino { + const obj: any = {}; + if (message.incentivizedPools) { + obj.incentivized_pools = message.incentivizedPools.map(e => e ? IncentivizedPool.toAmino(e) : undefined); + } else { + obj.incentivized_pools = []; + } + return obj; + }, + fromAminoMsg(object: QueryIncentivizedPoolsResponseAminoMsg): QueryIncentivizedPoolsResponse { + return QueryIncentivizedPoolsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryIncentivizedPoolsResponse): QueryIncentivizedPoolsResponseAminoMsg { + return { + type: "osmosis/poolincentives/query-incentivized-pools-response", + value: QueryIncentivizedPoolsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryIncentivizedPoolsResponseProtoMsg): QueryIncentivizedPoolsResponse { + return QueryIncentivizedPoolsResponse.decode(message.value); + }, + toProto(message: QueryIncentivizedPoolsResponse): Uint8Array { + return QueryIncentivizedPoolsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryIncentivizedPoolsResponse): QueryIncentivizedPoolsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryIncentivizedPoolsResponse", + value: QueryIncentivizedPoolsResponse.encode(message).finish() + }; } }; function createBaseQueryExternalIncentiveGaugesRequest(): QueryExternalIncentiveGaugesRequest { return {}; } export const QueryExternalIncentiveGaugesRequest = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesRequest", encode(_: QueryExternalIncentiveGaugesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -845,6 +1238,34 @@ export const QueryExternalIncentiveGaugesRequest = { toSDK(_: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryExternalIncentiveGaugesRequestAmino): QueryExternalIncentiveGaugesRequest { + return {}; + }, + toAmino(_: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryExternalIncentiveGaugesRequestAminoMsg): QueryExternalIncentiveGaugesRequest { + return QueryExternalIncentiveGaugesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestAminoMsg { + return { + type: "osmosis/poolincentives/query-external-incentive-gauges-request", + value: QueryExternalIncentiveGaugesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryExternalIncentiveGaugesRequestProtoMsg): QueryExternalIncentiveGaugesRequest { + return QueryExternalIncentiveGaugesRequest.decode(message.value); + }, + toProto(message: QueryExternalIncentiveGaugesRequest): Uint8Array { + return QueryExternalIncentiveGaugesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryExternalIncentiveGaugesRequest): QueryExternalIncentiveGaugesRequestProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesRequest", + value: QueryExternalIncentiveGaugesRequest.encode(message).finish() + }; } }; function createBaseQueryExternalIncentiveGaugesResponse(): QueryExternalIncentiveGaugesResponse { @@ -853,6 +1274,7 @@ function createBaseQueryExternalIncentiveGaugesResponse(): QueryExternalIncentiv }; } export const QueryExternalIncentiveGaugesResponse = { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesResponse", encode(message: QueryExternalIncentiveGaugesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { Gauge.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -913,5 +1335,40 @@ export const QueryExternalIncentiveGaugesResponse = { obj.data = []; } return obj; + }, + fromAmino(object: QueryExternalIncentiveGaugesResponseAmino): QueryExternalIncentiveGaugesResponse { + return { + data: Array.isArray(object?.data) ? object.data.map((e: any) => Gauge.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryExternalIncentiveGaugesResponse): QueryExternalIncentiveGaugesResponseAmino { + const obj: any = {}; + if (message.data) { + obj.data = message.data.map(e => e ? Gauge.toAmino(e) : undefined); + } else { + obj.data = []; + } + return obj; + }, + fromAminoMsg(object: QueryExternalIncentiveGaugesResponseAminoMsg): QueryExternalIncentiveGaugesResponse { + return QueryExternalIncentiveGaugesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryExternalIncentiveGaugesResponse): QueryExternalIncentiveGaugesResponseAminoMsg { + return { + type: "osmosis/poolincentives/query-external-incentive-gauges-response", + value: QueryExternalIncentiveGaugesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryExternalIncentiveGaugesResponseProtoMsg): QueryExternalIncentiveGaugesResponse { + return QueryExternalIncentiveGaugesResponse.decode(message.value); + }, + toProto(message: QueryExternalIncentiveGaugesResponse): Uint8Array { + return QueryExternalIncentiveGaugesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryExternalIncentiveGaugesResponse): QueryExternalIncentiveGaugesResponseProtoMsg { + return { + typeUrl: "/osmosis.poolincentives.v1beta1.QueryExternalIncentiveGaugesResponse", + value: QueryExternalIncentiveGaugesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts index 5d7ba68af8..d59100e7c0 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/genesis.ts @@ -32,6 +32,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.poolmanager.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.poolCreationFee) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -92,6 +93,41 @@ export const Params = { obj.pool_creation_fee = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + poolCreationFee: Array.isArray(object?.pool_creation_fee) ? object.pool_creation_fee.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.poolCreationFee) { + obj.pool_creation_fee = message.poolCreationFee.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.pool_creation_fee = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/poolmanager/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -102,6 +138,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.poolmanager.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nextPoolId !== BigInt(0)) { writer.uint32(8).uint64(message.nextPoolId); @@ -186,5 +223,44 @@ export const GenesisState = { obj.pool_routes = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + nextPoolId: BigInt(object.next_pool_id), + params: object?.params ? Params.fromAmino(object.params) : undefined, + poolRoutes: Array.isArray(object?.pool_routes) ? object.pool_routes.map((e: any) => ModuleRoute.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.next_pool_id = message.nextPoolId ? message.nextPoolId.toString() : undefined; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.poolRoutes) { + obj.pool_routes = message.poolRoutes.map(e => e ? ModuleRoute.toAmino(e) : undefined); + } else { + obj.pool_routes = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/poolmanager/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/module_route.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/module_route.ts index 41b673f1b5..a0c8b317e6 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/module_route.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/module_route.ts @@ -86,6 +86,7 @@ function createBaseModuleRoute(): ModuleRoute { }; } export const ModuleRoute = { + typeUrl: "/osmosis.poolmanager.v1beta1.ModuleRoute", encode(message: ModuleRoute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolType !== 0) { writer.uint32(8).int32(message.poolType); @@ -150,5 +151,38 @@ export const ModuleRoute = { message.poolType !== undefined && (obj.pool_type = poolTypeToJSON(message.poolType)); obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: ModuleRouteAmino): ModuleRoute { + return { + poolType: isSet(object.pool_type) ? poolTypeFromJSON(object.pool_type) : -1, + poolId: object?.pool_id ? BigInt(object.pool_id) : undefined + }; + }, + toAmino(message: ModuleRoute): ModuleRouteAmino { + const obj: any = {}; + obj.pool_type = message.poolType; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ModuleRouteAminoMsg): ModuleRoute { + return ModuleRoute.fromAmino(object.value); + }, + toAminoMsg(message: ModuleRoute): ModuleRouteAminoMsg { + return { + type: "osmosis/poolmanager/module-route", + value: ModuleRoute.toAmino(message) + }; + }, + fromProtoMsg(message: ModuleRouteProtoMsg): ModuleRoute { + return ModuleRoute.decode(message.value); + }, + toProto(message: ModuleRoute): Uint8Array { + return ModuleRoute.encode(message).finish(); + }, + toProtoMsg(message: ModuleRoute): ModuleRouteProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.ModuleRoute", + value: ModuleRoute.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts index 0f75ceddb5..4a0dd502e4 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/query.ts @@ -145,6 +145,7 @@ function createBaseParamsRequest(): ParamsRequest { return {}; } export const ParamsRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.ParamsRequest", encode(_: ParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -182,6 +183,34 @@ export const ParamsRequest = { toSDK(_: ParamsRequest): ParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ParamsRequestAmino): ParamsRequest { + return {}; + }, + toAmino(_: ParamsRequest): ParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ParamsRequestAminoMsg): ParamsRequest { + return ParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: ParamsRequest): ParamsRequestAminoMsg { + return { + type: "osmosis/poolmanager/params-request", + value: ParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsRequestProtoMsg): ParamsRequest { + return ParamsRequest.decode(message.value); + }, + toProto(message: ParamsRequest): Uint8Array { + return ParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: ParamsRequest): ParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.ParamsRequest", + value: ParamsRequest.encode(message).finish() + }; } }; function createBaseParamsResponse(): ParamsResponse { @@ -190,6 +219,7 @@ function createBaseParamsResponse(): ParamsResponse { }; } export const ParamsResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.ParamsResponse", encode(message: ParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -242,6 +272,37 @@ export const ParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: ParamsResponseAmino): ParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: ParamsResponse): ParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsResponseAminoMsg): ParamsResponse { + return ParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: ParamsResponse): ParamsResponseAminoMsg { + return { + type: "osmosis/poolmanager/params-response", + value: ParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsResponseProtoMsg): ParamsResponse { + return ParamsResponse.decode(message.value); + }, + toProto(message: ParamsResponse): Uint8Array { + return ParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: ParamsResponse): ParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.ParamsResponse", + value: ParamsResponse.encode(message).finish() + }; } }; function createBaseEstimateSwapExactAmountInRequest(): EstimateSwapExactAmountInRequest { @@ -252,6 +313,7 @@ function createBaseEstimateSwapExactAmountInRequest(): EstimateSwapExactAmountIn }; } export const EstimateSwapExactAmountInRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInRequest", encode(message: EstimateSwapExactAmountInRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(16).uint64(message.poolId); @@ -336,6 +398,45 @@ export const EstimateSwapExactAmountInRequest = { obj.routes = []; } return obj; + }, + fromAmino(object: EstimateSwapExactAmountInRequestAmino): EstimateSwapExactAmountInRequest { + return { + poolId: BigInt(object.pool_id), + tokenIn: object.token_in, + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountInRoute.fromAmino(e)) : [] + }; + }, + toAmino(message: EstimateSwapExactAmountInRequest): EstimateSwapExactAmountInRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + return obj; + }, + fromAminoMsg(object: EstimateSwapExactAmountInRequestAminoMsg): EstimateSwapExactAmountInRequest { + return EstimateSwapExactAmountInRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSwapExactAmountInRequest): EstimateSwapExactAmountInRequestAminoMsg { + return { + type: "osmosis/poolmanager/estimate-swap-exact-amount-in-request", + value: EstimateSwapExactAmountInRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSwapExactAmountInRequestProtoMsg): EstimateSwapExactAmountInRequest { + return EstimateSwapExactAmountInRequest.decode(message.value); + }, + toProto(message: EstimateSwapExactAmountInRequest): Uint8Array { + return EstimateSwapExactAmountInRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSwapExactAmountInRequest): EstimateSwapExactAmountInRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInRequest", + value: EstimateSwapExactAmountInRequest.encode(message).finish() + }; } }; function createBaseEstimateSinglePoolSwapExactAmountInRequest(): EstimateSinglePoolSwapExactAmountInRequest { @@ -346,6 +447,7 @@ function createBaseEstimateSinglePoolSwapExactAmountInRequest(): EstimateSingleP }; } export const EstimateSinglePoolSwapExactAmountInRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSinglePoolSwapExactAmountInRequest", encode(message: EstimateSinglePoolSwapExactAmountInRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -422,6 +524,41 @@ export const EstimateSinglePoolSwapExactAmountInRequest = { obj.token_in = message.tokenIn; obj.token_out_denom = message.tokenOutDenom; return obj; + }, + fromAmino(object: EstimateSinglePoolSwapExactAmountInRequestAmino): EstimateSinglePoolSwapExactAmountInRequest { + return { + poolId: BigInt(object.pool_id), + tokenIn: object.token_in, + tokenOutDenom: object.token_out_denom + }; + }, + toAmino(message: EstimateSinglePoolSwapExactAmountInRequest): EstimateSinglePoolSwapExactAmountInRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in = message.tokenIn; + obj.token_out_denom = message.tokenOutDenom; + return obj; + }, + fromAminoMsg(object: EstimateSinglePoolSwapExactAmountInRequestAminoMsg): EstimateSinglePoolSwapExactAmountInRequest { + return EstimateSinglePoolSwapExactAmountInRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSinglePoolSwapExactAmountInRequest): EstimateSinglePoolSwapExactAmountInRequestAminoMsg { + return { + type: "osmosis/poolmanager/estimate-single-pool-swap-exact-amount-in-request", + value: EstimateSinglePoolSwapExactAmountInRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSinglePoolSwapExactAmountInRequestProtoMsg): EstimateSinglePoolSwapExactAmountInRequest { + return EstimateSinglePoolSwapExactAmountInRequest.decode(message.value); + }, + toProto(message: EstimateSinglePoolSwapExactAmountInRequest): Uint8Array { + return EstimateSinglePoolSwapExactAmountInRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSinglePoolSwapExactAmountInRequest): EstimateSinglePoolSwapExactAmountInRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSinglePoolSwapExactAmountInRequest", + value: EstimateSinglePoolSwapExactAmountInRequest.encode(message).finish() + }; } }; function createBaseEstimateSwapExactAmountInResponse(): EstimateSwapExactAmountInResponse { @@ -430,6 +567,7 @@ function createBaseEstimateSwapExactAmountInResponse(): EstimateSwapExactAmountI }; } export const EstimateSwapExactAmountInResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInResponse", encode(message: EstimateSwapExactAmountInResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenOutAmount !== "") { writer.uint32(10).string(message.tokenOutAmount); @@ -482,6 +620,37 @@ export const EstimateSwapExactAmountInResponse = { const obj: any = {}; obj.token_out_amount = message.tokenOutAmount; return obj; + }, + fromAmino(object: EstimateSwapExactAmountInResponseAmino): EstimateSwapExactAmountInResponse { + return { + tokenOutAmount: object.token_out_amount + }; + }, + toAmino(message: EstimateSwapExactAmountInResponse): EstimateSwapExactAmountInResponseAmino { + const obj: any = {}; + obj.token_out_amount = message.tokenOutAmount; + return obj; + }, + fromAminoMsg(object: EstimateSwapExactAmountInResponseAminoMsg): EstimateSwapExactAmountInResponse { + return EstimateSwapExactAmountInResponse.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSwapExactAmountInResponse): EstimateSwapExactAmountInResponseAminoMsg { + return { + type: "osmosis/poolmanager/estimate-swap-exact-amount-in-response", + value: EstimateSwapExactAmountInResponse.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSwapExactAmountInResponseProtoMsg): EstimateSwapExactAmountInResponse { + return EstimateSwapExactAmountInResponse.decode(message.value); + }, + toProto(message: EstimateSwapExactAmountInResponse): Uint8Array { + return EstimateSwapExactAmountInResponse.encode(message).finish(); + }, + toProtoMsg(message: EstimateSwapExactAmountInResponse): EstimateSwapExactAmountInResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountInResponse", + value: EstimateSwapExactAmountInResponse.encode(message).finish() + }; } }; function createBaseEstimateSwapExactAmountOutRequest(): EstimateSwapExactAmountOutRequest { @@ -492,6 +661,7 @@ function createBaseEstimateSwapExactAmountOutRequest(): EstimateSwapExactAmountO }; } export const EstimateSwapExactAmountOutRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutRequest", encode(message: EstimateSwapExactAmountOutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(16).uint64(message.poolId); @@ -576,6 +746,45 @@ export const EstimateSwapExactAmountOutRequest = { } obj.token_out = message.tokenOut; return obj; + }, + fromAmino(object: EstimateSwapExactAmountOutRequestAmino): EstimateSwapExactAmountOutRequest { + return { + poolId: BigInt(object.pool_id), + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountOutRoute.fromAmino(e)) : [], + tokenOut: object.token_out + }; + }, + toAmino(message: EstimateSwapExactAmountOutRequest): EstimateSwapExactAmountOutRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + obj.token_out = message.tokenOut; + return obj; + }, + fromAminoMsg(object: EstimateSwapExactAmountOutRequestAminoMsg): EstimateSwapExactAmountOutRequest { + return EstimateSwapExactAmountOutRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSwapExactAmountOutRequest): EstimateSwapExactAmountOutRequestAminoMsg { + return { + type: "osmosis/poolmanager/estimate-swap-exact-amount-out-request", + value: EstimateSwapExactAmountOutRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSwapExactAmountOutRequestProtoMsg): EstimateSwapExactAmountOutRequest { + return EstimateSwapExactAmountOutRequest.decode(message.value); + }, + toProto(message: EstimateSwapExactAmountOutRequest): Uint8Array { + return EstimateSwapExactAmountOutRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSwapExactAmountOutRequest): EstimateSwapExactAmountOutRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutRequest", + value: EstimateSwapExactAmountOutRequest.encode(message).finish() + }; } }; function createBaseEstimateSinglePoolSwapExactAmountOutRequest(): EstimateSinglePoolSwapExactAmountOutRequest { @@ -586,6 +795,7 @@ function createBaseEstimateSinglePoolSwapExactAmountOutRequest(): EstimateSingle }; } export const EstimateSinglePoolSwapExactAmountOutRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSinglePoolSwapExactAmountOutRequest", encode(message: EstimateSinglePoolSwapExactAmountOutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -662,6 +872,41 @@ export const EstimateSinglePoolSwapExactAmountOutRequest = { obj.token_in_denom = message.tokenInDenom; obj.token_out = message.tokenOut; return obj; + }, + fromAmino(object: EstimateSinglePoolSwapExactAmountOutRequestAmino): EstimateSinglePoolSwapExactAmountOutRequest { + return { + poolId: BigInt(object.pool_id), + tokenInDenom: object.token_in_denom, + tokenOut: object.token_out + }; + }, + toAmino(message: EstimateSinglePoolSwapExactAmountOutRequest): EstimateSinglePoolSwapExactAmountOutRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom; + obj.token_out = message.tokenOut; + return obj; + }, + fromAminoMsg(object: EstimateSinglePoolSwapExactAmountOutRequestAminoMsg): EstimateSinglePoolSwapExactAmountOutRequest { + return EstimateSinglePoolSwapExactAmountOutRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSinglePoolSwapExactAmountOutRequest): EstimateSinglePoolSwapExactAmountOutRequestAminoMsg { + return { + type: "osmosis/poolmanager/estimate-single-pool-swap-exact-amount-out-request", + value: EstimateSinglePoolSwapExactAmountOutRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSinglePoolSwapExactAmountOutRequestProtoMsg): EstimateSinglePoolSwapExactAmountOutRequest { + return EstimateSinglePoolSwapExactAmountOutRequest.decode(message.value); + }, + toProto(message: EstimateSinglePoolSwapExactAmountOutRequest): Uint8Array { + return EstimateSinglePoolSwapExactAmountOutRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSinglePoolSwapExactAmountOutRequest): EstimateSinglePoolSwapExactAmountOutRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSinglePoolSwapExactAmountOutRequest", + value: EstimateSinglePoolSwapExactAmountOutRequest.encode(message).finish() + }; } }; function createBaseEstimateSwapExactAmountOutResponse(): EstimateSwapExactAmountOutResponse { @@ -670,6 +915,7 @@ function createBaseEstimateSwapExactAmountOutResponse(): EstimateSwapExactAmount }; } export const EstimateSwapExactAmountOutResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutResponse", encode(message: EstimateSwapExactAmountOutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenInAmount !== "") { writer.uint32(10).string(message.tokenInAmount); @@ -722,12 +968,44 @@ export const EstimateSwapExactAmountOutResponse = { const obj: any = {}; obj.token_in_amount = message.tokenInAmount; return obj; + }, + fromAmino(object: EstimateSwapExactAmountOutResponseAmino): EstimateSwapExactAmountOutResponse { + return { + tokenInAmount: object.token_in_amount + }; + }, + toAmino(message: EstimateSwapExactAmountOutResponse): EstimateSwapExactAmountOutResponseAmino { + const obj: any = {}; + obj.token_in_amount = message.tokenInAmount; + return obj; + }, + fromAminoMsg(object: EstimateSwapExactAmountOutResponseAminoMsg): EstimateSwapExactAmountOutResponse { + return EstimateSwapExactAmountOutResponse.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSwapExactAmountOutResponse): EstimateSwapExactAmountOutResponseAminoMsg { + return { + type: "osmosis/poolmanager/estimate-swap-exact-amount-out-response", + value: EstimateSwapExactAmountOutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSwapExactAmountOutResponseProtoMsg): EstimateSwapExactAmountOutResponse { + return EstimateSwapExactAmountOutResponse.decode(message.value); + }, + toProto(message: EstimateSwapExactAmountOutResponse): Uint8Array { + return EstimateSwapExactAmountOutResponse.encode(message).finish(); + }, + toProtoMsg(message: EstimateSwapExactAmountOutResponse): EstimateSwapExactAmountOutResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.EstimateSwapExactAmountOutResponse", + value: EstimateSwapExactAmountOutResponse.encode(message).finish() + }; } }; function createBaseNumPoolsRequest(): NumPoolsRequest { return {}; } export const NumPoolsRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.NumPoolsRequest", encode(_: NumPoolsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -765,6 +1043,34 @@ export const NumPoolsRequest = { toSDK(_: NumPoolsRequest): NumPoolsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: NumPoolsRequestAmino): NumPoolsRequest { + return {}; + }, + toAmino(_: NumPoolsRequest): NumPoolsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: NumPoolsRequestAminoMsg): NumPoolsRequest { + return NumPoolsRequest.fromAmino(object.value); + }, + toAminoMsg(message: NumPoolsRequest): NumPoolsRequestAminoMsg { + return { + type: "osmosis/poolmanager/num-pools-request", + value: NumPoolsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: NumPoolsRequestProtoMsg): NumPoolsRequest { + return NumPoolsRequest.decode(message.value); + }, + toProto(message: NumPoolsRequest): Uint8Array { + return NumPoolsRequest.encode(message).finish(); + }, + toProtoMsg(message: NumPoolsRequest): NumPoolsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.NumPoolsRequest", + value: NumPoolsRequest.encode(message).finish() + }; } }; function createBaseNumPoolsResponse(): NumPoolsResponse { @@ -773,6 +1079,7 @@ function createBaseNumPoolsResponse(): NumPoolsResponse { }; } export const NumPoolsResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.NumPoolsResponse", encode(message: NumPoolsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numPools !== BigInt(0)) { writer.uint32(8).uint64(message.numPools); @@ -825,6 +1132,37 @@ export const NumPoolsResponse = { const obj: any = {}; obj.num_pools = message.numPools; return obj; + }, + fromAmino(object: NumPoolsResponseAmino): NumPoolsResponse { + return { + numPools: BigInt(object.num_pools) + }; + }, + toAmino(message: NumPoolsResponse): NumPoolsResponseAmino { + const obj: any = {}; + obj.num_pools = message.numPools ? message.numPools.toString() : undefined; + return obj; + }, + fromAminoMsg(object: NumPoolsResponseAminoMsg): NumPoolsResponse { + return NumPoolsResponse.fromAmino(object.value); + }, + toAminoMsg(message: NumPoolsResponse): NumPoolsResponseAminoMsg { + return { + type: "osmosis/poolmanager/num-pools-response", + value: NumPoolsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: NumPoolsResponseProtoMsg): NumPoolsResponse { + return NumPoolsResponse.decode(message.value); + }, + toProto(message: NumPoolsResponse): Uint8Array { + return NumPoolsResponse.encode(message).finish(); + }, + toProtoMsg(message: NumPoolsResponse): NumPoolsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.NumPoolsResponse", + value: NumPoolsResponse.encode(message).finish() + }; } }; function createBasePoolRequest(): PoolRequest { @@ -833,6 +1171,7 @@ function createBasePoolRequest(): PoolRequest { }; } export const PoolRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.PoolRequest", encode(message: PoolRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -885,6 +1224,37 @@ export const PoolRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: PoolRequestAmino): PoolRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: PoolRequest): PoolRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: PoolRequestAminoMsg): PoolRequest { + return PoolRequest.fromAmino(object.value); + }, + toAminoMsg(message: PoolRequest): PoolRequestAminoMsg { + return { + type: "osmosis/poolmanager/pool-request", + value: PoolRequest.toAmino(message) + }; + }, + fromProtoMsg(message: PoolRequestProtoMsg): PoolRequest { + return PoolRequest.decode(message.value); + }, + toProto(message: PoolRequest): Uint8Array { + return PoolRequest.encode(message).finish(); + }, + toProtoMsg(message: PoolRequest): PoolRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.PoolRequest", + value: PoolRequest.encode(message).finish() + }; } }; function createBasePoolResponse(): PoolResponse { @@ -893,6 +1263,7 @@ function createBasePoolResponse(): PoolResponse { }; } export const PoolResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.PoolResponse", encode(message: PoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pool !== undefined) { Any.encode(message.pool, writer.uint32(10).fork()).ldelim(); @@ -945,6 +1316,37 @@ export const PoolResponse = { const obj: any = {}; message.pool !== undefined && (obj.pool = message.pool ? Any.toSDK(message.pool) : undefined); return obj; + }, + fromAmino(object: PoolResponseAmino): PoolResponse { + return { + pool: object?.pool ? Any.fromAmino(object.pool) : undefined + }; + }, + toAmino(message: PoolResponse): PoolResponseAmino { + const obj: any = {}; + obj.pool = message.pool ? Any.toAmino(message.pool) : undefined; + return obj; + }, + fromAminoMsg(object: PoolResponseAminoMsg): PoolResponse { + return PoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: PoolResponse): PoolResponseAminoMsg { + return { + type: "osmosis/poolmanager/pool-response", + value: PoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: PoolResponseProtoMsg): PoolResponse { + return PoolResponse.decode(message.value); + }, + toProto(message: PoolResponse): Uint8Array { + return PoolResponse.encode(message).finish(); + }, + toProtoMsg(message: PoolResponse): PoolResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.PoolResponse", + value: PoolResponse.encode(message).finish() + }; } }; function createBaseAllPoolsRequest(): AllPoolsRequest { @@ -953,6 +1355,7 @@ function createBaseAllPoolsRequest(): AllPoolsRequest { }; } export const AllPoolsRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.AllPoolsRequest", encode(message: AllPoolsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1005,6 +1408,37 @@ export const AllPoolsRequest = { const obj: any = {}; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: AllPoolsRequestAmino): AllPoolsRequest { + return { + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: AllPoolsRequest): AllPoolsRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: AllPoolsRequestAminoMsg): AllPoolsRequest { + return AllPoolsRequest.fromAmino(object.value); + }, + toAminoMsg(message: AllPoolsRequest): AllPoolsRequestAminoMsg { + return { + type: "osmosis/poolmanager/all-pools-request", + value: AllPoolsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AllPoolsRequestProtoMsg): AllPoolsRequest { + return AllPoolsRequest.decode(message.value); + }, + toProto(message: AllPoolsRequest): Uint8Array { + return AllPoolsRequest.encode(message).finish(); + }, + toProtoMsg(message: AllPoolsRequest): AllPoolsRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.AllPoolsRequest", + value: AllPoolsRequest.encode(message).finish() + }; } }; function createBaseAllPoolsResponse(): AllPoolsResponse { @@ -1013,6 +1447,7 @@ function createBaseAllPoolsResponse(): AllPoolsResponse { }; } export const AllPoolsResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.AllPoolsResponse", encode(message: AllPoolsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pools) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1073,6 +1508,41 @@ export const AllPoolsResponse = { obj.pools = []; } return obj; + }, + fromAmino(object: AllPoolsResponseAmino): AllPoolsResponse { + return { + pools: Array.isArray(object?.pools) ? object.pools.map((e: any) => Any.fromAmino(e)) : [] + }; + }, + toAmino(message: AllPoolsResponse): AllPoolsResponseAmino { + const obj: any = {}; + if (message.pools) { + obj.pools = message.pools.map(e => e ? Any.toAmino(e) : undefined); + } else { + obj.pools = []; + } + return obj; + }, + fromAminoMsg(object: AllPoolsResponseAminoMsg): AllPoolsResponse { + return AllPoolsResponse.fromAmino(object.value); + }, + toAminoMsg(message: AllPoolsResponse): AllPoolsResponseAminoMsg { + return { + type: "osmosis/poolmanager/all-pools-response", + value: AllPoolsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AllPoolsResponseProtoMsg): AllPoolsResponse { + return AllPoolsResponse.decode(message.value); + }, + toProto(message: AllPoolsResponse): Uint8Array { + return AllPoolsResponse.encode(message).finish(); + }, + toProtoMsg(message: AllPoolsResponse): AllPoolsResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.AllPoolsResponse", + value: AllPoolsResponse.encode(message).finish() + }; } }; function createBaseSpotPriceRequest(): SpotPriceRequest { @@ -1083,6 +1553,7 @@ function createBaseSpotPriceRequest(): SpotPriceRequest { }; } export const SpotPriceRequest = { + typeUrl: "/osmosis.poolmanager.v1beta1.SpotPriceRequest", encode(message: SpotPriceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -1159,6 +1630,41 @@ export const SpotPriceRequest = { obj.base_asset_denom = message.baseAssetDenom; obj.quote_asset_denom = message.quoteAssetDenom; return obj; + }, + fromAmino(object: SpotPriceRequestAmino): SpotPriceRequest { + return { + poolId: BigInt(object.pool_id), + baseAssetDenom: object.base_asset_denom, + quoteAssetDenom: object.quote_asset_denom + }; + }, + toAmino(message: SpotPriceRequest): SpotPriceRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.base_asset_denom = message.baseAssetDenom; + obj.quote_asset_denom = message.quoteAssetDenom; + return obj; + }, + fromAminoMsg(object: SpotPriceRequestAminoMsg): SpotPriceRequest { + return SpotPriceRequest.fromAmino(object.value); + }, + toAminoMsg(message: SpotPriceRequest): SpotPriceRequestAminoMsg { + return { + type: "osmosis/poolmanager/spot-price-request", + value: SpotPriceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SpotPriceRequestProtoMsg): SpotPriceRequest { + return SpotPriceRequest.decode(message.value); + }, + toProto(message: SpotPriceRequest): Uint8Array { + return SpotPriceRequest.encode(message).finish(); + }, + toProtoMsg(message: SpotPriceRequest): SpotPriceRequestProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.SpotPriceRequest", + value: SpotPriceRequest.encode(message).finish() + }; } }; function createBaseSpotPriceResponse(): SpotPriceResponse { @@ -1167,6 +1673,7 @@ function createBaseSpotPriceResponse(): SpotPriceResponse { }; } export const SpotPriceResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.SpotPriceResponse", encode(message: SpotPriceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spotPrice !== "") { writer.uint32(10).string(message.spotPrice); @@ -1219,5 +1726,36 @@ export const SpotPriceResponse = { const obj: any = {}; obj.spot_price = message.spotPrice; return obj; + }, + fromAmino(object: SpotPriceResponseAmino): SpotPriceResponse { + return { + spotPrice: object.spot_price + }; + }, + toAmino(message: SpotPriceResponse): SpotPriceResponseAmino { + const obj: any = {}; + obj.spot_price = message.spotPrice; + return obj; + }, + fromAminoMsg(object: SpotPriceResponseAminoMsg): SpotPriceResponse { + return SpotPriceResponse.fromAmino(object.value); + }, + toAminoMsg(message: SpotPriceResponse): SpotPriceResponseAminoMsg { + return { + type: "osmosis/poolmanager/spot-price-response", + value: SpotPriceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SpotPriceResponseProtoMsg): SpotPriceResponse { + return SpotPriceResponse.decode(message.value); + }, + toProto(message: SpotPriceResponse): Uint8Array { + return SpotPriceResponse.encode(message).finish(); + }, + toProtoMsg(message: SpotPriceResponse): SpotPriceResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.SpotPriceResponse", + value: SpotPriceResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/swap_route.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/swap_route.ts index 1d1906c035..b1bab266fc 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/swap_route.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/swap_route.ts @@ -24,6 +24,7 @@ function createBaseSwapAmountInRoute(): SwapAmountInRoute { }; } export const SwapAmountInRoute = { + typeUrl: "/osmosis.poolmanager.v1beta1.SwapAmountInRoute", encode(message: SwapAmountInRoute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -88,6 +89,39 @@ export const SwapAmountInRoute = { obj.pool_id = message.poolId; obj.token_out_denom = message.tokenOutDenom; return obj; + }, + fromAmino(object: SwapAmountInRouteAmino): SwapAmountInRoute { + return { + poolId: BigInt(object.pool_id), + tokenOutDenom: object.token_out_denom + }; + }, + toAmino(message: SwapAmountInRoute): SwapAmountInRouteAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_out_denom = message.tokenOutDenom; + return obj; + }, + fromAminoMsg(object: SwapAmountInRouteAminoMsg): SwapAmountInRoute { + return SwapAmountInRoute.fromAmino(object.value); + }, + toAminoMsg(message: SwapAmountInRoute): SwapAmountInRouteAminoMsg { + return { + type: "osmosis/poolmanager/swap-amount-in-route", + value: SwapAmountInRoute.toAmino(message) + }; + }, + fromProtoMsg(message: SwapAmountInRouteProtoMsg): SwapAmountInRoute { + return SwapAmountInRoute.decode(message.value); + }, + toProto(message: SwapAmountInRoute): Uint8Array { + return SwapAmountInRoute.encode(message).finish(); + }, + toProtoMsg(message: SwapAmountInRoute): SwapAmountInRouteProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.SwapAmountInRoute", + value: SwapAmountInRoute.encode(message).finish() + }; } }; function createBaseSwapAmountOutRoute(): SwapAmountOutRoute { @@ -97,6 +131,7 @@ function createBaseSwapAmountOutRoute(): SwapAmountOutRoute { }; } export const SwapAmountOutRoute = { + typeUrl: "/osmosis.poolmanager.v1beta1.SwapAmountOutRoute", encode(message: SwapAmountOutRoute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -161,5 +196,38 @@ export const SwapAmountOutRoute = { obj.pool_id = message.poolId; obj.token_in_denom = message.tokenInDenom; return obj; + }, + fromAmino(object: SwapAmountOutRouteAmino): SwapAmountOutRoute { + return { + poolId: BigInt(object.pool_id), + tokenInDenom: object.token_in_denom + }; + }, + toAmino(message: SwapAmountOutRoute): SwapAmountOutRouteAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.token_in_denom = message.tokenInDenom; + return obj; + }, + fromAminoMsg(object: SwapAmountOutRouteAminoMsg): SwapAmountOutRoute { + return SwapAmountOutRoute.fromAmino(object.value); + }, + toAminoMsg(message: SwapAmountOutRoute): SwapAmountOutRouteAminoMsg { + return { + type: "osmosis/poolmanager/swap-amount-out-route", + value: SwapAmountOutRoute.toAmino(message) + }; + }, + fromProtoMsg(message: SwapAmountOutRouteProtoMsg): SwapAmountOutRoute { + return SwapAmountOutRoute.decode(message.value); + }, + toProto(message: SwapAmountOutRoute): Uint8Array { + return SwapAmountOutRoute.encode(message).finish(); + }, + toProtoMsg(message: SwapAmountOutRoute): SwapAmountOutRouteProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.SwapAmountOutRoute", + value: SwapAmountOutRoute.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts index 32d47a5fa1..a4fd24f1ab 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/poolmanager/v1beta1/tx.ts @@ -52,6 +52,7 @@ function createBaseMsgSwapExactAmountIn(): MsgSwapExactAmountIn { }; } export const MsgSwapExactAmountIn = { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountIn", encode(message: MsgSwapExactAmountIn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -148,6 +149,47 @@ export const MsgSwapExactAmountIn = { message.tokenIn !== undefined && (obj.token_in = message.tokenIn ? Coin.toSDK(message.tokenIn) : undefined); obj.token_out_min_amount = message.tokenOutMinAmount; return obj; + }, + fromAmino(object: MsgSwapExactAmountInAmino): MsgSwapExactAmountIn { + return { + sender: object.sender, + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountInRoute.fromAmino(e)) : [], + tokenIn: object?.token_in ? Coin.fromAmino(object.token_in) : undefined, + tokenOutMinAmount: object.token_out_min_amount + }; + }, + toAmino(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAmino { + const obj: any = {}; + obj.sender = message.sender; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountInRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + obj.token_in = message.tokenIn ? Coin.toAmino(message.tokenIn) : undefined; + obj.token_out_min_amount = message.tokenOutMinAmount; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountInAminoMsg): MsgSwapExactAmountIn { + return MsgSwapExactAmountIn.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountIn): MsgSwapExactAmountInAminoMsg { + return { + type: "osmosis/poolmanager/swap-exact-amount-in", + value: MsgSwapExactAmountIn.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountInProtoMsg): MsgSwapExactAmountIn { + return MsgSwapExactAmountIn.decode(message.value); + }, + toProto(message: MsgSwapExactAmountIn): Uint8Array { + return MsgSwapExactAmountIn.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountIn): MsgSwapExactAmountInProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountIn", + value: MsgSwapExactAmountIn.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountInResponse(): MsgSwapExactAmountInResponse { @@ -156,6 +198,7 @@ function createBaseMsgSwapExactAmountInResponse(): MsgSwapExactAmountInResponse }; } export const MsgSwapExactAmountInResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountInResponse", encode(message: MsgSwapExactAmountInResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenOutAmount !== "") { writer.uint32(10).string(message.tokenOutAmount); @@ -208,6 +251,37 @@ export const MsgSwapExactAmountInResponse = { const obj: any = {}; obj.token_out_amount = message.tokenOutAmount; return obj; + }, + fromAmino(object: MsgSwapExactAmountInResponseAmino): MsgSwapExactAmountInResponse { + return { + tokenOutAmount: object.token_out_amount + }; + }, + toAmino(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAmino { + const obj: any = {}; + obj.token_out_amount = message.tokenOutAmount; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountInResponseAminoMsg): MsgSwapExactAmountInResponse { + return MsgSwapExactAmountInResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseAminoMsg { + return { + type: "osmosis/poolmanager/swap-exact-amount-in-response", + value: MsgSwapExactAmountInResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountInResponseProtoMsg): MsgSwapExactAmountInResponse { + return MsgSwapExactAmountInResponse.decode(message.value); + }, + toProto(message: MsgSwapExactAmountInResponse): Uint8Array { + return MsgSwapExactAmountInResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountInResponse): MsgSwapExactAmountInResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountInResponse", + value: MsgSwapExactAmountInResponse.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountOut(): MsgSwapExactAmountOut { @@ -219,6 +293,7 @@ function createBaseMsgSwapExactAmountOut(): MsgSwapExactAmountOut { }; } export const MsgSwapExactAmountOut = { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountOut", encode(message: MsgSwapExactAmountOut, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -315,6 +390,47 @@ export const MsgSwapExactAmountOut = { obj.token_in_max_amount = message.tokenInMaxAmount; message.tokenOut !== undefined && (obj.token_out = message.tokenOut ? Coin.toSDK(message.tokenOut) : undefined); return obj; + }, + fromAmino(object: MsgSwapExactAmountOutAmino): MsgSwapExactAmountOut { + return { + sender: object.sender, + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => SwapAmountOutRoute.fromAmino(e)) : [], + tokenInMaxAmount: object.token_in_max_amount, + tokenOut: object?.token_out ? Coin.fromAmino(object.token_out) : undefined + }; + }, + toAmino(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAmino { + const obj: any = {}; + obj.sender = message.sender; + if (message.routes) { + obj.routes = message.routes.map(e => e ? SwapAmountOutRoute.toAmino(e) : undefined); + } else { + obj.routes = []; + } + obj.token_in_max_amount = message.tokenInMaxAmount; + obj.token_out = message.tokenOut ? Coin.toAmino(message.tokenOut) : undefined; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountOutAminoMsg): MsgSwapExactAmountOut { + return MsgSwapExactAmountOut.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutAminoMsg { + return { + type: "osmosis/poolmanager/swap-exact-amount-out", + value: MsgSwapExactAmountOut.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountOutProtoMsg): MsgSwapExactAmountOut { + return MsgSwapExactAmountOut.decode(message.value); + }, + toProto(message: MsgSwapExactAmountOut): Uint8Array { + return MsgSwapExactAmountOut.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountOut): MsgSwapExactAmountOutProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountOut", + value: MsgSwapExactAmountOut.encode(message).finish() + }; } }; function createBaseMsgSwapExactAmountOutResponse(): MsgSwapExactAmountOutResponse { @@ -323,6 +439,7 @@ function createBaseMsgSwapExactAmountOutResponse(): MsgSwapExactAmountOutRespons }; } export const MsgSwapExactAmountOutResponse = { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountOutResponse", encode(message: MsgSwapExactAmountOutResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenInAmount !== "") { writer.uint32(10).string(message.tokenInAmount); @@ -375,5 +492,36 @@ export const MsgSwapExactAmountOutResponse = { const obj: any = {}; obj.token_in_amount = message.tokenInAmount; return obj; + }, + fromAmino(object: MsgSwapExactAmountOutResponseAmino): MsgSwapExactAmountOutResponse { + return { + tokenInAmount: object.token_in_amount + }; + }, + toAmino(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAmino { + const obj: any = {}; + obj.token_in_amount = message.tokenInAmount; + return obj; + }, + fromAminoMsg(object: MsgSwapExactAmountOutResponseAminoMsg): MsgSwapExactAmountOutResponse { + return MsgSwapExactAmountOutResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseAminoMsg { + return { + type: "osmosis/poolmanager/swap-exact-amount-out-response", + value: MsgSwapExactAmountOutResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSwapExactAmountOutResponseProtoMsg): MsgSwapExactAmountOutResponse { + return MsgSwapExactAmountOutResponse.decode(message.value); + }, + toProto(message: MsgSwapExactAmountOutResponse): Uint8Array { + return MsgSwapExactAmountOutResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSwapExactAmountOutResponse): MsgSwapExactAmountOutResponseProtoMsg { + return { + typeUrl: "/osmosis.poolmanager.v1beta1.MsgSwapExactAmountOutResponse", + value: MsgSwapExactAmountOutResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts index 1b6ef22733..54994ff714 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/genesis.ts @@ -71,6 +71,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.protorev.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -267,5 +268,68 @@ export const GenesisState = { obj.max_pool_points_per_tx = message.maxPoolPointsPerTx; obj.point_count_for_block = message.pointCountForBlock; return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + tokenPairArbRoutes: Array.isArray(object?.token_pair_arb_routes) ? object.token_pair_arb_routes.map((e: any) => TokenPairArbRoutes.fromAmino(e)) : [], + baseDenoms: Array.isArray(object?.base_denoms) ? object.base_denoms.map((e: any) => BaseDenom.fromAmino(e)) : [], + poolWeights: object?.pool_weights ? PoolWeights.fromAmino(object.pool_weights) : undefined, + daysSinceModuleGenesis: BigInt(object.days_since_module_genesis), + developerFees: Array.isArray(object?.developer_fees) ? object.developer_fees.map((e: any) => Coin.fromAmino(e)) : [], + latestBlockHeight: BigInt(object.latest_block_height), + developerAddress: object.developer_address, + maxPoolPointsPerBlock: BigInt(object.max_pool_points_per_block), + maxPoolPointsPerTx: BigInt(object.max_pool_points_per_tx), + pointCountForBlock: BigInt(object.point_count_for_block) + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.tokenPairArbRoutes) { + obj.token_pair_arb_routes = message.tokenPairArbRoutes.map(e => e ? TokenPairArbRoutes.toAmino(e) : undefined); + } else { + obj.token_pair_arb_routes = []; + } + if (message.baseDenoms) { + obj.base_denoms = message.baseDenoms.map(e => e ? BaseDenom.toAmino(e) : undefined); + } else { + obj.base_denoms = []; + } + obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; + obj.days_since_module_genesis = message.daysSinceModuleGenesis ? message.daysSinceModuleGenesis.toString() : undefined; + if (message.developerFees) { + obj.developer_fees = message.developerFees.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.developer_fees = []; + } + obj.latest_block_height = message.latestBlockHeight ? message.latestBlockHeight.toString() : undefined; + obj.developer_address = message.developerAddress; + obj.max_pool_points_per_block = message.maxPoolPointsPerBlock ? message.maxPoolPointsPerBlock.toString() : undefined; + obj.max_pool_points_per_tx = message.maxPoolPointsPerTx ? message.maxPoolPointsPerTx.toString() : undefined; + obj.point_count_for_block = message.pointCountForBlock ? message.pointCountForBlock.toString() : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/protorev/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts index 0c27fab549..8a11872048 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/gov.ts @@ -47,6 +47,7 @@ function createBaseSetProtoRevEnabledProposal(): SetProtoRevEnabledProposal { }; } export const SetProtoRevEnabledProposal = { + typeUrl: "/osmosis.protorev.v1beta1.SetProtoRevEnabledProposal", encode(message: SetProtoRevEnabledProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -123,6 +124,41 @@ export const SetProtoRevEnabledProposal = { obj.description = message.description; obj.enabled = message.enabled; return obj; + }, + fromAmino(object: SetProtoRevEnabledProposalAmino): SetProtoRevEnabledProposal { + return { + title: object.title, + description: object.description, + enabled: object.enabled + }; + }, + toAmino(message: SetProtoRevEnabledProposal): SetProtoRevEnabledProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.enabled = message.enabled; + return obj; + }, + fromAminoMsg(object: SetProtoRevEnabledProposalAminoMsg): SetProtoRevEnabledProposal { + return SetProtoRevEnabledProposal.fromAmino(object.value); + }, + toAminoMsg(message: SetProtoRevEnabledProposal): SetProtoRevEnabledProposalAminoMsg { + return { + type: "osmosis/protorev/set-proto-rev-enabled-proposal", + value: SetProtoRevEnabledProposal.toAmino(message) + }; + }, + fromProtoMsg(message: SetProtoRevEnabledProposalProtoMsg): SetProtoRevEnabledProposal { + return SetProtoRevEnabledProposal.decode(message.value); + }, + toProto(message: SetProtoRevEnabledProposal): Uint8Array { + return SetProtoRevEnabledProposal.encode(message).finish(); + }, + toProtoMsg(message: SetProtoRevEnabledProposal): SetProtoRevEnabledProposalProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.SetProtoRevEnabledProposal", + value: SetProtoRevEnabledProposal.encode(message).finish() + }; } }; function createBaseSetProtoRevAdminAccountProposal(): SetProtoRevAdminAccountProposal { @@ -133,6 +169,7 @@ function createBaseSetProtoRevAdminAccountProposal(): SetProtoRevAdminAccountPro }; } export const SetProtoRevAdminAccountProposal = { + typeUrl: "/osmosis.protorev.v1beta1.SetProtoRevAdminAccountProposal", encode(message: SetProtoRevAdminAccountProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -209,5 +246,40 @@ export const SetProtoRevAdminAccountProposal = { obj.description = message.description; obj.account = message.account; return obj; + }, + fromAmino(object: SetProtoRevAdminAccountProposalAmino): SetProtoRevAdminAccountProposal { + return { + title: object.title, + description: object.description, + account: object.account + }; + }, + toAmino(message: SetProtoRevAdminAccountProposal): SetProtoRevAdminAccountProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.account = message.account; + return obj; + }, + fromAminoMsg(object: SetProtoRevAdminAccountProposalAminoMsg): SetProtoRevAdminAccountProposal { + return SetProtoRevAdminAccountProposal.fromAmino(object.value); + }, + toAminoMsg(message: SetProtoRevAdminAccountProposal): SetProtoRevAdminAccountProposalAminoMsg { + return { + type: "osmosis/protorev/set-proto-rev-admin-account-proposal", + value: SetProtoRevAdminAccountProposal.toAmino(message) + }; + }, + fromProtoMsg(message: SetProtoRevAdminAccountProposalProtoMsg): SetProtoRevAdminAccountProposal { + return SetProtoRevAdminAccountProposal.decode(message.value); + }, + toProto(message: SetProtoRevAdminAccountProposal): Uint8Array { + return SetProtoRevAdminAccountProposal.encode(message).finish(); + }, + toProtoMsg(message: SetProtoRevAdminAccountProposal): SetProtoRevAdminAccountProposalProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.SetProtoRevAdminAccountProposal", + value: SetProtoRevAdminAccountProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts index 150357b43f..d456d5515b 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/params.ts @@ -20,6 +20,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.protorev.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enabled === true) { writer.uint32(8).bool(message.enabled); @@ -84,5 +85,38 @@ export const Params = { obj.enabled = message.enabled; obj.admin = message.admin; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + enabled: object.enabled, + admin: object.admin + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.enabled = message.enabled; + obj.admin = message.admin; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/protorev/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts index 84745f48bb..70ce6676e8 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/protorev.ts @@ -132,6 +132,7 @@ function createBaseTokenPairArbRoutes(): TokenPairArbRoutes { }; } export const TokenPairArbRoutes = { + typeUrl: "/osmosis.protorev.v1beta1.TokenPairArbRoutes", encode(message: TokenPairArbRoutes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.arbRoutes) { Route.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -216,6 +217,45 @@ export const TokenPairArbRoutes = { obj.token_in = message.tokenIn; obj.token_out = message.tokenOut; return obj; + }, + fromAmino(object: TokenPairArbRoutesAmino): TokenPairArbRoutes { + return { + arbRoutes: Array.isArray(object?.arb_routes) ? object.arb_routes.map((e: any) => Route.fromAmino(e)) : [], + tokenIn: object.token_in, + tokenOut: object.token_out + }; + }, + toAmino(message: TokenPairArbRoutes): TokenPairArbRoutesAmino { + const obj: any = {}; + if (message.arbRoutes) { + obj.arb_routes = message.arbRoutes.map(e => e ? Route.toAmino(e) : undefined); + } else { + obj.arb_routes = []; + } + obj.token_in = message.tokenIn; + obj.token_out = message.tokenOut; + return obj; + }, + fromAminoMsg(object: TokenPairArbRoutesAminoMsg): TokenPairArbRoutes { + return TokenPairArbRoutes.fromAmino(object.value); + }, + toAminoMsg(message: TokenPairArbRoutes): TokenPairArbRoutesAminoMsg { + return { + type: "osmosis/protorev/token-pair-arb-routes", + value: TokenPairArbRoutes.toAmino(message) + }; + }, + fromProtoMsg(message: TokenPairArbRoutesProtoMsg): TokenPairArbRoutes { + return TokenPairArbRoutes.decode(message.value); + }, + toProto(message: TokenPairArbRoutes): Uint8Array { + return TokenPairArbRoutes.encode(message).finish(); + }, + toProtoMsg(message: TokenPairArbRoutes): TokenPairArbRoutesProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.TokenPairArbRoutes", + value: TokenPairArbRoutes.encode(message).finish() + }; } }; function createBaseRoute(): Route { @@ -225,6 +265,7 @@ function createBaseRoute(): Route { }; } export const Route = { + typeUrl: "/osmosis.protorev.v1beta1.Route", encode(message: Route, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.trades) { Trade.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -297,6 +338,43 @@ export const Route = { } obj.step_size = message.stepSize; return obj; + }, + fromAmino(object: RouteAmino): Route { + return { + trades: Array.isArray(object?.trades) ? object.trades.map((e: any) => Trade.fromAmino(e)) : [], + stepSize: object.step_size + }; + }, + toAmino(message: Route): RouteAmino { + const obj: any = {}; + if (message.trades) { + obj.trades = message.trades.map(e => e ? Trade.toAmino(e) : undefined); + } else { + obj.trades = []; + } + obj.step_size = message.stepSize; + return obj; + }, + fromAminoMsg(object: RouteAminoMsg): Route { + return Route.fromAmino(object.value); + }, + toAminoMsg(message: Route): RouteAminoMsg { + return { + type: "osmosis/protorev/route", + value: Route.toAmino(message) + }; + }, + fromProtoMsg(message: RouteProtoMsg): Route { + return Route.decode(message.value); + }, + toProto(message: Route): Uint8Array { + return Route.encode(message).finish(); + }, + toProtoMsg(message: Route): RouteProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.Route", + value: Route.encode(message).finish() + }; } }; function createBaseTrade(): Trade { @@ -307,6 +385,7 @@ function createBaseTrade(): Trade { }; } export const Trade = { + typeUrl: "/osmosis.protorev.v1beta1.Trade", encode(message: Trade, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pool !== BigInt(0)) { writer.uint32(8).uint64(message.pool); @@ -383,6 +462,41 @@ export const Trade = { obj.token_in = message.tokenIn; obj.token_out = message.tokenOut; return obj; + }, + fromAmino(object: TradeAmino): Trade { + return { + pool: BigInt(object.pool), + tokenIn: object.token_in, + tokenOut: object.token_out + }; + }, + toAmino(message: Trade): TradeAmino { + const obj: any = {}; + obj.pool = message.pool ? message.pool.toString() : undefined; + obj.token_in = message.tokenIn; + obj.token_out = message.tokenOut; + return obj; + }, + fromAminoMsg(object: TradeAminoMsg): Trade { + return Trade.fromAmino(object.value); + }, + toAminoMsg(message: Trade): TradeAminoMsg { + return { + type: "osmosis/protorev/trade", + value: Trade.toAmino(message) + }; + }, + fromProtoMsg(message: TradeProtoMsg): Trade { + return Trade.decode(message.value); + }, + toProto(message: Trade): Uint8Array { + return Trade.encode(message).finish(); + }, + toProtoMsg(message: Trade): TradeProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.Trade", + value: Trade.encode(message).finish() + }; } }; function createBaseRouteStatistics(): RouteStatistics { @@ -393,6 +507,7 @@ function createBaseRouteStatistics(): RouteStatistics { }; } export const RouteStatistics = { + typeUrl: "/osmosis.protorev.v1beta1.RouteStatistics", encode(message: RouteStatistics, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.profits) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -494,6 +609,49 @@ export const RouteStatistics = { obj.route = []; } return obj; + }, + fromAmino(object: RouteStatisticsAmino): RouteStatistics { + return { + profits: Array.isArray(object?.profits) ? object.profits.map((e: any) => Coin.fromAmino(e)) : [], + numberOfTrades: object.number_of_trades, + route: Array.isArray(object?.route) ? object.route.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: RouteStatistics): RouteStatisticsAmino { + const obj: any = {}; + if (message.profits) { + obj.profits = message.profits.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.profits = []; + } + obj.number_of_trades = message.numberOfTrades; + if (message.route) { + obj.route = message.route.map(e => e.toString()); + } else { + obj.route = []; + } + return obj; + }, + fromAminoMsg(object: RouteStatisticsAminoMsg): RouteStatistics { + return RouteStatistics.fromAmino(object.value); + }, + toAminoMsg(message: RouteStatistics): RouteStatisticsAminoMsg { + return { + type: "osmosis/protorev/route-statistics", + value: RouteStatistics.toAmino(message) + }; + }, + fromProtoMsg(message: RouteStatisticsProtoMsg): RouteStatistics { + return RouteStatistics.decode(message.value); + }, + toProto(message: RouteStatistics): Uint8Array { + return RouteStatistics.encode(message).finish(); + }, + toProtoMsg(message: RouteStatistics): RouteStatisticsProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.RouteStatistics", + value: RouteStatistics.encode(message).finish() + }; } }; function createBasePoolWeights(): PoolWeights { @@ -504,6 +662,7 @@ function createBasePoolWeights(): PoolWeights { }; } export const PoolWeights = { + typeUrl: "/osmosis.protorev.v1beta1.PoolWeights", encode(message: PoolWeights, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.stableWeight !== BigInt(0)) { writer.uint32(8).uint64(message.stableWeight); @@ -580,6 +739,41 @@ export const PoolWeights = { obj.balancer_weight = message.balancerWeight; obj.concentrated_weight = message.concentratedWeight; return obj; + }, + fromAmino(object: PoolWeightsAmino): PoolWeights { + return { + stableWeight: BigInt(object.stable_weight), + balancerWeight: BigInt(object.balancer_weight), + concentratedWeight: BigInt(object.concentrated_weight) + }; + }, + toAmino(message: PoolWeights): PoolWeightsAmino { + const obj: any = {}; + obj.stable_weight = message.stableWeight ? message.stableWeight.toString() : undefined; + obj.balancer_weight = message.balancerWeight ? message.balancerWeight.toString() : undefined; + obj.concentrated_weight = message.concentratedWeight ? message.concentratedWeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: PoolWeightsAminoMsg): PoolWeights { + return PoolWeights.fromAmino(object.value); + }, + toAminoMsg(message: PoolWeights): PoolWeightsAminoMsg { + return { + type: "osmosis/protorev/pool-weights", + value: PoolWeights.toAmino(message) + }; + }, + fromProtoMsg(message: PoolWeightsProtoMsg): PoolWeights { + return PoolWeights.decode(message.value); + }, + toProto(message: PoolWeights): Uint8Array { + return PoolWeights.encode(message).finish(); + }, + toProtoMsg(message: PoolWeights): PoolWeightsProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.PoolWeights", + value: PoolWeights.encode(message).finish() + }; } }; function createBaseBaseDenom(): BaseDenom { @@ -589,6 +783,7 @@ function createBaseBaseDenom(): BaseDenom { }; } export const BaseDenom = { + typeUrl: "/osmosis.protorev.v1beta1.BaseDenom", encode(message: BaseDenom, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -653,5 +848,38 @@ export const BaseDenom = { obj.denom = message.denom; obj.step_size = message.stepSize; return obj; + }, + fromAmino(object: BaseDenomAmino): BaseDenom { + return { + denom: object.denom, + stepSize: object.step_size + }; + }, + toAmino(message: BaseDenom): BaseDenomAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.step_size = message.stepSize; + return obj; + }, + fromAminoMsg(object: BaseDenomAminoMsg): BaseDenom { + return BaseDenom.fromAmino(object.value); + }, + toAminoMsg(message: BaseDenom): BaseDenomAminoMsg { + return { + type: "osmosis/protorev/base-denom", + value: BaseDenom.toAmino(message) + }; + }, + fromProtoMsg(message: BaseDenomProtoMsg): BaseDenom { + return BaseDenom.decode(message.value); + }, + toProto(message: BaseDenom): Uint8Array { + return BaseDenom.encode(message).finish(); + }, + toProtoMsg(message: BaseDenom): BaseDenomProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.BaseDenom", + value: BaseDenom.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts index 523b116a05..6765e096b2 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/query.ts @@ -371,6 +371,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -408,6 +409,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/protorev/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -416,6 +445,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -468,12 +498,44 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/protorev/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevNumberOfTradesRequest(): QueryGetProtoRevNumberOfTradesRequest { return {}; } export const QueryGetProtoRevNumberOfTradesRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevNumberOfTradesRequest", encode(_: QueryGetProtoRevNumberOfTradesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -511,6 +573,34 @@ export const QueryGetProtoRevNumberOfTradesRequest = { toSDK(_: QueryGetProtoRevNumberOfTradesRequest): QueryGetProtoRevNumberOfTradesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevNumberOfTradesRequestAmino): QueryGetProtoRevNumberOfTradesRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevNumberOfTradesRequest): QueryGetProtoRevNumberOfTradesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevNumberOfTradesRequestAminoMsg): QueryGetProtoRevNumberOfTradesRequest { + return QueryGetProtoRevNumberOfTradesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevNumberOfTradesRequest): QueryGetProtoRevNumberOfTradesRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-number-of-trades-request", + value: QueryGetProtoRevNumberOfTradesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevNumberOfTradesRequestProtoMsg): QueryGetProtoRevNumberOfTradesRequest { + return QueryGetProtoRevNumberOfTradesRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevNumberOfTradesRequest): Uint8Array { + return QueryGetProtoRevNumberOfTradesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevNumberOfTradesRequest): QueryGetProtoRevNumberOfTradesRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevNumberOfTradesRequest", + value: QueryGetProtoRevNumberOfTradesRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevNumberOfTradesResponse(): QueryGetProtoRevNumberOfTradesResponse { @@ -519,6 +609,7 @@ function createBaseQueryGetProtoRevNumberOfTradesResponse(): QueryGetProtoRevNum }; } export const QueryGetProtoRevNumberOfTradesResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevNumberOfTradesResponse", encode(message: QueryGetProtoRevNumberOfTradesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numberOfTrades !== "") { writer.uint32(10).string(message.numberOfTrades); @@ -571,6 +662,37 @@ export const QueryGetProtoRevNumberOfTradesResponse = { const obj: any = {}; obj.number_of_trades = message.numberOfTrades; return obj; + }, + fromAmino(object: QueryGetProtoRevNumberOfTradesResponseAmino): QueryGetProtoRevNumberOfTradesResponse { + return { + numberOfTrades: object.number_of_trades + }; + }, + toAmino(message: QueryGetProtoRevNumberOfTradesResponse): QueryGetProtoRevNumberOfTradesResponseAmino { + const obj: any = {}; + obj.number_of_trades = message.numberOfTrades; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevNumberOfTradesResponseAminoMsg): QueryGetProtoRevNumberOfTradesResponse { + return QueryGetProtoRevNumberOfTradesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevNumberOfTradesResponse): QueryGetProtoRevNumberOfTradesResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-number-of-trades-response", + value: QueryGetProtoRevNumberOfTradesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevNumberOfTradesResponseProtoMsg): QueryGetProtoRevNumberOfTradesResponse { + return QueryGetProtoRevNumberOfTradesResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevNumberOfTradesResponse): Uint8Array { + return QueryGetProtoRevNumberOfTradesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevNumberOfTradesResponse): QueryGetProtoRevNumberOfTradesResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevNumberOfTradesResponse", + value: QueryGetProtoRevNumberOfTradesResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevProfitsByDenomRequest(): QueryGetProtoRevProfitsByDenomRequest { @@ -579,6 +701,7 @@ function createBaseQueryGetProtoRevProfitsByDenomRequest(): QueryGetProtoRevProf }; } export const QueryGetProtoRevProfitsByDenomRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevProfitsByDenomRequest", encode(message: QueryGetProtoRevProfitsByDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -631,6 +754,37 @@ export const QueryGetProtoRevProfitsByDenomRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryGetProtoRevProfitsByDenomRequestAmino): QueryGetProtoRevProfitsByDenomRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryGetProtoRevProfitsByDenomRequest): QueryGetProtoRevProfitsByDenomRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevProfitsByDenomRequestAminoMsg): QueryGetProtoRevProfitsByDenomRequest { + return QueryGetProtoRevProfitsByDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevProfitsByDenomRequest): QueryGetProtoRevProfitsByDenomRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-profits-by-denom-request", + value: QueryGetProtoRevProfitsByDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevProfitsByDenomRequestProtoMsg): QueryGetProtoRevProfitsByDenomRequest { + return QueryGetProtoRevProfitsByDenomRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevProfitsByDenomRequest): Uint8Array { + return QueryGetProtoRevProfitsByDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevProfitsByDenomRequest): QueryGetProtoRevProfitsByDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevProfitsByDenomRequest", + value: QueryGetProtoRevProfitsByDenomRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevProfitsByDenomResponse(): QueryGetProtoRevProfitsByDenomResponse { @@ -639,6 +793,7 @@ function createBaseQueryGetProtoRevProfitsByDenomResponse(): QueryGetProtoRevPro }; } export const QueryGetProtoRevProfitsByDenomResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevProfitsByDenomResponse", encode(message: QueryGetProtoRevProfitsByDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.profit !== undefined) { Coin.encode(message.profit, writer.uint32(10).fork()).ldelim(); @@ -691,12 +846,44 @@ export const QueryGetProtoRevProfitsByDenomResponse = { const obj: any = {}; message.profit !== undefined && (obj.profit = message.profit ? Coin.toSDK(message.profit) : undefined); return obj; + }, + fromAmino(object: QueryGetProtoRevProfitsByDenomResponseAmino): QueryGetProtoRevProfitsByDenomResponse { + return { + profit: object?.profit ? Coin.fromAmino(object.profit) : undefined + }; + }, + toAmino(message: QueryGetProtoRevProfitsByDenomResponse): QueryGetProtoRevProfitsByDenomResponseAmino { + const obj: any = {}; + obj.profit = message.profit ? Coin.toAmino(message.profit) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevProfitsByDenomResponseAminoMsg): QueryGetProtoRevProfitsByDenomResponse { + return QueryGetProtoRevProfitsByDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevProfitsByDenomResponse): QueryGetProtoRevProfitsByDenomResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-profits-by-denom-response", + value: QueryGetProtoRevProfitsByDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevProfitsByDenomResponseProtoMsg): QueryGetProtoRevProfitsByDenomResponse { + return QueryGetProtoRevProfitsByDenomResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevProfitsByDenomResponse): Uint8Array { + return QueryGetProtoRevProfitsByDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevProfitsByDenomResponse): QueryGetProtoRevProfitsByDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevProfitsByDenomResponse", + value: QueryGetProtoRevProfitsByDenomResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevAllProfitsRequest(): QueryGetProtoRevAllProfitsRequest { return {}; } export const QueryGetProtoRevAllProfitsRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllProfitsRequest", encode(_: QueryGetProtoRevAllProfitsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -734,6 +921,34 @@ export const QueryGetProtoRevAllProfitsRequest = { toSDK(_: QueryGetProtoRevAllProfitsRequest): QueryGetProtoRevAllProfitsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevAllProfitsRequestAmino): QueryGetProtoRevAllProfitsRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevAllProfitsRequest): QueryGetProtoRevAllProfitsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevAllProfitsRequestAminoMsg): QueryGetProtoRevAllProfitsRequest { + return QueryGetProtoRevAllProfitsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevAllProfitsRequest): QueryGetProtoRevAllProfitsRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-all-profits-request", + value: QueryGetProtoRevAllProfitsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevAllProfitsRequestProtoMsg): QueryGetProtoRevAllProfitsRequest { + return QueryGetProtoRevAllProfitsRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevAllProfitsRequest): Uint8Array { + return QueryGetProtoRevAllProfitsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevAllProfitsRequest): QueryGetProtoRevAllProfitsRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllProfitsRequest", + value: QueryGetProtoRevAllProfitsRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevAllProfitsResponse(): QueryGetProtoRevAllProfitsResponse { @@ -742,6 +957,7 @@ function createBaseQueryGetProtoRevAllProfitsResponse(): QueryGetProtoRevAllProf }; } export const QueryGetProtoRevAllProfitsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllProfitsResponse", encode(message: QueryGetProtoRevAllProfitsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.profits) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -802,6 +1018,41 @@ export const QueryGetProtoRevAllProfitsResponse = { obj.profits = []; } return obj; + }, + fromAmino(object: QueryGetProtoRevAllProfitsResponseAmino): QueryGetProtoRevAllProfitsResponse { + return { + profits: Array.isArray(object?.profits) ? object.profits.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryGetProtoRevAllProfitsResponse): QueryGetProtoRevAllProfitsResponseAmino { + const obj: any = {}; + if (message.profits) { + obj.profits = message.profits.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.profits = []; + } + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevAllProfitsResponseAminoMsg): QueryGetProtoRevAllProfitsResponse { + return QueryGetProtoRevAllProfitsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevAllProfitsResponse): QueryGetProtoRevAllProfitsResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-all-profits-response", + value: QueryGetProtoRevAllProfitsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevAllProfitsResponseProtoMsg): QueryGetProtoRevAllProfitsResponse { + return QueryGetProtoRevAllProfitsResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevAllProfitsResponse): Uint8Array { + return QueryGetProtoRevAllProfitsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevAllProfitsResponse): QueryGetProtoRevAllProfitsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllProfitsResponse", + value: QueryGetProtoRevAllProfitsResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevStatisticsByRouteRequest(): QueryGetProtoRevStatisticsByRouteRequest { @@ -810,6 +1061,7 @@ function createBaseQueryGetProtoRevStatisticsByRouteRequest(): QueryGetProtoRevS }; } export const QueryGetProtoRevStatisticsByRouteRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevStatisticsByRouteRequest", encode(message: QueryGetProtoRevStatisticsByRouteRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.route) { @@ -879,6 +1131,41 @@ export const QueryGetProtoRevStatisticsByRouteRequest = { obj.route = []; } return obj; + }, + fromAmino(object: QueryGetProtoRevStatisticsByRouteRequestAmino): QueryGetProtoRevStatisticsByRouteRequest { + return { + route: Array.isArray(object?.route) ? object.route.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: QueryGetProtoRevStatisticsByRouteRequest): QueryGetProtoRevStatisticsByRouteRequestAmino { + const obj: any = {}; + if (message.route) { + obj.route = message.route.map(e => e.toString()); + } else { + obj.route = []; + } + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevStatisticsByRouteRequestAminoMsg): QueryGetProtoRevStatisticsByRouteRequest { + return QueryGetProtoRevStatisticsByRouteRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevStatisticsByRouteRequest): QueryGetProtoRevStatisticsByRouteRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-statistics-by-route-request", + value: QueryGetProtoRevStatisticsByRouteRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevStatisticsByRouteRequestProtoMsg): QueryGetProtoRevStatisticsByRouteRequest { + return QueryGetProtoRevStatisticsByRouteRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevStatisticsByRouteRequest): Uint8Array { + return QueryGetProtoRevStatisticsByRouteRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevStatisticsByRouteRequest): QueryGetProtoRevStatisticsByRouteRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevStatisticsByRouteRequest", + value: QueryGetProtoRevStatisticsByRouteRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevStatisticsByRouteResponse(): QueryGetProtoRevStatisticsByRouteResponse { @@ -887,6 +1174,7 @@ function createBaseQueryGetProtoRevStatisticsByRouteResponse(): QueryGetProtoRev }; } export const QueryGetProtoRevStatisticsByRouteResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevStatisticsByRouteResponse", encode(message: QueryGetProtoRevStatisticsByRouteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.statistics !== undefined) { RouteStatistics.encode(message.statistics, writer.uint32(10).fork()).ldelim(); @@ -939,12 +1227,44 @@ export const QueryGetProtoRevStatisticsByRouteResponse = { const obj: any = {}; message.statistics !== undefined && (obj.statistics = message.statistics ? RouteStatistics.toSDK(message.statistics) : undefined); return obj; + }, + fromAmino(object: QueryGetProtoRevStatisticsByRouteResponseAmino): QueryGetProtoRevStatisticsByRouteResponse { + return { + statistics: object?.statistics ? RouteStatistics.fromAmino(object.statistics) : undefined + }; + }, + toAmino(message: QueryGetProtoRevStatisticsByRouteResponse): QueryGetProtoRevStatisticsByRouteResponseAmino { + const obj: any = {}; + obj.statistics = message.statistics ? RouteStatistics.toAmino(message.statistics) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevStatisticsByRouteResponseAminoMsg): QueryGetProtoRevStatisticsByRouteResponse { + return QueryGetProtoRevStatisticsByRouteResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevStatisticsByRouteResponse): QueryGetProtoRevStatisticsByRouteResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-statistics-by-route-response", + value: QueryGetProtoRevStatisticsByRouteResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevStatisticsByRouteResponseProtoMsg): QueryGetProtoRevStatisticsByRouteResponse { + return QueryGetProtoRevStatisticsByRouteResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevStatisticsByRouteResponse): Uint8Array { + return QueryGetProtoRevStatisticsByRouteResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevStatisticsByRouteResponse): QueryGetProtoRevStatisticsByRouteResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevStatisticsByRouteResponse", + value: QueryGetProtoRevStatisticsByRouteResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevAllRouteStatisticsRequest(): QueryGetProtoRevAllRouteStatisticsRequest { return {}; } export const QueryGetProtoRevAllRouteStatisticsRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllRouteStatisticsRequest", encode(_: QueryGetProtoRevAllRouteStatisticsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -982,6 +1302,34 @@ export const QueryGetProtoRevAllRouteStatisticsRequest = { toSDK(_: QueryGetProtoRevAllRouteStatisticsRequest): QueryGetProtoRevAllRouteStatisticsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevAllRouteStatisticsRequestAmino): QueryGetProtoRevAllRouteStatisticsRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevAllRouteStatisticsRequest): QueryGetProtoRevAllRouteStatisticsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevAllRouteStatisticsRequestAminoMsg): QueryGetProtoRevAllRouteStatisticsRequest { + return QueryGetProtoRevAllRouteStatisticsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevAllRouteStatisticsRequest): QueryGetProtoRevAllRouteStatisticsRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-all-route-statistics-request", + value: QueryGetProtoRevAllRouteStatisticsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevAllRouteStatisticsRequestProtoMsg): QueryGetProtoRevAllRouteStatisticsRequest { + return QueryGetProtoRevAllRouteStatisticsRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevAllRouteStatisticsRequest): Uint8Array { + return QueryGetProtoRevAllRouteStatisticsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevAllRouteStatisticsRequest): QueryGetProtoRevAllRouteStatisticsRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllRouteStatisticsRequest", + value: QueryGetProtoRevAllRouteStatisticsRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevAllRouteStatisticsResponse(): QueryGetProtoRevAllRouteStatisticsResponse { @@ -990,6 +1338,7 @@ function createBaseQueryGetProtoRevAllRouteStatisticsResponse(): QueryGetProtoRe }; } export const QueryGetProtoRevAllRouteStatisticsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllRouteStatisticsResponse", encode(message: QueryGetProtoRevAllRouteStatisticsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.statistics) { RouteStatistics.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1050,12 +1399,48 @@ export const QueryGetProtoRevAllRouteStatisticsResponse = { obj.statistics = []; } return obj; + }, + fromAmino(object: QueryGetProtoRevAllRouteStatisticsResponseAmino): QueryGetProtoRevAllRouteStatisticsResponse { + return { + statistics: Array.isArray(object?.statistics) ? object.statistics.map((e: any) => RouteStatistics.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryGetProtoRevAllRouteStatisticsResponse): QueryGetProtoRevAllRouteStatisticsResponseAmino { + const obj: any = {}; + if (message.statistics) { + obj.statistics = message.statistics.map(e => e ? RouteStatistics.toAmino(e) : undefined); + } else { + obj.statistics = []; + } + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevAllRouteStatisticsResponseAminoMsg): QueryGetProtoRevAllRouteStatisticsResponse { + return QueryGetProtoRevAllRouteStatisticsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevAllRouteStatisticsResponse): QueryGetProtoRevAllRouteStatisticsResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-all-route-statistics-response", + value: QueryGetProtoRevAllRouteStatisticsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevAllRouteStatisticsResponseProtoMsg): QueryGetProtoRevAllRouteStatisticsResponse { + return QueryGetProtoRevAllRouteStatisticsResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevAllRouteStatisticsResponse): Uint8Array { + return QueryGetProtoRevAllRouteStatisticsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevAllRouteStatisticsResponse): QueryGetProtoRevAllRouteStatisticsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAllRouteStatisticsResponse", + value: QueryGetProtoRevAllRouteStatisticsResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevTokenPairArbRoutesRequest(): QueryGetProtoRevTokenPairArbRoutesRequest { return {}; } export const QueryGetProtoRevTokenPairArbRoutesRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevTokenPairArbRoutesRequest", encode(_: QueryGetProtoRevTokenPairArbRoutesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1093,6 +1478,34 @@ export const QueryGetProtoRevTokenPairArbRoutesRequest = { toSDK(_: QueryGetProtoRevTokenPairArbRoutesRequest): QueryGetProtoRevTokenPairArbRoutesRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevTokenPairArbRoutesRequestAmino): QueryGetProtoRevTokenPairArbRoutesRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevTokenPairArbRoutesRequest): QueryGetProtoRevTokenPairArbRoutesRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevTokenPairArbRoutesRequestAminoMsg): QueryGetProtoRevTokenPairArbRoutesRequest { + return QueryGetProtoRevTokenPairArbRoutesRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevTokenPairArbRoutesRequest): QueryGetProtoRevTokenPairArbRoutesRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-token-pair-arb-routes-request", + value: QueryGetProtoRevTokenPairArbRoutesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevTokenPairArbRoutesRequestProtoMsg): QueryGetProtoRevTokenPairArbRoutesRequest { + return QueryGetProtoRevTokenPairArbRoutesRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevTokenPairArbRoutesRequest): Uint8Array { + return QueryGetProtoRevTokenPairArbRoutesRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevTokenPairArbRoutesRequest): QueryGetProtoRevTokenPairArbRoutesRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevTokenPairArbRoutesRequest", + value: QueryGetProtoRevTokenPairArbRoutesRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevTokenPairArbRoutesResponse(): QueryGetProtoRevTokenPairArbRoutesResponse { @@ -1101,6 +1514,7 @@ function createBaseQueryGetProtoRevTokenPairArbRoutesResponse(): QueryGetProtoRe }; } export const QueryGetProtoRevTokenPairArbRoutesResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevTokenPairArbRoutesResponse", encode(message: QueryGetProtoRevTokenPairArbRoutesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.routes) { TokenPairArbRoutes.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1161,12 +1575,48 @@ export const QueryGetProtoRevTokenPairArbRoutesResponse = { obj.routes = []; } return obj; + }, + fromAmino(object: QueryGetProtoRevTokenPairArbRoutesResponseAmino): QueryGetProtoRevTokenPairArbRoutesResponse { + return { + routes: Array.isArray(object?.routes) ? object.routes.map((e: any) => TokenPairArbRoutes.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryGetProtoRevTokenPairArbRoutesResponse): QueryGetProtoRevTokenPairArbRoutesResponseAmino { + const obj: any = {}; + if (message.routes) { + obj.routes = message.routes.map(e => e ? TokenPairArbRoutes.toAmino(e) : undefined); + } else { + obj.routes = []; + } + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevTokenPairArbRoutesResponseAminoMsg): QueryGetProtoRevTokenPairArbRoutesResponse { + return QueryGetProtoRevTokenPairArbRoutesResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevTokenPairArbRoutesResponse): QueryGetProtoRevTokenPairArbRoutesResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-token-pair-arb-routes-response", + value: QueryGetProtoRevTokenPairArbRoutesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevTokenPairArbRoutesResponseProtoMsg): QueryGetProtoRevTokenPairArbRoutesResponse { + return QueryGetProtoRevTokenPairArbRoutesResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevTokenPairArbRoutesResponse): Uint8Array { + return QueryGetProtoRevTokenPairArbRoutesResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevTokenPairArbRoutesResponse): QueryGetProtoRevTokenPairArbRoutesResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevTokenPairArbRoutesResponse", + value: QueryGetProtoRevTokenPairArbRoutesResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevAdminAccountRequest(): QueryGetProtoRevAdminAccountRequest { return {}; } export const QueryGetProtoRevAdminAccountRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAdminAccountRequest", encode(_: QueryGetProtoRevAdminAccountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1204,6 +1654,34 @@ export const QueryGetProtoRevAdminAccountRequest = { toSDK(_: QueryGetProtoRevAdminAccountRequest): QueryGetProtoRevAdminAccountRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevAdminAccountRequestAmino): QueryGetProtoRevAdminAccountRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevAdminAccountRequest): QueryGetProtoRevAdminAccountRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevAdminAccountRequestAminoMsg): QueryGetProtoRevAdminAccountRequest { + return QueryGetProtoRevAdminAccountRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevAdminAccountRequest): QueryGetProtoRevAdminAccountRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-admin-account-request", + value: QueryGetProtoRevAdminAccountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevAdminAccountRequestProtoMsg): QueryGetProtoRevAdminAccountRequest { + return QueryGetProtoRevAdminAccountRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevAdminAccountRequest): Uint8Array { + return QueryGetProtoRevAdminAccountRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevAdminAccountRequest): QueryGetProtoRevAdminAccountRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAdminAccountRequest", + value: QueryGetProtoRevAdminAccountRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevAdminAccountResponse(): QueryGetProtoRevAdminAccountResponse { @@ -1212,6 +1690,7 @@ function createBaseQueryGetProtoRevAdminAccountResponse(): QueryGetProtoRevAdmin }; } export const QueryGetProtoRevAdminAccountResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAdminAccountResponse", encode(message: QueryGetProtoRevAdminAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.adminAccount !== "") { writer.uint32(10).string(message.adminAccount); @@ -1264,12 +1743,44 @@ export const QueryGetProtoRevAdminAccountResponse = { const obj: any = {}; obj.admin_account = message.adminAccount; return obj; + }, + fromAmino(object: QueryGetProtoRevAdminAccountResponseAmino): QueryGetProtoRevAdminAccountResponse { + return { + adminAccount: object.admin_account + }; + }, + toAmino(message: QueryGetProtoRevAdminAccountResponse): QueryGetProtoRevAdminAccountResponseAmino { + const obj: any = {}; + obj.admin_account = message.adminAccount; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevAdminAccountResponseAminoMsg): QueryGetProtoRevAdminAccountResponse { + return QueryGetProtoRevAdminAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevAdminAccountResponse): QueryGetProtoRevAdminAccountResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-admin-account-response", + value: QueryGetProtoRevAdminAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevAdminAccountResponseProtoMsg): QueryGetProtoRevAdminAccountResponse { + return QueryGetProtoRevAdminAccountResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevAdminAccountResponse): Uint8Array { + return QueryGetProtoRevAdminAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevAdminAccountResponse): QueryGetProtoRevAdminAccountResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevAdminAccountResponse", + value: QueryGetProtoRevAdminAccountResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevDeveloperAccountRequest(): QueryGetProtoRevDeveloperAccountRequest { return {}; } export const QueryGetProtoRevDeveloperAccountRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevDeveloperAccountRequest", encode(_: QueryGetProtoRevDeveloperAccountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1307,6 +1818,34 @@ export const QueryGetProtoRevDeveloperAccountRequest = { toSDK(_: QueryGetProtoRevDeveloperAccountRequest): QueryGetProtoRevDeveloperAccountRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevDeveloperAccountRequestAmino): QueryGetProtoRevDeveloperAccountRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevDeveloperAccountRequest): QueryGetProtoRevDeveloperAccountRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevDeveloperAccountRequestAminoMsg): QueryGetProtoRevDeveloperAccountRequest { + return QueryGetProtoRevDeveloperAccountRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevDeveloperAccountRequest): QueryGetProtoRevDeveloperAccountRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-developer-account-request", + value: QueryGetProtoRevDeveloperAccountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevDeveloperAccountRequestProtoMsg): QueryGetProtoRevDeveloperAccountRequest { + return QueryGetProtoRevDeveloperAccountRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevDeveloperAccountRequest): Uint8Array { + return QueryGetProtoRevDeveloperAccountRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevDeveloperAccountRequest): QueryGetProtoRevDeveloperAccountRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevDeveloperAccountRequest", + value: QueryGetProtoRevDeveloperAccountRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevDeveloperAccountResponse(): QueryGetProtoRevDeveloperAccountResponse { @@ -1315,6 +1854,7 @@ function createBaseQueryGetProtoRevDeveloperAccountResponse(): QueryGetProtoRevD }; } export const QueryGetProtoRevDeveloperAccountResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevDeveloperAccountResponse", encode(message: QueryGetProtoRevDeveloperAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.developerAccount !== "") { writer.uint32(10).string(message.developerAccount); @@ -1367,12 +1907,44 @@ export const QueryGetProtoRevDeveloperAccountResponse = { const obj: any = {}; obj.developer_account = message.developerAccount; return obj; + }, + fromAmino(object: QueryGetProtoRevDeveloperAccountResponseAmino): QueryGetProtoRevDeveloperAccountResponse { + return { + developerAccount: object.developer_account + }; + }, + toAmino(message: QueryGetProtoRevDeveloperAccountResponse): QueryGetProtoRevDeveloperAccountResponseAmino { + const obj: any = {}; + obj.developer_account = message.developerAccount; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevDeveloperAccountResponseAminoMsg): QueryGetProtoRevDeveloperAccountResponse { + return QueryGetProtoRevDeveloperAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevDeveloperAccountResponse): QueryGetProtoRevDeveloperAccountResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-developer-account-response", + value: QueryGetProtoRevDeveloperAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevDeveloperAccountResponseProtoMsg): QueryGetProtoRevDeveloperAccountResponse { + return QueryGetProtoRevDeveloperAccountResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevDeveloperAccountResponse): Uint8Array { + return QueryGetProtoRevDeveloperAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevDeveloperAccountResponse): QueryGetProtoRevDeveloperAccountResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevDeveloperAccountResponse", + value: QueryGetProtoRevDeveloperAccountResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevPoolWeightsRequest(): QueryGetProtoRevPoolWeightsRequest { return {}; } export const QueryGetProtoRevPoolWeightsRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsRequest", encode(_: QueryGetProtoRevPoolWeightsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1410,6 +1982,34 @@ export const QueryGetProtoRevPoolWeightsRequest = { toSDK(_: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevPoolWeightsRequestAmino): QueryGetProtoRevPoolWeightsRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevPoolWeightsRequestAminoMsg): QueryGetProtoRevPoolWeightsRequest { + return QueryGetProtoRevPoolWeightsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-pool-weights-request", + value: QueryGetProtoRevPoolWeightsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevPoolWeightsRequestProtoMsg): QueryGetProtoRevPoolWeightsRequest { + return QueryGetProtoRevPoolWeightsRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevPoolWeightsRequest): Uint8Array { + return QueryGetProtoRevPoolWeightsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevPoolWeightsRequest): QueryGetProtoRevPoolWeightsRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsRequest", + value: QueryGetProtoRevPoolWeightsRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevPoolWeightsResponse(): QueryGetProtoRevPoolWeightsResponse { @@ -1418,6 +2018,7 @@ function createBaseQueryGetProtoRevPoolWeightsResponse(): QueryGetProtoRevPoolWe }; } export const QueryGetProtoRevPoolWeightsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsResponse", encode(message: QueryGetProtoRevPoolWeightsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolWeights !== undefined) { PoolWeights.encode(message.poolWeights, writer.uint32(10).fork()).ldelim(); @@ -1470,12 +2071,44 @@ export const QueryGetProtoRevPoolWeightsResponse = { const obj: any = {}; message.poolWeights !== undefined && (obj.pool_weights = message.poolWeights ? PoolWeights.toSDK(message.poolWeights) : undefined); return obj; + }, + fromAmino(object: QueryGetProtoRevPoolWeightsResponseAmino): QueryGetProtoRevPoolWeightsResponse { + return { + poolWeights: object?.pool_weights ? PoolWeights.fromAmino(object.pool_weights) : undefined + }; + }, + toAmino(message: QueryGetProtoRevPoolWeightsResponse): QueryGetProtoRevPoolWeightsResponseAmino { + const obj: any = {}; + obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevPoolWeightsResponseAminoMsg): QueryGetProtoRevPoolWeightsResponse { + return QueryGetProtoRevPoolWeightsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevPoolWeightsResponse): QueryGetProtoRevPoolWeightsResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-pool-weights-response", + value: QueryGetProtoRevPoolWeightsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevPoolWeightsResponseProtoMsg): QueryGetProtoRevPoolWeightsResponse { + return QueryGetProtoRevPoolWeightsResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevPoolWeightsResponse): Uint8Array { + return QueryGetProtoRevPoolWeightsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevPoolWeightsResponse): QueryGetProtoRevPoolWeightsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevPoolWeightsResponse", + value: QueryGetProtoRevPoolWeightsResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevMaxPoolPointsPerBlockRequest(): QueryGetProtoRevMaxPoolPointsPerBlockRequest { return {}; } export const QueryGetProtoRevMaxPoolPointsPerBlockRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerBlockRequest", encode(_: QueryGetProtoRevMaxPoolPointsPerBlockRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1513,6 +2146,34 @@ export const QueryGetProtoRevMaxPoolPointsPerBlockRequest = { toSDK(_: QueryGetProtoRevMaxPoolPointsPerBlockRequest): QueryGetProtoRevMaxPoolPointsPerBlockRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevMaxPoolPointsPerBlockRequestAmino): QueryGetProtoRevMaxPoolPointsPerBlockRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevMaxPoolPointsPerBlockRequest): QueryGetProtoRevMaxPoolPointsPerBlockRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevMaxPoolPointsPerBlockRequestAminoMsg): QueryGetProtoRevMaxPoolPointsPerBlockRequest { + return QueryGetProtoRevMaxPoolPointsPerBlockRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevMaxPoolPointsPerBlockRequest): QueryGetProtoRevMaxPoolPointsPerBlockRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-max-pool-points-per-block-request", + value: QueryGetProtoRevMaxPoolPointsPerBlockRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerBlockRequestProtoMsg): QueryGetProtoRevMaxPoolPointsPerBlockRequest { + return QueryGetProtoRevMaxPoolPointsPerBlockRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevMaxPoolPointsPerBlockRequest): Uint8Array { + return QueryGetProtoRevMaxPoolPointsPerBlockRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerBlockRequest): QueryGetProtoRevMaxPoolPointsPerBlockRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerBlockRequest", + value: QueryGetProtoRevMaxPoolPointsPerBlockRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevMaxPoolPointsPerBlockResponse(): QueryGetProtoRevMaxPoolPointsPerBlockResponse { @@ -1521,6 +2182,7 @@ function createBaseQueryGetProtoRevMaxPoolPointsPerBlockResponse(): QueryGetProt }; } export const QueryGetProtoRevMaxPoolPointsPerBlockResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerBlockResponse", encode(message: QueryGetProtoRevMaxPoolPointsPerBlockResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxPoolPointsPerBlock !== BigInt(0)) { writer.uint32(8).uint64(message.maxPoolPointsPerBlock); @@ -1573,12 +2235,44 @@ export const QueryGetProtoRevMaxPoolPointsPerBlockResponse = { const obj: any = {}; obj.max_pool_points_per_block = message.maxPoolPointsPerBlock; return obj; + }, + fromAmino(object: QueryGetProtoRevMaxPoolPointsPerBlockResponseAmino): QueryGetProtoRevMaxPoolPointsPerBlockResponse { + return { + maxPoolPointsPerBlock: BigInt(object.max_pool_points_per_block) + }; + }, + toAmino(message: QueryGetProtoRevMaxPoolPointsPerBlockResponse): QueryGetProtoRevMaxPoolPointsPerBlockResponseAmino { + const obj: any = {}; + obj.max_pool_points_per_block = message.maxPoolPointsPerBlock ? message.maxPoolPointsPerBlock.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevMaxPoolPointsPerBlockResponseAminoMsg): QueryGetProtoRevMaxPoolPointsPerBlockResponse { + return QueryGetProtoRevMaxPoolPointsPerBlockResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevMaxPoolPointsPerBlockResponse): QueryGetProtoRevMaxPoolPointsPerBlockResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-max-pool-points-per-block-response", + value: QueryGetProtoRevMaxPoolPointsPerBlockResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerBlockResponseProtoMsg): QueryGetProtoRevMaxPoolPointsPerBlockResponse { + return QueryGetProtoRevMaxPoolPointsPerBlockResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevMaxPoolPointsPerBlockResponse): Uint8Array { + return QueryGetProtoRevMaxPoolPointsPerBlockResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerBlockResponse): QueryGetProtoRevMaxPoolPointsPerBlockResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerBlockResponse", + value: QueryGetProtoRevMaxPoolPointsPerBlockResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevMaxPoolPointsPerTxRequest(): QueryGetProtoRevMaxPoolPointsPerTxRequest { return {}; } export const QueryGetProtoRevMaxPoolPointsPerTxRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerTxRequest", encode(_: QueryGetProtoRevMaxPoolPointsPerTxRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1616,6 +2310,34 @@ export const QueryGetProtoRevMaxPoolPointsPerTxRequest = { toSDK(_: QueryGetProtoRevMaxPoolPointsPerTxRequest): QueryGetProtoRevMaxPoolPointsPerTxRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevMaxPoolPointsPerTxRequestAmino): QueryGetProtoRevMaxPoolPointsPerTxRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevMaxPoolPointsPerTxRequest): QueryGetProtoRevMaxPoolPointsPerTxRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevMaxPoolPointsPerTxRequestAminoMsg): QueryGetProtoRevMaxPoolPointsPerTxRequest { + return QueryGetProtoRevMaxPoolPointsPerTxRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevMaxPoolPointsPerTxRequest): QueryGetProtoRevMaxPoolPointsPerTxRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-max-pool-points-per-tx-request", + value: QueryGetProtoRevMaxPoolPointsPerTxRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerTxRequestProtoMsg): QueryGetProtoRevMaxPoolPointsPerTxRequest { + return QueryGetProtoRevMaxPoolPointsPerTxRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevMaxPoolPointsPerTxRequest): Uint8Array { + return QueryGetProtoRevMaxPoolPointsPerTxRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerTxRequest): QueryGetProtoRevMaxPoolPointsPerTxRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerTxRequest", + value: QueryGetProtoRevMaxPoolPointsPerTxRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevMaxPoolPointsPerTxResponse(): QueryGetProtoRevMaxPoolPointsPerTxResponse { @@ -1624,6 +2346,7 @@ function createBaseQueryGetProtoRevMaxPoolPointsPerTxResponse(): QueryGetProtoRe }; } export const QueryGetProtoRevMaxPoolPointsPerTxResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerTxResponse", encode(message: QueryGetProtoRevMaxPoolPointsPerTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxPoolPointsPerTx !== BigInt(0)) { writer.uint32(8).uint64(message.maxPoolPointsPerTx); @@ -1676,12 +2399,44 @@ export const QueryGetProtoRevMaxPoolPointsPerTxResponse = { const obj: any = {}; obj.max_pool_points_per_tx = message.maxPoolPointsPerTx; return obj; + }, + fromAmino(object: QueryGetProtoRevMaxPoolPointsPerTxResponseAmino): QueryGetProtoRevMaxPoolPointsPerTxResponse { + return { + maxPoolPointsPerTx: BigInt(object.max_pool_points_per_tx) + }; + }, + toAmino(message: QueryGetProtoRevMaxPoolPointsPerTxResponse): QueryGetProtoRevMaxPoolPointsPerTxResponseAmino { + const obj: any = {}; + obj.max_pool_points_per_tx = message.maxPoolPointsPerTx ? message.maxPoolPointsPerTx.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevMaxPoolPointsPerTxResponseAminoMsg): QueryGetProtoRevMaxPoolPointsPerTxResponse { + return QueryGetProtoRevMaxPoolPointsPerTxResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevMaxPoolPointsPerTxResponse): QueryGetProtoRevMaxPoolPointsPerTxResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-max-pool-points-per-tx-response", + value: QueryGetProtoRevMaxPoolPointsPerTxResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerTxResponseProtoMsg): QueryGetProtoRevMaxPoolPointsPerTxResponse { + return QueryGetProtoRevMaxPoolPointsPerTxResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevMaxPoolPointsPerTxResponse): Uint8Array { + return QueryGetProtoRevMaxPoolPointsPerTxResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevMaxPoolPointsPerTxResponse): QueryGetProtoRevMaxPoolPointsPerTxResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevMaxPoolPointsPerTxResponse", + value: QueryGetProtoRevMaxPoolPointsPerTxResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevBaseDenomsRequest(): QueryGetProtoRevBaseDenomsRequest { return {}; } export const QueryGetProtoRevBaseDenomsRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevBaseDenomsRequest", encode(_: QueryGetProtoRevBaseDenomsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1719,6 +2474,34 @@ export const QueryGetProtoRevBaseDenomsRequest = { toSDK(_: QueryGetProtoRevBaseDenomsRequest): QueryGetProtoRevBaseDenomsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevBaseDenomsRequestAmino): QueryGetProtoRevBaseDenomsRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevBaseDenomsRequest): QueryGetProtoRevBaseDenomsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevBaseDenomsRequestAminoMsg): QueryGetProtoRevBaseDenomsRequest { + return QueryGetProtoRevBaseDenomsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevBaseDenomsRequest): QueryGetProtoRevBaseDenomsRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-base-denoms-request", + value: QueryGetProtoRevBaseDenomsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevBaseDenomsRequestProtoMsg): QueryGetProtoRevBaseDenomsRequest { + return QueryGetProtoRevBaseDenomsRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevBaseDenomsRequest): Uint8Array { + return QueryGetProtoRevBaseDenomsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevBaseDenomsRequest): QueryGetProtoRevBaseDenomsRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevBaseDenomsRequest", + value: QueryGetProtoRevBaseDenomsRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevBaseDenomsResponse(): QueryGetProtoRevBaseDenomsResponse { @@ -1727,6 +2510,7 @@ function createBaseQueryGetProtoRevBaseDenomsResponse(): QueryGetProtoRevBaseDen }; } export const QueryGetProtoRevBaseDenomsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevBaseDenomsResponse", encode(message: QueryGetProtoRevBaseDenomsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.baseDenoms) { BaseDenom.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1787,12 +2571,48 @@ export const QueryGetProtoRevBaseDenomsResponse = { obj.base_denoms = []; } return obj; + }, + fromAmino(object: QueryGetProtoRevBaseDenomsResponseAmino): QueryGetProtoRevBaseDenomsResponse { + return { + baseDenoms: Array.isArray(object?.base_denoms) ? object.base_denoms.map((e: any) => BaseDenom.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryGetProtoRevBaseDenomsResponse): QueryGetProtoRevBaseDenomsResponseAmino { + const obj: any = {}; + if (message.baseDenoms) { + obj.base_denoms = message.baseDenoms.map(e => e ? BaseDenom.toAmino(e) : undefined); + } else { + obj.base_denoms = []; + } + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevBaseDenomsResponseAminoMsg): QueryGetProtoRevBaseDenomsResponse { + return QueryGetProtoRevBaseDenomsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevBaseDenomsResponse): QueryGetProtoRevBaseDenomsResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-base-denoms-response", + value: QueryGetProtoRevBaseDenomsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevBaseDenomsResponseProtoMsg): QueryGetProtoRevBaseDenomsResponse { + return QueryGetProtoRevBaseDenomsResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevBaseDenomsResponse): Uint8Array { + return QueryGetProtoRevBaseDenomsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevBaseDenomsResponse): QueryGetProtoRevBaseDenomsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevBaseDenomsResponse", + value: QueryGetProtoRevBaseDenomsResponse.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevEnabledRequest(): QueryGetProtoRevEnabledRequest { return {}; } export const QueryGetProtoRevEnabledRequest = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevEnabledRequest", encode(_: QueryGetProtoRevEnabledRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1830,6 +2650,34 @@ export const QueryGetProtoRevEnabledRequest = { toSDK(_: QueryGetProtoRevEnabledRequest): QueryGetProtoRevEnabledRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryGetProtoRevEnabledRequestAmino): QueryGetProtoRevEnabledRequest { + return {}; + }, + toAmino(_: QueryGetProtoRevEnabledRequest): QueryGetProtoRevEnabledRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevEnabledRequestAminoMsg): QueryGetProtoRevEnabledRequest { + return QueryGetProtoRevEnabledRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevEnabledRequest): QueryGetProtoRevEnabledRequestAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-enabled-request", + value: QueryGetProtoRevEnabledRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevEnabledRequestProtoMsg): QueryGetProtoRevEnabledRequest { + return QueryGetProtoRevEnabledRequest.decode(message.value); + }, + toProto(message: QueryGetProtoRevEnabledRequest): Uint8Array { + return QueryGetProtoRevEnabledRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevEnabledRequest): QueryGetProtoRevEnabledRequestProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevEnabledRequest", + value: QueryGetProtoRevEnabledRequest.encode(message).finish() + }; } }; function createBaseQueryGetProtoRevEnabledResponse(): QueryGetProtoRevEnabledResponse { @@ -1838,6 +2686,7 @@ function createBaseQueryGetProtoRevEnabledResponse(): QueryGetProtoRevEnabledRes }; } export const QueryGetProtoRevEnabledResponse = { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevEnabledResponse", encode(message: QueryGetProtoRevEnabledResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enabled === true) { writer.uint32(8).bool(message.enabled); @@ -1890,5 +2739,36 @@ export const QueryGetProtoRevEnabledResponse = { const obj: any = {}; obj.enabled = message.enabled; return obj; + }, + fromAmino(object: QueryGetProtoRevEnabledResponseAmino): QueryGetProtoRevEnabledResponse { + return { + enabled: object.enabled + }; + }, + toAmino(message: QueryGetProtoRevEnabledResponse): QueryGetProtoRevEnabledResponseAmino { + const obj: any = {}; + obj.enabled = message.enabled; + return obj; + }, + fromAminoMsg(object: QueryGetProtoRevEnabledResponseAminoMsg): QueryGetProtoRevEnabledResponse { + return QueryGetProtoRevEnabledResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryGetProtoRevEnabledResponse): QueryGetProtoRevEnabledResponseAminoMsg { + return { + type: "osmosis/protorev/query-get-proto-rev-enabled-response", + value: QueryGetProtoRevEnabledResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryGetProtoRevEnabledResponseProtoMsg): QueryGetProtoRevEnabledResponse { + return QueryGetProtoRevEnabledResponse.decode(message.value); + }, + toProto(message: QueryGetProtoRevEnabledResponse): Uint8Array { + return QueryGetProtoRevEnabledResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryGetProtoRevEnabledResponse): QueryGetProtoRevEnabledResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.QueryGetProtoRevEnabledResponse", + value: QueryGetProtoRevEnabledResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts index dd7173ed2d..4dfd62deb7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/protorev/v1beta1/tx.ts @@ -141,6 +141,7 @@ function createBaseMsgSetHotRoutes(): MsgSetHotRoutes { }; } export const MsgSetHotRoutes = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetHotRoutes", encode(message: MsgSetHotRoutes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -213,12 +214,50 @@ export const MsgSetHotRoutes = { obj.hot_routes = []; } return obj; + }, + fromAmino(object: MsgSetHotRoutesAmino): MsgSetHotRoutes { + return { + admin: object.admin, + hotRoutes: Array.isArray(object?.hot_routes) ? object.hot_routes.map((e: any) => TokenPairArbRoutes.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSetHotRoutes): MsgSetHotRoutesAmino { + const obj: any = {}; + obj.admin = message.admin; + if (message.hotRoutes) { + obj.hot_routes = message.hotRoutes.map(e => e ? TokenPairArbRoutes.toAmino(e) : undefined); + } else { + obj.hot_routes = []; + } + return obj; + }, + fromAminoMsg(object: MsgSetHotRoutesAminoMsg): MsgSetHotRoutes { + return MsgSetHotRoutes.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetHotRoutes): MsgSetHotRoutesAminoMsg { + return { + type: "osmosis/MsgSetHotRoutes", + value: MsgSetHotRoutes.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetHotRoutesProtoMsg): MsgSetHotRoutes { + return MsgSetHotRoutes.decode(message.value); + }, + toProto(message: MsgSetHotRoutes): Uint8Array { + return MsgSetHotRoutes.encode(message).finish(); + }, + toProtoMsg(message: MsgSetHotRoutes): MsgSetHotRoutesProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetHotRoutes", + value: MsgSetHotRoutes.encode(message).finish() + }; } }; function createBaseMsgSetHotRoutesResponse(): MsgSetHotRoutesResponse { return {}; } export const MsgSetHotRoutesResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetHotRoutesResponse", encode(_: MsgSetHotRoutesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -256,6 +295,34 @@ export const MsgSetHotRoutesResponse = { toSDK(_: MsgSetHotRoutesResponse): MsgSetHotRoutesResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetHotRoutesResponseAmino): MsgSetHotRoutesResponse { + return {}; + }, + toAmino(_: MsgSetHotRoutesResponse): MsgSetHotRoutesResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetHotRoutesResponseAminoMsg): MsgSetHotRoutesResponse { + return MsgSetHotRoutesResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetHotRoutesResponse): MsgSetHotRoutesResponseAminoMsg { + return { + type: "osmosis/protorev/set-hot-routes-response", + value: MsgSetHotRoutesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetHotRoutesResponseProtoMsg): MsgSetHotRoutesResponse { + return MsgSetHotRoutesResponse.decode(message.value); + }, + toProto(message: MsgSetHotRoutesResponse): Uint8Array { + return MsgSetHotRoutesResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetHotRoutesResponse): MsgSetHotRoutesResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetHotRoutesResponse", + value: MsgSetHotRoutesResponse.encode(message).finish() + }; } }; function createBaseMsgSetDeveloperAccount(): MsgSetDeveloperAccount { @@ -265,6 +332,7 @@ function createBaseMsgSetDeveloperAccount(): MsgSetDeveloperAccount { }; } export const MsgSetDeveloperAccount = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetDeveloperAccount", encode(message: MsgSetDeveloperAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -329,12 +397,46 @@ export const MsgSetDeveloperAccount = { obj.admin = message.admin; obj.developer_account = message.developerAccount; return obj; + }, + fromAmino(object: MsgSetDeveloperAccountAmino): MsgSetDeveloperAccount { + return { + admin: object.admin, + developerAccount: object.developer_account + }; + }, + toAmino(message: MsgSetDeveloperAccount): MsgSetDeveloperAccountAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.developer_account = message.developerAccount; + return obj; + }, + fromAminoMsg(object: MsgSetDeveloperAccountAminoMsg): MsgSetDeveloperAccount { + return MsgSetDeveloperAccount.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetDeveloperAccount): MsgSetDeveloperAccountAminoMsg { + return { + type: "osmosis/MsgSetDeveloperAccount", + value: MsgSetDeveloperAccount.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetDeveloperAccountProtoMsg): MsgSetDeveloperAccount { + return MsgSetDeveloperAccount.decode(message.value); + }, + toProto(message: MsgSetDeveloperAccount): Uint8Array { + return MsgSetDeveloperAccount.encode(message).finish(); + }, + toProtoMsg(message: MsgSetDeveloperAccount): MsgSetDeveloperAccountProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetDeveloperAccount", + value: MsgSetDeveloperAccount.encode(message).finish() + }; } }; function createBaseMsgSetDeveloperAccountResponse(): MsgSetDeveloperAccountResponse { return {}; } export const MsgSetDeveloperAccountResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetDeveloperAccountResponse", encode(_: MsgSetDeveloperAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -372,6 +474,34 @@ export const MsgSetDeveloperAccountResponse = { toSDK(_: MsgSetDeveloperAccountResponse): MsgSetDeveloperAccountResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetDeveloperAccountResponseAmino): MsgSetDeveloperAccountResponse { + return {}; + }, + toAmino(_: MsgSetDeveloperAccountResponse): MsgSetDeveloperAccountResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetDeveloperAccountResponseAminoMsg): MsgSetDeveloperAccountResponse { + return MsgSetDeveloperAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetDeveloperAccountResponse): MsgSetDeveloperAccountResponseAminoMsg { + return { + type: "osmosis/protorev/set-developer-account-response", + value: MsgSetDeveloperAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetDeveloperAccountResponseProtoMsg): MsgSetDeveloperAccountResponse { + return MsgSetDeveloperAccountResponse.decode(message.value); + }, + toProto(message: MsgSetDeveloperAccountResponse): Uint8Array { + return MsgSetDeveloperAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetDeveloperAccountResponse): MsgSetDeveloperAccountResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetDeveloperAccountResponse", + value: MsgSetDeveloperAccountResponse.encode(message).finish() + }; } }; function createBaseMsgSetPoolWeights(): MsgSetPoolWeights { @@ -381,6 +511,7 @@ function createBaseMsgSetPoolWeights(): MsgSetPoolWeights { }; } export const MsgSetPoolWeights = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", encode(message: MsgSetPoolWeights, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -445,12 +576,46 @@ export const MsgSetPoolWeights = { obj.admin = message.admin; message.poolWeights !== undefined && (obj.pool_weights = message.poolWeights ? PoolWeights.toSDK(message.poolWeights) : undefined); return obj; + }, + fromAmino(object: MsgSetPoolWeightsAmino): MsgSetPoolWeights { + return { + admin: object.admin, + poolWeights: object?.pool_weights ? PoolWeights.fromAmino(object.pool_weights) : undefined + }; + }, + toAmino(message: MsgSetPoolWeights): MsgSetPoolWeightsAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.pool_weights = message.poolWeights ? PoolWeights.toAmino(message.poolWeights) : undefined; + return obj; + }, + fromAminoMsg(object: MsgSetPoolWeightsAminoMsg): MsgSetPoolWeights { + return MsgSetPoolWeights.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetPoolWeights): MsgSetPoolWeightsAminoMsg { + return { + type: "osmosis/protorev/set-pool-weights", + value: MsgSetPoolWeights.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetPoolWeightsProtoMsg): MsgSetPoolWeights { + return MsgSetPoolWeights.decode(message.value); + }, + toProto(message: MsgSetPoolWeights): Uint8Array { + return MsgSetPoolWeights.encode(message).finish(); + }, + toProtoMsg(message: MsgSetPoolWeights): MsgSetPoolWeightsProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeights", + value: MsgSetPoolWeights.encode(message).finish() + }; } }; function createBaseMsgSetPoolWeightsResponse(): MsgSetPoolWeightsResponse { return {}; } export const MsgSetPoolWeightsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeightsResponse", encode(_: MsgSetPoolWeightsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -488,6 +653,34 @@ export const MsgSetPoolWeightsResponse = { toSDK(_: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetPoolWeightsResponseAmino): MsgSetPoolWeightsResponse { + return {}; + }, + toAmino(_: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetPoolWeightsResponseAminoMsg): MsgSetPoolWeightsResponse { + return MsgSetPoolWeightsResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseAminoMsg { + return { + type: "osmosis/protorev/set-pool-weights-response", + value: MsgSetPoolWeightsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetPoolWeightsResponseProtoMsg): MsgSetPoolWeightsResponse { + return MsgSetPoolWeightsResponse.decode(message.value); + }, + toProto(message: MsgSetPoolWeightsResponse): Uint8Array { + return MsgSetPoolWeightsResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetPoolWeightsResponse): MsgSetPoolWeightsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetPoolWeightsResponse", + value: MsgSetPoolWeightsResponse.encode(message).finish() + }; } }; function createBaseMsgSetMaxPoolPointsPerTx(): MsgSetMaxPoolPointsPerTx { @@ -497,6 +690,7 @@ function createBaseMsgSetMaxPoolPointsPerTx(): MsgSetMaxPoolPointsPerTx { }; } export const MsgSetMaxPoolPointsPerTx = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerTx", encode(message: MsgSetMaxPoolPointsPerTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -561,12 +755,46 @@ export const MsgSetMaxPoolPointsPerTx = { obj.admin = message.admin; obj.max_pool_points_per_tx = message.maxPoolPointsPerTx; return obj; + }, + fromAmino(object: MsgSetMaxPoolPointsPerTxAmino): MsgSetMaxPoolPointsPerTx { + return { + admin: object.admin, + maxPoolPointsPerTx: BigInt(object.max_pool_points_per_tx) + }; + }, + toAmino(message: MsgSetMaxPoolPointsPerTx): MsgSetMaxPoolPointsPerTxAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.max_pool_points_per_tx = message.maxPoolPointsPerTx ? message.maxPoolPointsPerTx.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSetMaxPoolPointsPerTxAminoMsg): MsgSetMaxPoolPointsPerTx { + return MsgSetMaxPoolPointsPerTx.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetMaxPoolPointsPerTx): MsgSetMaxPoolPointsPerTxAminoMsg { + return { + type: "osmosis/protorev/set-max-pool-points-per-tx", + value: MsgSetMaxPoolPointsPerTx.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetMaxPoolPointsPerTxProtoMsg): MsgSetMaxPoolPointsPerTx { + return MsgSetMaxPoolPointsPerTx.decode(message.value); + }, + toProto(message: MsgSetMaxPoolPointsPerTx): Uint8Array { + return MsgSetMaxPoolPointsPerTx.encode(message).finish(); + }, + toProtoMsg(message: MsgSetMaxPoolPointsPerTx): MsgSetMaxPoolPointsPerTxProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerTx", + value: MsgSetMaxPoolPointsPerTx.encode(message).finish() + }; } }; function createBaseMsgSetMaxPoolPointsPerTxResponse(): MsgSetMaxPoolPointsPerTxResponse { return {}; } export const MsgSetMaxPoolPointsPerTxResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerTxResponse", encode(_: MsgSetMaxPoolPointsPerTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -604,6 +832,34 @@ export const MsgSetMaxPoolPointsPerTxResponse = { toSDK(_: MsgSetMaxPoolPointsPerTxResponse): MsgSetMaxPoolPointsPerTxResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetMaxPoolPointsPerTxResponseAmino): MsgSetMaxPoolPointsPerTxResponse { + return {}; + }, + toAmino(_: MsgSetMaxPoolPointsPerTxResponse): MsgSetMaxPoolPointsPerTxResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetMaxPoolPointsPerTxResponseAminoMsg): MsgSetMaxPoolPointsPerTxResponse { + return MsgSetMaxPoolPointsPerTxResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetMaxPoolPointsPerTxResponse): MsgSetMaxPoolPointsPerTxResponseAminoMsg { + return { + type: "osmosis/protorev/set-max-pool-points-per-tx-response", + value: MsgSetMaxPoolPointsPerTxResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetMaxPoolPointsPerTxResponseProtoMsg): MsgSetMaxPoolPointsPerTxResponse { + return MsgSetMaxPoolPointsPerTxResponse.decode(message.value); + }, + toProto(message: MsgSetMaxPoolPointsPerTxResponse): Uint8Array { + return MsgSetMaxPoolPointsPerTxResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetMaxPoolPointsPerTxResponse): MsgSetMaxPoolPointsPerTxResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerTxResponse", + value: MsgSetMaxPoolPointsPerTxResponse.encode(message).finish() + }; } }; function createBaseMsgSetMaxPoolPointsPerBlock(): MsgSetMaxPoolPointsPerBlock { @@ -613,6 +869,7 @@ function createBaseMsgSetMaxPoolPointsPerBlock(): MsgSetMaxPoolPointsPerBlock { }; } export const MsgSetMaxPoolPointsPerBlock = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerBlock", encode(message: MsgSetMaxPoolPointsPerBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -677,12 +934,46 @@ export const MsgSetMaxPoolPointsPerBlock = { obj.admin = message.admin; obj.max_pool_points_per_block = message.maxPoolPointsPerBlock; return obj; + }, + fromAmino(object: MsgSetMaxPoolPointsPerBlockAmino): MsgSetMaxPoolPointsPerBlock { + return { + admin: object.admin, + maxPoolPointsPerBlock: BigInt(object.max_pool_points_per_block) + }; + }, + toAmino(message: MsgSetMaxPoolPointsPerBlock): MsgSetMaxPoolPointsPerBlockAmino { + const obj: any = {}; + obj.admin = message.admin; + obj.max_pool_points_per_block = message.maxPoolPointsPerBlock ? message.maxPoolPointsPerBlock.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSetMaxPoolPointsPerBlockAminoMsg): MsgSetMaxPoolPointsPerBlock { + return MsgSetMaxPoolPointsPerBlock.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetMaxPoolPointsPerBlock): MsgSetMaxPoolPointsPerBlockAminoMsg { + return { + type: "osmosis/protorev/set-max-pool-points-per-block", + value: MsgSetMaxPoolPointsPerBlock.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetMaxPoolPointsPerBlockProtoMsg): MsgSetMaxPoolPointsPerBlock { + return MsgSetMaxPoolPointsPerBlock.decode(message.value); + }, + toProto(message: MsgSetMaxPoolPointsPerBlock): Uint8Array { + return MsgSetMaxPoolPointsPerBlock.encode(message).finish(); + }, + toProtoMsg(message: MsgSetMaxPoolPointsPerBlock): MsgSetMaxPoolPointsPerBlockProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerBlock", + value: MsgSetMaxPoolPointsPerBlock.encode(message).finish() + }; } }; function createBaseMsgSetMaxPoolPointsPerBlockResponse(): MsgSetMaxPoolPointsPerBlockResponse { return {}; } export const MsgSetMaxPoolPointsPerBlockResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerBlockResponse", encode(_: MsgSetMaxPoolPointsPerBlockResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -720,6 +1011,34 @@ export const MsgSetMaxPoolPointsPerBlockResponse = { toSDK(_: MsgSetMaxPoolPointsPerBlockResponse): MsgSetMaxPoolPointsPerBlockResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetMaxPoolPointsPerBlockResponseAmino): MsgSetMaxPoolPointsPerBlockResponse { + return {}; + }, + toAmino(_: MsgSetMaxPoolPointsPerBlockResponse): MsgSetMaxPoolPointsPerBlockResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetMaxPoolPointsPerBlockResponseAminoMsg): MsgSetMaxPoolPointsPerBlockResponse { + return MsgSetMaxPoolPointsPerBlockResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetMaxPoolPointsPerBlockResponse): MsgSetMaxPoolPointsPerBlockResponseAminoMsg { + return { + type: "osmosis/protorev/set-max-pool-points-per-block-response", + value: MsgSetMaxPoolPointsPerBlockResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetMaxPoolPointsPerBlockResponseProtoMsg): MsgSetMaxPoolPointsPerBlockResponse { + return MsgSetMaxPoolPointsPerBlockResponse.decode(message.value); + }, + toProto(message: MsgSetMaxPoolPointsPerBlockResponse): Uint8Array { + return MsgSetMaxPoolPointsPerBlockResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetMaxPoolPointsPerBlockResponse): MsgSetMaxPoolPointsPerBlockResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetMaxPoolPointsPerBlockResponse", + value: MsgSetMaxPoolPointsPerBlockResponse.encode(message).finish() + }; } }; function createBaseMsgSetBaseDenoms(): MsgSetBaseDenoms { @@ -729,6 +1048,7 @@ function createBaseMsgSetBaseDenoms(): MsgSetBaseDenoms { }; } export const MsgSetBaseDenoms = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetBaseDenoms", encode(message: MsgSetBaseDenoms, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -801,12 +1121,50 @@ export const MsgSetBaseDenoms = { obj.base_denoms = []; } return obj; + }, + fromAmino(object: MsgSetBaseDenomsAmino): MsgSetBaseDenoms { + return { + admin: object.admin, + baseDenoms: Array.isArray(object?.base_denoms) ? object.base_denoms.map((e: any) => BaseDenom.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSetBaseDenoms): MsgSetBaseDenomsAmino { + const obj: any = {}; + obj.admin = message.admin; + if (message.baseDenoms) { + obj.base_denoms = message.baseDenoms.map(e => e ? BaseDenom.toAmino(e) : undefined); + } else { + obj.base_denoms = []; + } + return obj; + }, + fromAminoMsg(object: MsgSetBaseDenomsAminoMsg): MsgSetBaseDenoms { + return MsgSetBaseDenoms.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetBaseDenoms): MsgSetBaseDenomsAminoMsg { + return { + type: "osmosis/protorev/set-base-denoms", + value: MsgSetBaseDenoms.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetBaseDenomsProtoMsg): MsgSetBaseDenoms { + return MsgSetBaseDenoms.decode(message.value); + }, + toProto(message: MsgSetBaseDenoms): Uint8Array { + return MsgSetBaseDenoms.encode(message).finish(); + }, + toProtoMsg(message: MsgSetBaseDenoms): MsgSetBaseDenomsProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetBaseDenoms", + value: MsgSetBaseDenoms.encode(message).finish() + }; } }; function createBaseMsgSetBaseDenomsResponse(): MsgSetBaseDenomsResponse { return {}; } export const MsgSetBaseDenomsResponse = { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetBaseDenomsResponse", encode(_: MsgSetBaseDenomsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -844,5 +1202,33 @@ export const MsgSetBaseDenomsResponse = { toSDK(_: MsgSetBaseDenomsResponse): MsgSetBaseDenomsResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetBaseDenomsResponseAmino): MsgSetBaseDenomsResponse { + return {}; + }, + toAmino(_: MsgSetBaseDenomsResponse): MsgSetBaseDenomsResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetBaseDenomsResponseAminoMsg): MsgSetBaseDenomsResponse { + return MsgSetBaseDenomsResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetBaseDenomsResponse): MsgSetBaseDenomsResponseAminoMsg { + return { + type: "osmosis/protorev/set-base-denoms-response", + value: MsgSetBaseDenomsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetBaseDenomsResponseProtoMsg): MsgSetBaseDenomsResponse { + return MsgSetBaseDenomsResponse.decode(message.value); + }, + toProto(message: MsgSetBaseDenomsResponse): Uint8Array { + return MsgSetBaseDenomsResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetBaseDenomsResponse): MsgSetBaseDenomsResponseProtoMsg { + return { + typeUrl: "/osmosis.protorev.v1beta1.MsgSetBaseDenomsResponse", + value: MsgSetBaseDenomsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts b/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts index fed713b0cd..1af6320913 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/sumtree/v1beta1/tree.ts @@ -27,6 +27,7 @@ function createBaseNode(): Node { }; } export const Node = { + typeUrl: "/osmosis.store.v1beta1.Node", encode(message: Node, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.children) { Child.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -87,6 +88,41 @@ export const Node = { obj.children = []; } return obj; + }, + fromAmino(object: NodeAmino): Node { + return { + children: Array.isArray(object?.children) ? object.children.map((e: any) => Child.fromAmino(e)) : [] + }; + }, + toAmino(message: Node): NodeAmino { + const obj: any = {}; + if (message.children) { + obj.children = message.children.map(e => e ? Child.toAmino(e) : undefined); + } else { + obj.children = []; + } + return obj; + }, + fromAminoMsg(object: NodeAminoMsg): Node { + return Node.fromAmino(object.value); + }, + toAminoMsg(message: Node): NodeAminoMsg { + return { + type: "osmosis/store/node", + value: Node.toAmino(message) + }; + }, + fromProtoMsg(message: NodeProtoMsg): Node { + return Node.decode(message.value); + }, + toProto(message: Node): Uint8Array { + return Node.encode(message).finish(); + }, + toProtoMsg(message: Node): NodeProtoMsg { + return { + typeUrl: "/osmosis.store.v1beta1.Node", + value: Node.encode(message).finish() + }; } }; function createBaseChild(): Child { @@ -96,6 +132,7 @@ function createBaseChild(): Child { }; } export const Child = { + typeUrl: "/osmosis.store.v1beta1.Child", encode(message: Child, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index.length !== 0) { writer.uint32(10).bytes(message.index); @@ -160,6 +197,39 @@ export const Child = { obj.index = message.index; obj.accumulation = message.accumulation; return obj; + }, + fromAmino(object: ChildAmino): Child { + return { + index: object.index, + accumulation: object.accumulation + }; + }, + toAmino(message: Child): ChildAmino { + const obj: any = {}; + obj.index = message.index; + obj.accumulation = message.accumulation; + return obj; + }, + fromAminoMsg(object: ChildAminoMsg): Child { + return Child.fromAmino(object.value); + }, + toAminoMsg(message: Child): ChildAminoMsg { + return { + type: "osmosis/store/child", + value: Child.toAmino(message) + }; + }, + fromProtoMsg(message: ChildProtoMsg): Child { + return Child.decode(message.value); + }, + toProto(message: Child): Uint8Array { + return Child.encode(message).finish(); + }, + toProtoMsg(message: Child): ChildProtoMsg { + return { + typeUrl: "/osmosis.store.v1beta1.Child", + value: Child.encode(message).finish() + }; } }; function createBaseLeaf(): Leaf { @@ -168,6 +238,7 @@ function createBaseLeaf(): Leaf { }; } export const Leaf = { + typeUrl: "/osmosis.store.v1beta1.Leaf", encode(message: Leaf, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leaf !== undefined) { Child.encode(message.leaf, writer.uint32(10).fork()).ldelim(); @@ -220,5 +291,36 @@ export const Leaf = { const obj: any = {}; message.leaf !== undefined && (obj.leaf = message.leaf ? Child.toSDK(message.leaf) : undefined); return obj; + }, + fromAmino(object: LeafAmino): Leaf { + return { + leaf: object?.leaf ? Child.fromAmino(object.leaf) : undefined + }; + }, + toAmino(message: Leaf): LeafAmino { + const obj: any = {}; + obj.leaf = message.leaf ? Child.toAmino(message.leaf) : undefined; + return obj; + }, + fromAminoMsg(object: LeafAminoMsg): Leaf { + return Leaf.fromAmino(object.value); + }, + toAminoMsg(message: Leaf): LeafAminoMsg { + return { + type: "osmosis/store/leaf", + value: Leaf.toAmino(message) + }; + }, + fromProtoMsg(message: LeafProtoMsg): Leaf { + return Leaf.decode(message.value); + }, + toProto(message: Leaf): Uint8Array { + return Leaf.encode(message).finish(); + }, + toProtoMsg(message: Leaf): LeafProtoMsg { + return { + typeUrl: "/osmosis.store.v1beta1.Leaf", + value: Leaf.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts index ccd3211728..c2bf31aaac 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/genesis.ts @@ -41,6 +41,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.superfluid.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -173,5 +174,60 @@ export const GenesisState = { obj.intemediary_account_connections = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + superfluidAssets: Array.isArray(object?.superfluid_assets) ? object.superfluid_assets.map((e: any) => SuperfluidAsset.fromAmino(e)) : [], + osmoEquivalentMultipliers: Array.isArray(object?.osmo_equivalent_multipliers) ? object.osmo_equivalent_multipliers.map((e: any) => OsmoEquivalentMultiplierRecord.fromAmino(e)) : [], + intermediaryAccounts: Array.isArray(object?.intermediary_accounts) ? object.intermediary_accounts.map((e: any) => SuperfluidIntermediaryAccount.fromAmino(e)) : [], + intemediaryAccountConnections: Array.isArray(object?.intemediary_account_connections) ? object.intemediary_account_connections.map((e: any) => LockIdIntermediaryAccountConnection.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.superfluidAssets) { + obj.superfluid_assets = message.superfluidAssets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); + } else { + obj.superfluid_assets = []; + } + if (message.osmoEquivalentMultipliers) { + obj.osmo_equivalent_multipliers = message.osmoEquivalentMultipliers.map(e => e ? OsmoEquivalentMultiplierRecord.toAmino(e) : undefined); + } else { + obj.osmo_equivalent_multipliers = []; + } + if (message.intermediaryAccounts) { + obj.intermediary_accounts = message.intermediaryAccounts.map(e => e ? SuperfluidIntermediaryAccount.toAmino(e) : undefined); + } else { + obj.intermediary_accounts = []; + } + if (message.intemediaryAccountConnections) { + obj.intemediary_account_connections = message.intemediaryAccountConnections.map(e => e ? LockIdIntermediaryAccountConnection.toAmino(e) : undefined); + } else { + obj.intemediary_account_connections = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.superfluid.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts index b02d3c004b..f570e5d46d 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/params.ts @@ -22,6 +22,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.superfluid.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.minimumRiskFactor !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.minimumRiskFactor, 18).atomics); @@ -74,5 +75,36 @@ export const Params = { const obj: any = {}; obj.minimum_risk_factor = message.minimumRiskFactor; return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + minimumRiskFactor: object.minimum_risk_factor + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.minimum_risk_factor = message.minimumRiskFactor; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.superfluid.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts index 37dd217db2..da64331229 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/query.ts @@ -224,6 +224,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.superfluid.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -261,6 +262,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -269,6 +298,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.superfluid.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -321,6 +351,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseAssetTypeRequest(): AssetTypeRequest { @@ -329,6 +390,7 @@ function createBaseAssetTypeRequest(): AssetTypeRequest { }; } export const AssetTypeRequest = { + typeUrl: "/osmosis.superfluid.AssetTypeRequest", encode(message: AssetTypeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -381,6 +443,37 @@ export const AssetTypeRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: AssetTypeRequestAmino): AssetTypeRequest { + return { + denom: object.denom + }; + }, + toAmino(message: AssetTypeRequest): AssetTypeRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: AssetTypeRequestAminoMsg): AssetTypeRequest { + return AssetTypeRequest.fromAmino(object.value); + }, + toAminoMsg(message: AssetTypeRequest): AssetTypeRequestAminoMsg { + return { + type: "osmosis/asset-type-request", + value: AssetTypeRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AssetTypeRequestProtoMsg): AssetTypeRequest { + return AssetTypeRequest.decode(message.value); + }, + toProto(message: AssetTypeRequest): Uint8Array { + return AssetTypeRequest.encode(message).finish(); + }, + toProtoMsg(message: AssetTypeRequest): AssetTypeRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AssetTypeRequest", + value: AssetTypeRequest.encode(message).finish() + }; } }; function createBaseAssetTypeResponse(): AssetTypeResponse { @@ -389,6 +482,7 @@ function createBaseAssetTypeResponse(): AssetTypeResponse { }; } export const AssetTypeResponse = { + typeUrl: "/osmosis.superfluid.AssetTypeResponse", encode(message: AssetTypeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.assetType !== 0) { writer.uint32(8).int32(message.assetType); @@ -441,12 +535,44 @@ export const AssetTypeResponse = { const obj: any = {}; message.assetType !== undefined && (obj.asset_type = superfluidAssetTypeToJSON(message.assetType)); return obj; + }, + fromAmino(object: AssetTypeResponseAmino): AssetTypeResponse { + return { + assetType: isSet(object.asset_type) ? superfluidAssetTypeFromJSON(object.asset_type) : -1 + }; + }, + toAmino(message: AssetTypeResponse): AssetTypeResponseAmino { + const obj: any = {}; + obj.asset_type = message.assetType; + return obj; + }, + fromAminoMsg(object: AssetTypeResponseAminoMsg): AssetTypeResponse { + return AssetTypeResponse.fromAmino(object.value); + }, + toAminoMsg(message: AssetTypeResponse): AssetTypeResponseAminoMsg { + return { + type: "osmosis/asset-type-response", + value: AssetTypeResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AssetTypeResponseProtoMsg): AssetTypeResponse { + return AssetTypeResponse.decode(message.value); + }, + toProto(message: AssetTypeResponse): Uint8Array { + return AssetTypeResponse.encode(message).finish(); + }, + toProtoMsg(message: AssetTypeResponse): AssetTypeResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AssetTypeResponse", + value: AssetTypeResponse.encode(message).finish() + }; } }; function createBaseAllAssetsRequest(): AllAssetsRequest { return {}; } export const AllAssetsRequest = { + typeUrl: "/osmosis.superfluid.AllAssetsRequest", encode(_: AllAssetsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -484,6 +610,34 @@ export const AllAssetsRequest = { toSDK(_: AllAssetsRequest): AllAssetsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: AllAssetsRequestAmino): AllAssetsRequest { + return {}; + }, + toAmino(_: AllAssetsRequest): AllAssetsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: AllAssetsRequestAminoMsg): AllAssetsRequest { + return AllAssetsRequest.fromAmino(object.value); + }, + toAminoMsg(message: AllAssetsRequest): AllAssetsRequestAminoMsg { + return { + type: "osmosis/all-assets-request", + value: AllAssetsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AllAssetsRequestProtoMsg): AllAssetsRequest { + return AllAssetsRequest.decode(message.value); + }, + toProto(message: AllAssetsRequest): Uint8Array { + return AllAssetsRequest.encode(message).finish(); + }, + toProtoMsg(message: AllAssetsRequest): AllAssetsRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AllAssetsRequest", + value: AllAssetsRequest.encode(message).finish() + }; } }; function createBaseAllAssetsResponse(): AllAssetsResponse { @@ -492,6 +646,7 @@ function createBaseAllAssetsResponse(): AllAssetsResponse { }; } export const AllAssetsResponse = { + typeUrl: "/osmosis.superfluid.AllAssetsResponse", encode(message: AllAssetsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.assets) { SuperfluidAsset.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -552,6 +707,41 @@ export const AllAssetsResponse = { obj.assets = []; } return obj; + }, + fromAmino(object: AllAssetsResponseAmino): AllAssetsResponse { + return { + assets: Array.isArray(object?.assets) ? object.assets.map((e: any) => SuperfluidAsset.fromAmino(e)) : [] + }; + }, + toAmino(message: AllAssetsResponse): AllAssetsResponseAmino { + const obj: any = {}; + if (message.assets) { + obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); + } else { + obj.assets = []; + } + return obj; + }, + fromAminoMsg(object: AllAssetsResponseAminoMsg): AllAssetsResponse { + return AllAssetsResponse.fromAmino(object.value); + }, + toAminoMsg(message: AllAssetsResponse): AllAssetsResponseAminoMsg { + return { + type: "osmosis/all-assets-response", + value: AllAssetsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AllAssetsResponseProtoMsg): AllAssetsResponse { + return AllAssetsResponse.decode(message.value); + }, + toProto(message: AllAssetsResponse): Uint8Array { + return AllAssetsResponse.encode(message).finish(); + }, + toProtoMsg(message: AllAssetsResponse): AllAssetsResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AllAssetsResponse", + value: AllAssetsResponse.encode(message).finish() + }; } }; function createBaseAssetMultiplierRequest(): AssetMultiplierRequest { @@ -560,6 +750,7 @@ function createBaseAssetMultiplierRequest(): AssetMultiplierRequest { }; } export const AssetMultiplierRequest = { + typeUrl: "/osmosis.superfluid.AssetMultiplierRequest", encode(message: AssetMultiplierRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -612,6 +803,37 @@ export const AssetMultiplierRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: AssetMultiplierRequestAmino): AssetMultiplierRequest { + return { + denom: object.denom + }; + }, + toAmino(message: AssetMultiplierRequest): AssetMultiplierRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: AssetMultiplierRequestAminoMsg): AssetMultiplierRequest { + return AssetMultiplierRequest.fromAmino(object.value); + }, + toAminoMsg(message: AssetMultiplierRequest): AssetMultiplierRequestAminoMsg { + return { + type: "osmosis/asset-multiplier-request", + value: AssetMultiplierRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AssetMultiplierRequestProtoMsg): AssetMultiplierRequest { + return AssetMultiplierRequest.decode(message.value); + }, + toProto(message: AssetMultiplierRequest): Uint8Array { + return AssetMultiplierRequest.encode(message).finish(); + }, + toProtoMsg(message: AssetMultiplierRequest): AssetMultiplierRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AssetMultiplierRequest", + value: AssetMultiplierRequest.encode(message).finish() + }; } }; function createBaseAssetMultiplierResponse(): AssetMultiplierResponse { @@ -620,6 +842,7 @@ function createBaseAssetMultiplierResponse(): AssetMultiplierResponse { }; } export const AssetMultiplierResponse = { + typeUrl: "/osmosis.superfluid.AssetMultiplierResponse", encode(message: AssetMultiplierResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.osmoEquivalentMultiplier !== undefined) { OsmoEquivalentMultiplierRecord.encode(message.osmoEquivalentMultiplier, writer.uint32(10).fork()).ldelim(); @@ -672,6 +895,37 @@ export const AssetMultiplierResponse = { const obj: any = {}; message.osmoEquivalentMultiplier !== undefined && (obj.osmo_equivalent_multiplier = message.osmoEquivalentMultiplier ? OsmoEquivalentMultiplierRecord.toSDK(message.osmoEquivalentMultiplier) : undefined); return obj; + }, + fromAmino(object: AssetMultiplierResponseAmino): AssetMultiplierResponse { + return { + osmoEquivalentMultiplier: object?.osmo_equivalent_multiplier ? OsmoEquivalentMultiplierRecord.fromAmino(object.osmo_equivalent_multiplier) : undefined + }; + }, + toAmino(message: AssetMultiplierResponse): AssetMultiplierResponseAmino { + const obj: any = {}; + obj.osmo_equivalent_multiplier = message.osmoEquivalentMultiplier ? OsmoEquivalentMultiplierRecord.toAmino(message.osmoEquivalentMultiplier) : undefined; + return obj; + }, + fromAminoMsg(object: AssetMultiplierResponseAminoMsg): AssetMultiplierResponse { + return AssetMultiplierResponse.fromAmino(object.value); + }, + toAminoMsg(message: AssetMultiplierResponse): AssetMultiplierResponseAminoMsg { + return { + type: "osmosis/asset-multiplier-response", + value: AssetMultiplierResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AssetMultiplierResponseProtoMsg): AssetMultiplierResponse { + return AssetMultiplierResponse.decode(message.value); + }, + toProto(message: AssetMultiplierResponse): Uint8Array { + return AssetMultiplierResponse.encode(message).finish(); + }, + toProtoMsg(message: AssetMultiplierResponse): AssetMultiplierResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AssetMultiplierResponse", + value: AssetMultiplierResponse.encode(message).finish() + }; } }; function createBaseSuperfluidIntermediaryAccountInfo(): SuperfluidIntermediaryAccountInfo { @@ -683,6 +937,7 @@ function createBaseSuperfluidIntermediaryAccountInfo(): SuperfluidIntermediaryAc }; } export const SuperfluidIntermediaryAccountInfo = { + typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccountInfo", encode(message: SuperfluidIntermediaryAccountInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -771,6 +1026,43 @@ export const SuperfluidIntermediaryAccountInfo = { obj.gauge_id = message.gaugeId; obj.address = message.address; return obj; + }, + fromAmino(object: SuperfluidIntermediaryAccountInfoAmino): SuperfluidIntermediaryAccountInfo { + return { + denom: object.denom, + valAddr: object.val_addr, + gaugeId: BigInt(object.gauge_id), + address: object.address + }; + }, + toAmino(message: SuperfluidIntermediaryAccountInfo): SuperfluidIntermediaryAccountInfoAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.val_addr = message.valAddr; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: SuperfluidIntermediaryAccountInfoAminoMsg): SuperfluidIntermediaryAccountInfo { + return SuperfluidIntermediaryAccountInfo.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidIntermediaryAccountInfo): SuperfluidIntermediaryAccountInfoAminoMsg { + return { + type: "osmosis/superfluid-intermediary-account-info", + value: SuperfluidIntermediaryAccountInfo.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidIntermediaryAccountInfoProtoMsg): SuperfluidIntermediaryAccountInfo { + return SuperfluidIntermediaryAccountInfo.decode(message.value); + }, + toProto(message: SuperfluidIntermediaryAccountInfo): Uint8Array { + return SuperfluidIntermediaryAccountInfo.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidIntermediaryAccountInfo): SuperfluidIntermediaryAccountInfoProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccountInfo", + value: SuperfluidIntermediaryAccountInfo.encode(message).finish() + }; } }; function createBaseAllIntermediaryAccountsRequest(): AllIntermediaryAccountsRequest { @@ -779,6 +1071,7 @@ function createBaseAllIntermediaryAccountsRequest(): AllIntermediaryAccountsRequ }; } export const AllIntermediaryAccountsRequest = { + typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsRequest", encode(message: AllIntermediaryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); @@ -831,6 +1124,37 @@ export const AllIntermediaryAccountsRequest = { const obj: any = {}; message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: AllIntermediaryAccountsRequestAmino): AllIntermediaryAccountsRequest { + return { + pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: AllIntermediaryAccountsRequest): AllIntermediaryAccountsRequestAmino { + const obj: any = {}; + obj.pagination = message.pagination ? PageRequest.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: AllIntermediaryAccountsRequestAminoMsg): AllIntermediaryAccountsRequest { + return AllIntermediaryAccountsRequest.fromAmino(object.value); + }, + toAminoMsg(message: AllIntermediaryAccountsRequest): AllIntermediaryAccountsRequestAminoMsg { + return { + type: "osmosis/all-intermediary-accounts-request", + value: AllIntermediaryAccountsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: AllIntermediaryAccountsRequestProtoMsg): AllIntermediaryAccountsRequest { + return AllIntermediaryAccountsRequest.decode(message.value); + }, + toProto(message: AllIntermediaryAccountsRequest): Uint8Array { + return AllIntermediaryAccountsRequest.encode(message).finish(); + }, + toProtoMsg(message: AllIntermediaryAccountsRequest): AllIntermediaryAccountsRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsRequest", + value: AllIntermediaryAccountsRequest.encode(message).finish() + }; } }; function createBaseAllIntermediaryAccountsResponse(): AllIntermediaryAccountsResponse { @@ -840,6 +1164,7 @@ function createBaseAllIntermediaryAccountsResponse(): AllIntermediaryAccountsRes }; } export const AllIntermediaryAccountsResponse = { + typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsResponse", encode(message: AllIntermediaryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { SuperfluidIntermediaryAccountInfo.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -912,6 +1237,43 @@ export const AllIntermediaryAccountsResponse = { } message.pagination !== undefined && (obj.pagination = message.pagination ? PageResponse.toSDK(message.pagination) : undefined); return obj; + }, + fromAmino(object: AllIntermediaryAccountsResponseAmino): AllIntermediaryAccountsResponse { + return { + accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => SuperfluidIntermediaryAccountInfo.fromAmino(e)) : [], + pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined + }; + }, + toAmino(message: AllIntermediaryAccountsResponse): AllIntermediaryAccountsResponseAmino { + const obj: any = {}; + if (message.accounts) { + obj.accounts = message.accounts.map(e => e ? SuperfluidIntermediaryAccountInfo.toAmino(e) : undefined); + } else { + obj.accounts = []; + } + obj.pagination = message.pagination ? PageResponse.toAmino(message.pagination) : undefined; + return obj; + }, + fromAminoMsg(object: AllIntermediaryAccountsResponseAminoMsg): AllIntermediaryAccountsResponse { + return AllIntermediaryAccountsResponse.fromAmino(object.value); + }, + toAminoMsg(message: AllIntermediaryAccountsResponse): AllIntermediaryAccountsResponseAminoMsg { + return { + type: "osmosis/all-intermediary-accounts-response", + value: AllIntermediaryAccountsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: AllIntermediaryAccountsResponseProtoMsg): AllIntermediaryAccountsResponse { + return AllIntermediaryAccountsResponse.decode(message.value); + }, + toProto(message: AllIntermediaryAccountsResponse): Uint8Array { + return AllIntermediaryAccountsResponse.encode(message).finish(); + }, + toProtoMsg(message: AllIntermediaryAccountsResponse): AllIntermediaryAccountsResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.AllIntermediaryAccountsResponse", + value: AllIntermediaryAccountsResponse.encode(message).finish() + }; } }; function createBaseConnectedIntermediaryAccountRequest(): ConnectedIntermediaryAccountRequest { @@ -920,6 +1282,7 @@ function createBaseConnectedIntermediaryAccountRequest(): ConnectedIntermediaryA }; } export const ConnectedIntermediaryAccountRequest = { + typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountRequest", encode(message: ConnectedIntermediaryAccountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lockId !== BigInt(0)) { writer.uint32(8).uint64(message.lockId); @@ -972,6 +1335,37 @@ export const ConnectedIntermediaryAccountRequest = { const obj: any = {}; obj.lock_id = message.lockId; return obj; + }, + fromAmino(object: ConnectedIntermediaryAccountRequestAmino): ConnectedIntermediaryAccountRequest { + return { + lockId: BigInt(object.lock_id) + }; + }, + toAmino(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAmino { + const obj: any = {}; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConnectedIntermediaryAccountRequestAminoMsg): ConnectedIntermediaryAccountRequest { + return ConnectedIntermediaryAccountRequest.fromAmino(object.value); + }, + toAminoMsg(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestAminoMsg { + return { + type: "osmosis/connected-intermediary-account-request", + value: ConnectedIntermediaryAccountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ConnectedIntermediaryAccountRequestProtoMsg): ConnectedIntermediaryAccountRequest { + return ConnectedIntermediaryAccountRequest.decode(message.value); + }, + toProto(message: ConnectedIntermediaryAccountRequest): Uint8Array { + return ConnectedIntermediaryAccountRequest.encode(message).finish(); + }, + toProtoMsg(message: ConnectedIntermediaryAccountRequest): ConnectedIntermediaryAccountRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountRequest", + value: ConnectedIntermediaryAccountRequest.encode(message).finish() + }; } }; function createBaseConnectedIntermediaryAccountResponse(): ConnectedIntermediaryAccountResponse { @@ -980,6 +1374,7 @@ function createBaseConnectedIntermediaryAccountResponse(): ConnectedIntermediary }; } export const ConnectedIntermediaryAccountResponse = { + typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountResponse", encode(message: ConnectedIntermediaryAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.account !== undefined) { SuperfluidIntermediaryAccountInfo.encode(message.account, writer.uint32(10).fork()).ldelim(); @@ -1032,6 +1427,37 @@ export const ConnectedIntermediaryAccountResponse = { const obj: any = {}; message.account !== undefined && (obj.account = message.account ? SuperfluidIntermediaryAccountInfo.toSDK(message.account) : undefined); return obj; + }, + fromAmino(object: ConnectedIntermediaryAccountResponseAmino): ConnectedIntermediaryAccountResponse { + return { + account: object?.account ? SuperfluidIntermediaryAccountInfo.fromAmino(object.account) : undefined + }; + }, + toAmino(message: ConnectedIntermediaryAccountResponse): ConnectedIntermediaryAccountResponseAmino { + const obj: any = {}; + obj.account = message.account ? SuperfluidIntermediaryAccountInfo.toAmino(message.account) : undefined; + return obj; + }, + fromAminoMsg(object: ConnectedIntermediaryAccountResponseAminoMsg): ConnectedIntermediaryAccountResponse { + return ConnectedIntermediaryAccountResponse.fromAmino(object.value); + }, + toAminoMsg(message: ConnectedIntermediaryAccountResponse): ConnectedIntermediaryAccountResponseAminoMsg { + return { + type: "osmosis/connected-intermediary-account-response", + value: ConnectedIntermediaryAccountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ConnectedIntermediaryAccountResponseProtoMsg): ConnectedIntermediaryAccountResponse { + return ConnectedIntermediaryAccountResponse.decode(message.value); + }, + toProto(message: ConnectedIntermediaryAccountResponse): Uint8Array { + return ConnectedIntermediaryAccountResponse.encode(message).finish(); + }, + toProtoMsg(message: ConnectedIntermediaryAccountResponse): ConnectedIntermediaryAccountResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.ConnectedIntermediaryAccountResponse", + value: ConnectedIntermediaryAccountResponse.encode(message).finish() + }; } }; function createBaseQueryTotalDelegationByValidatorForDenomRequest(): QueryTotalDelegationByValidatorForDenomRequest { @@ -1040,6 +1466,7 @@ function createBaseQueryTotalDelegationByValidatorForDenomRequest(): QueryTotalD }; } export const QueryTotalDelegationByValidatorForDenomRequest = { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomRequest", encode(message: QueryTotalDelegationByValidatorForDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -1092,6 +1519,37 @@ export const QueryTotalDelegationByValidatorForDenomRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryTotalDelegationByValidatorForDenomRequestAmino): QueryTotalDelegationByValidatorForDenomRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomRequestAminoMsg): QueryTotalDelegationByValidatorForDenomRequest { + return QueryTotalDelegationByValidatorForDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestAminoMsg { + return { + type: "osmosis/query-total-delegation-by-validator-for-denom-request", + value: QueryTotalDelegationByValidatorForDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalDelegationByValidatorForDenomRequestProtoMsg): QueryTotalDelegationByValidatorForDenomRequest { + return QueryTotalDelegationByValidatorForDenomRequest.decode(message.value); + }, + toProto(message: QueryTotalDelegationByValidatorForDenomRequest): Uint8Array { + return QueryTotalDelegationByValidatorForDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalDelegationByValidatorForDenomRequest): QueryTotalDelegationByValidatorForDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomRequest", + value: QueryTotalDelegationByValidatorForDenomRequest.encode(message).finish() + }; } }; function createBaseQueryTotalDelegationByValidatorForDenomResponse(): QueryTotalDelegationByValidatorForDenomResponse { @@ -1100,6 +1558,7 @@ function createBaseQueryTotalDelegationByValidatorForDenomResponse(): QueryTotal }; } export const QueryTotalDelegationByValidatorForDenomResponse = { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomResponse", encode(message: QueryTotalDelegationByValidatorForDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.assets) { Delegations.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1160,6 +1619,41 @@ export const QueryTotalDelegationByValidatorForDenomResponse = { obj.assets = []; } return obj; + }, + fromAmino(object: QueryTotalDelegationByValidatorForDenomResponseAmino): QueryTotalDelegationByValidatorForDenomResponse { + return { + assets: Array.isArray(object?.assets) ? object.assets.map((e: any) => Delegations.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryTotalDelegationByValidatorForDenomResponse): QueryTotalDelegationByValidatorForDenomResponseAmino { + const obj: any = {}; + if (message.assets) { + obj.assets = message.assets.map(e => e ? Delegations.toAmino(e) : undefined); + } else { + obj.assets = []; + } + return obj; + }, + fromAminoMsg(object: QueryTotalDelegationByValidatorForDenomResponseAminoMsg): QueryTotalDelegationByValidatorForDenomResponse { + return QueryTotalDelegationByValidatorForDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalDelegationByValidatorForDenomResponse): QueryTotalDelegationByValidatorForDenomResponseAminoMsg { + return { + type: "osmosis/query-total-delegation-by-validator-for-denom-response", + value: QueryTotalDelegationByValidatorForDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalDelegationByValidatorForDenomResponseProtoMsg): QueryTotalDelegationByValidatorForDenomResponse { + return QueryTotalDelegationByValidatorForDenomResponse.decode(message.value); + }, + toProto(message: QueryTotalDelegationByValidatorForDenomResponse): Uint8Array { + return QueryTotalDelegationByValidatorForDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalDelegationByValidatorForDenomResponse): QueryTotalDelegationByValidatorForDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByValidatorForDenomResponse", + value: QueryTotalDelegationByValidatorForDenomResponse.encode(message).finish() + }; } }; function createBaseDelegations(): Delegations { @@ -1170,6 +1664,7 @@ function createBaseDelegations(): Delegations { }; } export const Delegations = { + typeUrl: "/osmosis.superfluid.Delegations", encode(message: Delegations, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.valAddr !== "") { writer.uint32(10).string(message.valAddr); @@ -1246,12 +1741,48 @@ export const Delegations = { obj.amount_sfsd = message.amountSfsd; obj.osmo_equivalent = message.osmoEquivalent; return obj; + }, + fromAmino(object: DelegationsAmino): Delegations { + return { + valAddr: object.val_addr, + amountSfsd: object.amount_sfsd, + osmoEquivalent: object.osmo_equivalent + }; + }, + toAmino(message: Delegations): DelegationsAmino { + const obj: any = {}; + obj.val_addr = message.valAddr; + obj.amount_sfsd = message.amountSfsd; + obj.osmo_equivalent = message.osmoEquivalent; + return obj; + }, + fromAminoMsg(object: DelegationsAminoMsg): Delegations { + return Delegations.fromAmino(object.value); + }, + toAminoMsg(message: Delegations): DelegationsAminoMsg { + return { + type: "osmosis/delegations", + value: Delegations.toAmino(message) + }; + }, + fromProtoMsg(message: DelegationsProtoMsg): Delegations { + return Delegations.decode(message.value); + }, + toProto(message: Delegations): Uint8Array { + return Delegations.encode(message).finish(); + }, + toProtoMsg(message: Delegations): DelegationsProtoMsg { + return { + typeUrl: "/osmosis.superfluid.Delegations", + value: Delegations.encode(message).finish() + }; } }; function createBaseTotalSuperfluidDelegationsRequest(): TotalSuperfluidDelegationsRequest { return {}; } export const TotalSuperfluidDelegationsRequest = { + typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsRequest", encode(_: TotalSuperfluidDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1289,6 +1820,34 @@ export const TotalSuperfluidDelegationsRequest = { toSDK(_: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: TotalSuperfluidDelegationsRequestAmino): TotalSuperfluidDelegationsRequest { + return {}; + }, + toAmino(_: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: TotalSuperfluidDelegationsRequestAminoMsg): TotalSuperfluidDelegationsRequest { + return TotalSuperfluidDelegationsRequest.fromAmino(object.value); + }, + toAminoMsg(message: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestAminoMsg { + return { + type: "osmosis/total-superfluid-delegations-request", + value: TotalSuperfluidDelegationsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: TotalSuperfluidDelegationsRequestProtoMsg): TotalSuperfluidDelegationsRequest { + return TotalSuperfluidDelegationsRequest.decode(message.value); + }, + toProto(message: TotalSuperfluidDelegationsRequest): Uint8Array { + return TotalSuperfluidDelegationsRequest.encode(message).finish(); + }, + toProtoMsg(message: TotalSuperfluidDelegationsRequest): TotalSuperfluidDelegationsRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsRequest", + value: TotalSuperfluidDelegationsRequest.encode(message).finish() + }; } }; function createBaseTotalSuperfluidDelegationsResponse(): TotalSuperfluidDelegationsResponse { @@ -1297,6 +1856,7 @@ function createBaseTotalSuperfluidDelegationsResponse(): TotalSuperfluidDelegati }; } export const TotalSuperfluidDelegationsResponse = { + typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsResponse", encode(message: TotalSuperfluidDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.totalDelegations !== "") { writer.uint32(10).string(message.totalDelegations); @@ -1349,6 +1909,37 @@ export const TotalSuperfluidDelegationsResponse = { const obj: any = {}; obj.total_delegations = message.totalDelegations; return obj; + }, + fromAmino(object: TotalSuperfluidDelegationsResponseAmino): TotalSuperfluidDelegationsResponse { + return { + totalDelegations: object.total_delegations + }; + }, + toAmino(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAmino { + const obj: any = {}; + obj.total_delegations = message.totalDelegations; + return obj; + }, + fromAminoMsg(object: TotalSuperfluidDelegationsResponseAminoMsg): TotalSuperfluidDelegationsResponse { + return TotalSuperfluidDelegationsResponse.fromAmino(object.value); + }, + toAminoMsg(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseAminoMsg { + return { + type: "osmosis/total-superfluid-delegations-response", + value: TotalSuperfluidDelegationsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: TotalSuperfluidDelegationsResponseProtoMsg): TotalSuperfluidDelegationsResponse { + return TotalSuperfluidDelegationsResponse.decode(message.value); + }, + toProto(message: TotalSuperfluidDelegationsResponse): Uint8Array { + return TotalSuperfluidDelegationsResponse.encode(message).finish(); + }, + toProtoMsg(message: TotalSuperfluidDelegationsResponse): TotalSuperfluidDelegationsResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.TotalSuperfluidDelegationsResponse", + value: TotalSuperfluidDelegationsResponse.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationAmountRequest(): SuperfluidDelegationAmountRequest { @@ -1359,6 +1950,7 @@ function createBaseSuperfluidDelegationAmountRequest(): SuperfluidDelegationAmou }; } export const SuperfluidDelegationAmountRequest = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountRequest", encode(message: SuperfluidDelegationAmountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1435,6 +2027,41 @@ export const SuperfluidDelegationAmountRequest = { obj.validator_address = message.validatorAddress; obj.denom = message.denom; return obj; + }, + fromAmino(object: SuperfluidDelegationAmountRequestAmino): SuperfluidDelegationAmountRequest { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + denom: object.denom + }; + }, + toAmino(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationAmountRequestAminoMsg): SuperfluidDelegationAmountRequest { + return SuperfluidDelegationAmountRequest.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestAminoMsg { + return { + type: "osmosis/superfluid-delegation-amount-request", + value: SuperfluidDelegationAmountRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationAmountRequestProtoMsg): SuperfluidDelegationAmountRequest { + return SuperfluidDelegationAmountRequest.decode(message.value); + }, + toProto(message: SuperfluidDelegationAmountRequest): Uint8Array { + return SuperfluidDelegationAmountRequest.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationAmountRequest): SuperfluidDelegationAmountRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountRequest", + value: SuperfluidDelegationAmountRequest.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationAmountResponse(): SuperfluidDelegationAmountResponse { @@ -1443,6 +2070,7 @@ function createBaseSuperfluidDelegationAmountResponse(): SuperfluidDelegationAmo }; } export const SuperfluidDelegationAmountResponse = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountResponse", encode(message: SuperfluidDelegationAmountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1503,6 +2131,41 @@ export const SuperfluidDelegationAmountResponse = { obj.amount = []; } return obj; + }, + fromAmino(object: SuperfluidDelegationAmountResponseAmino): SuperfluidDelegationAmountResponse { + return { + amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: SuperfluidDelegationAmountResponse): SuperfluidDelegationAmountResponseAmino { + const obj: any = {}; + if (message.amount) { + obj.amount = message.amount.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.amount = []; + } + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationAmountResponseAminoMsg): SuperfluidDelegationAmountResponse { + return SuperfluidDelegationAmountResponse.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationAmountResponse): SuperfluidDelegationAmountResponseAminoMsg { + return { + type: "osmosis/superfluid-delegation-amount-response", + value: SuperfluidDelegationAmountResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationAmountResponseProtoMsg): SuperfluidDelegationAmountResponse { + return SuperfluidDelegationAmountResponse.decode(message.value); + }, + toProto(message: SuperfluidDelegationAmountResponse): Uint8Array { + return SuperfluidDelegationAmountResponse.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationAmountResponse): SuperfluidDelegationAmountResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationAmountResponse", + value: SuperfluidDelegationAmountResponse.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationsByDelegatorRequest(): SuperfluidDelegationsByDelegatorRequest { @@ -1511,6 +2174,7 @@ function createBaseSuperfluidDelegationsByDelegatorRequest(): SuperfluidDelegati }; } export const SuperfluidDelegationsByDelegatorRequest = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorRequest", encode(message: SuperfluidDelegationsByDelegatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1563,6 +2227,37 @@ export const SuperfluidDelegationsByDelegatorRequest = { const obj: any = {}; obj.delegator_address = message.delegatorAddress; return obj; + }, + fromAmino(object: SuperfluidDelegationsByDelegatorRequestAmino): SuperfluidDelegationsByDelegatorRequest { + return { + delegatorAddress: object.delegator_address + }; + }, + toAmino(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationsByDelegatorRequestAminoMsg): SuperfluidDelegationsByDelegatorRequest { + return SuperfluidDelegationsByDelegatorRequest.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestAminoMsg { + return { + type: "osmosis/superfluid-delegations-by-delegator-request", + value: SuperfluidDelegationsByDelegatorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationsByDelegatorRequestProtoMsg): SuperfluidDelegationsByDelegatorRequest { + return SuperfluidDelegationsByDelegatorRequest.decode(message.value); + }, + toProto(message: SuperfluidDelegationsByDelegatorRequest): Uint8Array { + return SuperfluidDelegationsByDelegatorRequest.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationsByDelegatorRequest): SuperfluidDelegationsByDelegatorRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorRequest", + value: SuperfluidDelegationsByDelegatorRequest.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationsByDelegatorResponse(): SuperfluidDelegationsByDelegatorResponse { @@ -1573,6 +2268,7 @@ function createBaseSuperfluidDelegationsByDelegatorResponse(): SuperfluidDelegat }; } export const SuperfluidDelegationsByDelegatorResponse = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorResponse", encode(message: SuperfluidDelegationsByDelegatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.superfluidDelegationRecords) { SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1665,6 +2361,49 @@ export const SuperfluidDelegationsByDelegatorResponse = { } message.totalEquivalentStakedAmount !== undefined && (obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toSDK(message.totalEquivalentStakedAmount) : undefined); return obj; + }, + fromAmino(object: SuperfluidDelegationsByDelegatorResponseAmino): SuperfluidDelegationsByDelegatorResponse { + return { + superfluidDelegationRecords: Array.isArray(object?.superfluid_delegation_records) ? object.superfluid_delegation_records.map((e: any) => SuperfluidDelegationRecord.fromAmino(e)) : [], + totalDelegatedCoins: Array.isArray(object?.total_delegated_coins) ? object.total_delegated_coins.map((e: any) => Coin.fromAmino(e)) : [], + totalEquivalentStakedAmount: object?.total_equivalent_staked_amount ? Coin.fromAmino(object.total_equivalent_staked_amount) : undefined + }; + }, + toAmino(message: SuperfluidDelegationsByDelegatorResponse): SuperfluidDelegationsByDelegatorResponseAmino { + const obj: any = {}; + if (message.superfluidDelegationRecords) { + obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); + } else { + obj.superfluid_delegation_records = []; + } + if (message.totalDelegatedCoins) { + obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total_delegated_coins = []; + } + obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationsByDelegatorResponseAminoMsg): SuperfluidDelegationsByDelegatorResponse { + return SuperfluidDelegationsByDelegatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationsByDelegatorResponse): SuperfluidDelegationsByDelegatorResponseAminoMsg { + return { + type: "osmosis/superfluid-delegations-by-delegator-response", + value: SuperfluidDelegationsByDelegatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationsByDelegatorResponseProtoMsg): SuperfluidDelegationsByDelegatorResponse { + return SuperfluidDelegationsByDelegatorResponse.decode(message.value); + }, + toProto(message: SuperfluidDelegationsByDelegatorResponse): Uint8Array { + return SuperfluidDelegationsByDelegatorResponse.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationsByDelegatorResponse): SuperfluidDelegationsByDelegatorResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByDelegatorResponse", + value: SuperfluidDelegationsByDelegatorResponse.encode(message).finish() + }; } }; function createBaseSuperfluidUndelegationsByDelegatorRequest(): SuperfluidUndelegationsByDelegatorRequest { @@ -1674,6 +2413,7 @@ function createBaseSuperfluidUndelegationsByDelegatorRequest(): SuperfluidUndele }; } export const SuperfluidUndelegationsByDelegatorRequest = { + typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorRequest", encode(message: SuperfluidUndelegationsByDelegatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -1738,6 +2478,39 @@ export const SuperfluidUndelegationsByDelegatorRequest = { obj.delegator_address = message.delegatorAddress; obj.denom = message.denom; return obj; + }, + fromAmino(object: SuperfluidUndelegationsByDelegatorRequestAmino): SuperfluidUndelegationsByDelegatorRequest { + return { + delegatorAddress: object.delegator_address, + denom: object.denom + }; + }, + toAmino(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: SuperfluidUndelegationsByDelegatorRequestAminoMsg): SuperfluidUndelegationsByDelegatorRequest { + return SuperfluidUndelegationsByDelegatorRequest.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestAminoMsg { + return { + type: "osmosis/superfluid-undelegations-by-delegator-request", + value: SuperfluidUndelegationsByDelegatorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidUndelegationsByDelegatorRequestProtoMsg): SuperfluidUndelegationsByDelegatorRequest { + return SuperfluidUndelegationsByDelegatorRequest.decode(message.value); + }, + toProto(message: SuperfluidUndelegationsByDelegatorRequest): Uint8Array { + return SuperfluidUndelegationsByDelegatorRequest.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidUndelegationsByDelegatorRequest): SuperfluidUndelegationsByDelegatorRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorRequest", + value: SuperfluidUndelegationsByDelegatorRequest.encode(message).finish() + }; } }; function createBaseSuperfluidUndelegationsByDelegatorResponse(): SuperfluidUndelegationsByDelegatorResponse { @@ -1748,6 +2521,7 @@ function createBaseSuperfluidUndelegationsByDelegatorResponse(): SuperfluidUndel }; } export const SuperfluidUndelegationsByDelegatorResponse = { + typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorResponse", encode(message: SuperfluidUndelegationsByDelegatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.superfluidDelegationRecords) { SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1848,6 +2622,53 @@ export const SuperfluidUndelegationsByDelegatorResponse = { obj.synthetic_locks = []; } return obj; + }, + fromAmino(object: SuperfluidUndelegationsByDelegatorResponseAmino): SuperfluidUndelegationsByDelegatorResponse { + return { + superfluidDelegationRecords: Array.isArray(object?.superfluid_delegation_records) ? object.superfluid_delegation_records.map((e: any) => SuperfluidDelegationRecord.fromAmino(e)) : [], + totalUndelegatedCoins: Array.isArray(object?.total_undelegated_coins) ? object.total_undelegated_coins.map((e: any) => Coin.fromAmino(e)) : [], + syntheticLocks: Array.isArray(object?.synthetic_locks) ? object.synthetic_locks.map((e: any) => SyntheticLock.fromAmino(e)) : [] + }; + }, + toAmino(message: SuperfluidUndelegationsByDelegatorResponse): SuperfluidUndelegationsByDelegatorResponseAmino { + const obj: any = {}; + if (message.superfluidDelegationRecords) { + obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); + } else { + obj.superfluid_delegation_records = []; + } + if (message.totalUndelegatedCoins) { + obj.total_undelegated_coins = message.totalUndelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total_undelegated_coins = []; + } + if (message.syntheticLocks) { + obj.synthetic_locks = message.syntheticLocks.map(e => e ? SyntheticLock.toAmino(e) : undefined); + } else { + obj.synthetic_locks = []; + } + return obj; + }, + fromAminoMsg(object: SuperfluidUndelegationsByDelegatorResponseAminoMsg): SuperfluidUndelegationsByDelegatorResponse { + return SuperfluidUndelegationsByDelegatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidUndelegationsByDelegatorResponse): SuperfluidUndelegationsByDelegatorResponseAminoMsg { + return { + type: "osmosis/superfluid-undelegations-by-delegator-response", + value: SuperfluidUndelegationsByDelegatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidUndelegationsByDelegatorResponseProtoMsg): SuperfluidUndelegationsByDelegatorResponse { + return SuperfluidUndelegationsByDelegatorResponse.decode(message.value); + }, + toProto(message: SuperfluidUndelegationsByDelegatorResponse): Uint8Array { + return SuperfluidUndelegationsByDelegatorResponse.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidUndelegationsByDelegatorResponse): SuperfluidUndelegationsByDelegatorResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidUndelegationsByDelegatorResponse", + value: SuperfluidUndelegationsByDelegatorResponse.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationsByValidatorDenomRequest(): SuperfluidDelegationsByValidatorDenomRequest { @@ -1857,6 +2678,7 @@ function createBaseSuperfluidDelegationsByValidatorDenomRequest(): SuperfluidDel }; } export const SuperfluidDelegationsByValidatorDenomRequest = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomRequest", encode(message: SuperfluidDelegationsByValidatorDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -1921,6 +2743,39 @@ export const SuperfluidDelegationsByValidatorDenomRequest = { obj.validator_address = message.validatorAddress; obj.denom = message.denom; return obj; + }, + fromAmino(object: SuperfluidDelegationsByValidatorDenomRequestAmino): SuperfluidDelegationsByValidatorDenomRequest { + return { + validatorAddress: object.validator_address, + denom: object.denom + }; + }, + toAmino(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomRequestAminoMsg): SuperfluidDelegationsByValidatorDenomRequest { + return SuperfluidDelegationsByValidatorDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestAminoMsg { + return { + type: "osmosis/superfluid-delegations-by-validator-denom-request", + value: SuperfluidDelegationsByValidatorDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationsByValidatorDenomRequestProtoMsg): SuperfluidDelegationsByValidatorDenomRequest { + return SuperfluidDelegationsByValidatorDenomRequest.decode(message.value); + }, + toProto(message: SuperfluidDelegationsByValidatorDenomRequest): Uint8Array { + return SuperfluidDelegationsByValidatorDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationsByValidatorDenomRequest): SuperfluidDelegationsByValidatorDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomRequest", + value: SuperfluidDelegationsByValidatorDenomRequest.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationsByValidatorDenomResponse(): SuperfluidDelegationsByValidatorDenomResponse { @@ -1929,6 +2784,7 @@ function createBaseSuperfluidDelegationsByValidatorDenomResponse(): SuperfluidDe }; } export const SuperfluidDelegationsByValidatorDenomResponse = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomResponse", encode(message: SuperfluidDelegationsByValidatorDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.superfluidDelegationRecords) { SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -1989,6 +2845,41 @@ export const SuperfluidDelegationsByValidatorDenomResponse = { obj.superfluid_delegation_records = []; } return obj; + }, + fromAmino(object: SuperfluidDelegationsByValidatorDenomResponseAmino): SuperfluidDelegationsByValidatorDenomResponse { + return { + superfluidDelegationRecords: Array.isArray(object?.superfluid_delegation_records) ? object.superfluid_delegation_records.map((e: any) => SuperfluidDelegationRecord.fromAmino(e)) : [] + }; + }, + toAmino(message: SuperfluidDelegationsByValidatorDenomResponse): SuperfluidDelegationsByValidatorDenomResponseAmino { + const obj: any = {}; + if (message.superfluidDelegationRecords) { + obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); + } else { + obj.superfluid_delegation_records = []; + } + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationsByValidatorDenomResponseAminoMsg): SuperfluidDelegationsByValidatorDenomResponse { + return SuperfluidDelegationsByValidatorDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationsByValidatorDenomResponse): SuperfluidDelegationsByValidatorDenomResponseAminoMsg { + return { + type: "osmosis/superfluid-delegations-by-validator-denom-response", + value: SuperfluidDelegationsByValidatorDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationsByValidatorDenomResponseProtoMsg): SuperfluidDelegationsByValidatorDenomResponse { + return SuperfluidDelegationsByValidatorDenomResponse.decode(message.value); + }, + toProto(message: SuperfluidDelegationsByValidatorDenomResponse): Uint8Array { + return SuperfluidDelegationsByValidatorDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationsByValidatorDenomResponse): SuperfluidDelegationsByValidatorDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationsByValidatorDenomResponse", + value: SuperfluidDelegationsByValidatorDenomResponse.encode(message).finish() + }; } }; function createBaseEstimateSuperfluidDelegatedAmountByValidatorDenomRequest(): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { @@ -1998,6 +2889,7 @@ function createBaseEstimateSuperfluidDelegatedAmountByValidatorDenomRequest(): E }; } export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { + typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomRequest", encode(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); @@ -2062,6 +2954,39 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomRequest = { obj.validator_address = message.validatorAddress; obj.denom = message.denom; return obj; + }, + fromAmino(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { + return { + validatorAddress: object.validator_address, + denom: object.denom + }; + }, + toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAmino { + const obj: any = {}; + obj.validator_address = message.validatorAddress; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { + return EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestAminoMsg { + return { + type: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-request", + value: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomRequest { + return EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.decode(message.value); + }, + toProto(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): Uint8Array { + return EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest): EstimateSuperfluidDelegatedAmountByValidatorDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomRequest", + value: EstimateSuperfluidDelegatedAmountByValidatorDenomRequest.encode(message).finish() + }; } }; function createBaseEstimateSuperfluidDelegatedAmountByValidatorDenomResponse(): EstimateSuperfluidDelegatedAmountByValidatorDenomResponse { @@ -2070,6 +2995,7 @@ function createBaseEstimateSuperfluidDelegatedAmountByValidatorDenomResponse(): }; } export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { + typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomResponse", encode(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.totalDelegatedCoins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2130,6 +3056,41 @@ export const EstimateSuperfluidDelegatedAmountByValidatorDenomResponse = { obj.total_delegated_coins = []; } return obj; + }, + fromAmino(object: EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAmino): EstimateSuperfluidDelegatedAmountByValidatorDenomResponse { + return { + totalDelegatedCoins: Array.isArray(object?.total_delegated_coins) ? object.total_delegated_coins.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAmino { + const obj: any = {}; + if (message.totalDelegatedCoins) { + obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total_delegated_coins = []; + } + return obj; + }, + fromAminoMsg(object: EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAminoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomResponse { + return EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): EstimateSuperfluidDelegatedAmountByValidatorDenomResponseAminoMsg { + return { + type: "osmosis/estimate-superfluid-delegated-amount-by-validator-denom-response", + value: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponseProtoMsg): EstimateSuperfluidDelegatedAmountByValidatorDenomResponse { + return EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.decode(message.value); + }, + toProto(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): Uint8Array { + return EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse): EstimateSuperfluidDelegatedAmountByValidatorDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.EstimateSuperfluidDelegatedAmountByValidatorDenomResponse", + value: EstimateSuperfluidDelegatedAmountByValidatorDenomResponse.encode(message).finish() + }; } }; function createBaseQueryTotalDelegationByDelegatorRequest(): QueryTotalDelegationByDelegatorRequest { @@ -2138,6 +3099,7 @@ function createBaseQueryTotalDelegationByDelegatorRequest(): QueryTotalDelegatio }; } export const QueryTotalDelegationByDelegatorRequest = { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorRequest", encode(message: QueryTotalDelegationByDelegatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -2190,6 +3152,37 @@ export const QueryTotalDelegationByDelegatorRequest = { const obj: any = {}; obj.delegator_address = message.delegatorAddress; return obj; + }, + fromAmino(object: QueryTotalDelegationByDelegatorRequestAmino): QueryTotalDelegationByDelegatorRequest { + return { + delegatorAddress: object.delegator_address + }; + }, + toAmino(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + return obj; + }, + fromAminoMsg(object: QueryTotalDelegationByDelegatorRequestAminoMsg): QueryTotalDelegationByDelegatorRequest { + return QueryTotalDelegationByDelegatorRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestAminoMsg { + return { + type: "osmosis/query-total-delegation-by-delegator-request", + value: QueryTotalDelegationByDelegatorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalDelegationByDelegatorRequestProtoMsg): QueryTotalDelegationByDelegatorRequest { + return QueryTotalDelegationByDelegatorRequest.decode(message.value); + }, + toProto(message: QueryTotalDelegationByDelegatorRequest): Uint8Array { + return QueryTotalDelegationByDelegatorRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalDelegationByDelegatorRequest): QueryTotalDelegationByDelegatorRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorRequest", + value: QueryTotalDelegationByDelegatorRequest.encode(message).finish() + }; } }; function createBaseQueryTotalDelegationByDelegatorResponse(): QueryTotalDelegationByDelegatorResponse { @@ -2201,6 +3194,7 @@ function createBaseQueryTotalDelegationByDelegatorResponse(): QueryTotalDelegati }; } export const QueryTotalDelegationByDelegatorResponse = { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorResponse", encode(message: QueryTotalDelegationByDelegatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.superfluidDelegationRecords) { SuperfluidDelegationRecord.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -2313,12 +3307,62 @@ export const QueryTotalDelegationByDelegatorResponse = { } message.totalEquivalentStakedAmount !== undefined && (obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toSDK(message.totalEquivalentStakedAmount) : undefined); return obj; + }, + fromAmino(object: QueryTotalDelegationByDelegatorResponseAmino): QueryTotalDelegationByDelegatorResponse { + return { + superfluidDelegationRecords: Array.isArray(object?.superfluid_delegation_records) ? object.superfluid_delegation_records.map((e: any) => SuperfluidDelegationRecord.fromAmino(e)) : [], + delegationResponse: Array.isArray(object?.delegation_response) ? object.delegation_response.map((e: any) => DelegationResponse.fromAmino(e)) : [], + totalDelegatedCoins: Array.isArray(object?.total_delegated_coins) ? object.total_delegated_coins.map((e: any) => Coin.fromAmino(e)) : [], + totalEquivalentStakedAmount: object?.total_equivalent_staked_amount ? Coin.fromAmino(object.total_equivalent_staked_amount) : undefined + }; + }, + toAmino(message: QueryTotalDelegationByDelegatorResponse): QueryTotalDelegationByDelegatorResponseAmino { + const obj: any = {}; + if (message.superfluidDelegationRecords) { + obj.superfluid_delegation_records = message.superfluidDelegationRecords.map(e => e ? SuperfluidDelegationRecord.toAmino(e) : undefined); + } else { + obj.superfluid_delegation_records = []; + } + if (message.delegationResponse) { + obj.delegation_response = message.delegationResponse.map(e => e ? DelegationResponse.toAmino(e) : undefined); + } else { + obj.delegation_response = []; + } + if (message.totalDelegatedCoins) { + obj.total_delegated_coins = message.totalDelegatedCoins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.total_delegated_coins = []; + } + obj.total_equivalent_staked_amount = message.totalEquivalentStakedAmount ? Coin.toAmino(message.totalEquivalentStakedAmount) : undefined; + return obj; + }, + fromAminoMsg(object: QueryTotalDelegationByDelegatorResponseAminoMsg): QueryTotalDelegationByDelegatorResponse { + return QueryTotalDelegationByDelegatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryTotalDelegationByDelegatorResponse): QueryTotalDelegationByDelegatorResponseAminoMsg { + return { + type: "osmosis/query-total-delegation-by-delegator-response", + value: QueryTotalDelegationByDelegatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryTotalDelegationByDelegatorResponseProtoMsg): QueryTotalDelegationByDelegatorResponse { + return QueryTotalDelegationByDelegatorResponse.decode(message.value); + }, + toProto(message: QueryTotalDelegationByDelegatorResponse): Uint8Array { + return QueryTotalDelegationByDelegatorResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryTotalDelegationByDelegatorResponse): QueryTotalDelegationByDelegatorResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryTotalDelegationByDelegatorResponse", + value: QueryTotalDelegationByDelegatorResponse.encode(message).finish() + }; } }; function createBaseQueryUnpoolWhitelistRequest(): QueryUnpoolWhitelistRequest { return {}; } export const QueryUnpoolWhitelistRequest = { + typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistRequest", encode(_: QueryUnpoolWhitelistRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2356,6 +3400,34 @@ export const QueryUnpoolWhitelistRequest = { toSDK(_: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryUnpoolWhitelistRequestAmino): QueryUnpoolWhitelistRequest { + return {}; + }, + toAmino(_: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryUnpoolWhitelistRequestAminoMsg): QueryUnpoolWhitelistRequest { + return QueryUnpoolWhitelistRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestAminoMsg { + return { + type: "osmosis/query-unpool-whitelist-request", + value: QueryUnpoolWhitelistRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnpoolWhitelistRequestProtoMsg): QueryUnpoolWhitelistRequest { + return QueryUnpoolWhitelistRequest.decode(message.value); + }, + toProto(message: QueryUnpoolWhitelistRequest): Uint8Array { + return QueryUnpoolWhitelistRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryUnpoolWhitelistRequest): QueryUnpoolWhitelistRequestProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistRequest", + value: QueryUnpoolWhitelistRequest.encode(message).finish() + }; } }; function createBaseQueryUnpoolWhitelistResponse(): QueryUnpoolWhitelistResponse { @@ -2364,6 +3436,7 @@ function createBaseQueryUnpoolWhitelistResponse(): QueryUnpoolWhitelistResponse }; } export const QueryUnpoolWhitelistResponse = { + typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistResponse", encode(message: QueryUnpoolWhitelistResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.poolIds) { @@ -2433,5 +3506,40 @@ export const QueryUnpoolWhitelistResponse = { obj.pool_ids = []; } return obj; + }, + fromAmino(object: QueryUnpoolWhitelistResponseAmino): QueryUnpoolWhitelistResponse { + return { + poolIds: Array.isArray(object?.pool_ids) ? object.pool_ids.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: QueryUnpoolWhitelistResponse): QueryUnpoolWhitelistResponseAmino { + const obj: any = {}; + if (message.poolIds) { + obj.pool_ids = message.poolIds.map(e => e.toString()); + } else { + obj.pool_ids = []; + } + return obj; + }, + fromAminoMsg(object: QueryUnpoolWhitelistResponseAminoMsg): QueryUnpoolWhitelistResponse { + return QueryUnpoolWhitelistResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryUnpoolWhitelistResponse): QueryUnpoolWhitelistResponseAminoMsg { + return { + type: "osmosis/query-unpool-whitelist-response", + value: QueryUnpoolWhitelistResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryUnpoolWhitelistResponseProtoMsg): QueryUnpoolWhitelistResponse { + return QueryUnpoolWhitelistResponse.decode(message.value); + }, + toProto(message: QueryUnpoolWhitelistResponse): Uint8Array { + return QueryUnpoolWhitelistResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryUnpoolWhitelistResponse): QueryUnpoolWhitelistResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.QueryUnpoolWhitelistResponse", + value: QueryUnpoolWhitelistResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts index 42c47941cc..13d1c0fe76 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/superfluid.ts @@ -154,6 +154,7 @@ function createBaseSuperfluidAsset(): SuperfluidAsset { }; } export const SuperfluidAsset = { + typeUrl: "/osmosis.superfluid.SuperfluidAsset", encode(message: SuperfluidAsset, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -218,6 +219,39 @@ export const SuperfluidAsset = { obj.denom = message.denom; message.assetType !== undefined && (obj.asset_type = superfluidAssetTypeToJSON(message.assetType)); return obj; + }, + fromAmino(object: SuperfluidAssetAmino): SuperfluidAsset { + return { + denom: object.denom, + assetType: isSet(object.asset_type) ? superfluidAssetTypeFromJSON(object.asset_type) : -1 + }; + }, + toAmino(message: SuperfluidAsset): SuperfluidAssetAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.asset_type = message.assetType; + return obj; + }, + fromAminoMsg(object: SuperfluidAssetAminoMsg): SuperfluidAsset { + return SuperfluidAsset.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidAsset): SuperfluidAssetAminoMsg { + return { + type: "osmosis/superfluid-asset", + value: SuperfluidAsset.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidAssetProtoMsg): SuperfluidAsset { + return SuperfluidAsset.decode(message.value); + }, + toProto(message: SuperfluidAsset): Uint8Array { + return SuperfluidAsset.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidAsset): SuperfluidAssetProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidAsset", + value: SuperfluidAsset.encode(message).finish() + }; } }; function createBaseSuperfluidIntermediaryAccount(): SuperfluidIntermediaryAccount { @@ -228,6 +262,7 @@ function createBaseSuperfluidIntermediaryAccount(): SuperfluidIntermediaryAccoun }; } export const SuperfluidIntermediaryAccount = { + typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccount", encode(message: SuperfluidIntermediaryAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -304,6 +339,41 @@ export const SuperfluidIntermediaryAccount = { obj.val_addr = message.valAddr; obj.gauge_id = message.gaugeId; return obj; + }, + fromAmino(object: SuperfluidIntermediaryAccountAmino): SuperfluidIntermediaryAccount { + return { + denom: object.denom, + valAddr: object.val_addr, + gaugeId: BigInt(object.gauge_id) + }; + }, + toAmino(message: SuperfluidIntermediaryAccount): SuperfluidIntermediaryAccountAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.val_addr = message.valAddr; + obj.gauge_id = message.gaugeId ? message.gaugeId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SuperfluidIntermediaryAccountAminoMsg): SuperfluidIntermediaryAccount { + return SuperfluidIntermediaryAccount.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidIntermediaryAccount): SuperfluidIntermediaryAccountAminoMsg { + return { + type: "osmosis/superfluid-intermediary-account", + value: SuperfluidIntermediaryAccount.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidIntermediaryAccountProtoMsg): SuperfluidIntermediaryAccount { + return SuperfluidIntermediaryAccount.decode(message.value); + }, + toProto(message: SuperfluidIntermediaryAccount): Uint8Array { + return SuperfluidIntermediaryAccount.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidIntermediaryAccount): SuperfluidIntermediaryAccountProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidIntermediaryAccount", + value: SuperfluidIntermediaryAccount.encode(message).finish() + }; } }; function createBaseOsmoEquivalentMultiplierRecord(): OsmoEquivalentMultiplierRecord { @@ -314,6 +384,7 @@ function createBaseOsmoEquivalentMultiplierRecord(): OsmoEquivalentMultiplierRec }; } export const OsmoEquivalentMultiplierRecord = { + typeUrl: "/osmosis.superfluid.OsmoEquivalentMultiplierRecord", encode(message: OsmoEquivalentMultiplierRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.epochNumber !== BigInt(0)) { writer.uint32(8).int64(message.epochNumber); @@ -390,6 +461,41 @@ export const OsmoEquivalentMultiplierRecord = { obj.denom = message.denom; obj.multiplier = message.multiplier; return obj; + }, + fromAmino(object: OsmoEquivalentMultiplierRecordAmino): OsmoEquivalentMultiplierRecord { + return { + epochNumber: BigInt(object.epoch_number), + denom: object.denom, + multiplier: object.multiplier + }; + }, + toAmino(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAmino { + const obj: any = {}; + obj.epoch_number = message.epochNumber ? message.epochNumber.toString() : undefined; + obj.denom = message.denom; + obj.multiplier = message.multiplier; + return obj; + }, + fromAminoMsg(object: OsmoEquivalentMultiplierRecordAminoMsg): OsmoEquivalentMultiplierRecord { + return OsmoEquivalentMultiplierRecord.fromAmino(object.value); + }, + toAminoMsg(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordAminoMsg { + return { + type: "osmosis/osmo-equivalent-multiplier-record", + value: OsmoEquivalentMultiplierRecord.toAmino(message) + }; + }, + fromProtoMsg(message: OsmoEquivalentMultiplierRecordProtoMsg): OsmoEquivalentMultiplierRecord { + return OsmoEquivalentMultiplierRecord.decode(message.value); + }, + toProto(message: OsmoEquivalentMultiplierRecord): Uint8Array { + return OsmoEquivalentMultiplierRecord.encode(message).finish(); + }, + toProtoMsg(message: OsmoEquivalentMultiplierRecord): OsmoEquivalentMultiplierRecordProtoMsg { + return { + typeUrl: "/osmosis.superfluid.OsmoEquivalentMultiplierRecord", + value: OsmoEquivalentMultiplierRecord.encode(message).finish() + }; } }; function createBaseSuperfluidDelegationRecord(): SuperfluidDelegationRecord { @@ -401,6 +507,7 @@ function createBaseSuperfluidDelegationRecord(): SuperfluidDelegationRecord { }; } export const SuperfluidDelegationRecord = { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationRecord", encode(message: SuperfluidDelegationRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); @@ -489,6 +596,43 @@ export const SuperfluidDelegationRecord = { message.delegationAmount !== undefined && (obj.delegation_amount = message.delegationAmount ? Coin.toSDK(message.delegationAmount) : undefined); message.equivalentStakedAmount !== undefined && (obj.equivalent_staked_amount = message.equivalentStakedAmount ? Coin.toSDK(message.equivalentStakedAmount) : undefined); return obj; + }, + fromAmino(object: SuperfluidDelegationRecordAmino): SuperfluidDelegationRecord { + return { + delegatorAddress: object.delegator_address, + validatorAddress: object.validator_address, + delegationAmount: object?.delegation_amount ? Coin.fromAmino(object.delegation_amount) : undefined, + equivalentStakedAmount: object?.equivalent_staked_amount ? Coin.fromAmino(object.equivalent_staked_amount) : undefined + }; + }, + toAmino(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAmino { + const obj: any = {}; + obj.delegator_address = message.delegatorAddress; + obj.validator_address = message.validatorAddress; + obj.delegation_amount = message.delegationAmount ? Coin.toAmino(message.delegationAmount) : undefined; + obj.equivalent_staked_amount = message.equivalentStakedAmount ? Coin.toAmino(message.equivalentStakedAmount) : undefined; + return obj; + }, + fromAminoMsg(object: SuperfluidDelegationRecordAminoMsg): SuperfluidDelegationRecord { + return SuperfluidDelegationRecord.fromAmino(object.value); + }, + toAminoMsg(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordAminoMsg { + return { + type: "osmosis/superfluid-delegation-record", + value: SuperfluidDelegationRecord.toAmino(message) + }; + }, + fromProtoMsg(message: SuperfluidDelegationRecordProtoMsg): SuperfluidDelegationRecord { + return SuperfluidDelegationRecord.decode(message.value); + }, + toProto(message: SuperfluidDelegationRecord): Uint8Array { + return SuperfluidDelegationRecord.encode(message).finish(); + }, + toProtoMsg(message: SuperfluidDelegationRecord): SuperfluidDelegationRecordProtoMsg { + return { + typeUrl: "/osmosis.superfluid.SuperfluidDelegationRecord", + value: SuperfluidDelegationRecord.encode(message).finish() + }; } }; function createBaseLockIdIntermediaryAccountConnection(): LockIdIntermediaryAccountConnection { @@ -498,6 +642,7 @@ function createBaseLockIdIntermediaryAccountConnection(): LockIdIntermediaryAcco }; } export const LockIdIntermediaryAccountConnection = { + typeUrl: "/osmosis.superfluid.LockIdIntermediaryAccountConnection", encode(message: LockIdIntermediaryAccountConnection, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lockId !== BigInt(0)) { writer.uint32(8).uint64(message.lockId); @@ -562,6 +707,39 @@ export const LockIdIntermediaryAccountConnection = { obj.lock_id = message.lockId; obj.intermediary_account = message.intermediaryAccount; return obj; + }, + fromAmino(object: LockIdIntermediaryAccountConnectionAmino): LockIdIntermediaryAccountConnection { + return { + lockId: BigInt(object.lock_id), + intermediaryAccount: object.intermediary_account + }; + }, + toAmino(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAmino { + const obj: any = {}; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.intermediary_account = message.intermediaryAccount; + return obj; + }, + fromAminoMsg(object: LockIdIntermediaryAccountConnectionAminoMsg): LockIdIntermediaryAccountConnection { + return LockIdIntermediaryAccountConnection.fromAmino(object.value); + }, + toAminoMsg(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionAminoMsg { + return { + type: "osmosis/lock-id-intermediary-account-connection", + value: LockIdIntermediaryAccountConnection.toAmino(message) + }; + }, + fromProtoMsg(message: LockIdIntermediaryAccountConnectionProtoMsg): LockIdIntermediaryAccountConnection { + return LockIdIntermediaryAccountConnection.decode(message.value); + }, + toProto(message: LockIdIntermediaryAccountConnection): Uint8Array { + return LockIdIntermediaryAccountConnection.encode(message).finish(); + }, + toProtoMsg(message: LockIdIntermediaryAccountConnection): LockIdIntermediaryAccountConnectionProtoMsg { + return { + typeUrl: "/osmosis.superfluid.LockIdIntermediaryAccountConnection", + value: LockIdIntermediaryAccountConnection.encode(message).finish() + }; } }; function createBaseUnpoolWhitelistedPools(): UnpoolWhitelistedPools { @@ -570,6 +748,7 @@ function createBaseUnpoolWhitelistedPools(): UnpoolWhitelistedPools { }; } export const UnpoolWhitelistedPools = { + typeUrl: "/osmosis.superfluid.UnpoolWhitelistedPools", encode(message: UnpoolWhitelistedPools, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.ids) { @@ -639,5 +818,40 @@ export const UnpoolWhitelistedPools = { obj.ids = []; } return obj; + }, + fromAmino(object: UnpoolWhitelistedPoolsAmino): UnpoolWhitelistedPools { + return { + ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: UnpoolWhitelistedPools): UnpoolWhitelistedPoolsAmino { + const obj: any = {}; + if (message.ids) { + obj.ids = message.ids.map(e => e.toString()); + } else { + obj.ids = []; + } + return obj; + }, + fromAminoMsg(object: UnpoolWhitelistedPoolsAminoMsg): UnpoolWhitelistedPools { + return UnpoolWhitelistedPools.fromAmino(object.value); + }, + toAminoMsg(message: UnpoolWhitelistedPools): UnpoolWhitelistedPoolsAminoMsg { + return { + type: "osmosis/unpool-whitelisted-pools", + value: UnpoolWhitelistedPools.toAmino(message) + }; + }, + fromProtoMsg(message: UnpoolWhitelistedPoolsProtoMsg): UnpoolWhitelistedPools { + return UnpoolWhitelistedPools.decode(message.value); + }, + toProto(message: UnpoolWhitelistedPools): Uint8Array { + return UnpoolWhitelistedPools.encode(message).finish(); + }, + toProtoMsg(message: UnpoolWhitelistedPools): UnpoolWhitelistedPoolsProtoMsg { + return { + typeUrl: "/osmosis.superfluid.UnpoolWhitelistedPools", + value: UnpoolWhitelistedPools.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts index 1b06c5da19..15c4066b0a 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/tx.ts @@ -102,6 +102,7 @@ function createBaseMsgSuperfluidDelegate(): MsgSuperfluidDelegate { }; } export const MsgSuperfluidDelegate = { + typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegate", encode(message: MsgSuperfluidDelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -178,12 +179,48 @@ export const MsgSuperfluidDelegate = { obj.lock_id = message.lockId; obj.val_addr = message.valAddr; return obj; + }, + fromAmino(object: MsgSuperfluidDelegateAmino): MsgSuperfluidDelegate { + return { + sender: object.sender, + lockId: BigInt(object.lock_id), + valAddr: object.val_addr + }; + }, + toAmino(message: MsgSuperfluidDelegate): MsgSuperfluidDelegateAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + obj.val_addr = message.valAddr; + return obj; + }, + fromAminoMsg(object: MsgSuperfluidDelegateAminoMsg): MsgSuperfluidDelegate { + return MsgSuperfluidDelegate.fromAmino(object.value); + }, + toAminoMsg(message: MsgSuperfluidDelegate): MsgSuperfluidDelegateAminoMsg { + return { + type: "osmosis/superfluid-delegate", + value: MsgSuperfluidDelegate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSuperfluidDelegateProtoMsg): MsgSuperfluidDelegate { + return MsgSuperfluidDelegate.decode(message.value); + }, + toProto(message: MsgSuperfluidDelegate): Uint8Array { + return MsgSuperfluidDelegate.encode(message).finish(); + }, + toProtoMsg(message: MsgSuperfluidDelegate): MsgSuperfluidDelegateProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegate", + value: MsgSuperfluidDelegate.encode(message).finish() + }; } }; function createBaseMsgSuperfluidDelegateResponse(): MsgSuperfluidDelegateResponse { return {}; } export const MsgSuperfluidDelegateResponse = { + typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegateResponse", encode(_: MsgSuperfluidDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -221,6 +258,34 @@ export const MsgSuperfluidDelegateResponse = { toSDK(_: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSuperfluidDelegateResponseAmino): MsgSuperfluidDelegateResponse { + return {}; + }, + toAmino(_: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSuperfluidDelegateResponseAminoMsg): MsgSuperfluidDelegateResponse { + return MsgSuperfluidDelegateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseAminoMsg { + return { + type: "osmosis/superfluid-delegate-response", + value: MsgSuperfluidDelegateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSuperfluidDelegateResponseProtoMsg): MsgSuperfluidDelegateResponse { + return MsgSuperfluidDelegateResponse.decode(message.value); + }, + toProto(message: MsgSuperfluidDelegateResponse): Uint8Array { + return MsgSuperfluidDelegateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSuperfluidDelegateResponse): MsgSuperfluidDelegateResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgSuperfluidDelegateResponse", + value: MsgSuperfluidDelegateResponse.encode(message).finish() + }; } }; function createBaseMsgSuperfluidUndelegate(): MsgSuperfluidUndelegate { @@ -230,6 +295,7 @@ function createBaseMsgSuperfluidUndelegate(): MsgSuperfluidUndelegate { }; } export const MsgSuperfluidUndelegate = { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegate", encode(message: MsgSuperfluidUndelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -294,12 +360,46 @@ export const MsgSuperfluidUndelegate = { obj.sender = message.sender; obj.lock_id = message.lockId; return obj; + }, + fromAmino(object: MsgSuperfluidUndelegateAmino): MsgSuperfluidUndelegate { + return { + sender: object.sender, + lockId: BigInt(object.lock_id) + }; + }, + toAmino(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSuperfluidUndelegateAminoMsg): MsgSuperfluidUndelegate { + return MsgSuperfluidUndelegate.fromAmino(object.value); + }, + toAminoMsg(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateAminoMsg { + return { + type: "osmosis/superfluid-undelegate", + value: MsgSuperfluidUndelegate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSuperfluidUndelegateProtoMsg): MsgSuperfluidUndelegate { + return MsgSuperfluidUndelegate.decode(message.value); + }, + toProto(message: MsgSuperfluidUndelegate): Uint8Array { + return MsgSuperfluidUndelegate.encode(message).finish(); + }, + toProtoMsg(message: MsgSuperfluidUndelegate): MsgSuperfluidUndelegateProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegate", + value: MsgSuperfluidUndelegate.encode(message).finish() + }; } }; function createBaseMsgSuperfluidUndelegateResponse(): MsgSuperfluidUndelegateResponse { return {}; } export const MsgSuperfluidUndelegateResponse = { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegateResponse", encode(_: MsgSuperfluidUndelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -337,6 +437,34 @@ export const MsgSuperfluidUndelegateResponse = { toSDK(_: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSuperfluidUndelegateResponseAmino): MsgSuperfluidUndelegateResponse { + return {}; + }, + toAmino(_: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSuperfluidUndelegateResponseAminoMsg): MsgSuperfluidUndelegateResponse { + return MsgSuperfluidUndelegateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseAminoMsg { + return { + type: "osmosis/superfluid-undelegate-response", + value: MsgSuperfluidUndelegateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSuperfluidUndelegateResponseProtoMsg): MsgSuperfluidUndelegateResponse { + return MsgSuperfluidUndelegateResponse.decode(message.value); + }, + toProto(message: MsgSuperfluidUndelegateResponse): Uint8Array { + return MsgSuperfluidUndelegateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSuperfluidUndelegateResponse): MsgSuperfluidUndelegateResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUndelegateResponse", + value: MsgSuperfluidUndelegateResponse.encode(message).finish() + }; } }; function createBaseMsgSuperfluidUnbondLock(): MsgSuperfluidUnbondLock { @@ -346,6 +474,7 @@ function createBaseMsgSuperfluidUnbondLock(): MsgSuperfluidUnbondLock { }; } export const MsgSuperfluidUnbondLock = { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLock", encode(message: MsgSuperfluidUnbondLock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -410,12 +539,46 @@ export const MsgSuperfluidUnbondLock = { obj.sender = message.sender; obj.lock_id = message.lockId; return obj; + }, + fromAmino(object: MsgSuperfluidUnbondLockAmino): MsgSuperfluidUnbondLock { + return { + sender: object.sender, + lockId: BigInt(object.lock_id) + }; + }, + toAmino(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.lock_id = message.lockId ? message.lockId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgSuperfluidUnbondLockAminoMsg): MsgSuperfluidUnbondLock { + return MsgSuperfluidUnbondLock.fromAmino(object.value); + }, + toAminoMsg(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockAminoMsg { + return { + type: "osmosis/superfluid-unbond-lock", + value: MsgSuperfluidUnbondLock.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSuperfluidUnbondLockProtoMsg): MsgSuperfluidUnbondLock { + return MsgSuperfluidUnbondLock.decode(message.value); + }, + toProto(message: MsgSuperfluidUnbondLock): Uint8Array { + return MsgSuperfluidUnbondLock.encode(message).finish(); + }, + toProtoMsg(message: MsgSuperfluidUnbondLock): MsgSuperfluidUnbondLockProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLock", + value: MsgSuperfluidUnbondLock.encode(message).finish() + }; } }; function createBaseMsgSuperfluidUnbondLockResponse(): MsgSuperfluidUnbondLockResponse { return {}; } export const MsgSuperfluidUnbondLockResponse = { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLockResponse", encode(_: MsgSuperfluidUnbondLockResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -453,6 +616,34 @@ export const MsgSuperfluidUnbondLockResponse = { toSDK(_: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSuperfluidUnbondLockResponseAmino): MsgSuperfluidUnbondLockResponse { + return {}; + }, + toAmino(_: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSuperfluidUnbondLockResponseAminoMsg): MsgSuperfluidUnbondLockResponse { + return MsgSuperfluidUnbondLockResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseAminoMsg { + return { + type: "osmosis/superfluid-unbond-lock-response", + value: MsgSuperfluidUnbondLockResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSuperfluidUnbondLockResponseProtoMsg): MsgSuperfluidUnbondLockResponse { + return MsgSuperfluidUnbondLockResponse.decode(message.value); + }, + toProto(message: MsgSuperfluidUnbondLockResponse): Uint8Array { + return MsgSuperfluidUnbondLockResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSuperfluidUnbondLockResponse): MsgSuperfluidUnbondLockResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgSuperfluidUnbondLockResponse", + value: MsgSuperfluidUnbondLockResponse.encode(message).finish() + }; } }; function createBaseMsgLockAndSuperfluidDelegate(): MsgLockAndSuperfluidDelegate { @@ -463,6 +654,7 @@ function createBaseMsgLockAndSuperfluidDelegate(): MsgLockAndSuperfluidDelegate }; } export const MsgLockAndSuperfluidDelegate = { + typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegate", encode(message: MsgLockAndSuperfluidDelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -547,6 +739,45 @@ export const MsgLockAndSuperfluidDelegate = { } obj.val_addr = message.valAddr; return obj; + }, + fromAmino(object: MsgLockAndSuperfluidDelegateAmino): MsgLockAndSuperfluidDelegate { + return { + sender: object.sender, + coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromAmino(e)) : [], + valAddr: object.val_addr + }; + }, + toAmino(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAmino { + const obj: any = {}; + obj.sender = message.sender; + if (message.coins) { + obj.coins = message.coins.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.coins = []; + } + obj.val_addr = message.valAddr; + return obj; + }, + fromAminoMsg(object: MsgLockAndSuperfluidDelegateAminoMsg): MsgLockAndSuperfluidDelegate { + return MsgLockAndSuperfluidDelegate.fromAmino(object.value); + }, + toAminoMsg(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateAminoMsg { + return { + type: "osmosis/lock-and-superfluid-delegate", + value: MsgLockAndSuperfluidDelegate.toAmino(message) + }; + }, + fromProtoMsg(message: MsgLockAndSuperfluidDelegateProtoMsg): MsgLockAndSuperfluidDelegate { + return MsgLockAndSuperfluidDelegate.decode(message.value); + }, + toProto(message: MsgLockAndSuperfluidDelegate): Uint8Array { + return MsgLockAndSuperfluidDelegate.encode(message).finish(); + }, + toProtoMsg(message: MsgLockAndSuperfluidDelegate): MsgLockAndSuperfluidDelegateProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegate", + value: MsgLockAndSuperfluidDelegate.encode(message).finish() + }; } }; function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidDelegateResponse { @@ -555,6 +786,7 @@ function createBaseMsgLockAndSuperfluidDelegateResponse(): MsgLockAndSuperfluidD }; } 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); @@ -607,6 +839,37 @@ export const MsgLockAndSuperfluidDelegateResponse = { const obj: any = {}; obj.ID = message.ID; return obj; + }, + fromAmino(object: MsgLockAndSuperfluidDelegateResponseAmino): MsgLockAndSuperfluidDelegateResponse { + return { + ID: BigInt(object.ID) + }; + }, + toAmino(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAmino { + const obj: any = {}; + obj.ID = message.ID ? message.ID.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgLockAndSuperfluidDelegateResponseAminoMsg): MsgLockAndSuperfluidDelegateResponse { + return MsgLockAndSuperfluidDelegateResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseAminoMsg { + return { + type: "osmosis/lock-and-superfluid-delegate-response", + value: MsgLockAndSuperfluidDelegateResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgLockAndSuperfluidDelegateResponseProtoMsg): MsgLockAndSuperfluidDelegateResponse { + return MsgLockAndSuperfluidDelegateResponse.decode(message.value); + }, + toProto(message: MsgLockAndSuperfluidDelegateResponse): Uint8Array { + return MsgLockAndSuperfluidDelegateResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgLockAndSuperfluidDelegateResponse): MsgLockAndSuperfluidDelegateResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgLockAndSuperfluidDelegateResponse", + value: MsgLockAndSuperfluidDelegateResponse.encode(message).finish() + }; } }; function createBaseMsgUnPoolWhitelistedPool(): MsgUnPoolWhitelistedPool { @@ -616,6 +879,7 @@ function createBaseMsgUnPoolWhitelistedPool(): MsgUnPoolWhitelistedPool { }; } export const MsgUnPoolWhitelistedPool = { + typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPool", encode(message: MsgUnPoolWhitelistedPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -680,6 +944,39 @@ export const MsgUnPoolWhitelistedPool = { obj.sender = message.sender; obj.pool_id = message.poolId; return obj; + }, + fromAmino(object: MsgUnPoolWhitelistedPoolAmino): MsgUnPoolWhitelistedPool { + return { + sender: object.sender, + poolId: BigInt(object.pool_id) + }; + }, + toAmino(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgUnPoolWhitelistedPoolAminoMsg): MsgUnPoolWhitelistedPool { + return MsgUnPoolWhitelistedPool.fromAmino(object.value); + }, + toAminoMsg(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolAminoMsg { + return { + type: "osmosis/unpool-whitelisted-pool", + value: MsgUnPoolWhitelistedPool.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUnPoolWhitelistedPoolProtoMsg): MsgUnPoolWhitelistedPool { + return MsgUnPoolWhitelistedPool.decode(message.value); + }, + toProto(message: MsgUnPoolWhitelistedPool): Uint8Array { + return MsgUnPoolWhitelistedPool.encode(message).finish(); + }, + toProtoMsg(message: MsgUnPoolWhitelistedPool): MsgUnPoolWhitelistedPoolProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPool", + value: MsgUnPoolWhitelistedPool.encode(message).finish() + }; } }; function createBaseMsgUnPoolWhitelistedPoolResponse(): MsgUnPoolWhitelistedPoolResponse { @@ -688,6 +985,7 @@ function createBaseMsgUnPoolWhitelistedPoolResponse(): MsgUnPoolWhitelistedPoolR }; } export const MsgUnPoolWhitelistedPoolResponse = { + typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPoolResponse", encode(message: MsgUnPoolWhitelistedPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.exitedLockIds) { @@ -757,5 +1055,40 @@ export const MsgUnPoolWhitelistedPoolResponse = { obj.exited_lock_ids = []; } return obj; + }, + fromAmino(object: MsgUnPoolWhitelistedPoolResponseAmino): MsgUnPoolWhitelistedPoolResponse { + return { + exitedLockIds: Array.isArray(object?.exited_lock_ids) ? object.exited_lock_ids.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: MsgUnPoolWhitelistedPoolResponse): MsgUnPoolWhitelistedPoolResponseAmino { + const obj: any = {}; + if (message.exitedLockIds) { + obj.exited_lock_ids = message.exitedLockIds.map(e => e.toString()); + } else { + obj.exited_lock_ids = []; + } + return obj; + }, + fromAminoMsg(object: MsgUnPoolWhitelistedPoolResponseAminoMsg): MsgUnPoolWhitelistedPoolResponse { + return MsgUnPoolWhitelistedPoolResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUnPoolWhitelistedPoolResponse): MsgUnPoolWhitelistedPoolResponseAminoMsg { + return { + type: "osmosis/un-pool-whitelisted-pool-response", + value: MsgUnPoolWhitelistedPoolResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUnPoolWhitelistedPoolResponseProtoMsg): MsgUnPoolWhitelistedPoolResponse { + return MsgUnPoolWhitelistedPoolResponse.decode(message.value); + }, + toProto(message: MsgUnPoolWhitelistedPoolResponse): Uint8Array { + return MsgUnPoolWhitelistedPoolResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUnPoolWhitelistedPoolResponse): MsgUnPoolWhitelistedPoolResponseProtoMsg { + return { + typeUrl: "/osmosis.superfluid.MsgUnPoolWhitelistedPoolResponse", + value: MsgUnPoolWhitelistedPoolResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts index e1c5eafb35..111653cb58 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/superfluid/v1beta1/gov.ts @@ -66,6 +66,7 @@ function createBaseSetSuperfluidAssetsProposal(): SetSuperfluidAssetsProposal { }; } export const SetSuperfluidAssetsProposal = { + typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal", encode(message: SetSuperfluidAssetsProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -150,6 +151,45 @@ export const SetSuperfluidAssetsProposal = { obj.assets = []; } return obj; + }, + fromAmino(object: SetSuperfluidAssetsProposalAmino): SetSuperfluidAssetsProposal { + return { + title: object.title, + description: object.description, + assets: Array.isArray(object?.assets) ? object.assets.map((e: any) => SuperfluidAsset.fromAmino(e)) : [] + }; + }, + toAmino(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.assets) { + obj.assets = message.assets.map(e => e ? SuperfluidAsset.toAmino(e) : undefined); + } else { + obj.assets = []; + } + return obj; + }, + fromAminoMsg(object: SetSuperfluidAssetsProposalAminoMsg): SetSuperfluidAssetsProposal { + return SetSuperfluidAssetsProposal.fromAmino(object.value); + }, + toAminoMsg(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalAminoMsg { + return { + type: "osmosis/v1beta1/set-superfluid-assets-proposal", + value: SetSuperfluidAssetsProposal.toAmino(message) + }; + }, + fromProtoMsg(message: SetSuperfluidAssetsProposalProtoMsg): SetSuperfluidAssetsProposal { + return SetSuperfluidAssetsProposal.decode(message.value); + }, + toProto(message: SetSuperfluidAssetsProposal): Uint8Array { + return SetSuperfluidAssetsProposal.encode(message).finish(); + }, + toProtoMsg(message: SetSuperfluidAssetsProposal): SetSuperfluidAssetsProposalProtoMsg { + return { + typeUrl: "/osmosis.superfluid.v1beta1.SetSuperfluidAssetsProposal", + value: SetSuperfluidAssetsProposal.encode(message).finish() + }; } }; function createBaseRemoveSuperfluidAssetsProposal(): RemoveSuperfluidAssetsProposal { @@ -160,6 +200,7 @@ function createBaseRemoveSuperfluidAssetsProposal(): RemoveSuperfluidAssetsPropo }; } export const RemoveSuperfluidAssetsProposal = { + typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal", encode(message: RemoveSuperfluidAssetsProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -244,6 +285,45 @@ export const RemoveSuperfluidAssetsProposal = { obj.superfluid_asset_denoms = []; } return obj; + }, + fromAmino(object: RemoveSuperfluidAssetsProposalAmino): RemoveSuperfluidAssetsProposal { + return { + title: object.title, + description: object.description, + superfluidAssetDenoms: Array.isArray(object?.superfluid_asset_denoms) ? object.superfluid_asset_denoms.map((e: any) => e) : [] + }; + }, + toAmino(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.superfluidAssetDenoms) { + obj.superfluid_asset_denoms = message.superfluidAssetDenoms.map(e => e); + } else { + obj.superfluid_asset_denoms = []; + } + return obj; + }, + fromAminoMsg(object: RemoveSuperfluidAssetsProposalAminoMsg): RemoveSuperfluidAssetsProposal { + return RemoveSuperfluidAssetsProposal.fromAmino(object.value); + }, + toAminoMsg(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalAminoMsg { + return { + type: "osmosis/v1beta1/remove-superfluid-assets-proposal", + value: RemoveSuperfluidAssetsProposal.toAmino(message) + }; + }, + fromProtoMsg(message: RemoveSuperfluidAssetsProposalProtoMsg): RemoveSuperfluidAssetsProposal { + return RemoveSuperfluidAssetsProposal.decode(message.value); + }, + toProto(message: RemoveSuperfluidAssetsProposal): Uint8Array { + return RemoveSuperfluidAssetsProposal.encode(message).finish(); + }, + toProtoMsg(message: RemoveSuperfluidAssetsProposal): RemoveSuperfluidAssetsProposalProtoMsg { + return { + typeUrl: "/osmosis.superfluid.v1beta1.RemoveSuperfluidAssetsProposal", + value: RemoveSuperfluidAssetsProposal.encode(message).finish() + }; } }; function createBaseUpdateUnpoolWhiteListProposal(): UpdateUnpoolWhiteListProposal { @@ -255,6 +335,7 @@ function createBaseUpdateUnpoolWhiteListProposal(): UpdateUnpoolWhiteListProposa }; } export const UpdateUnpoolWhiteListProposal = { + typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal", encode(message: UpdateUnpoolWhiteListProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -360,5 +441,46 @@ export const UpdateUnpoolWhiteListProposal = { } obj.is_overwrite = message.isOverwrite; return obj; + }, + fromAmino(object: UpdateUnpoolWhiteListProposalAmino): UpdateUnpoolWhiteListProposal { + return { + title: object.title, + description: object.description, + ids: Array.isArray(object?.ids) ? object.ids.map((e: any) => BigInt(e)) : [], + isOverwrite: object.is_overwrite + }; + }, + toAmino(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + if (message.ids) { + obj.ids = message.ids.map(e => e.toString()); + } else { + obj.ids = []; + } + obj.is_overwrite = message.isOverwrite; + return obj; + }, + fromAminoMsg(object: UpdateUnpoolWhiteListProposalAminoMsg): UpdateUnpoolWhiteListProposal { + return UpdateUnpoolWhiteListProposal.fromAmino(object.value); + }, + toAminoMsg(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalAminoMsg { + return { + type: "osmosis/v1beta1/update-unpool-white-list-proposal", + value: UpdateUnpoolWhiteListProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UpdateUnpoolWhiteListProposalProtoMsg): UpdateUnpoolWhiteListProposal { + return UpdateUnpoolWhiteListProposal.decode(message.value); + }, + toProto(message: UpdateUnpoolWhiteListProposal): Uint8Array { + return UpdateUnpoolWhiteListProposal.encode(message).finish(); + }, + toProtoMsg(message: UpdateUnpoolWhiteListProposal): UpdateUnpoolWhiteListProposalProtoMsg { + return { + typeUrl: "/osmosis.superfluid.v1beta1.UpdateUnpoolWhiteListProposal", + value: UpdateUnpoolWhiteListProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts index eb5c599c62..f0562d1e5f 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/authorityMetadata.ts @@ -24,6 +24,7 @@ function createBaseDenomAuthorityMetadata(): DenomAuthorityMetadata { }; } export const DenomAuthorityMetadata = { + typeUrl: "/osmosis.tokenfactory.v1beta1.DenomAuthorityMetadata", encode(message: DenomAuthorityMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); @@ -76,5 +77,36 @@ export const DenomAuthorityMetadata = { const obj: any = {}; obj.admin = message.admin; return obj; + }, + fromAmino(object: DenomAuthorityMetadataAmino): DenomAuthorityMetadata { + return { + admin: object.admin + }; + }, + toAmino(message: DenomAuthorityMetadata): DenomAuthorityMetadataAmino { + const obj: any = {}; + obj.admin = message.admin; + return obj; + }, + fromAminoMsg(object: DenomAuthorityMetadataAminoMsg): DenomAuthorityMetadata { + return DenomAuthorityMetadata.fromAmino(object.value); + }, + toAminoMsg(message: DenomAuthorityMetadata): DenomAuthorityMetadataAminoMsg { + return { + type: "osmosis/tokenfactory/denom-authority-metadata", + value: DenomAuthorityMetadata.toAmino(message) + }; + }, + fromProtoMsg(message: DenomAuthorityMetadataProtoMsg): DenomAuthorityMetadata { + return DenomAuthorityMetadata.decode(message.value); + }, + toProto(message: DenomAuthorityMetadata): Uint8Array { + return DenomAuthorityMetadata.encode(message).finish(); + }, + toProtoMsg(message: DenomAuthorityMetadata): DenomAuthorityMetadataProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.DenomAuthorityMetadata", + value: DenomAuthorityMetadata.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts index e087b34cda..960bab7c74 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/genesis.ts @@ -39,6 +39,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -111,6 +112,43 @@ export const GenesisState = { obj.factory_denoms = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined, + factoryDenoms: Array.isArray(object?.factory_denoms) ? object.factory_denoms.map((e: any) => GenesisDenom.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + if (message.factoryDenoms) { + obj.factory_denoms = message.factoryDenoms.map(e => e ? GenesisDenom.toAmino(e) : undefined); + } else { + obj.factory_denoms = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/tokenfactory/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; function createBaseGenesisDenom(): GenesisDenom { @@ -120,6 +158,7 @@ function createBaseGenesisDenom(): GenesisDenom { }; } export const GenesisDenom = { + typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisDenom", encode(message: GenesisDenom, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -184,5 +223,38 @@ export const GenesisDenom = { obj.denom = message.denom; message.authorityMetadata !== undefined && (obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toSDK(message.authorityMetadata) : undefined); return obj; + }, + fromAmino(object: GenesisDenomAmino): GenesisDenom { + return { + denom: object.denom, + authorityMetadata: object?.authority_metadata ? DenomAuthorityMetadata.fromAmino(object.authority_metadata) : undefined + }; + }, + toAmino(message: GenesisDenom): GenesisDenomAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisDenomAminoMsg): GenesisDenom { + return GenesisDenom.fromAmino(object.value); + }, + toAminoMsg(message: GenesisDenom): GenesisDenomAminoMsg { + return { + type: "osmosis/tokenfactory/genesis-denom", + value: GenesisDenom.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisDenomProtoMsg): GenesisDenom { + return GenesisDenom.decode(message.value); + }, + toProto(message: GenesisDenom): Uint8Array { + return GenesisDenom.encode(message).finish(); + }, + toProtoMsg(message: GenesisDenom): GenesisDenomProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.GenesisDenom", + value: GenesisDenom.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts index 3f13f94f82..ccbb7c226c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/params.ts @@ -16,6 +16,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.tokenfactory.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.denomCreationFee) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -76,5 +77,40 @@ export const Params = { obj.denom_creation_fee = []; } return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + denomCreationFee: Array.isArray(object?.denom_creation_fee) ? object.denom_creation_fee.map((e: any) => Coin.fromAmino(e)) : [] + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + if (message.denomCreationFee) { + obj.denom_creation_fee = message.denomCreationFee.map(e => e ? Coin.toAmino(e) : undefined); + } else { + obj.denom_creation_fee = []; + } + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/tokenfactory/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts index 69a22c87e1..73afbc9c01 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/query.ts @@ -76,6 +76,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { return {}; } export const QueryParamsRequest = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsRequest", encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -113,6 +114,34 @@ export const QueryParamsRequest = { toSDK(_: QueryParamsRequest): QueryParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryParamsRequestAmino): QueryParamsRequest { + return {}; + }, + toAmino(_: QueryParamsRequest): QueryParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryParamsRequestAminoMsg): QueryParamsRequest { + return QueryParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsRequest): QueryParamsRequestAminoMsg { + return { + type: "osmosis/tokenfactory/query-params-request", + value: QueryParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsRequestProtoMsg): QueryParamsRequest { + return QueryParamsRequest.decode(message.value); + }, + toProto(message: QueryParamsRequest): Uint8Array { + return QueryParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsRequest): QueryParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsRequest", + value: QueryParamsRequest.encode(message).finish() + }; } }; function createBaseQueryParamsResponse(): QueryParamsResponse { @@ -121,6 +150,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { }; } export const QueryParamsResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsResponse", encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -173,6 +203,37 @@ export const QueryParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: QueryParamsResponseAmino): QueryParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: QueryParamsResponse): QueryParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: QueryParamsResponseAminoMsg): QueryParamsResponse { + return QueryParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryParamsResponse): QueryParamsResponseAminoMsg { + return { + type: "osmosis/tokenfactory/query-params-response", + value: QueryParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryParamsResponseProtoMsg): QueryParamsResponse { + return QueryParamsResponse.decode(message.value); + }, + toProto(message: QueryParamsResponse): Uint8Array { + return QueryParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryParamsResponse): QueryParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryParamsResponse", + value: QueryParamsResponse.encode(message).finish() + }; } }; function createBaseQueryDenomAuthorityMetadataRequest(): QueryDenomAuthorityMetadataRequest { @@ -181,6 +242,7 @@ function createBaseQueryDenomAuthorityMetadataRequest(): QueryDenomAuthorityMeta }; } export const QueryDenomAuthorityMetadataRequest = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataRequest", encode(message: QueryDenomAuthorityMetadataRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -233,6 +295,37 @@ export const QueryDenomAuthorityMetadataRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryDenomAuthorityMetadataRequestAmino): QueryDenomAuthorityMetadataRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryDenomAuthorityMetadataRequestAminoMsg): QueryDenomAuthorityMetadataRequest { + return QueryDenomAuthorityMetadataRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestAminoMsg { + return { + type: "osmosis/tokenfactory/query-denom-authority-metadata-request", + value: QueryDenomAuthorityMetadataRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomAuthorityMetadataRequestProtoMsg): QueryDenomAuthorityMetadataRequest { + return QueryDenomAuthorityMetadataRequest.decode(message.value); + }, + toProto(message: QueryDenomAuthorityMetadataRequest): Uint8Array { + return QueryDenomAuthorityMetadataRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomAuthorityMetadataRequest): QueryDenomAuthorityMetadataRequestProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataRequest", + value: QueryDenomAuthorityMetadataRequest.encode(message).finish() + }; } }; function createBaseQueryDenomAuthorityMetadataResponse(): QueryDenomAuthorityMetadataResponse { @@ -241,6 +334,7 @@ function createBaseQueryDenomAuthorityMetadataResponse(): QueryDenomAuthorityMet }; } export const QueryDenomAuthorityMetadataResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse", encode(message: QueryDenomAuthorityMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authorityMetadata !== undefined) { DenomAuthorityMetadata.encode(message.authorityMetadata, writer.uint32(10).fork()).ldelim(); @@ -293,6 +387,37 @@ export const QueryDenomAuthorityMetadataResponse = { const obj: any = {}; message.authorityMetadata !== undefined && (obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toSDK(message.authorityMetadata) : undefined); return obj; + }, + fromAmino(object: QueryDenomAuthorityMetadataResponseAmino): QueryDenomAuthorityMetadataResponse { + return { + authorityMetadata: object?.authority_metadata ? DenomAuthorityMetadata.fromAmino(object.authority_metadata) : undefined + }; + }, + toAmino(message: QueryDenomAuthorityMetadataResponse): QueryDenomAuthorityMetadataResponseAmino { + const obj: any = {}; + obj.authority_metadata = message.authorityMetadata ? DenomAuthorityMetadata.toAmino(message.authorityMetadata) : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomAuthorityMetadataResponseAminoMsg): QueryDenomAuthorityMetadataResponse { + return QueryDenomAuthorityMetadataResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomAuthorityMetadataResponse): QueryDenomAuthorityMetadataResponseAminoMsg { + return { + type: "osmosis/tokenfactory/query-denom-authority-metadata-response", + value: QueryDenomAuthorityMetadataResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomAuthorityMetadataResponseProtoMsg): QueryDenomAuthorityMetadataResponse { + return QueryDenomAuthorityMetadataResponse.decode(message.value); + }, + toProto(message: QueryDenomAuthorityMetadataResponse): Uint8Array { + return QueryDenomAuthorityMetadataResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomAuthorityMetadataResponse): QueryDenomAuthorityMetadataResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomAuthorityMetadataResponse", + value: QueryDenomAuthorityMetadataResponse.encode(message).finish() + }; } }; function createBaseQueryDenomsFromCreatorRequest(): QueryDenomsFromCreatorRequest { @@ -301,6 +426,7 @@ function createBaseQueryDenomsFromCreatorRequest(): QueryDenomsFromCreatorReques }; } export const QueryDenomsFromCreatorRequest = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest", encode(message: QueryDenomsFromCreatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.creator !== "") { writer.uint32(10).string(message.creator); @@ -353,6 +479,37 @@ export const QueryDenomsFromCreatorRequest = { const obj: any = {}; obj.creator = message.creator; return obj; + }, + fromAmino(object: QueryDenomsFromCreatorRequestAmino): QueryDenomsFromCreatorRequest { + return { + creator: object.creator + }; + }, + toAmino(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAmino { + const obj: any = {}; + obj.creator = message.creator; + return obj; + }, + fromAminoMsg(object: QueryDenomsFromCreatorRequestAminoMsg): QueryDenomsFromCreatorRequest { + return QueryDenomsFromCreatorRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestAminoMsg { + return { + type: "osmosis/tokenfactory/query-denoms-from-creator-request", + value: QueryDenomsFromCreatorRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomsFromCreatorRequestProtoMsg): QueryDenomsFromCreatorRequest { + return QueryDenomsFromCreatorRequest.decode(message.value); + }, + toProto(message: QueryDenomsFromCreatorRequest): Uint8Array { + return QueryDenomsFromCreatorRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomsFromCreatorRequest): QueryDenomsFromCreatorRequestProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorRequest", + value: QueryDenomsFromCreatorRequest.encode(message).finish() + }; } }; function createBaseQueryDenomsFromCreatorResponse(): QueryDenomsFromCreatorResponse { @@ -361,6 +518,7 @@ function createBaseQueryDenomsFromCreatorResponse(): QueryDenomsFromCreatorRespo }; } export const QueryDenomsFromCreatorResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse", encode(message: QueryDenomsFromCreatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.denoms) { writer.uint32(10).string(v!); @@ -421,5 +579,40 @@ export const QueryDenomsFromCreatorResponse = { obj.denoms = []; } return obj; + }, + fromAmino(object: QueryDenomsFromCreatorResponseAmino): QueryDenomsFromCreatorResponse { + return { + denoms: Array.isArray(object?.denoms) ? object.denoms.map((e: any) => e) : [] + }; + }, + toAmino(message: QueryDenomsFromCreatorResponse): QueryDenomsFromCreatorResponseAmino { + const obj: any = {}; + if (message.denoms) { + obj.denoms = message.denoms.map(e => e); + } else { + obj.denoms = []; + } + return obj; + }, + fromAminoMsg(object: QueryDenomsFromCreatorResponseAminoMsg): QueryDenomsFromCreatorResponse { + return QueryDenomsFromCreatorResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomsFromCreatorResponse): QueryDenomsFromCreatorResponseAminoMsg { + return { + type: "osmosis/tokenfactory/query-denoms-from-creator-response", + value: QueryDenomsFromCreatorResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomsFromCreatorResponseProtoMsg): QueryDenomsFromCreatorResponse { + return QueryDenomsFromCreatorResponse.decode(message.value); + }, + toProto(message: QueryDenomsFromCreatorResponse): Uint8Array { + return QueryDenomsFromCreatorResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomsFromCreatorResponse): QueryDenomsFromCreatorResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.QueryDenomsFromCreatorResponse", + value: QueryDenomsFromCreatorResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts index c89c095fcd..cc25cfa05d 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/tokenfactory/v1beta1/tx.ts @@ -145,6 +145,7 @@ function createBaseMsgCreateDenom(): MsgCreateDenom { }; } export const MsgCreateDenom = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenom", encode(message: MsgCreateDenom, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -209,6 +210,39 @@ export const MsgCreateDenom = { obj.sender = message.sender; obj.subdenom = message.subdenom; return obj; + }, + fromAmino(object: MsgCreateDenomAmino): MsgCreateDenom { + return { + sender: object.sender, + subdenom: object.subdenom + }; + }, + toAmino(message: MsgCreateDenom): MsgCreateDenomAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.subdenom = message.subdenom; + return obj; + }, + fromAminoMsg(object: MsgCreateDenomAminoMsg): MsgCreateDenom { + return MsgCreateDenom.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateDenom): MsgCreateDenomAminoMsg { + return { + type: "osmosis/tokenfactory/create-denom", + value: MsgCreateDenom.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateDenomProtoMsg): MsgCreateDenom { + return MsgCreateDenom.decode(message.value); + }, + toProto(message: MsgCreateDenom): Uint8Array { + return MsgCreateDenom.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateDenom): MsgCreateDenomProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenom", + value: MsgCreateDenom.encode(message).finish() + }; } }; function createBaseMsgCreateDenomResponse(): MsgCreateDenomResponse { @@ -217,6 +251,7 @@ function createBaseMsgCreateDenomResponse(): MsgCreateDenomResponse { }; } export const MsgCreateDenomResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse", encode(message: MsgCreateDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newTokenDenom !== "") { writer.uint32(10).string(message.newTokenDenom); @@ -269,6 +304,37 @@ export const MsgCreateDenomResponse = { const obj: any = {}; obj.new_token_denom = message.newTokenDenom; return obj; + }, + fromAmino(object: MsgCreateDenomResponseAmino): MsgCreateDenomResponse { + return { + newTokenDenom: object.new_token_denom + }; + }, + toAmino(message: MsgCreateDenomResponse): MsgCreateDenomResponseAmino { + const obj: any = {}; + obj.new_token_denom = message.newTokenDenom; + return obj; + }, + fromAminoMsg(object: MsgCreateDenomResponseAminoMsg): MsgCreateDenomResponse { + return MsgCreateDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgCreateDenomResponse): MsgCreateDenomResponseAminoMsg { + return { + type: "osmosis/tokenfactory/create-denom-response", + value: MsgCreateDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgCreateDenomResponseProtoMsg): MsgCreateDenomResponse { + return MsgCreateDenomResponse.decode(message.value); + }, + toProto(message: MsgCreateDenomResponse): Uint8Array { + return MsgCreateDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgCreateDenomResponse): MsgCreateDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgCreateDenomResponse", + value: MsgCreateDenomResponse.encode(message).finish() + }; } }; function createBaseMsgMint(): MsgMint { @@ -278,6 +344,7 @@ function createBaseMsgMint(): MsgMint { }; } export const MsgMint = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMint", encode(message: MsgMint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -342,12 +409,46 @@ export const MsgMint = { obj.sender = message.sender; message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: MsgMintAmino): MsgMint { + return { + sender: object.sender, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: MsgMint): MsgMintAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: MsgMintAminoMsg): MsgMint { + return MsgMint.fromAmino(object.value); + }, + toAminoMsg(message: MsgMint): MsgMintAminoMsg { + return { + type: "osmosis/tokenfactory/mint", + value: MsgMint.toAmino(message) + }; + }, + fromProtoMsg(message: MsgMintProtoMsg): MsgMint { + return MsgMint.decode(message.value); + }, + toProto(message: MsgMint): Uint8Array { + return MsgMint.encode(message).finish(); + }, + toProtoMsg(message: MsgMint): MsgMintProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMint", + value: MsgMint.encode(message).finish() + }; } }; function createBaseMsgMintResponse(): MsgMintResponse { return {}; } export const MsgMintResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMintResponse", encode(_: MsgMintResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -385,6 +486,34 @@ export const MsgMintResponse = { toSDK(_: MsgMintResponse): MsgMintResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgMintResponseAmino): MsgMintResponse { + return {}; + }, + toAmino(_: MsgMintResponse): MsgMintResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgMintResponseAminoMsg): MsgMintResponse { + return MsgMintResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgMintResponse): MsgMintResponseAminoMsg { + return { + type: "osmosis/tokenfactory/mint-response", + value: MsgMintResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgMintResponseProtoMsg): MsgMintResponse { + return MsgMintResponse.decode(message.value); + }, + toProto(message: MsgMintResponse): Uint8Array { + return MsgMintResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgMintResponse): MsgMintResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgMintResponse", + value: MsgMintResponse.encode(message).finish() + }; } }; function createBaseMsgBurn(): MsgBurn { @@ -394,6 +523,7 @@ function createBaseMsgBurn(): MsgBurn { }; } export const MsgBurn = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurn", encode(message: MsgBurn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -458,12 +588,46 @@ export const MsgBurn = { obj.sender = message.sender; message.amount !== undefined && (obj.amount = message.amount ? Coin.toSDK(message.amount) : undefined); return obj; + }, + fromAmino(object: MsgBurnAmino): MsgBurn { + return { + sender: object.sender, + amount: object?.amount ? Coin.fromAmino(object.amount) : undefined + }; + }, + toAmino(message: MsgBurn): MsgBurnAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.amount = message.amount ? Coin.toAmino(message.amount) : undefined; + return obj; + }, + fromAminoMsg(object: MsgBurnAminoMsg): MsgBurn { + return MsgBurn.fromAmino(object.value); + }, + toAminoMsg(message: MsgBurn): MsgBurnAminoMsg { + return { + type: "osmosis/tokenfactory/burn", + value: MsgBurn.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBurnProtoMsg): MsgBurn { + return MsgBurn.decode(message.value); + }, + toProto(message: MsgBurn): Uint8Array { + return MsgBurn.encode(message).finish(); + }, + toProtoMsg(message: MsgBurn): MsgBurnProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurn", + value: MsgBurn.encode(message).finish() + }; } }; function createBaseMsgBurnResponse(): MsgBurnResponse { return {}; } export const MsgBurnResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurnResponse", encode(_: MsgBurnResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -501,6 +665,34 @@ export const MsgBurnResponse = { toSDK(_: MsgBurnResponse): MsgBurnResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgBurnResponseAmino): MsgBurnResponse { + return {}; + }, + toAmino(_: MsgBurnResponse): MsgBurnResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgBurnResponseAminoMsg): MsgBurnResponse { + return MsgBurnResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgBurnResponse): MsgBurnResponseAminoMsg { + return { + type: "osmosis/tokenfactory/burn-response", + value: MsgBurnResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgBurnResponseProtoMsg): MsgBurnResponse { + return MsgBurnResponse.decode(message.value); + }, + toProto(message: MsgBurnResponse): Uint8Array { + return MsgBurnResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgBurnResponse): MsgBurnResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgBurnResponse", + value: MsgBurnResponse.encode(message).finish() + }; } }; function createBaseMsgChangeAdmin(): MsgChangeAdmin { @@ -511,6 +703,7 @@ function createBaseMsgChangeAdmin(): MsgChangeAdmin { }; } export const MsgChangeAdmin = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdmin", encode(message: MsgChangeAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -587,12 +780,48 @@ export const MsgChangeAdmin = { obj.denom = message.denom; obj.new_admin = message.newAdmin; return obj; + }, + fromAmino(object: MsgChangeAdminAmino): MsgChangeAdmin { + return { + sender: object.sender, + denom: object.denom, + newAdmin: object.new_admin + }; + }, + toAmino(message: MsgChangeAdmin): MsgChangeAdminAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.denom = message.denom; + obj.new_admin = message.newAdmin; + return obj; + }, + fromAminoMsg(object: MsgChangeAdminAminoMsg): MsgChangeAdmin { + return MsgChangeAdmin.fromAmino(object.value); + }, + toAminoMsg(message: MsgChangeAdmin): MsgChangeAdminAminoMsg { + return { + type: "osmosis/tokenfactory/change-admin", + value: MsgChangeAdmin.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChangeAdminProtoMsg): MsgChangeAdmin { + return MsgChangeAdmin.decode(message.value); + }, + toProto(message: MsgChangeAdmin): Uint8Array { + return MsgChangeAdmin.encode(message).finish(); + }, + toProtoMsg(message: MsgChangeAdmin): MsgChangeAdminProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdmin", + value: MsgChangeAdmin.encode(message).finish() + }; } }; function createBaseMsgChangeAdminResponse(): MsgChangeAdminResponse { return {}; } export const MsgChangeAdminResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse", encode(_: MsgChangeAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -630,6 +859,34 @@ export const MsgChangeAdminResponse = { toSDK(_: MsgChangeAdminResponse): MsgChangeAdminResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgChangeAdminResponseAmino): MsgChangeAdminResponse { + return {}; + }, + toAmino(_: MsgChangeAdminResponse): MsgChangeAdminResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgChangeAdminResponseAminoMsg): MsgChangeAdminResponse { + return MsgChangeAdminResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgChangeAdminResponse): MsgChangeAdminResponseAminoMsg { + return { + type: "osmosis/tokenfactory/change-admin-response", + value: MsgChangeAdminResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgChangeAdminResponseProtoMsg): MsgChangeAdminResponse { + return MsgChangeAdminResponse.decode(message.value); + }, + toProto(message: MsgChangeAdminResponse): Uint8Array { + return MsgChangeAdminResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgChangeAdminResponse): MsgChangeAdminResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgChangeAdminResponse", + value: MsgChangeAdminResponse.encode(message).finish() + }; } }; function createBaseMsgSetDenomMetadata(): MsgSetDenomMetadata { @@ -639,6 +896,7 @@ function createBaseMsgSetDenomMetadata(): MsgSetDenomMetadata { }; } export const MsgSetDenomMetadata = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata", encode(message: MsgSetDenomMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); @@ -703,12 +961,46 @@ export const MsgSetDenomMetadata = { obj.sender = message.sender; message.metadata !== undefined && (obj.metadata = message.metadata ? Metadata.toSDK(message.metadata) : undefined); return obj; + }, + fromAmino(object: MsgSetDenomMetadataAmino): MsgSetDenomMetadata { + return { + sender: object.sender, + metadata: object?.metadata ? Metadata.fromAmino(object.metadata) : undefined + }; + }, + toAmino(message: MsgSetDenomMetadata): MsgSetDenomMetadataAmino { + const obj: any = {}; + obj.sender = message.sender; + obj.metadata = message.metadata ? Metadata.toAmino(message.metadata) : undefined; + return obj; + }, + fromAminoMsg(object: MsgSetDenomMetadataAminoMsg): MsgSetDenomMetadata { + return MsgSetDenomMetadata.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetDenomMetadata): MsgSetDenomMetadataAminoMsg { + return { + type: "osmosis/tokenfactory/set-denom-metadata", + value: MsgSetDenomMetadata.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetDenomMetadataProtoMsg): MsgSetDenomMetadata { + return MsgSetDenomMetadata.decode(message.value); + }, + toProto(message: MsgSetDenomMetadata): Uint8Array { + return MsgSetDenomMetadata.encode(message).finish(); + }, + toProtoMsg(message: MsgSetDenomMetadata): MsgSetDenomMetadataProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata", + value: MsgSetDenomMetadata.encode(message).finish() + }; } }; function createBaseMsgSetDenomMetadataResponse(): MsgSetDenomMetadataResponse { return {}; } export const MsgSetDenomMetadataResponse = { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse", encode(_: MsgSetDenomMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -746,5 +1038,33 @@ export const MsgSetDenomMetadataResponse = { toSDK(_: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetDenomMetadataResponseAmino): MsgSetDenomMetadataResponse { + return {}; + }, + toAmino(_: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetDenomMetadataResponseAminoMsg): MsgSetDenomMetadataResponse { + return MsgSetDenomMetadataResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseAminoMsg { + return { + type: "osmosis/tokenfactory/set-denom-metadata-response", + value: MsgSetDenomMetadataResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetDenomMetadataResponseProtoMsg): MsgSetDenomMetadataResponse { + return MsgSetDenomMetadataResponse.decode(message.value); + }, + toProto(message: MsgSetDenomMetadataResponse): Uint8Array { + return MsgSetDenomMetadataResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetDenomMetadataResponse): MsgSetDenomMetadataResponseProtoMsg { + return { + typeUrl: "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadataResponse", + value: MsgSetDenomMetadataResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts index 5fc2a9e456..ce3e641a12 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/genesis.ts @@ -32,6 +32,7 @@ function createBaseParams(): Params { }; } export const Params = { + typeUrl: "/osmosis.twap.v1beta1.Params", encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pruneEpochIdentifier !== "") { writer.uint32(10).string(message.pruneEpochIdentifier); @@ -96,6 +97,39 @@ export const Params = { obj.prune_epoch_identifier = message.pruneEpochIdentifier; message.recordHistoryKeepPeriod !== undefined && (obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toSDK(message.recordHistoryKeepPeriod) : undefined); return obj; + }, + fromAmino(object: ParamsAmino): Params { + return { + pruneEpochIdentifier: object.prune_epoch_identifier, + recordHistoryKeepPeriod: object?.record_history_keep_period ? Duration.fromAmino(object.record_history_keep_period) : undefined + }; + }, + toAmino(message: Params): ParamsAmino { + const obj: any = {}; + obj.prune_epoch_identifier = message.pruneEpochIdentifier; + obj.record_history_keep_period = message.recordHistoryKeepPeriod ? Duration.toAmino(message.recordHistoryKeepPeriod) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsAminoMsg): Params { + return Params.fromAmino(object.value); + }, + toAminoMsg(message: Params): ParamsAminoMsg { + return { + type: "osmosis/twap/params", + value: Params.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsProtoMsg): Params { + return Params.decode(message.value); + }, + toProto(message: Params): Uint8Array { + return Params.encode(message).finish(); + }, + toProtoMsg(message: Params): ParamsProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.Params", + value: Params.encode(message).finish() + }; } }; function createBaseGenesisState(): GenesisState { @@ -105,6 +139,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.twap.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.twaps) { TwapRecord.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -177,5 +212,42 @@ export const GenesisState = { } message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + twaps: Array.isArray(object?.twaps) ? object.twaps.map((e: any) => TwapRecord.fromAmino(e)) : [], + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + if (message.twaps) { + obj.twaps = message.twaps.map(e => e ? TwapRecord.toAmino(e) : undefined); + } else { + obj.twaps = []; + } + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/twap/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts index 364c5c97e3..a736b7d685 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/query.ts @@ -60,6 +60,7 @@ function createBaseArithmeticTwapRequest(): ArithmeticTwapRequest { }; } export const ArithmeticTwapRequest = { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapRequest", encode(message: ArithmeticTwapRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -160,6 +161,45 @@ export const ArithmeticTwapRequest = { message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); message.endTime !== undefined && (obj.end_time = message.endTime ?? undefined); return obj; + }, + fromAmino(object: ArithmeticTwapRequestAmino): ArithmeticTwapRequest { + return { + poolId: BigInt(object.pool_id), + baseAsset: object.base_asset, + quoteAsset: object.quote_asset, + startTime: object.start_time, + endTime: object?.end_time + }; + }, + toAmino(message: ArithmeticTwapRequest): ArithmeticTwapRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset; + obj.quote_asset = message.quoteAsset; + obj.start_time = message.startTime; + obj.end_time = message.endTime; + return obj; + }, + fromAminoMsg(object: ArithmeticTwapRequestAminoMsg): ArithmeticTwapRequest { + return ArithmeticTwapRequest.fromAmino(object.value); + }, + toAminoMsg(message: ArithmeticTwapRequest): ArithmeticTwapRequestAminoMsg { + return { + type: "osmosis/twap/arithmetic-twap-request", + value: ArithmeticTwapRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ArithmeticTwapRequestProtoMsg): ArithmeticTwapRequest { + return ArithmeticTwapRequest.decode(message.value); + }, + toProto(message: ArithmeticTwapRequest): Uint8Array { + return ArithmeticTwapRequest.encode(message).finish(); + }, + toProtoMsg(message: ArithmeticTwapRequest): ArithmeticTwapRequestProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapRequest", + value: ArithmeticTwapRequest.encode(message).finish() + }; } }; function createBaseArithmeticTwapResponse(): ArithmeticTwapResponse { @@ -168,6 +208,7 @@ function createBaseArithmeticTwapResponse(): ArithmeticTwapResponse { }; } export const ArithmeticTwapResponse = { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapResponse", encode(message: ArithmeticTwapResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.arithmeticTwap !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.arithmeticTwap, 18).atomics); @@ -220,6 +261,37 @@ export const ArithmeticTwapResponse = { const obj: any = {}; obj.arithmetic_twap = message.arithmeticTwap; return obj; + }, + fromAmino(object: ArithmeticTwapResponseAmino): ArithmeticTwapResponse { + return { + arithmeticTwap: object.arithmetic_twap + }; + }, + toAmino(message: ArithmeticTwapResponse): ArithmeticTwapResponseAmino { + const obj: any = {}; + obj.arithmetic_twap = message.arithmeticTwap; + return obj; + }, + fromAminoMsg(object: ArithmeticTwapResponseAminoMsg): ArithmeticTwapResponse { + return ArithmeticTwapResponse.fromAmino(object.value); + }, + toAminoMsg(message: ArithmeticTwapResponse): ArithmeticTwapResponseAminoMsg { + return { + type: "osmosis/twap/arithmetic-twap-response", + value: ArithmeticTwapResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ArithmeticTwapResponseProtoMsg): ArithmeticTwapResponse { + return ArithmeticTwapResponse.decode(message.value); + }, + toProto(message: ArithmeticTwapResponse): Uint8Array { + return ArithmeticTwapResponse.encode(message).finish(); + }, + toProtoMsg(message: ArithmeticTwapResponse): ArithmeticTwapResponseProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapResponse", + value: ArithmeticTwapResponse.encode(message).finish() + }; } }; function createBaseArithmeticTwapToNowRequest(): ArithmeticTwapToNowRequest { @@ -231,6 +303,7 @@ function createBaseArithmeticTwapToNowRequest(): ArithmeticTwapToNowRequest { }; } export const ArithmeticTwapToNowRequest = { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowRequest", encode(message: ArithmeticTwapToNowRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -319,6 +392,43 @@ export const ArithmeticTwapToNowRequest = { obj.quote_asset = message.quoteAsset; message.startTime !== undefined && (obj.start_time = message.startTime ?? undefined); return obj; + }, + fromAmino(object: ArithmeticTwapToNowRequestAmino): ArithmeticTwapToNowRequest { + return { + poolId: BigInt(object.pool_id), + baseAsset: object.base_asset, + quoteAsset: object.quote_asset, + startTime: object.start_time + }; + }, + toAmino(message: ArithmeticTwapToNowRequest): ArithmeticTwapToNowRequestAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.base_asset = message.baseAsset; + obj.quote_asset = message.quoteAsset; + obj.start_time = message.startTime; + return obj; + }, + fromAminoMsg(object: ArithmeticTwapToNowRequestAminoMsg): ArithmeticTwapToNowRequest { + return ArithmeticTwapToNowRequest.fromAmino(object.value); + }, + toAminoMsg(message: ArithmeticTwapToNowRequest): ArithmeticTwapToNowRequestAminoMsg { + return { + type: "osmosis/twap/arithmetic-twap-to-now-request", + value: ArithmeticTwapToNowRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ArithmeticTwapToNowRequestProtoMsg): ArithmeticTwapToNowRequest { + return ArithmeticTwapToNowRequest.decode(message.value); + }, + toProto(message: ArithmeticTwapToNowRequest): Uint8Array { + return ArithmeticTwapToNowRequest.encode(message).finish(); + }, + toProtoMsg(message: ArithmeticTwapToNowRequest): ArithmeticTwapToNowRequestProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowRequest", + value: ArithmeticTwapToNowRequest.encode(message).finish() + }; } }; function createBaseArithmeticTwapToNowResponse(): ArithmeticTwapToNowResponse { @@ -327,6 +437,7 @@ function createBaseArithmeticTwapToNowResponse(): ArithmeticTwapToNowResponse { }; } export const ArithmeticTwapToNowResponse = { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowResponse", encode(message: ArithmeticTwapToNowResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.arithmeticTwap !== "") { writer.uint32(10).string(Decimal.fromUserInput(message.arithmeticTwap, 18).atomics); @@ -379,12 +490,44 @@ export const ArithmeticTwapToNowResponse = { const obj: any = {}; obj.arithmetic_twap = message.arithmeticTwap; return obj; + }, + fromAmino(object: ArithmeticTwapToNowResponseAmino): ArithmeticTwapToNowResponse { + return { + arithmeticTwap: object.arithmetic_twap + }; + }, + toAmino(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAmino { + const obj: any = {}; + obj.arithmetic_twap = message.arithmeticTwap; + return obj; + }, + fromAminoMsg(object: ArithmeticTwapToNowResponseAminoMsg): ArithmeticTwapToNowResponse { + return ArithmeticTwapToNowResponse.fromAmino(object.value); + }, + toAminoMsg(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseAminoMsg { + return { + type: "osmosis/twap/arithmetic-twap-to-now-response", + value: ArithmeticTwapToNowResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ArithmeticTwapToNowResponseProtoMsg): ArithmeticTwapToNowResponse { + return ArithmeticTwapToNowResponse.decode(message.value); + }, + toProto(message: ArithmeticTwapToNowResponse): Uint8Array { + return ArithmeticTwapToNowResponse.encode(message).finish(); + }, + toProtoMsg(message: ArithmeticTwapToNowResponse): ArithmeticTwapToNowResponseProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.ArithmeticTwapToNowResponse", + value: ArithmeticTwapToNowResponse.encode(message).finish() + }; } }; function createBaseParamsRequest(): ParamsRequest { return {}; } export const ParamsRequest = { + typeUrl: "/osmosis.twap.v1beta1.ParamsRequest", encode(_: ParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -422,6 +565,34 @@ export const ParamsRequest = { toSDK(_: ParamsRequest): ParamsRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: ParamsRequestAmino): ParamsRequest { + return {}; + }, + toAmino(_: ParamsRequest): ParamsRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ParamsRequestAminoMsg): ParamsRequest { + return ParamsRequest.fromAmino(object.value); + }, + toAminoMsg(message: ParamsRequest): ParamsRequestAminoMsg { + return { + type: "osmosis/twap/params-request", + value: ParamsRequest.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsRequestProtoMsg): ParamsRequest { + return ParamsRequest.decode(message.value); + }, + toProto(message: ParamsRequest): Uint8Array { + return ParamsRequest.encode(message).finish(); + }, + toProtoMsg(message: ParamsRequest): ParamsRequestProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.ParamsRequest", + value: ParamsRequest.encode(message).finish() + }; } }; function createBaseParamsResponse(): ParamsResponse { @@ -430,6 +601,7 @@ function createBaseParamsResponse(): ParamsResponse { }; } export const ParamsResponse = { + typeUrl: "/osmosis.twap.v1beta1.ParamsResponse", encode(message: ParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); @@ -482,5 +654,36 @@ export const ParamsResponse = { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toSDK(message.params) : undefined); return obj; + }, + fromAmino(object: ParamsResponseAmino): ParamsResponse { + return { + params: object?.params ? Params.fromAmino(object.params) : undefined + }; + }, + toAmino(message: ParamsResponse): ParamsResponseAmino { + const obj: any = {}; + obj.params = message.params ? Params.toAmino(message.params) : undefined; + return obj; + }, + fromAminoMsg(object: ParamsResponseAminoMsg): ParamsResponse { + return ParamsResponse.fromAmino(object.value); + }, + toAminoMsg(message: ParamsResponse): ParamsResponseAminoMsg { + return { + type: "osmosis/twap/params-response", + value: ParamsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: ParamsResponseProtoMsg): ParamsResponse { + return ParamsResponse.decode(message.value); + }, + toProto(message: ParamsResponse): Uint8Array { + return ParamsResponse.encode(message).finish(); + }, + toProtoMsg(message: ParamsResponse): ParamsResponseProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.ParamsResponse", + value: ParamsResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/twap_record.ts b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/twap_record.ts index cd5f30b313..8515e15cf7 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/twap_record.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/twap/v1beta1/twap_record.ts @@ -76,6 +76,7 @@ function createBaseTwapRecord(): TwapRecord { }; } export const TwapRecord = { + typeUrl: "/osmosis.twap.v1beta1.TwapRecord", encode(message: TwapRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolId !== BigInt(0)) { writer.uint32(8).uint64(message.poolId); @@ -236,5 +237,54 @@ export const TwapRecord = { obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator; message.lastErrorTime !== undefined && (obj.last_error_time = message.lastErrorTime ?? undefined); return obj; + }, + fromAmino(object: TwapRecordAmino): TwapRecord { + return { + poolId: BigInt(object.pool_id), + asset0Denom: object.asset0_denom, + asset1Denom: object.asset1_denom, + height: BigInt(object.height), + time: object.time, + p0LastSpotPrice: object.p0_last_spot_price, + p1LastSpotPrice: object.p1_last_spot_price, + p0ArithmeticTwapAccumulator: object.p0_arithmetic_twap_accumulator, + p1ArithmeticTwapAccumulator: object.p1_arithmetic_twap_accumulator, + lastErrorTime: object.last_error_time + }; + }, + toAmino(message: TwapRecord): TwapRecordAmino { + const obj: any = {}; + obj.pool_id = message.poolId ? message.poolId.toString() : undefined; + obj.asset0_denom = message.asset0Denom; + obj.asset1_denom = message.asset1Denom; + obj.height = message.height ? message.height.toString() : undefined; + obj.time = message.time; + obj.p0_last_spot_price = message.p0LastSpotPrice; + obj.p1_last_spot_price = message.p1LastSpotPrice; + obj.p0_arithmetic_twap_accumulator = message.p0ArithmeticTwapAccumulator; + obj.p1_arithmetic_twap_accumulator = message.p1ArithmeticTwapAccumulator; + obj.last_error_time = message.lastErrorTime; + return obj; + }, + fromAminoMsg(object: TwapRecordAminoMsg): TwapRecord { + return TwapRecord.fromAmino(object.value); + }, + toAminoMsg(message: TwapRecord): TwapRecordAminoMsg { + return { + type: "osmosis/twap/twap-record", + value: TwapRecord.toAmino(message) + }; + }, + fromProtoMsg(message: TwapRecordProtoMsg): TwapRecord { + return TwapRecord.decode(message.value); + }, + toProto(message: TwapRecord): Uint8Array { + return TwapRecord.encode(message).finish(); + }, + toProtoMsg(message: TwapRecord): TwapRecordProtoMsg { + return { + typeUrl: "/osmosis.twap.v1beta1.TwapRecord", + value: TwapRecord.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts index 6c2771318f..966f0cd38c 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/feetoken.ts @@ -28,6 +28,7 @@ function createBaseFeeToken(): FeeToken { }; } export const FeeToken = { + typeUrl: "/osmosis.txfees.v1beta1.FeeToken", encode(message: FeeToken, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -92,5 +93,38 @@ export const FeeToken = { obj.denom = message.denom; obj.poolID = message.poolID; return obj; + }, + fromAmino(object: FeeTokenAmino): FeeToken { + return { + denom: object.denom, + poolID: BigInt(object.poolID) + }; + }, + toAmino(message: FeeToken): FeeTokenAmino { + const obj: any = {}; + obj.denom = message.denom; + obj.poolID = message.poolID ? message.poolID.toString() : undefined; + return obj; + }, + fromAminoMsg(object: FeeTokenAminoMsg): FeeToken { + return FeeToken.fromAmino(object.value); + }, + toAminoMsg(message: FeeToken): FeeTokenAminoMsg { + return { + type: "osmosis/txfees/fee-token", + value: FeeToken.toAmino(message) + }; + }, + fromProtoMsg(message: FeeTokenProtoMsg): FeeToken { + return FeeToken.decode(message.value); + }, + toProto(message: FeeToken): Uint8Array { + return FeeToken.encode(message).finish(); + }, + toProtoMsg(message: FeeToken): FeeTokenProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.FeeToken", + value: FeeToken.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts index 3a7b4f2a72..e8d01a8750 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/genesis.ts @@ -19,6 +19,7 @@ function createBaseGenesisState(): GenesisState { }; } export const GenesisState = { + typeUrl: "/osmosis.txfees.v1beta1.GenesisState", encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.basedenom !== "") { writer.uint32(10).string(message.basedenom); @@ -91,5 +92,42 @@ export const GenesisState = { obj.feetokens = []; } return obj; + }, + fromAmino(object: GenesisStateAmino): GenesisState { + return { + basedenom: object.basedenom, + feetokens: Array.isArray(object?.feetokens) ? object.feetokens.map((e: any) => FeeToken.fromAmino(e)) : [] + }; + }, + toAmino(message: GenesisState): GenesisStateAmino { + const obj: any = {}; + obj.basedenom = message.basedenom; + if (message.feetokens) { + obj.feetokens = message.feetokens.map(e => e ? FeeToken.toAmino(e) : undefined); + } else { + obj.feetokens = []; + } + return obj; + }, + fromAminoMsg(object: GenesisStateAminoMsg): GenesisState { + return GenesisState.fromAmino(object.value); + }, + toAminoMsg(message: GenesisState): GenesisStateAminoMsg { + return { + type: "osmosis/txfees/genesis-state", + value: GenesisState.toAmino(message) + }; + }, + fromProtoMsg(message: GenesisStateProtoMsg): GenesisState { + return GenesisState.decode(message.value); + }, + toProto(message: GenesisState): Uint8Array { + return GenesisState.encode(message).finish(); + }, + toProtoMsg(message: GenesisState): GenesisStateProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.GenesisState", + value: GenesisState.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts index 0b95fc5019..a0bc7509fc 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/gov.ts @@ -34,6 +34,7 @@ function createBaseUpdateFeeTokenProposal(): UpdateFeeTokenProposal { }; } export const UpdateFeeTokenProposal = { + typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal", encode(message: UpdateFeeTokenProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); @@ -110,5 +111,40 @@ export const UpdateFeeTokenProposal = { obj.description = message.description; message.feetoken !== undefined && (obj.feetoken = message.feetoken ? FeeToken.toSDK(message.feetoken) : undefined); return obj; + }, + fromAmino(object: UpdateFeeTokenProposalAmino): UpdateFeeTokenProposal { + return { + title: object.title, + description: object.description, + feetoken: object?.feetoken ? FeeToken.fromAmino(object.feetoken) : undefined + }; + }, + toAmino(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAmino { + const obj: any = {}; + obj.title = message.title; + obj.description = message.description; + obj.feetoken = message.feetoken ? FeeToken.toAmino(message.feetoken) : undefined; + return obj; + }, + fromAminoMsg(object: UpdateFeeTokenProposalAminoMsg): UpdateFeeTokenProposal { + return UpdateFeeTokenProposal.fromAmino(object.value); + }, + toAminoMsg(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalAminoMsg { + return { + type: "osmosis/txfees/update-fee-token-proposal", + value: UpdateFeeTokenProposal.toAmino(message) + }; + }, + fromProtoMsg(message: UpdateFeeTokenProposalProtoMsg): UpdateFeeTokenProposal { + return UpdateFeeTokenProposal.decode(message.value); + }, + toProto(message: UpdateFeeTokenProposal): Uint8Array { + return UpdateFeeTokenProposal.encode(message).finish(); + }, + toProtoMsg(message: UpdateFeeTokenProposal): UpdateFeeTokenProposalProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.UpdateFeeTokenProposal", + value: UpdateFeeTokenProposal.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts index 0ac04e29d0..a722c03266 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/txfees/v1beta1/query.ts @@ -65,6 +65,7 @@ function createBaseQueryFeeTokensRequest(): QueryFeeTokensRequest { return {}; } export const QueryFeeTokensRequest = { + typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensRequest", encode(_: QueryFeeTokensRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -102,6 +103,34 @@ export const QueryFeeTokensRequest = { toSDK(_: QueryFeeTokensRequest): QueryFeeTokensRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryFeeTokensRequestAmino): QueryFeeTokensRequest { + return {}; + }, + toAmino(_: QueryFeeTokensRequest): QueryFeeTokensRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryFeeTokensRequestAminoMsg): QueryFeeTokensRequest { + return QueryFeeTokensRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryFeeTokensRequest): QueryFeeTokensRequestAminoMsg { + return { + type: "osmosis/txfees/query-fee-tokens-request", + value: QueryFeeTokensRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryFeeTokensRequestProtoMsg): QueryFeeTokensRequest { + return QueryFeeTokensRequest.decode(message.value); + }, + toProto(message: QueryFeeTokensRequest): Uint8Array { + return QueryFeeTokensRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryFeeTokensRequest): QueryFeeTokensRequestProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensRequest", + value: QueryFeeTokensRequest.encode(message).finish() + }; } }; function createBaseQueryFeeTokensResponse(): QueryFeeTokensResponse { @@ -110,6 +139,7 @@ function createBaseQueryFeeTokensResponse(): QueryFeeTokensResponse { }; } export const QueryFeeTokensResponse = { + typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensResponse", encode(message: QueryFeeTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.feeTokens) { FeeToken.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -170,6 +200,41 @@ export const QueryFeeTokensResponse = { obj.fee_tokens = []; } return obj; + }, + fromAmino(object: QueryFeeTokensResponseAmino): QueryFeeTokensResponse { + return { + feeTokens: Array.isArray(object?.fee_tokens) ? object.fee_tokens.map((e: any) => FeeToken.fromAmino(e)) : [] + }; + }, + toAmino(message: QueryFeeTokensResponse): QueryFeeTokensResponseAmino { + const obj: any = {}; + if (message.feeTokens) { + obj.fee_tokens = message.feeTokens.map(e => e ? FeeToken.toAmino(e) : undefined); + } else { + obj.fee_tokens = []; + } + return obj; + }, + fromAminoMsg(object: QueryFeeTokensResponseAminoMsg): QueryFeeTokensResponse { + return QueryFeeTokensResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryFeeTokensResponse): QueryFeeTokensResponseAminoMsg { + return { + type: "osmosis/txfees/query-fee-tokens-response", + value: QueryFeeTokensResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryFeeTokensResponseProtoMsg): QueryFeeTokensResponse { + return QueryFeeTokensResponse.decode(message.value); + }, + toProto(message: QueryFeeTokensResponse): Uint8Array { + return QueryFeeTokensResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryFeeTokensResponse): QueryFeeTokensResponseProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryFeeTokensResponse", + value: QueryFeeTokensResponse.encode(message).finish() + }; } }; function createBaseQueryDenomSpotPriceRequest(): QueryDenomSpotPriceRequest { @@ -178,6 +243,7 @@ function createBaseQueryDenomSpotPriceRequest(): QueryDenomSpotPriceRequest { }; } export const QueryDenomSpotPriceRequest = { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceRequest", encode(message: QueryDenomSpotPriceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -230,6 +296,37 @@ export const QueryDenomSpotPriceRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryDenomSpotPriceRequestAmino): QueryDenomSpotPriceRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryDenomSpotPriceRequestAminoMsg): QueryDenomSpotPriceRequest { + return QueryDenomSpotPriceRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestAminoMsg { + return { + type: "osmosis/txfees/query-denom-spot-price-request", + value: QueryDenomSpotPriceRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomSpotPriceRequestProtoMsg): QueryDenomSpotPriceRequest { + return QueryDenomSpotPriceRequest.decode(message.value); + }, + toProto(message: QueryDenomSpotPriceRequest): Uint8Array { + return QueryDenomSpotPriceRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomSpotPriceRequest): QueryDenomSpotPriceRequestProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceRequest", + value: QueryDenomSpotPriceRequest.encode(message).finish() + }; } }; function createBaseQueryDenomSpotPriceResponse(): QueryDenomSpotPriceResponse { @@ -239,6 +336,7 @@ function createBaseQueryDenomSpotPriceResponse(): QueryDenomSpotPriceResponse { }; } export const QueryDenomSpotPriceResponse = { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceResponse", encode(message: QueryDenomSpotPriceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolID !== BigInt(0)) { writer.uint32(8).uint64(message.poolID); @@ -303,6 +401,39 @@ export const QueryDenomSpotPriceResponse = { obj.poolID = message.poolID; obj.spot_price = message.spotPrice; return obj; + }, + fromAmino(object: QueryDenomSpotPriceResponseAmino): QueryDenomSpotPriceResponse { + return { + poolID: BigInt(object.poolID), + spotPrice: object.spot_price + }; + }, + toAmino(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAmino { + const obj: any = {}; + obj.poolID = message.poolID ? message.poolID.toString() : undefined; + obj.spot_price = message.spotPrice; + return obj; + }, + fromAminoMsg(object: QueryDenomSpotPriceResponseAminoMsg): QueryDenomSpotPriceResponse { + return QueryDenomSpotPriceResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseAminoMsg { + return { + type: "osmosis/txfees/query-denom-spot-price-response", + value: QueryDenomSpotPriceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomSpotPriceResponseProtoMsg): QueryDenomSpotPriceResponse { + return QueryDenomSpotPriceResponse.decode(message.value); + }, + toProto(message: QueryDenomSpotPriceResponse): Uint8Array { + return QueryDenomSpotPriceResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomSpotPriceResponse): QueryDenomSpotPriceResponseProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomSpotPriceResponse", + value: QueryDenomSpotPriceResponse.encode(message).finish() + }; } }; function createBaseQueryDenomPoolIdRequest(): QueryDenomPoolIdRequest { @@ -311,6 +442,7 @@ function createBaseQueryDenomPoolIdRequest(): QueryDenomPoolIdRequest { }; } export const QueryDenomPoolIdRequest = { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdRequest", encode(message: QueryDenomPoolIdRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); @@ -363,6 +495,37 @@ export const QueryDenomPoolIdRequest = { const obj: any = {}; obj.denom = message.denom; return obj; + }, + fromAmino(object: QueryDenomPoolIdRequestAmino): QueryDenomPoolIdRequest { + return { + denom: object.denom + }; + }, + toAmino(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAmino { + const obj: any = {}; + obj.denom = message.denom; + return obj; + }, + fromAminoMsg(object: QueryDenomPoolIdRequestAminoMsg): QueryDenomPoolIdRequest { + return QueryDenomPoolIdRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestAminoMsg { + return { + type: "osmosis/txfees/query-denom-pool-id-request", + value: QueryDenomPoolIdRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomPoolIdRequestProtoMsg): QueryDenomPoolIdRequest { + return QueryDenomPoolIdRequest.decode(message.value); + }, + toProto(message: QueryDenomPoolIdRequest): Uint8Array { + return QueryDenomPoolIdRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomPoolIdRequest): QueryDenomPoolIdRequestProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdRequest", + value: QueryDenomPoolIdRequest.encode(message).finish() + }; } }; function createBaseQueryDenomPoolIdResponse(): QueryDenomPoolIdResponse { @@ -371,6 +534,7 @@ function createBaseQueryDenomPoolIdResponse(): QueryDenomPoolIdResponse { }; } export const QueryDenomPoolIdResponse = { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdResponse", encode(message: QueryDenomPoolIdResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.poolID !== BigInt(0)) { writer.uint32(8).uint64(message.poolID); @@ -423,12 +587,44 @@ export const QueryDenomPoolIdResponse = { const obj: any = {}; obj.poolID = message.poolID; return obj; + }, + fromAmino(object: QueryDenomPoolIdResponseAmino): QueryDenomPoolIdResponse { + return { + poolID: BigInt(object.poolID) + }; + }, + toAmino(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAmino { + const obj: any = {}; + obj.poolID = message.poolID ? message.poolID.toString() : undefined; + return obj; + }, + fromAminoMsg(object: QueryDenomPoolIdResponseAminoMsg): QueryDenomPoolIdResponse { + return QueryDenomPoolIdResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseAminoMsg { + return { + type: "osmosis/txfees/query-denom-pool-id-response", + value: QueryDenomPoolIdResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryDenomPoolIdResponseProtoMsg): QueryDenomPoolIdResponse { + return QueryDenomPoolIdResponse.decode(message.value); + }, + toProto(message: QueryDenomPoolIdResponse): Uint8Array { + return QueryDenomPoolIdResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryDenomPoolIdResponse): QueryDenomPoolIdResponseProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryDenomPoolIdResponse", + value: QueryDenomPoolIdResponse.encode(message).finish() + }; } }; function createBaseQueryBaseDenomRequest(): QueryBaseDenomRequest { return {}; } export const QueryBaseDenomRequest = { + typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomRequest", encode(_: QueryBaseDenomRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -466,6 +662,34 @@ export const QueryBaseDenomRequest = { toSDK(_: QueryBaseDenomRequest): QueryBaseDenomRequestSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: QueryBaseDenomRequestAmino): QueryBaseDenomRequest { + return {}; + }, + toAmino(_: QueryBaseDenomRequest): QueryBaseDenomRequestAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: QueryBaseDenomRequestAminoMsg): QueryBaseDenomRequest { + return QueryBaseDenomRequest.fromAmino(object.value); + }, + toAminoMsg(message: QueryBaseDenomRequest): QueryBaseDenomRequestAminoMsg { + return { + type: "osmosis/txfees/query-base-denom-request", + value: QueryBaseDenomRequest.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBaseDenomRequestProtoMsg): QueryBaseDenomRequest { + return QueryBaseDenomRequest.decode(message.value); + }, + toProto(message: QueryBaseDenomRequest): Uint8Array { + return QueryBaseDenomRequest.encode(message).finish(); + }, + toProtoMsg(message: QueryBaseDenomRequest): QueryBaseDenomRequestProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomRequest", + value: QueryBaseDenomRequest.encode(message).finish() + }; } }; function createBaseQueryBaseDenomResponse(): QueryBaseDenomResponse { @@ -474,6 +698,7 @@ function createBaseQueryBaseDenomResponse(): QueryBaseDenomResponse { }; } export const QueryBaseDenomResponse = { + typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomResponse", encode(message: QueryBaseDenomResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseDenom !== "") { writer.uint32(10).string(message.baseDenom); @@ -526,5 +751,36 @@ export const QueryBaseDenomResponse = { const obj: any = {}; obj.base_denom = message.baseDenom; return obj; + }, + fromAmino(object: QueryBaseDenomResponseAmino): QueryBaseDenomResponse { + return { + baseDenom: object.base_denom + }; + }, + toAmino(message: QueryBaseDenomResponse): QueryBaseDenomResponseAmino { + const obj: any = {}; + obj.base_denom = message.baseDenom; + return obj; + }, + fromAminoMsg(object: QueryBaseDenomResponseAminoMsg): QueryBaseDenomResponse { + return QueryBaseDenomResponse.fromAmino(object.value); + }, + toAminoMsg(message: QueryBaseDenomResponse): QueryBaseDenomResponseAminoMsg { + return { + type: "osmosis/txfees/query-base-denom-response", + value: QueryBaseDenomResponse.toAmino(message) + }; + }, + fromProtoMsg(message: QueryBaseDenomResponseProtoMsg): QueryBaseDenomResponse { + return QueryBaseDenomResponse.decode(message.value); + }, + toProto(message: QueryBaseDenomResponse): Uint8Array { + return QueryBaseDenomResponse.encode(message).finish(); + }, + toProtoMsg(message: QueryBaseDenomResponse): QueryBaseDenomResponseProtoMsg { + return { + typeUrl: "/osmosis.txfees.v1beta1.QueryBaseDenomResponse", + value: QueryBaseDenomResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/query.ts b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/query.ts index bb9f935bc4..74c86dd98e 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/query.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/query.ts @@ -25,6 +25,7 @@ function createBaseUserValidatorPreferencesRequest(): UserValidatorPreferencesRe }; } export const UserValidatorPreferencesRequest = { + typeUrl: "/osmosis.valsetpref.v1beta1.UserValidatorPreferencesRequest", encode(message: UserValidatorPreferencesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -77,6 +78,37 @@ export const UserValidatorPreferencesRequest = { const obj: any = {}; obj.address = message.address; return obj; + }, + fromAmino(object: UserValidatorPreferencesRequestAmino): UserValidatorPreferencesRequest { + return { + address: object.address + }; + }, + toAmino(message: UserValidatorPreferencesRequest): UserValidatorPreferencesRequestAmino { + const obj: any = {}; + obj.address = message.address; + return obj; + }, + fromAminoMsg(object: UserValidatorPreferencesRequestAminoMsg): UserValidatorPreferencesRequest { + return UserValidatorPreferencesRequest.fromAmino(object.value); + }, + toAminoMsg(message: UserValidatorPreferencesRequest): UserValidatorPreferencesRequestAminoMsg { + return { + type: "osmosis/valsetpref/user-validator-preferences-request", + value: UserValidatorPreferencesRequest.toAmino(message) + }; + }, + fromProtoMsg(message: UserValidatorPreferencesRequestProtoMsg): UserValidatorPreferencesRequest { + return UserValidatorPreferencesRequest.decode(message.value); + }, + toProto(message: UserValidatorPreferencesRequest): Uint8Array { + return UserValidatorPreferencesRequest.encode(message).finish(); + }, + toProtoMsg(message: UserValidatorPreferencesRequest): UserValidatorPreferencesRequestProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.UserValidatorPreferencesRequest", + value: UserValidatorPreferencesRequest.encode(message).finish() + }; } }; function createBaseUserValidatorPreferencesResponse(): UserValidatorPreferencesResponse { @@ -85,6 +117,7 @@ function createBaseUserValidatorPreferencesResponse(): UserValidatorPreferencesR }; } export const UserValidatorPreferencesResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.UserValidatorPreferencesResponse", encode(message: UserValidatorPreferencesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.preferences) { ValidatorPreference.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -145,5 +178,40 @@ export const UserValidatorPreferencesResponse = { obj.preferences = []; } return obj; + }, + fromAmino(object: UserValidatorPreferencesResponseAmino): UserValidatorPreferencesResponse { + return { + preferences: Array.isArray(object?.preferences) ? object.preferences.map((e: any) => ValidatorPreference.fromAmino(e)) : [] + }; + }, + toAmino(message: UserValidatorPreferencesResponse): UserValidatorPreferencesResponseAmino { + const obj: any = {}; + if (message.preferences) { + obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); + } else { + obj.preferences = []; + } + return obj; + }, + fromAminoMsg(object: UserValidatorPreferencesResponseAminoMsg): UserValidatorPreferencesResponse { + return UserValidatorPreferencesResponse.fromAmino(object.value); + }, + toAminoMsg(message: UserValidatorPreferencesResponse): UserValidatorPreferencesResponseAminoMsg { + return { + type: "osmosis/valsetpref/user-validator-preferences-response", + value: UserValidatorPreferencesResponse.toAmino(message) + }; + }, + fromProtoMsg(message: UserValidatorPreferencesResponseProtoMsg): UserValidatorPreferencesResponse { + return UserValidatorPreferencesResponse.decode(message.value); + }, + toProto(message: UserValidatorPreferencesResponse): Uint8Array { + return UserValidatorPreferencesResponse.encode(message).finish(); + }, + toProtoMsg(message: UserValidatorPreferencesResponse): UserValidatorPreferencesResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.UserValidatorPreferencesResponse", + value: UserValidatorPreferencesResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/state.ts b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/state.ts index 6011c7ee8c..859649aa26 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/state.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/state.ts @@ -55,6 +55,7 @@ function createBaseValidatorPreference(): ValidatorPreference { }; } export const ValidatorPreference = { + typeUrl: "/osmosis.valsetpref.v1beta1.ValidatorPreference", encode(message: ValidatorPreference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.valOperAddress !== "") { writer.uint32(10).string(message.valOperAddress); @@ -119,6 +120,39 @@ export const ValidatorPreference = { obj.val_oper_address = message.valOperAddress; obj.weight = message.weight; return obj; + }, + fromAmino(object: ValidatorPreferenceAmino): ValidatorPreference { + return { + valOperAddress: object.val_oper_address, + weight: object.weight + }; + }, + toAmino(message: ValidatorPreference): ValidatorPreferenceAmino { + const obj: any = {}; + obj.val_oper_address = message.valOperAddress; + obj.weight = message.weight; + return obj; + }, + fromAminoMsg(object: ValidatorPreferenceAminoMsg): ValidatorPreference { + return ValidatorPreference.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorPreference): ValidatorPreferenceAminoMsg { + return { + type: "osmosis/valsetpref/validator-preference", + value: ValidatorPreference.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorPreferenceProtoMsg): ValidatorPreference { + return ValidatorPreference.decode(message.value); + }, + toProto(message: ValidatorPreference): Uint8Array { + return ValidatorPreference.encode(message).finish(); + }, + toProtoMsg(message: ValidatorPreference): ValidatorPreferenceProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.ValidatorPreference", + value: ValidatorPreference.encode(message).finish() + }; } }; function createBaseValidatorSetPreferences(): ValidatorSetPreferences { @@ -127,6 +161,7 @@ function createBaseValidatorSetPreferences(): ValidatorSetPreferences { }; } export const ValidatorSetPreferences = { + typeUrl: "/osmosis.valsetpref.v1beta1.ValidatorSetPreferences", encode(message: ValidatorSetPreferences, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.preferences) { ValidatorPreference.encode(v!, writer.uint32(18).fork()).ldelim(); @@ -187,5 +222,40 @@ export const ValidatorSetPreferences = { obj.preferences = []; } return obj; + }, + fromAmino(object: ValidatorSetPreferencesAmino): ValidatorSetPreferences { + return { + preferences: Array.isArray(object?.preferences) ? object.preferences.map((e: any) => ValidatorPreference.fromAmino(e)) : [] + }; + }, + toAmino(message: ValidatorSetPreferences): ValidatorSetPreferencesAmino { + const obj: any = {}; + if (message.preferences) { + obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); + } else { + obj.preferences = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorSetPreferencesAminoMsg): ValidatorSetPreferences { + return ValidatorSetPreferences.fromAmino(object.value); + }, + toAminoMsg(message: ValidatorSetPreferences): ValidatorSetPreferencesAminoMsg { + return { + type: "osmosis/valsetpref/validator-set-preferences", + value: ValidatorSetPreferences.toAmino(message) + }; + }, + fromProtoMsg(message: ValidatorSetPreferencesProtoMsg): ValidatorSetPreferences { + return ValidatorSetPreferences.decode(message.value); + }, + toProto(message: ValidatorSetPreferences): Uint8Array { + return ValidatorSetPreferences.encode(message).finish(); + }, + toProtoMsg(message: ValidatorSetPreferences): ValidatorSetPreferencesProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.ValidatorSetPreferences", + value: ValidatorSetPreferences.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/tx.ts b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/tx.ts index fdc01778b9..83b226b46a 100644 --- a/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputosmojs/osmosis/valset-pref/v1beta1/tx.ts @@ -118,6 +118,7 @@ function createBaseMsgSetValidatorSetPreference(): MsgSetValidatorSetPreference }; } export const MsgSetValidatorSetPreference = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgSetValidatorSetPreference", encode(message: MsgSetValidatorSetPreference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegator !== "") { writer.uint32(10).string(message.delegator); @@ -190,12 +191,50 @@ export const MsgSetValidatorSetPreference = { obj.preferences = []; } return obj; + }, + fromAmino(object: MsgSetValidatorSetPreferenceAmino): MsgSetValidatorSetPreference { + return { + delegator: object.delegator, + preferences: Array.isArray(object?.preferences) ? object.preferences.map((e: any) => ValidatorPreference.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgSetValidatorSetPreference): MsgSetValidatorSetPreferenceAmino { + const obj: any = {}; + obj.delegator = message.delegator; + if (message.preferences) { + obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); + } else { + obj.preferences = []; + } + return obj; + }, + fromAminoMsg(object: MsgSetValidatorSetPreferenceAminoMsg): MsgSetValidatorSetPreference { + return MsgSetValidatorSetPreference.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetValidatorSetPreference): MsgSetValidatorSetPreferenceAminoMsg { + return { + type: "osmosis/valset-pref/MsgSetValidatorSetPreference", + value: MsgSetValidatorSetPreference.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetValidatorSetPreferenceProtoMsg): MsgSetValidatorSetPreference { + return MsgSetValidatorSetPreference.decode(message.value); + }, + toProto(message: MsgSetValidatorSetPreference): Uint8Array { + return MsgSetValidatorSetPreference.encode(message).finish(); + }, + toProtoMsg(message: MsgSetValidatorSetPreference): MsgSetValidatorSetPreferenceProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgSetValidatorSetPreference", + value: MsgSetValidatorSetPreference.encode(message).finish() + }; } }; function createBaseMsgSetValidatorSetPreferenceResponse(): MsgSetValidatorSetPreferenceResponse { return {}; } export const MsgSetValidatorSetPreferenceResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgSetValidatorSetPreferenceResponse", encode(_: MsgSetValidatorSetPreferenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -233,6 +272,34 @@ export const MsgSetValidatorSetPreferenceResponse = { toSDK(_: MsgSetValidatorSetPreferenceResponse): MsgSetValidatorSetPreferenceResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgSetValidatorSetPreferenceResponseAmino): MsgSetValidatorSetPreferenceResponse { + return {}; + }, + toAmino(_: MsgSetValidatorSetPreferenceResponse): MsgSetValidatorSetPreferenceResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgSetValidatorSetPreferenceResponseAminoMsg): MsgSetValidatorSetPreferenceResponse { + return MsgSetValidatorSetPreferenceResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgSetValidatorSetPreferenceResponse): MsgSetValidatorSetPreferenceResponseAminoMsg { + return { + type: "osmosis/valsetpref/set-validator-set-preference-response", + value: MsgSetValidatorSetPreferenceResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgSetValidatorSetPreferenceResponseProtoMsg): MsgSetValidatorSetPreferenceResponse { + return MsgSetValidatorSetPreferenceResponse.decode(message.value); + }, + toProto(message: MsgSetValidatorSetPreferenceResponse): Uint8Array { + return MsgSetValidatorSetPreferenceResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgSetValidatorSetPreferenceResponse): MsgSetValidatorSetPreferenceResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgSetValidatorSetPreferenceResponse", + value: MsgSetValidatorSetPreferenceResponse.encode(message).finish() + }; } }; function createBaseMsgDelegateToValidatorSet(): MsgDelegateToValidatorSet { @@ -242,6 +309,7 @@ function createBaseMsgDelegateToValidatorSet(): MsgDelegateToValidatorSet { }; } export const MsgDelegateToValidatorSet = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateToValidatorSet", encode(message: MsgDelegateToValidatorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegator !== "") { writer.uint32(10).string(message.delegator); @@ -306,12 +374,46 @@ export const MsgDelegateToValidatorSet = { obj.delegator = message.delegator; message.coin !== undefined && (obj.coin = message.coin ? Coin.toSDK(message.coin) : undefined); return obj; + }, + fromAmino(object: MsgDelegateToValidatorSetAmino): MsgDelegateToValidatorSet { + return { + delegator: object.delegator, + coin: object?.coin ? Coin.fromAmino(object.coin) : undefined + }; + }, + toAmino(message: MsgDelegateToValidatorSet): MsgDelegateToValidatorSetAmino { + const obj: any = {}; + obj.delegator = message.delegator; + obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; + return obj; + }, + fromAminoMsg(object: MsgDelegateToValidatorSetAminoMsg): MsgDelegateToValidatorSet { + return MsgDelegateToValidatorSet.fromAmino(object.value); + }, + toAminoMsg(message: MsgDelegateToValidatorSet): MsgDelegateToValidatorSetAminoMsg { + return { + type: "osmosis/valset-pref/MsgDelegateToValidatorSet", + value: MsgDelegateToValidatorSet.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDelegateToValidatorSetProtoMsg): MsgDelegateToValidatorSet { + return MsgDelegateToValidatorSet.decode(message.value); + }, + toProto(message: MsgDelegateToValidatorSet): Uint8Array { + return MsgDelegateToValidatorSet.encode(message).finish(); + }, + toProtoMsg(message: MsgDelegateToValidatorSet): MsgDelegateToValidatorSetProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateToValidatorSet", + value: MsgDelegateToValidatorSet.encode(message).finish() + }; } }; function createBaseMsgDelegateToValidatorSetResponse(): MsgDelegateToValidatorSetResponse { return {}; } export const MsgDelegateToValidatorSetResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateToValidatorSetResponse", encode(_: MsgDelegateToValidatorSetResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -349,6 +451,34 @@ export const MsgDelegateToValidatorSetResponse = { toSDK(_: MsgDelegateToValidatorSetResponse): MsgDelegateToValidatorSetResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDelegateToValidatorSetResponseAmino): MsgDelegateToValidatorSetResponse { + return {}; + }, + toAmino(_: MsgDelegateToValidatorSetResponse): MsgDelegateToValidatorSetResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDelegateToValidatorSetResponseAminoMsg): MsgDelegateToValidatorSetResponse { + return MsgDelegateToValidatorSetResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDelegateToValidatorSetResponse): MsgDelegateToValidatorSetResponseAminoMsg { + return { + type: "osmosis/valsetpref/delegate-to-validator-set-response", + value: MsgDelegateToValidatorSetResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDelegateToValidatorSetResponseProtoMsg): MsgDelegateToValidatorSetResponse { + return MsgDelegateToValidatorSetResponse.decode(message.value); + }, + toProto(message: MsgDelegateToValidatorSetResponse): Uint8Array { + return MsgDelegateToValidatorSetResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDelegateToValidatorSetResponse): MsgDelegateToValidatorSetResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateToValidatorSetResponse", + value: MsgDelegateToValidatorSetResponse.encode(message).finish() + }; } }; function createBaseMsgUndelegateFromValidatorSet(): MsgUndelegateFromValidatorSet { @@ -358,6 +488,7 @@ function createBaseMsgUndelegateFromValidatorSet(): MsgUndelegateFromValidatorSe }; } export const MsgUndelegateFromValidatorSet = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgUndelegateFromValidatorSet", encode(message: MsgUndelegateFromValidatorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegator !== "") { writer.uint32(10).string(message.delegator); @@ -422,12 +553,46 @@ export const MsgUndelegateFromValidatorSet = { obj.delegator = message.delegator; message.coin !== undefined && (obj.coin = message.coin ? Coin.toSDK(message.coin) : undefined); return obj; + }, + fromAmino(object: MsgUndelegateFromValidatorSetAmino): MsgUndelegateFromValidatorSet { + return { + delegator: object.delegator, + coin: object?.coin ? Coin.fromAmino(object.coin) : undefined + }; + }, + toAmino(message: MsgUndelegateFromValidatorSet): MsgUndelegateFromValidatorSetAmino { + const obj: any = {}; + obj.delegator = message.delegator; + obj.coin = message.coin ? Coin.toAmino(message.coin) : undefined; + return obj; + }, + fromAminoMsg(object: MsgUndelegateFromValidatorSetAminoMsg): MsgUndelegateFromValidatorSet { + return MsgUndelegateFromValidatorSet.fromAmino(object.value); + }, + toAminoMsg(message: MsgUndelegateFromValidatorSet): MsgUndelegateFromValidatorSetAminoMsg { + return { + type: "osmosis/valset-pref/MsgUndelegateFromValidatorSet", + value: MsgUndelegateFromValidatorSet.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUndelegateFromValidatorSetProtoMsg): MsgUndelegateFromValidatorSet { + return MsgUndelegateFromValidatorSet.decode(message.value); + }, + toProto(message: MsgUndelegateFromValidatorSet): Uint8Array { + return MsgUndelegateFromValidatorSet.encode(message).finish(); + }, + toProtoMsg(message: MsgUndelegateFromValidatorSet): MsgUndelegateFromValidatorSetProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgUndelegateFromValidatorSet", + value: MsgUndelegateFromValidatorSet.encode(message).finish() + }; } }; function createBaseMsgUndelegateFromValidatorSetResponse(): MsgUndelegateFromValidatorSetResponse { return {}; } export const MsgUndelegateFromValidatorSetResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgUndelegateFromValidatorSetResponse", encode(_: MsgUndelegateFromValidatorSetResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -465,6 +630,34 @@ export const MsgUndelegateFromValidatorSetResponse = { toSDK(_: MsgUndelegateFromValidatorSetResponse): MsgUndelegateFromValidatorSetResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgUndelegateFromValidatorSetResponseAmino): MsgUndelegateFromValidatorSetResponse { + return {}; + }, + toAmino(_: MsgUndelegateFromValidatorSetResponse): MsgUndelegateFromValidatorSetResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgUndelegateFromValidatorSetResponseAminoMsg): MsgUndelegateFromValidatorSetResponse { + return MsgUndelegateFromValidatorSetResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgUndelegateFromValidatorSetResponse): MsgUndelegateFromValidatorSetResponseAminoMsg { + return { + type: "osmosis/valsetpref/undelegate-from-validator-set-response", + value: MsgUndelegateFromValidatorSetResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgUndelegateFromValidatorSetResponseProtoMsg): MsgUndelegateFromValidatorSetResponse { + return MsgUndelegateFromValidatorSetResponse.decode(message.value); + }, + toProto(message: MsgUndelegateFromValidatorSetResponse): Uint8Array { + return MsgUndelegateFromValidatorSetResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgUndelegateFromValidatorSetResponse): MsgUndelegateFromValidatorSetResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgUndelegateFromValidatorSetResponse", + value: MsgUndelegateFromValidatorSetResponse.encode(message).finish() + }; } }; function createBaseMsgRedelegateValidatorSet(): MsgRedelegateValidatorSet { @@ -474,6 +667,7 @@ function createBaseMsgRedelegateValidatorSet(): MsgRedelegateValidatorSet { }; } export const MsgRedelegateValidatorSet = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgRedelegateValidatorSet", encode(message: MsgRedelegateValidatorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegator !== "") { writer.uint32(10).string(message.delegator); @@ -546,12 +740,50 @@ export const MsgRedelegateValidatorSet = { obj.preferences = []; } return obj; + }, + fromAmino(object: MsgRedelegateValidatorSetAmino): MsgRedelegateValidatorSet { + return { + delegator: object.delegator, + preferences: Array.isArray(object?.preferences) ? object.preferences.map((e: any) => ValidatorPreference.fromAmino(e)) : [] + }; + }, + toAmino(message: MsgRedelegateValidatorSet): MsgRedelegateValidatorSetAmino { + const obj: any = {}; + obj.delegator = message.delegator; + if (message.preferences) { + obj.preferences = message.preferences.map(e => e ? ValidatorPreference.toAmino(e) : undefined); + } else { + obj.preferences = []; + } + return obj; + }, + fromAminoMsg(object: MsgRedelegateValidatorSetAminoMsg): MsgRedelegateValidatorSet { + return MsgRedelegateValidatorSet.fromAmino(object.value); + }, + toAminoMsg(message: MsgRedelegateValidatorSet): MsgRedelegateValidatorSetAminoMsg { + return { + type: "osmosis/valsetpref/redelegate-validator-set", + value: MsgRedelegateValidatorSet.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRedelegateValidatorSetProtoMsg): MsgRedelegateValidatorSet { + return MsgRedelegateValidatorSet.decode(message.value); + }, + toProto(message: MsgRedelegateValidatorSet): Uint8Array { + return MsgRedelegateValidatorSet.encode(message).finish(); + }, + toProtoMsg(message: MsgRedelegateValidatorSet): MsgRedelegateValidatorSetProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgRedelegateValidatorSet", + value: MsgRedelegateValidatorSet.encode(message).finish() + }; } }; function createBaseMsgRedelegateValidatorSetResponse(): MsgRedelegateValidatorSetResponse { return {}; } export const MsgRedelegateValidatorSetResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgRedelegateValidatorSetResponse", encode(_: MsgRedelegateValidatorSetResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -589,6 +821,34 @@ export const MsgRedelegateValidatorSetResponse = { toSDK(_: MsgRedelegateValidatorSetResponse): MsgRedelegateValidatorSetResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgRedelegateValidatorSetResponseAmino): MsgRedelegateValidatorSetResponse { + return {}; + }, + toAmino(_: MsgRedelegateValidatorSetResponse): MsgRedelegateValidatorSetResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgRedelegateValidatorSetResponseAminoMsg): MsgRedelegateValidatorSetResponse { + return MsgRedelegateValidatorSetResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgRedelegateValidatorSetResponse): MsgRedelegateValidatorSetResponseAminoMsg { + return { + type: "osmosis/valsetpref/redelegate-validator-set-response", + value: MsgRedelegateValidatorSetResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgRedelegateValidatorSetResponseProtoMsg): MsgRedelegateValidatorSetResponse { + return MsgRedelegateValidatorSetResponse.decode(message.value); + }, + toProto(message: MsgRedelegateValidatorSetResponse): Uint8Array { + return MsgRedelegateValidatorSetResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgRedelegateValidatorSetResponse): MsgRedelegateValidatorSetResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgRedelegateValidatorSetResponse", + value: MsgRedelegateValidatorSetResponse.encode(message).finish() + }; } }; function createBaseMsgWithdrawDelegationRewards(): MsgWithdrawDelegationRewards { @@ -597,6 +857,7 @@ function createBaseMsgWithdrawDelegationRewards(): MsgWithdrawDelegationRewards }; } export const MsgWithdrawDelegationRewards = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgWithdrawDelegationRewards", encode(message: MsgWithdrawDelegationRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegator !== "") { writer.uint32(10).string(message.delegator); @@ -649,12 +910,44 @@ export const MsgWithdrawDelegationRewards = { const obj: any = {}; obj.delegator = message.delegator; return obj; + }, + fromAmino(object: MsgWithdrawDelegationRewardsAmino): MsgWithdrawDelegationRewards { + return { + delegator: object.delegator + }; + }, + toAmino(message: MsgWithdrawDelegationRewards): MsgWithdrawDelegationRewardsAmino { + const obj: any = {}; + obj.delegator = message.delegator; + return obj; + }, + fromAminoMsg(object: MsgWithdrawDelegationRewardsAminoMsg): MsgWithdrawDelegationRewards { + return MsgWithdrawDelegationRewards.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawDelegationRewards): MsgWithdrawDelegationRewardsAminoMsg { + return { + type: "osmosis/valset-pref/MsgWithdrawDelegationRewards", + value: MsgWithdrawDelegationRewards.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawDelegationRewardsProtoMsg): MsgWithdrawDelegationRewards { + return MsgWithdrawDelegationRewards.decode(message.value); + }, + toProto(message: MsgWithdrawDelegationRewards): Uint8Array { + return MsgWithdrawDelegationRewards.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawDelegationRewards): MsgWithdrawDelegationRewardsProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgWithdrawDelegationRewards", + value: MsgWithdrawDelegationRewards.encode(message).finish() + }; } }; function createBaseMsgWithdrawDelegationRewardsResponse(): MsgWithdrawDelegationRewardsResponse { return {}; } export const MsgWithdrawDelegationRewardsResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgWithdrawDelegationRewardsResponse", encode(_: MsgWithdrawDelegationRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -692,6 +985,34 @@ export const MsgWithdrawDelegationRewardsResponse = { toSDK(_: MsgWithdrawDelegationRewardsResponse): MsgWithdrawDelegationRewardsResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgWithdrawDelegationRewardsResponseAmino): MsgWithdrawDelegationRewardsResponse { + return {}; + }, + toAmino(_: MsgWithdrawDelegationRewardsResponse): MsgWithdrawDelegationRewardsResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgWithdrawDelegationRewardsResponseAminoMsg): MsgWithdrawDelegationRewardsResponse { + return MsgWithdrawDelegationRewardsResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgWithdrawDelegationRewardsResponse): MsgWithdrawDelegationRewardsResponseAminoMsg { + return { + type: "osmosis/valsetpref/withdraw-delegation-rewards-response", + value: MsgWithdrawDelegationRewardsResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgWithdrawDelegationRewardsResponseProtoMsg): MsgWithdrawDelegationRewardsResponse { + return MsgWithdrawDelegationRewardsResponse.decode(message.value); + }, + toProto(message: MsgWithdrawDelegationRewardsResponse): Uint8Array { + return MsgWithdrawDelegationRewardsResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgWithdrawDelegationRewardsResponse): MsgWithdrawDelegationRewardsResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgWithdrawDelegationRewardsResponse", + value: MsgWithdrawDelegationRewardsResponse.encode(message).finish() + }; } }; function createBaseMsgDelegateBondedTokens(): MsgDelegateBondedTokens { @@ -701,6 +1022,7 @@ function createBaseMsgDelegateBondedTokens(): MsgDelegateBondedTokens { }; } export const MsgDelegateBondedTokens = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateBondedTokens", encode(message: MsgDelegateBondedTokens, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegator !== "") { writer.uint32(10).string(message.delegator); @@ -765,12 +1087,46 @@ export const MsgDelegateBondedTokens = { obj.delegator = message.delegator; obj.lockID = message.lockID; return obj; + }, + fromAmino(object: MsgDelegateBondedTokensAmino): MsgDelegateBondedTokens { + return { + delegator: object.delegator, + lockID: BigInt(object.lockID) + }; + }, + toAmino(message: MsgDelegateBondedTokens): MsgDelegateBondedTokensAmino { + const obj: any = {}; + obj.delegator = message.delegator; + obj.lockID = message.lockID ? message.lockID.toString() : undefined; + return obj; + }, + fromAminoMsg(object: MsgDelegateBondedTokensAminoMsg): MsgDelegateBondedTokens { + return MsgDelegateBondedTokens.fromAmino(object.value); + }, + toAminoMsg(message: MsgDelegateBondedTokens): MsgDelegateBondedTokensAminoMsg { + return { + type: "osmosis/valsetpref/delegate-bonded-tokens", + value: MsgDelegateBondedTokens.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDelegateBondedTokensProtoMsg): MsgDelegateBondedTokens { + return MsgDelegateBondedTokens.decode(message.value); + }, + toProto(message: MsgDelegateBondedTokens): Uint8Array { + return MsgDelegateBondedTokens.encode(message).finish(); + }, + toProtoMsg(message: MsgDelegateBondedTokens): MsgDelegateBondedTokensProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateBondedTokens", + value: MsgDelegateBondedTokens.encode(message).finish() + }; } }; function createBaseMsgDelegateBondedTokensResponse(): MsgDelegateBondedTokensResponse { return {}; } export const MsgDelegateBondedTokensResponse = { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateBondedTokensResponse", encode(_: MsgDelegateBondedTokensResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -808,5 +1164,33 @@ export const MsgDelegateBondedTokensResponse = { toSDK(_: MsgDelegateBondedTokensResponse): MsgDelegateBondedTokensResponseSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: MsgDelegateBondedTokensResponseAmino): MsgDelegateBondedTokensResponse { + return {}; + }, + toAmino(_: MsgDelegateBondedTokensResponse): MsgDelegateBondedTokensResponseAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: MsgDelegateBondedTokensResponseAminoMsg): MsgDelegateBondedTokensResponse { + return MsgDelegateBondedTokensResponse.fromAmino(object.value); + }, + toAminoMsg(message: MsgDelegateBondedTokensResponse): MsgDelegateBondedTokensResponseAminoMsg { + return { + type: "osmosis/valsetpref/delegate-bonded-tokens-response", + value: MsgDelegateBondedTokensResponse.toAmino(message) + }; + }, + fromProtoMsg(message: MsgDelegateBondedTokensResponseProtoMsg): MsgDelegateBondedTokensResponse { + return MsgDelegateBondedTokensResponse.decode(message.value); + }, + toProto(message: MsgDelegateBondedTokensResponse): Uint8Array { + return MsgDelegateBondedTokensResponse.encode(message).finish(); + }, + toProtoMsg(message: MsgDelegateBondedTokensResponse): MsgDelegateBondedTokensResponseProtoMsg { + return { + typeUrl: "/osmosis.valsetpref.v1beta1.MsgDelegateBondedTokensResponse", + value: MsgDelegateBondedTokensResponse.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts index 1324952200..8fba9784f1 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/abci/types.ts @@ -761,6 +761,7 @@ function createBaseRequest(): Request { }; } export const Request = { + typeUrl: "/tendermint.abci.Request", encode(message: Request, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.echo !== undefined) { RequestEcho.encode(message.echo, writer.uint32(10).fork()).ldelim(); @@ -981,6 +982,59 @@ export const Request = { message.loadSnapshotChunk !== undefined && (obj.load_snapshot_chunk = message.loadSnapshotChunk ? RequestLoadSnapshotChunk.toSDK(message.loadSnapshotChunk) : undefined); message.applySnapshotChunk !== undefined && (obj.apply_snapshot_chunk = message.applySnapshotChunk ? RequestApplySnapshotChunk.toSDK(message.applySnapshotChunk) : undefined); return obj; + }, + fromAmino(object: RequestAmino): Request { + return { + echo: object?.echo ? RequestEcho.fromAmino(object.echo) : undefined, + flush: object?.flush ? RequestFlush.fromAmino(object.flush) : undefined, + info: object?.info ? RequestInfo.fromAmino(object.info) : undefined, + setOption: object?.set_option ? RequestSetOption.fromAmino(object.set_option) : undefined, + initChain: object?.init_chain ? RequestInitChain.fromAmino(object.init_chain) : undefined, + query: object?.query ? RequestQuery.fromAmino(object.query) : undefined, + beginBlock: object?.begin_block ? RequestBeginBlock.fromAmino(object.begin_block) : undefined, + checkTx: object?.check_tx ? RequestCheckTx.fromAmino(object.check_tx) : undefined, + deliverTx: object?.deliver_tx ? RequestDeliverTx.fromAmino(object.deliver_tx) : undefined, + endBlock: object?.end_block ? RequestEndBlock.fromAmino(object.end_block) : undefined, + commit: object?.commit ? RequestCommit.fromAmino(object.commit) : undefined, + listSnapshots: object?.list_snapshots ? RequestListSnapshots.fromAmino(object.list_snapshots) : undefined, + offerSnapshot: object?.offer_snapshot ? RequestOfferSnapshot.fromAmino(object.offer_snapshot) : undefined, + loadSnapshotChunk: object?.load_snapshot_chunk ? RequestLoadSnapshotChunk.fromAmino(object.load_snapshot_chunk) : undefined, + applySnapshotChunk: object?.apply_snapshot_chunk ? RequestApplySnapshotChunk.fromAmino(object.apply_snapshot_chunk) : undefined + }; + }, + toAmino(message: Request): RequestAmino { + const obj: any = {}; + obj.echo = message.echo ? RequestEcho.toAmino(message.echo) : undefined; + obj.flush = message.flush ? RequestFlush.toAmino(message.flush) : undefined; + obj.info = message.info ? RequestInfo.toAmino(message.info) : undefined; + obj.set_option = message.setOption ? RequestSetOption.toAmino(message.setOption) : undefined; + obj.init_chain = message.initChain ? RequestInitChain.toAmino(message.initChain) : undefined; + obj.query = message.query ? RequestQuery.toAmino(message.query) : undefined; + obj.begin_block = message.beginBlock ? RequestBeginBlock.toAmino(message.beginBlock) : undefined; + obj.check_tx = message.checkTx ? RequestCheckTx.toAmino(message.checkTx) : undefined; + obj.deliver_tx = message.deliverTx ? RequestDeliverTx.toAmino(message.deliverTx) : undefined; + obj.end_block = message.endBlock ? RequestEndBlock.toAmino(message.endBlock) : undefined; + obj.commit = message.commit ? RequestCommit.toAmino(message.commit) : undefined; + obj.list_snapshots = message.listSnapshots ? RequestListSnapshots.toAmino(message.listSnapshots) : undefined; + obj.offer_snapshot = message.offerSnapshot ? RequestOfferSnapshot.toAmino(message.offerSnapshot) : undefined; + obj.load_snapshot_chunk = message.loadSnapshotChunk ? RequestLoadSnapshotChunk.toAmino(message.loadSnapshotChunk) : undefined; + obj.apply_snapshot_chunk = message.applySnapshotChunk ? RequestApplySnapshotChunk.toAmino(message.applySnapshotChunk) : undefined; + return obj; + }, + fromAminoMsg(object: RequestAminoMsg): Request { + return Request.fromAmino(object.value); + }, + fromProtoMsg(message: RequestProtoMsg): Request { + return Request.decode(message.value); + }, + toProto(message: Request): Uint8Array { + return Request.encode(message).finish(); + }, + toProtoMsg(message: Request): RequestProtoMsg { + return { + typeUrl: "/tendermint.abci.Request", + value: Request.encode(message).finish() + }; } }; function createBaseRequestEcho(): RequestEcho { @@ -989,6 +1043,7 @@ function createBaseRequestEcho(): RequestEcho { }; } export const RequestEcho = { + typeUrl: "/tendermint.abci.RequestEcho", encode(message: RequestEcho, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.message !== "") { writer.uint32(10).string(message.message); @@ -1041,12 +1096,38 @@ export const RequestEcho = { const obj: any = {}; obj.message = message.message; return obj; + }, + fromAmino(object: RequestEchoAmino): RequestEcho { + return { + message: object.message + }; + }, + toAmino(message: RequestEcho): RequestEchoAmino { + const obj: any = {}; + obj.message = message.message; + return obj; + }, + fromAminoMsg(object: RequestEchoAminoMsg): RequestEcho { + return RequestEcho.fromAmino(object.value); + }, + fromProtoMsg(message: RequestEchoProtoMsg): RequestEcho { + return RequestEcho.decode(message.value); + }, + toProto(message: RequestEcho): Uint8Array { + return RequestEcho.encode(message).finish(); + }, + toProtoMsg(message: RequestEcho): RequestEchoProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestEcho", + value: RequestEcho.encode(message).finish() + }; } }; function createBaseRequestFlush(): RequestFlush { return {}; } export const RequestFlush = { + typeUrl: "/tendermint.abci.RequestFlush", encode(_: RequestFlush, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1084,6 +1165,28 @@ export const RequestFlush = { toSDK(_: RequestFlush): RequestFlushSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: RequestFlushAmino): RequestFlush { + return {}; + }, + toAmino(_: RequestFlush): RequestFlushAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: RequestFlushAminoMsg): RequestFlush { + return RequestFlush.fromAmino(object.value); + }, + fromProtoMsg(message: RequestFlushProtoMsg): RequestFlush { + return RequestFlush.decode(message.value); + }, + toProto(message: RequestFlush): Uint8Array { + return RequestFlush.encode(message).finish(); + }, + toProtoMsg(message: RequestFlush): RequestFlushProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestFlush", + value: RequestFlush.encode(message).finish() + }; } }; function createBaseRequestInfo(): RequestInfo { @@ -1094,6 +1197,7 @@ function createBaseRequestInfo(): RequestInfo { }; } export const RequestInfo = { + typeUrl: "/tendermint.abci.RequestInfo", encode(message: RequestInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.version !== "") { writer.uint32(10).string(message.version); @@ -1170,6 +1274,35 @@ export const RequestInfo = { obj.block_version = message.blockVersion; obj.p2p_version = message.p2pVersion; return obj; + }, + fromAmino(object: RequestInfoAmino): RequestInfo { + return { + version: object.version, + blockVersion: BigInt(object.block_version), + p2pVersion: BigInt(object.p2p_version) + }; + }, + toAmino(message: RequestInfo): RequestInfoAmino { + const obj: any = {}; + obj.version = message.version; + obj.block_version = message.blockVersion ? message.blockVersion.toString() : undefined; + obj.p2p_version = message.p2pVersion ? message.p2pVersion.toString() : undefined; + return obj; + }, + fromAminoMsg(object: RequestInfoAminoMsg): RequestInfo { + return RequestInfo.fromAmino(object.value); + }, + fromProtoMsg(message: RequestInfoProtoMsg): RequestInfo { + return RequestInfo.decode(message.value); + }, + toProto(message: RequestInfo): Uint8Array { + return RequestInfo.encode(message).finish(); + }, + toProtoMsg(message: RequestInfo): RequestInfoProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestInfo", + value: RequestInfo.encode(message).finish() + }; } }; function createBaseRequestSetOption(): RequestSetOption { @@ -1179,6 +1312,7 @@ function createBaseRequestSetOption(): RequestSetOption { }; } export const RequestSetOption = { + typeUrl: "/tendermint.abci.RequestSetOption", encode(message: RequestSetOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); @@ -1243,6 +1377,33 @@ export const RequestSetOption = { obj.key = message.key; obj.value = message.value; return obj; + }, + fromAmino(object: RequestSetOptionAmino): RequestSetOption { + return { + key: object.key, + value: object.value + }; + }, + toAmino(message: RequestSetOption): RequestSetOptionAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + return obj; + }, + fromAminoMsg(object: RequestSetOptionAminoMsg): RequestSetOption { + return RequestSetOption.fromAmino(object.value); + }, + fromProtoMsg(message: RequestSetOptionProtoMsg): RequestSetOption { + return RequestSetOption.decode(message.value); + }, + toProto(message: RequestSetOption): Uint8Array { + return RequestSetOption.encode(message).finish(); + }, + toProtoMsg(message: RequestSetOption): RequestSetOptionProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestSetOption", + value: RequestSetOption.encode(message).finish() + }; } }; function createBaseRequestInitChain(): RequestInitChain { @@ -1256,6 +1417,7 @@ function createBaseRequestInitChain(): RequestInitChain { }; } export const RequestInitChain = { + typeUrl: "/tendermint.abci.RequestInitChain", encode(message: RequestInitChain, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.time !== undefined) { Timestamp.encode(toTimestamp(message.time), writer.uint32(10).fork()).ldelim(); @@ -1376,6 +1538,45 @@ export const RequestInitChain = { obj.app_state_bytes = message.appStateBytes; obj.initial_height = message.initialHeight; return obj; + }, + fromAmino(object: RequestInitChainAmino): RequestInitChain { + return { + time: object.time, + chainId: object.chain_id, + consensusParams: object?.consensus_params ? ConsensusParams.fromAmino(object.consensus_params) : undefined, + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => ValidatorUpdate.fromAmino(e)) : [], + appStateBytes: object.app_state_bytes, + initialHeight: BigInt(object.initial_height) + }; + }, + toAmino(message: RequestInitChain): RequestInitChainAmino { + const obj: any = {}; + obj.time = message.time; + obj.chain_id = message.chainId; + obj.consensus_params = message.consensusParams ? ConsensusParams.toAmino(message.consensusParams) : undefined; + if (message.validators) { + obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.app_state_bytes = message.appStateBytes; + obj.initial_height = message.initialHeight ? message.initialHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: RequestInitChainAminoMsg): RequestInitChain { + return RequestInitChain.fromAmino(object.value); + }, + fromProtoMsg(message: RequestInitChainProtoMsg): RequestInitChain { + return RequestInitChain.decode(message.value); + }, + toProto(message: RequestInitChain): Uint8Array { + return RequestInitChain.encode(message).finish(); + }, + toProtoMsg(message: RequestInitChain): RequestInitChainProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestInitChain", + value: RequestInitChain.encode(message).finish() + }; } }; function createBaseRequestQuery(): RequestQuery { @@ -1387,6 +1588,7 @@ function createBaseRequestQuery(): RequestQuery { }; } export const RequestQuery = { + typeUrl: "/tendermint.abci.RequestQuery", encode(message: RequestQuery, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); @@ -1475,6 +1677,37 @@ export const RequestQuery = { obj.height = message.height; obj.prove = message.prove; return obj; + }, + fromAmino(object: RequestQueryAmino): RequestQuery { + return { + data: object.data, + path: object.path, + height: BigInt(object.height), + prove: object.prove + }; + }, + toAmino(message: RequestQuery): RequestQueryAmino { + const obj: any = {}; + obj.data = message.data; + obj.path = message.path; + obj.height = message.height ? message.height.toString() : undefined; + obj.prove = message.prove; + return obj; + }, + fromAminoMsg(object: RequestQueryAminoMsg): RequestQuery { + return RequestQuery.fromAmino(object.value); + }, + fromProtoMsg(message: RequestQueryProtoMsg): RequestQuery { + return RequestQuery.decode(message.value); + }, + toProto(message: RequestQuery): Uint8Array { + return RequestQuery.encode(message).finish(); + }, + toProtoMsg(message: RequestQuery): RequestQueryProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestQuery", + value: RequestQuery.encode(message).finish() + }; } }; function createBaseRequestBeginBlock(): RequestBeginBlock { @@ -1486,6 +1719,7 @@ function createBaseRequestBeginBlock(): RequestBeginBlock { }; } export const RequestBeginBlock = { + typeUrl: "/tendermint.abci.RequestBeginBlock", encode(message: RequestBeginBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash.length !== 0) { writer.uint32(10).bytes(message.hash); @@ -1582,6 +1816,41 @@ export const RequestBeginBlock = { obj.byzantine_validators = []; } return obj; + }, + fromAmino(object: RequestBeginBlockAmino): RequestBeginBlock { + return { + hash: object.hash, + header: object?.header ? Header.fromAmino(object.header) : undefined, + lastCommitInfo: object?.last_commit_info ? LastCommitInfo.fromAmino(object.last_commit_info) : undefined, + byzantineValidators: Array.isArray(object?.byzantine_validators) ? object.byzantine_validators.map((e: any) => Evidence.fromAmino(e)) : [] + }; + }, + toAmino(message: RequestBeginBlock): RequestBeginBlockAmino { + const obj: any = {}; + obj.hash = message.hash; + obj.header = message.header ? Header.toAmino(message.header) : undefined; + obj.last_commit_info = message.lastCommitInfo ? LastCommitInfo.toAmino(message.lastCommitInfo) : undefined; + if (message.byzantineValidators) { + obj.byzantine_validators = message.byzantineValidators.map(e => e ? Evidence.toAmino(e) : undefined); + } else { + obj.byzantine_validators = []; + } + return obj; + }, + fromAminoMsg(object: RequestBeginBlockAminoMsg): RequestBeginBlock { + return RequestBeginBlock.fromAmino(object.value); + }, + fromProtoMsg(message: RequestBeginBlockProtoMsg): RequestBeginBlock { + return RequestBeginBlock.decode(message.value); + }, + toProto(message: RequestBeginBlock): Uint8Array { + return RequestBeginBlock.encode(message).finish(); + }, + toProtoMsg(message: RequestBeginBlock): RequestBeginBlockProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestBeginBlock", + value: RequestBeginBlock.encode(message).finish() + }; } }; function createBaseRequestCheckTx(): RequestCheckTx { @@ -1591,6 +1860,7 @@ function createBaseRequestCheckTx(): RequestCheckTx { }; } export const RequestCheckTx = { + typeUrl: "/tendermint.abci.RequestCheckTx", encode(message: RequestCheckTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx.length !== 0) { writer.uint32(10).bytes(message.tx); @@ -1655,6 +1925,33 @@ export const RequestCheckTx = { obj.tx = message.tx; message.type !== undefined && (obj.type = checkTxTypeToJSON(message.type)); return obj; + }, + fromAmino(object: RequestCheckTxAmino): RequestCheckTx { + return { + tx: object.tx, + type: isSet(object.type) ? checkTxTypeFromJSON(object.type) : -1 + }; + }, + toAmino(message: RequestCheckTx): RequestCheckTxAmino { + const obj: any = {}; + obj.tx = message.tx; + obj.type = message.type; + return obj; + }, + fromAminoMsg(object: RequestCheckTxAminoMsg): RequestCheckTx { + return RequestCheckTx.fromAmino(object.value); + }, + fromProtoMsg(message: RequestCheckTxProtoMsg): RequestCheckTx { + return RequestCheckTx.decode(message.value); + }, + toProto(message: RequestCheckTx): Uint8Array { + return RequestCheckTx.encode(message).finish(); + }, + toProtoMsg(message: RequestCheckTx): RequestCheckTxProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestCheckTx", + value: RequestCheckTx.encode(message).finish() + }; } }; function createBaseRequestDeliverTx(): RequestDeliverTx { @@ -1663,6 +1960,7 @@ function createBaseRequestDeliverTx(): RequestDeliverTx { }; } export const RequestDeliverTx = { + typeUrl: "/tendermint.abci.RequestDeliverTx", encode(message: RequestDeliverTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx.length !== 0) { writer.uint32(10).bytes(message.tx); @@ -1715,6 +2013,31 @@ export const RequestDeliverTx = { const obj: any = {}; obj.tx = message.tx; return obj; + }, + fromAmino(object: RequestDeliverTxAmino): RequestDeliverTx { + return { + tx: object.tx + }; + }, + toAmino(message: RequestDeliverTx): RequestDeliverTxAmino { + const obj: any = {}; + obj.tx = message.tx; + return obj; + }, + fromAminoMsg(object: RequestDeliverTxAminoMsg): RequestDeliverTx { + return RequestDeliverTx.fromAmino(object.value); + }, + fromProtoMsg(message: RequestDeliverTxProtoMsg): RequestDeliverTx { + return RequestDeliverTx.decode(message.value); + }, + toProto(message: RequestDeliverTx): Uint8Array { + return RequestDeliverTx.encode(message).finish(); + }, + toProtoMsg(message: RequestDeliverTx): RequestDeliverTxProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestDeliverTx", + value: RequestDeliverTx.encode(message).finish() + }; } }; function createBaseRequestEndBlock(): RequestEndBlock { @@ -1723,6 +2046,7 @@ function createBaseRequestEndBlock(): RequestEndBlock { }; } export const RequestEndBlock = { + typeUrl: "/tendermint.abci.RequestEndBlock", encode(message: RequestEndBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -1775,12 +2099,38 @@ export const RequestEndBlock = { const obj: any = {}; obj.height = message.height; return obj; + }, + fromAmino(object: RequestEndBlockAmino): RequestEndBlock { + return { + height: BigInt(object.height) + }; + }, + toAmino(message: RequestEndBlock): RequestEndBlockAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + return obj; + }, + fromAminoMsg(object: RequestEndBlockAminoMsg): RequestEndBlock { + return RequestEndBlock.fromAmino(object.value); + }, + fromProtoMsg(message: RequestEndBlockProtoMsg): RequestEndBlock { + return RequestEndBlock.decode(message.value); + }, + toProto(message: RequestEndBlock): Uint8Array { + return RequestEndBlock.encode(message).finish(); + }, + toProtoMsg(message: RequestEndBlock): RequestEndBlockProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestEndBlock", + value: RequestEndBlock.encode(message).finish() + }; } }; function createBaseRequestCommit(): RequestCommit { return {}; } export const RequestCommit = { + typeUrl: "/tendermint.abci.RequestCommit", encode(_: RequestCommit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1818,12 +2168,35 @@ export const RequestCommit = { toSDK(_: RequestCommit): RequestCommitSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: RequestCommitAmino): RequestCommit { + return {}; + }, + toAmino(_: RequestCommit): RequestCommitAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: RequestCommitAminoMsg): RequestCommit { + return RequestCommit.fromAmino(object.value); + }, + fromProtoMsg(message: RequestCommitProtoMsg): RequestCommit { + return RequestCommit.decode(message.value); + }, + toProto(message: RequestCommit): Uint8Array { + return RequestCommit.encode(message).finish(); + }, + toProtoMsg(message: RequestCommit): RequestCommitProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestCommit", + value: RequestCommit.encode(message).finish() + }; } }; function createBaseRequestListSnapshots(): RequestListSnapshots { return {}; } export const RequestListSnapshots = { + typeUrl: "/tendermint.abci.RequestListSnapshots", encode(_: RequestListSnapshots, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -1861,6 +2234,28 @@ export const RequestListSnapshots = { toSDK(_: RequestListSnapshots): RequestListSnapshotsSDKType { const obj: any = {}; return obj; + }, + fromAmino(_: RequestListSnapshotsAmino): RequestListSnapshots { + return {}; + }, + toAmino(_: RequestListSnapshots): RequestListSnapshotsAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: RequestListSnapshotsAminoMsg): RequestListSnapshots { + return RequestListSnapshots.fromAmino(object.value); + }, + fromProtoMsg(message: RequestListSnapshotsProtoMsg): RequestListSnapshots { + return RequestListSnapshots.decode(message.value); + }, + toProto(message: RequestListSnapshots): Uint8Array { + return RequestListSnapshots.encode(message).finish(); + }, + toProtoMsg(message: RequestListSnapshots): RequestListSnapshotsProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestListSnapshots", + value: RequestListSnapshots.encode(message).finish() + }; } }; function createBaseRequestOfferSnapshot(): RequestOfferSnapshot { @@ -1870,6 +2265,7 @@ function createBaseRequestOfferSnapshot(): RequestOfferSnapshot { }; } export const RequestOfferSnapshot = { + typeUrl: "/tendermint.abci.RequestOfferSnapshot", encode(message: RequestOfferSnapshot, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.snapshot !== undefined) { Snapshot.encode(message.snapshot, writer.uint32(10).fork()).ldelim(); @@ -1934,6 +2330,33 @@ export const RequestOfferSnapshot = { message.snapshot !== undefined && (obj.snapshot = message.snapshot ? Snapshot.toSDK(message.snapshot) : undefined); obj.app_hash = message.appHash; return obj; + }, + fromAmino(object: RequestOfferSnapshotAmino): RequestOfferSnapshot { + return { + snapshot: object?.snapshot ? Snapshot.fromAmino(object.snapshot) : undefined, + appHash: object.app_hash + }; + }, + toAmino(message: RequestOfferSnapshot): RequestOfferSnapshotAmino { + const obj: any = {}; + obj.snapshot = message.snapshot ? Snapshot.toAmino(message.snapshot) : undefined; + obj.app_hash = message.appHash; + return obj; + }, + fromAminoMsg(object: RequestOfferSnapshotAminoMsg): RequestOfferSnapshot { + return RequestOfferSnapshot.fromAmino(object.value); + }, + fromProtoMsg(message: RequestOfferSnapshotProtoMsg): RequestOfferSnapshot { + return RequestOfferSnapshot.decode(message.value); + }, + toProto(message: RequestOfferSnapshot): Uint8Array { + return RequestOfferSnapshot.encode(message).finish(); + }, + toProtoMsg(message: RequestOfferSnapshot): RequestOfferSnapshotProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestOfferSnapshot", + value: RequestOfferSnapshot.encode(message).finish() + }; } }; function createBaseRequestLoadSnapshotChunk(): RequestLoadSnapshotChunk { @@ -1944,6 +2367,7 @@ function createBaseRequestLoadSnapshotChunk(): RequestLoadSnapshotChunk { }; } export const RequestLoadSnapshotChunk = { + typeUrl: "/tendermint.abci.RequestLoadSnapshotChunk", encode(message: RequestLoadSnapshotChunk, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).uint64(message.height); @@ -2020,6 +2444,35 @@ export const RequestLoadSnapshotChunk = { obj.format = message.format; obj.chunk = message.chunk; return obj; + }, + fromAmino(object: RequestLoadSnapshotChunkAmino): RequestLoadSnapshotChunk { + return { + height: BigInt(object.height), + format: object.format, + chunk: object.chunk + }; + }, + toAmino(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.format = message.format; + obj.chunk = message.chunk; + return obj; + }, + fromAminoMsg(object: RequestLoadSnapshotChunkAminoMsg): RequestLoadSnapshotChunk { + return RequestLoadSnapshotChunk.fromAmino(object.value); + }, + fromProtoMsg(message: RequestLoadSnapshotChunkProtoMsg): RequestLoadSnapshotChunk { + return RequestLoadSnapshotChunk.decode(message.value); + }, + toProto(message: RequestLoadSnapshotChunk): Uint8Array { + return RequestLoadSnapshotChunk.encode(message).finish(); + }, + toProtoMsg(message: RequestLoadSnapshotChunk): RequestLoadSnapshotChunkProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestLoadSnapshotChunk", + value: RequestLoadSnapshotChunk.encode(message).finish() + }; } }; function createBaseRequestApplySnapshotChunk(): RequestApplySnapshotChunk { @@ -2030,6 +2483,7 @@ function createBaseRequestApplySnapshotChunk(): RequestApplySnapshotChunk { }; } export const RequestApplySnapshotChunk = { + typeUrl: "/tendermint.abci.RequestApplySnapshotChunk", encode(message: RequestApplySnapshotChunk, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== 0) { writer.uint32(8).uint32(message.index); @@ -2106,6 +2560,35 @@ export const RequestApplySnapshotChunk = { obj.chunk = message.chunk; obj.sender = message.sender; return obj; + }, + fromAmino(object: RequestApplySnapshotChunkAmino): RequestApplySnapshotChunk { + return { + index: object.index, + chunk: object.chunk, + sender: object.sender + }; + }, + toAmino(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkAmino { + const obj: any = {}; + obj.index = message.index; + obj.chunk = message.chunk; + obj.sender = message.sender; + return obj; + }, + fromAminoMsg(object: RequestApplySnapshotChunkAminoMsg): RequestApplySnapshotChunk { + return RequestApplySnapshotChunk.fromAmino(object.value); + }, + fromProtoMsg(message: RequestApplySnapshotChunkProtoMsg): RequestApplySnapshotChunk { + return RequestApplySnapshotChunk.decode(message.value); + }, + toProto(message: RequestApplySnapshotChunk): Uint8Array { + return RequestApplySnapshotChunk.encode(message).finish(); + }, + toProtoMsg(message: RequestApplySnapshotChunk): RequestApplySnapshotChunkProtoMsg { + return { + typeUrl: "/tendermint.abci.RequestApplySnapshotChunk", + value: RequestApplySnapshotChunk.encode(message).finish() + }; } }; function createBaseResponse(): Response { @@ -2129,6 +2612,7 @@ function createBaseResponse(): Response { }; } export const Response = { + typeUrl: "/tendermint.abci.Response", encode(message: Response, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exception !== undefined) { ResponseException.encode(message.exception, writer.uint32(10).fork()).ldelim(); @@ -2361,6 +2845,61 @@ export const Response = { message.loadSnapshotChunk !== undefined && (obj.load_snapshot_chunk = message.loadSnapshotChunk ? ResponseLoadSnapshotChunk.toSDK(message.loadSnapshotChunk) : undefined); message.applySnapshotChunk !== undefined && (obj.apply_snapshot_chunk = message.applySnapshotChunk ? ResponseApplySnapshotChunk.toSDK(message.applySnapshotChunk) : undefined); return obj; + }, + fromAmino(object: ResponseAmino): Response { + return { + exception: object?.exception ? ResponseException.fromAmino(object.exception) : undefined, + echo: object?.echo ? ResponseEcho.fromAmino(object.echo) : undefined, + flush: object?.flush ? ResponseFlush.fromAmino(object.flush) : undefined, + info: object?.info ? ResponseInfo.fromAmino(object.info) : undefined, + setOption: object?.set_option ? ResponseSetOption.fromAmino(object.set_option) : undefined, + initChain: object?.init_chain ? ResponseInitChain.fromAmino(object.init_chain) : undefined, + query: object?.query ? ResponseQuery.fromAmino(object.query) : undefined, + beginBlock: object?.begin_block ? ResponseBeginBlock.fromAmino(object.begin_block) : undefined, + checkTx: object?.check_tx ? ResponseCheckTx.fromAmino(object.check_tx) : undefined, + deliverTx: object?.deliver_tx ? ResponseDeliverTx.fromAmino(object.deliver_tx) : undefined, + endBlock: object?.end_block ? ResponseEndBlock.fromAmino(object.end_block) : undefined, + commit: object?.commit ? ResponseCommit.fromAmino(object.commit) : undefined, + listSnapshots: object?.list_snapshots ? ResponseListSnapshots.fromAmino(object.list_snapshots) : undefined, + offerSnapshot: object?.offer_snapshot ? ResponseOfferSnapshot.fromAmino(object.offer_snapshot) : undefined, + loadSnapshotChunk: object?.load_snapshot_chunk ? ResponseLoadSnapshotChunk.fromAmino(object.load_snapshot_chunk) : undefined, + applySnapshotChunk: object?.apply_snapshot_chunk ? ResponseApplySnapshotChunk.fromAmino(object.apply_snapshot_chunk) : undefined + }; + }, + toAmino(message: Response): ResponseAmino { + const obj: any = {}; + obj.exception = message.exception ? ResponseException.toAmino(message.exception) : undefined; + obj.echo = message.echo ? ResponseEcho.toAmino(message.echo) : undefined; + obj.flush = message.flush ? ResponseFlush.toAmino(message.flush) : undefined; + obj.info = message.info ? ResponseInfo.toAmino(message.info) : undefined; + obj.set_option = message.setOption ? ResponseSetOption.toAmino(message.setOption) : undefined; + obj.init_chain = message.initChain ? ResponseInitChain.toAmino(message.initChain) : undefined; + obj.query = message.query ? ResponseQuery.toAmino(message.query) : undefined; + obj.begin_block = message.beginBlock ? ResponseBeginBlock.toAmino(message.beginBlock) : undefined; + obj.check_tx = message.checkTx ? ResponseCheckTx.toAmino(message.checkTx) : undefined; + obj.deliver_tx = message.deliverTx ? ResponseDeliverTx.toAmino(message.deliverTx) : undefined; + obj.end_block = message.endBlock ? ResponseEndBlock.toAmino(message.endBlock) : undefined; + obj.commit = message.commit ? ResponseCommit.toAmino(message.commit) : undefined; + obj.list_snapshots = message.listSnapshots ? ResponseListSnapshots.toAmino(message.listSnapshots) : undefined; + obj.offer_snapshot = message.offerSnapshot ? ResponseOfferSnapshot.toAmino(message.offerSnapshot) : undefined; + obj.load_snapshot_chunk = message.loadSnapshotChunk ? ResponseLoadSnapshotChunk.toAmino(message.loadSnapshotChunk) : undefined; + obj.apply_snapshot_chunk = message.applySnapshotChunk ? ResponseApplySnapshotChunk.toAmino(message.applySnapshotChunk) : undefined; + return obj; + }, + fromAminoMsg(object: ResponseAminoMsg): Response { + return Response.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseProtoMsg): Response { + return Response.decode(message.value); + }, + toProto(message: Response): Uint8Array { + return Response.encode(message).finish(); + }, + toProtoMsg(message: Response): ResponseProtoMsg { + return { + typeUrl: "/tendermint.abci.Response", + value: Response.encode(message).finish() + }; } }; function createBaseResponseException(): ResponseException { @@ -2369,6 +2908,7 @@ function createBaseResponseException(): ResponseException { }; } export const ResponseException = { + typeUrl: "/tendermint.abci.ResponseException", encode(message: ResponseException, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.error !== "") { writer.uint32(10).string(message.error); @@ -2421,6 +2961,31 @@ export const ResponseException = { const obj: any = {}; obj.error = message.error; return obj; + }, + fromAmino(object: ResponseExceptionAmino): ResponseException { + return { + error: object.error + }; + }, + toAmino(message: ResponseException): ResponseExceptionAmino { + const obj: any = {}; + obj.error = message.error; + return obj; + }, + fromAminoMsg(object: ResponseExceptionAminoMsg): ResponseException { + return ResponseException.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseExceptionProtoMsg): ResponseException { + return ResponseException.decode(message.value); + }, + toProto(message: ResponseException): Uint8Array { + return ResponseException.encode(message).finish(); + }, + toProtoMsg(message: ResponseException): ResponseExceptionProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseException", + value: ResponseException.encode(message).finish() + }; } }; function createBaseResponseEcho(): ResponseEcho { @@ -2429,6 +2994,7 @@ function createBaseResponseEcho(): ResponseEcho { }; } export const ResponseEcho = { + typeUrl: "/tendermint.abci.ResponseEcho", encode(message: ResponseEcho, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.message !== "") { writer.uint32(10).string(message.message); @@ -2481,12 +3047,38 @@ export const ResponseEcho = { const obj: any = {}; obj.message = message.message; return obj; + }, + fromAmino(object: ResponseEchoAmino): ResponseEcho { + return { + message: object.message + }; + }, + toAmino(message: ResponseEcho): ResponseEchoAmino { + const obj: any = {}; + obj.message = message.message; + return obj; + }, + fromAminoMsg(object: ResponseEchoAminoMsg): ResponseEcho { + return ResponseEcho.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseEchoProtoMsg): ResponseEcho { + return ResponseEcho.decode(message.value); + }, + toProto(message: ResponseEcho): Uint8Array { + return ResponseEcho.encode(message).finish(); + }, + toProtoMsg(message: ResponseEcho): ResponseEchoProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseEcho", + value: ResponseEcho.encode(message).finish() + }; } }; function createBaseResponseFlush(): ResponseFlush { return {}; } export const ResponseFlush = { + typeUrl: "/tendermint.abci.ResponseFlush", encode(_: ResponseFlush, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, @@ -2524,7 +3116,29 @@ export const ResponseFlush = { toSDK(_: ResponseFlush): ResponseFlushSDKType { const obj: any = {}; return obj; - } + }, + fromAmino(_: ResponseFlushAmino): ResponseFlush { + return {}; + }, + toAmino(_: ResponseFlush): ResponseFlushAmino { + const obj: any = {}; + return obj; + }, + fromAminoMsg(object: ResponseFlushAminoMsg): ResponseFlush { + return ResponseFlush.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseFlushProtoMsg): ResponseFlush { + return ResponseFlush.decode(message.value); + }, + toProto(message: ResponseFlush): Uint8Array { + return ResponseFlush.encode(message).finish(); + }, + toProtoMsg(message: ResponseFlush): ResponseFlushProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseFlush", + value: ResponseFlush.encode(message).finish() + }; + } }; function createBaseResponseInfo(): ResponseInfo { return { @@ -2536,6 +3150,7 @@ function createBaseResponseInfo(): ResponseInfo { }; } export const ResponseInfo = { + typeUrl: "/tendermint.abci.ResponseInfo", encode(message: ResponseInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data !== "") { writer.uint32(10).string(message.data); @@ -2636,6 +3251,39 @@ export const ResponseInfo = { obj.last_block_height = message.lastBlockHeight; obj.last_block_app_hash = message.lastBlockAppHash; return obj; + }, + fromAmino(object: ResponseInfoAmino): ResponseInfo { + return { + data: object.data, + version: object.version, + appVersion: BigInt(object.app_version), + lastBlockHeight: BigInt(object.last_block_height), + lastBlockAppHash: object.last_block_app_hash + }; + }, + toAmino(message: ResponseInfo): ResponseInfoAmino { + const obj: any = {}; + obj.data = message.data; + obj.version = message.version; + obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + obj.last_block_height = message.lastBlockHeight ? message.lastBlockHeight.toString() : undefined; + obj.last_block_app_hash = message.lastBlockAppHash; + return obj; + }, + fromAminoMsg(object: ResponseInfoAminoMsg): ResponseInfo { + return ResponseInfo.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseInfoProtoMsg): ResponseInfo { + return ResponseInfo.decode(message.value); + }, + toProto(message: ResponseInfo): Uint8Array { + return ResponseInfo.encode(message).finish(); + }, + toProtoMsg(message: ResponseInfo): ResponseInfoProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseInfo", + value: ResponseInfo.encode(message).finish() + }; } }; function createBaseResponseSetOption(): ResponseSetOption { @@ -2646,6 +3294,7 @@ function createBaseResponseSetOption(): ResponseSetOption { }; } export const ResponseSetOption = { + typeUrl: "/tendermint.abci.ResponseSetOption", encode(message: ResponseSetOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).uint32(message.code); @@ -2722,6 +3371,35 @@ export const ResponseSetOption = { obj.log = message.log; obj.info = message.info; return obj; + }, + fromAmino(object: ResponseSetOptionAmino): ResponseSetOption { + return { + code: object.code, + log: object.log, + info: object.info + }; + }, + toAmino(message: ResponseSetOption): ResponseSetOptionAmino { + const obj: any = {}; + obj.code = message.code; + obj.log = message.log; + obj.info = message.info; + return obj; + }, + fromAminoMsg(object: ResponseSetOptionAminoMsg): ResponseSetOption { + return ResponseSetOption.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseSetOptionProtoMsg): ResponseSetOption { + return ResponseSetOption.decode(message.value); + }, + toProto(message: ResponseSetOption): Uint8Array { + return ResponseSetOption.encode(message).finish(); + }, + toProtoMsg(message: ResponseSetOption): ResponseSetOptionProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseSetOption", + value: ResponseSetOption.encode(message).finish() + }; } }; function createBaseResponseInitChain(): ResponseInitChain { @@ -2732,6 +3410,7 @@ function createBaseResponseInitChain(): ResponseInitChain { }; } export const ResponseInitChain = { + typeUrl: "/tendermint.abci.ResponseInitChain", encode(message: ResponseInitChain, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.consensusParams !== undefined) { ConsensusParams.encode(message.consensusParams, writer.uint32(10).fork()).ldelim(); @@ -2816,6 +3495,39 @@ export const ResponseInitChain = { } obj.app_hash = message.appHash; return obj; + }, + fromAmino(object: ResponseInitChainAmino): ResponseInitChain { + return { + consensusParams: object?.consensus_params ? ConsensusParams.fromAmino(object.consensus_params) : undefined, + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => ValidatorUpdate.fromAmino(e)) : [], + appHash: object.app_hash + }; + }, + toAmino(message: ResponseInitChain): ResponseInitChainAmino { + const obj: any = {}; + obj.consensus_params = message.consensusParams ? ConsensusParams.toAmino(message.consensusParams) : undefined; + if (message.validators) { + obj.validators = message.validators.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.app_hash = message.appHash; + return obj; + }, + fromAminoMsg(object: ResponseInitChainAminoMsg): ResponseInitChain { + return ResponseInitChain.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseInitChainProtoMsg): ResponseInitChain { + return ResponseInitChain.decode(message.value); + }, + toProto(message: ResponseInitChain): Uint8Array { + return ResponseInitChain.encode(message).finish(); + }, + toProtoMsg(message: ResponseInitChain): ResponseInitChainProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseInitChain", + value: ResponseInitChain.encode(message).finish() + }; } }; function createBaseResponseQuery(): ResponseQuery { @@ -2832,6 +3544,7 @@ function createBaseResponseQuery(): ResponseQuery { }; } export const ResponseQuery = { + typeUrl: "/tendermint.abci.ResponseQuery", encode(message: ResponseQuery, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).uint32(message.code); @@ -2980,6 +3693,47 @@ export const ResponseQuery = { obj.height = message.height; obj.codespace = message.codespace; return obj; + }, + fromAmino(object: ResponseQueryAmino): ResponseQuery { + return { + code: object.code, + log: object.log, + info: object.info, + index: BigInt(object.index), + key: object.key, + value: object.value, + proofOps: object?.proof_ops ? ProofOps.fromAmino(object.proof_ops) : undefined, + height: BigInt(object.height), + codespace: object.codespace + }; + }, + toAmino(message: ResponseQuery): ResponseQueryAmino { + const obj: any = {}; + obj.code = message.code; + obj.log = message.log; + obj.info = message.info; + obj.index = message.index ? message.index.toString() : undefined; + obj.key = message.key; + obj.value = message.value; + obj.proof_ops = message.proofOps ? ProofOps.toAmino(message.proofOps) : undefined; + obj.height = message.height ? message.height.toString() : undefined; + obj.codespace = message.codespace; + return obj; + }, + fromAminoMsg(object: ResponseQueryAminoMsg): ResponseQuery { + return ResponseQuery.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseQueryProtoMsg): ResponseQuery { + return ResponseQuery.decode(message.value); + }, + toProto(message: ResponseQuery): Uint8Array { + return ResponseQuery.encode(message).finish(); + }, + toProtoMsg(message: ResponseQuery): ResponseQueryProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseQuery", + value: ResponseQuery.encode(message).finish() + }; } }; function createBaseResponseBeginBlock(): ResponseBeginBlock { @@ -2988,6 +3742,7 @@ function createBaseResponseBeginBlock(): ResponseBeginBlock { }; } export const ResponseBeginBlock = { + typeUrl: "/tendermint.abci.ResponseBeginBlock", encode(message: ResponseBeginBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.events) { Event.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3048,6 +3803,35 @@ export const ResponseBeginBlock = { obj.events = []; } return obj; + }, + fromAmino(object: ResponseBeginBlockAmino): ResponseBeginBlock { + return { + events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [] + }; + }, + toAmino(message: ResponseBeginBlock): ResponseBeginBlockAmino { + const obj: any = {}; + if (message.events) { + obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); + } else { + obj.events = []; + } + return obj; + }, + fromAminoMsg(object: ResponseBeginBlockAminoMsg): ResponseBeginBlock { + return ResponseBeginBlock.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseBeginBlockProtoMsg): ResponseBeginBlock { + return ResponseBeginBlock.decode(message.value); + }, + toProto(message: ResponseBeginBlock): Uint8Array { + return ResponseBeginBlock.encode(message).finish(); + }, + toProtoMsg(message: ResponseBeginBlock): ResponseBeginBlockProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseBeginBlock", + value: ResponseBeginBlock.encode(message).finish() + }; } }; function createBaseResponseCheckTx(): ResponseCheckTx { @@ -3063,6 +3847,7 @@ function createBaseResponseCheckTx(): ResponseCheckTx { }; } export const ResponseCheckTx = { + typeUrl: "/tendermint.abci.ResponseCheckTx", encode(message: ResponseCheckTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).uint32(message.code); @@ -3207,6 +3992,49 @@ export const ResponseCheckTx = { } obj.codespace = message.codespace; return obj; + }, + fromAmino(object: ResponseCheckTxAmino): ResponseCheckTx { + return { + code: object.code, + data: object.data, + log: object.log, + info: object.info, + gasWanted: BigInt(object.gas_wanted), + gasUsed: BigInt(object.gas_used), + events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [], + codespace: object.codespace + }; + }, + toAmino(message: ResponseCheckTx): ResponseCheckTxAmino { + const obj: any = {}; + obj.code = message.code; + obj.data = message.data; + obj.log = message.log; + obj.info = message.info; + obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + if (message.events) { + obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); + } else { + obj.events = []; + } + obj.codespace = message.codespace; + return obj; + }, + fromAminoMsg(object: ResponseCheckTxAminoMsg): ResponseCheckTx { + return ResponseCheckTx.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseCheckTxProtoMsg): ResponseCheckTx { + return ResponseCheckTx.decode(message.value); + }, + toProto(message: ResponseCheckTx): Uint8Array { + return ResponseCheckTx.encode(message).finish(); + }, + toProtoMsg(message: ResponseCheckTx): ResponseCheckTxProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseCheckTx", + value: ResponseCheckTx.encode(message).finish() + }; } }; function createBaseResponseDeliverTx(): ResponseDeliverTx { @@ -3222,6 +4050,7 @@ function createBaseResponseDeliverTx(): ResponseDeliverTx { }; } export const ResponseDeliverTx = { + typeUrl: "/tendermint.abci.ResponseDeliverTx", encode(message: ResponseDeliverTx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).uint32(message.code); @@ -3366,6 +4195,49 @@ export const ResponseDeliverTx = { } obj.codespace = message.codespace; return obj; + }, + fromAmino(object: ResponseDeliverTxAmino): ResponseDeliverTx { + return { + code: object.code, + data: object.data, + log: object.log, + info: object.info, + gasWanted: BigInt(object.gas_wanted), + gasUsed: BigInt(object.gas_used), + events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [], + codespace: object.codespace + }; + }, + toAmino(message: ResponseDeliverTx): ResponseDeliverTxAmino { + const obj: any = {}; + obj.code = message.code; + obj.data = message.data; + obj.log = message.log; + obj.info = message.info; + obj.gas_wanted = message.gasWanted ? message.gasWanted.toString() : undefined; + obj.gas_used = message.gasUsed ? message.gasUsed.toString() : undefined; + if (message.events) { + obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); + } else { + obj.events = []; + } + obj.codespace = message.codespace; + return obj; + }, + fromAminoMsg(object: ResponseDeliverTxAminoMsg): ResponseDeliverTx { + return ResponseDeliverTx.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseDeliverTxProtoMsg): ResponseDeliverTx { + return ResponseDeliverTx.decode(message.value); + }, + toProto(message: ResponseDeliverTx): Uint8Array { + return ResponseDeliverTx.encode(message).finish(); + }, + toProtoMsg(message: ResponseDeliverTx): ResponseDeliverTxProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseDeliverTx", + value: ResponseDeliverTx.encode(message).finish() + }; } }; function createBaseResponseEndBlock(): ResponseEndBlock { @@ -3376,6 +4248,7 @@ function createBaseResponseEndBlock(): ResponseEndBlock { }; } export const ResponseEndBlock = { + typeUrl: "/tendermint.abci.ResponseEndBlock", encode(message: ResponseEndBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validatorUpdates) { ValidatorUpdate.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3468,6 +4341,43 @@ export const ResponseEndBlock = { obj.events = []; } return obj; + }, + fromAmino(object: ResponseEndBlockAmino): ResponseEndBlock { + return { + validatorUpdates: Array.isArray(object?.validator_updates) ? object.validator_updates.map((e: any) => ValidatorUpdate.fromAmino(e)) : [], + consensusParamUpdates: object?.consensus_param_updates ? ConsensusParams.fromAmino(object.consensus_param_updates) : undefined, + events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [] + }; + }, + toAmino(message: ResponseEndBlock): ResponseEndBlockAmino { + const obj: any = {}; + if (message.validatorUpdates) { + obj.validator_updates = message.validatorUpdates.map(e => e ? ValidatorUpdate.toAmino(e) : undefined); + } else { + obj.validator_updates = []; + } + obj.consensus_param_updates = message.consensusParamUpdates ? ConsensusParams.toAmino(message.consensusParamUpdates) : undefined; + if (message.events) { + obj.events = message.events.map(e => e ? Event.toAmino(e) : undefined); + } else { + obj.events = []; + } + return obj; + }, + fromAminoMsg(object: ResponseEndBlockAminoMsg): ResponseEndBlock { + return ResponseEndBlock.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseEndBlockProtoMsg): ResponseEndBlock { + return ResponseEndBlock.decode(message.value); + }, + toProto(message: ResponseEndBlock): Uint8Array { + return ResponseEndBlock.encode(message).finish(); + }, + toProtoMsg(message: ResponseEndBlock): ResponseEndBlockProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseEndBlock", + value: ResponseEndBlock.encode(message).finish() + }; } }; function createBaseResponseCommit(): ResponseCommit { @@ -3477,6 +4387,7 @@ function createBaseResponseCommit(): ResponseCommit { }; } export const ResponseCommit = { + typeUrl: "/tendermint.abci.ResponseCommit", encode(message: ResponseCommit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(18).bytes(message.data); @@ -3541,6 +4452,33 @@ export const ResponseCommit = { obj.data = message.data; obj.retain_height = message.retainHeight; return obj; + }, + fromAmino(object: ResponseCommitAmino): ResponseCommit { + return { + data: object.data, + retainHeight: BigInt(object.retain_height) + }; + }, + toAmino(message: ResponseCommit): ResponseCommitAmino { + const obj: any = {}; + obj.data = message.data; + obj.retain_height = message.retainHeight ? message.retainHeight.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ResponseCommitAminoMsg): ResponseCommit { + return ResponseCommit.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseCommitProtoMsg): ResponseCommit { + return ResponseCommit.decode(message.value); + }, + toProto(message: ResponseCommit): Uint8Array { + return ResponseCommit.encode(message).finish(); + }, + toProtoMsg(message: ResponseCommit): ResponseCommitProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseCommit", + value: ResponseCommit.encode(message).finish() + }; } }; function createBaseResponseListSnapshots(): ResponseListSnapshots { @@ -3549,6 +4487,7 @@ function createBaseResponseListSnapshots(): ResponseListSnapshots { }; } export const ResponseListSnapshots = { + typeUrl: "/tendermint.abci.ResponseListSnapshots", encode(message: ResponseListSnapshots, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.snapshots) { Snapshot.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -3609,6 +4548,35 @@ export const ResponseListSnapshots = { obj.snapshots = []; } return obj; + }, + fromAmino(object: ResponseListSnapshotsAmino): ResponseListSnapshots { + return { + snapshots: Array.isArray(object?.snapshots) ? object.snapshots.map((e: any) => Snapshot.fromAmino(e)) : [] + }; + }, + toAmino(message: ResponseListSnapshots): ResponseListSnapshotsAmino { + const obj: any = {}; + if (message.snapshots) { + obj.snapshots = message.snapshots.map(e => e ? Snapshot.toAmino(e) : undefined); + } else { + obj.snapshots = []; + } + return obj; + }, + fromAminoMsg(object: ResponseListSnapshotsAminoMsg): ResponseListSnapshots { + return ResponseListSnapshots.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseListSnapshotsProtoMsg): ResponseListSnapshots { + return ResponseListSnapshots.decode(message.value); + }, + toProto(message: ResponseListSnapshots): Uint8Array { + return ResponseListSnapshots.encode(message).finish(); + }, + toProtoMsg(message: ResponseListSnapshots): ResponseListSnapshotsProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseListSnapshots", + value: ResponseListSnapshots.encode(message).finish() + }; } }; function createBaseResponseOfferSnapshot(): ResponseOfferSnapshot { @@ -3617,6 +4585,7 @@ function createBaseResponseOfferSnapshot(): ResponseOfferSnapshot { }; } export const ResponseOfferSnapshot = { + typeUrl: "/tendermint.abci.ResponseOfferSnapshot", encode(message: ResponseOfferSnapshot, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.result !== 0) { writer.uint32(8).int32(message.result); @@ -3669,6 +4638,31 @@ export const ResponseOfferSnapshot = { const obj: any = {}; message.result !== undefined && (obj.result = responseOfferSnapshot_ResultToJSON(message.result)); return obj; + }, + fromAmino(object: ResponseOfferSnapshotAmino): ResponseOfferSnapshot { + return { + result: isSet(object.result) ? responseOfferSnapshot_ResultFromJSON(object.result) : -1 + }; + }, + toAmino(message: ResponseOfferSnapshot): ResponseOfferSnapshotAmino { + const obj: any = {}; + obj.result = message.result; + return obj; + }, + fromAminoMsg(object: ResponseOfferSnapshotAminoMsg): ResponseOfferSnapshot { + return ResponseOfferSnapshot.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseOfferSnapshotProtoMsg): ResponseOfferSnapshot { + return ResponseOfferSnapshot.decode(message.value); + }, + toProto(message: ResponseOfferSnapshot): Uint8Array { + return ResponseOfferSnapshot.encode(message).finish(); + }, + toProtoMsg(message: ResponseOfferSnapshot): ResponseOfferSnapshotProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseOfferSnapshot", + value: ResponseOfferSnapshot.encode(message).finish() + }; } }; function createBaseResponseLoadSnapshotChunk(): ResponseLoadSnapshotChunk { @@ -3677,6 +4671,7 @@ function createBaseResponseLoadSnapshotChunk(): ResponseLoadSnapshotChunk { }; } export const ResponseLoadSnapshotChunk = { + typeUrl: "/tendermint.abci.ResponseLoadSnapshotChunk", encode(message: ResponseLoadSnapshotChunk, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.chunk.length !== 0) { writer.uint32(10).bytes(message.chunk); @@ -3729,6 +4724,31 @@ export const ResponseLoadSnapshotChunk = { const obj: any = {}; obj.chunk = message.chunk; return obj; + }, + fromAmino(object: ResponseLoadSnapshotChunkAmino): ResponseLoadSnapshotChunk { + return { + chunk: object.chunk + }; + }, + toAmino(message: ResponseLoadSnapshotChunk): ResponseLoadSnapshotChunkAmino { + const obj: any = {}; + obj.chunk = message.chunk; + return obj; + }, + fromAminoMsg(object: ResponseLoadSnapshotChunkAminoMsg): ResponseLoadSnapshotChunk { + return ResponseLoadSnapshotChunk.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseLoadSnapshotChunkProtoMsg): ResponseLoadSnapshotChunk { + return ResponseLoadSnapshotChunk.decode(message.value); + }, + toProto(message: ResponseLoadSnapshotChunk): Uint8Array { + return ResponseLoadSnapshotChunk.encode(message).finish(); + }, + toProtoMsg(message: ResponseLoadSnapshotChunk): ResponseLoadSnapshotChunkProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseLoadSnapshotChunk", + value: ResponseLoadSnapshotChunk.encode(message).finish() + }; } }; function createBaseResponseApplySnapshotChunk(): ResponseApplySnapshotChunk { @@ -3739,6 +4759,7 @@ function createBaseResponseApplySnapshotChunk(): ResponseApplySnapshotChunk { }; } export const ResponseApplySnapshotChunk = { + typeUrl: "/tendermint.abci.ResponseApplySnapshotChunk", encode(message: ResponseApplySnapshotChunk, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.result !== 0) { writer.uint32(8).int32(message.result); @@ -3840,6 +4861,43 @@ export const ResponseApplySnapshotChunk = { obj.reject_senders = []; } return obj; + }, + fromAmino(object: ResponseApplySnapshotChunkAmino): ResponseApplySnapshotChunk { + return { + result: isSet(object.result) ? responseApplySnapshotChunk_ResultFromJSON(object.result) : -1, + refetchChunks: Array.isArray(object?.refetch_chunks) ? object.refetch_chunks.map((e: any) => e) : [], + rejectSenders: Array.isArray(object?.reject_senders) ? object.reject_senders.map((e: any) => e) : [] + }; + }, + toAmino(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkAmino { + const obj: any = {}; + obj.result = message.result; + if (message.refetchChunks) { + obj.refetch_chunks = message.refetchChunks.map(e => e); + } else { + obj.refetch_chunks = []; + } + if (message.rejectSenders) { + obj.reject_senders = message.rejectSenders.map(e => e); + } else { + obj.reject_senders = []; + } + return obj; + }, + fromAminoMsg(object: ResponseApplySnapshotChunkAminoMsg): ResponseApplySnapshotChunk { + return ResponseApplySnapshotChunk.fromAmino(object.value); + }, + fromProtoMsg(message: ResponseApplySnapshotChunkProtoMsg): ResponseApplySnapshotChunk { + return ResponseApplySnapshotChunk.decode(message.value); + }, + toProto(message: ResponseApplySnapshotChunk): Uint8Array { + return ResponseApplySnapshotChunk.encode(message).finish(); + }, + toProtoMsg(message: ResponseApplySnapshotChunk): ResponseApplySnapshotChunkProtoMsg { + return { + typeUrl: "/tendermint.abci.ResponseApplySnapshotChunk", + value: ResponseApplySnapshotChunk.encode(message).finish() + }; } }; function createBaseConsensusParams(): ConsensusParams { @@ -3851,6 +4909,7 @@ function createBaseConsensusParams(): ConsensusParams { }; } export const ConsensusParams = { + typeUrl: "/tendermint.abci.ConsensusParams", encode(message: ConsensusParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.block !== undefined) { BlockParams.encode(message.block, writer.uint32(10).fork()).ldelim(); @@ -3939,6 +4998,37 @@ export const ConsensusParams = { message.validator !== undefined && (obj.validator = message.validator ? ValidatorParams.toSDK(message.validator) : undefined); message.version !== undefined && (obj.version = message.version ? VersionParams.toSDK(message.version) : undefined); return obj; + }, + fromAmino(object: ConsensusParamsAmino): ConsensusParams { + return { + block: object?.block ? BlockParams.fromAmino(object.block) : undefined, + evidence: object?.evidence ? EvidenceParams.fromAmino(object.evidence) : undefined, + validator: object?.validator ? ValidatorParams.fromAmino(object.validator) : undefined, + version: object?.version ? VersionParams.fromAmino(object.version) : undefined + }; + }, + toAmino(message: ConsensusParams): ConsensusParamsAmino { + const obj: any = {}; + obj.block = message.block ? BlockParams.toAmino(message.block) : undefined; + obj.evidence = message.evidence ? EvidenceParams.toAmino(message.evidence) : undefined; + obj.validator = message.validator ? ValidatorParams.toAmino(message.validator) : undefined; + obj.version = message.version ? VersionParams.toAmino(message.version) : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusParamsAminoMsg): ConsensusParams { + return ConsensusParams.fromAmino(object.value); + }, + fromProtoMsg(message: ConsensusParamsProtoMsg): ConsensusParams { + return ConsensusParams.decode(message.value); + }, + toProto(message: ConsensusParams): Uint8Array { + return ConsensusParams.encode(message).finish(); + }, + toProtoMsg(message: ConsensusParams): ConsensusParamsProtoMsg { + return { + typeUrl: "/tendermint.abci.ConsensusParams", + value: ConsensusParams.encode(message).finish() + }; } }; function createBaseBlockParams(): BlockParams { @@ -3948,6 +5038,7 @@ function createBaseBlockParams(): BlockParams { }; } export const BlockParams = { + typeUrl: "/tendermint.abci.BlockParams", encode(message: BlockParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxBytes !== BigInt(0)) { writer.uint32(8).int64(message.maxBytes); @@ -4012,6 +5103,33 @@ export const BlockParams = { obj.max_bytes = message.maxBytes; obj.max_gas = message.maxGas; return obj; + }, + fromAmino(object: BlockParamsAmino): BlockParams { + return { + maxBytes: BigInt(object.max_bytes), + maxGas: BigInt(object.max_gas) + }; + }, + toAmino(message: BlockParams): BlockParamsAmino { + const obj: any = {}; + obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas ? message.maxGas.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { + return BlockParams.fromAmino(object.value); + }, + fromProtoMsg(message: BlockParamsProtoMsg): BlockParams { + return BlockParams.decode(message.value); + }, + toProto(message: BlockParams): Uint8Array { + return BlockParams.encode(message).finish(); + }, + toProtoMsg(message: BlockParams): BlockParamsProtoMsg { + return { + typeUrl: "/tendermint.abci.BlockParams", + value: BlockParams.encode(message).finish() + }; } }; function createBaseLastCommitInfo(): LastCommitInfo { @@ -4021,6 +5139,7 @@ function createBaseLastCommitInfo(): LastCommitInfo { }; } export const LastCommitInfo = { + typeUrl: "/tendermint.abci.LastCommitInfo", encode(message: LastCommitInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.round !== 0) { writer.uint32(8).int32(message.round); @@ -4093,6 +5212,37 @@ export const LastCommitInfo = { obj.votes = []; } return obj; + }, + fromAmino(object: LastCommitInfoAmino): LastCommitInfo { + return { + round: object.round, + votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => VoteInfo.fromAmino(e)) : [] + }; + }, + toAmino(message: LastCommitInfo): LastCommitInfoAmino { + const obj: any = {}; + obj.round = message.round; + if (message.votes) { + obj.votes = message.votes.map(e => e ? VoteInfo.toAmino(e) : undefined); + } else { + obj.votes = []; + } + return obj; + }, + fromAminoMsg(object: LastCommitInfoAminoMsg): LastCommitInfo { + return LastCommitInfo.fromAmino(object.value); + }, + fromProtoMsg(message: LastCommitInfoProtoMsg): LastCommitInfo { + return LastCommitInfo.decode(message.value); + }, + toProto(message: LastCommitInfo): Uint8Array { + return LastCommitInfo.encode(message).finish(); + }, + toProtoMsg(message: LastCommitInfo): LastCommitInfoProtoMsg { + return { + typeUrl: "/tendermint.abci.LastCommitInfo", + value: LastCommitInfo.encode(message).finish() + }; } }; function createBaseEvent(): Event { @@ -4102,6 +5252,7 @@ function createBaseEvent(): Event { }; } export const Event = { + typeUrl: "/tendermint.abci.Event", encode(message: Event, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -4174,6 +5325,37 @@ export const Event = { obj.attributes = []; } return obj; + }, + fromAmino(object: EventAmino): Event { + return { + type: object.type, + attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => EventAttribute.fromAmino(e)) : [] + }; + }, + toAmino(message: Event): EventAmino { + const obj: any = {}; + obj.type = message.type; + if (message.attributes) { + obj.attributes = message.attributes.map(e => e ? EventAttribute.toAmino(e) : undefined); + } else { + obj.attributes = []; + } + return obj; + }, + fromAminoMsg(object: EventAminoMsg): Event { + return Event.fromAmino(object.value); + }, + fromProtoMsg(message: EventProtoMsg): Event { + return Event.decode(message.value); + }, + toProto(message: Event): Uint8Array { + return Event.encode(message).finish(); + }, + toProtoMsg(message: Event): EventProtoMsg { + return { + typeUrl: "/tendermint.abci.Event", + value: Event.encode(message).finish() + }; } }; function createBaseEventAttribute(): EventAttribute { @@ -4184,6 +5366,7 @@ function createBaseEventAttribute(): EventAttribute { }; } export const EventAttribute = { + typeUrl: "/tendermint.abci.EventAttribute", encode(message: EventAttribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -4260,6 +5443,35 @@ export const EventAttribute = { obj.value = message.value; obj.index = message.index; return obj; + }, + fromAmino(object: EventAttributeAmino): EventAttribute { + return { + key: object.key, + value: object.value, + index: object.index + }; + }, + toAmino(message: EventAttribute): EventAttributeAmino { + const obj: any = {}; + obj.key = message.key; + obj.value = message.value; + obj.index = message.index; + return obj; + }, + fromAminoMsg(object: EventAttributeAminoMsg): EventAttribute { + return EventAttribute.fromAmino(object.value); + }, + fromProtoMsg(message: EventAttributeProtoMsg): EventAttribute { + return EventAttribute.decode(message.value); + }, + toProto(message: EventAttribute): Uint8Array { + return EventAttribute.encode(message).finish(); + }, + toProtoMsg(message: EventAttribute): EventAttributeProtoMsg { + return { + typeUrl: "/tendermint.abci.EventAttribute", + value: EventAttribute.encode(message).finish() + }; } }; function createBaseTxResult(): TxResult { @@ -4271,6 +5483,7 @@ function createBaseTxResult(): TxResult { }; } export const TxResult = { + typeUrl: "/tendermint.abci.TxResult", encode(message: TxResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -4359,6 +5572,37 @@ export const TxResult = { obj.tx = message.tx; message.result !== undefined && (obj.result = message.result ? ResponseDeliverTx.toSDK(message.result) : undefined); return obj; + }, + fromAmino(object: TxResultAmino): TxResult { + return { + height: BigInt(object.height), + index: object.index, + tx: object.tx, + result: object?.result ? ResponseDeliverTx.fromAmino(object.result) : undefined + }; + }, + toAmino(message: TxResult): TxResultAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.index = message.index; + obj.tx = message.tx; + obj.result = message.result ? ResponseDeliverTx.toAmino(message.result) : undefined; + return obj; + }, + fromAminoMsg(object: TxResultAminoMsg): TxResult { + return TxResult.fromAmino(object.value); + }, + fromProtoMsg(message: TxResultProtoMsg): TxResult { + return TxResult.decode(message.value); + }, + toProto(message: TxResult): Uint8Array { + return TxResult.encode(message).finish(); + }, + toProtoMsg(message: TxResult): TxResultProtoMsg { + return { + typeUrl: "/tendermint.abci.TxResult", + value: TxResult.encode(message).finish() + }; } }; function createBaseValidator(): Validator { @@ -4368,6 +5612,7 @@ function createBaseValidator(): Validator { }; } export const Validator = { + typeUrl: "/tendermint.abci.Validator", encode(message: Validator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address.length !== 0) { writer.uint32(10).bytes(message.address); @@ -4432,6 +5677,33 @@ export const Validator = { obj.address = message.address; obj.power = message.power; return obj; + }, + fromAmino(object: ValidatorAmino): Validator { + return { + address: object.address, + power: BigInt(object.power) + }; + }, + toAmino(message: Validator): ValidatorAmino { + const obj: any = {}; + obj.address = message.address; + obj.power = message.power ? message.power.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorAminoMsg): Validator { + return Validator.fromAmino(object.value); + }, + fromProtoMsg(message: ValidatorProtoMsg): Validator { + return Validator.decode(message.value); + }, + toProto(message: Validator): Uint8Array { + return Validator.encode(message).finish(); + }, + toProtoMsg(message: Validator): ValidatorProtoMsg { + return { + typeUrl: "/tendermint.abci.Validator", + value: Validator.encode(message).finish() + }; } }; function createBaseValidatorUpdate(): ValidatorUpdate { @@ -4441,6 +5713,7 @@ function createBaseValidatorUpdate(): ValidatorUpdate { }; } export const ValidatorUpdate = { + typeUrl: "/tendermint.abci.ValidatorUpdate", encode(message: ValidatorUpdate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pubKey !== undefined) { PublicKey.encode(message.pubKey, writer.uint32(10).fork()).ldelim(); @@ -4505,6 +5778,33 @@ export const ValidatorUpdate = { message.pubKey !== undefined && (obj.pub_key = message.pubKey ? PublicKey.toSDK(message.pubKey) : undefined); obj.power = message.power; return obj; + }, + fromAmino(object: ValidatorUpdateAmino): ValidatorUpdate { + return { + pubKey: object?.pub_key ? PublicKey.fromAmino(object.pub_key) : undefined, + power: BigInt(object.power) + }; + }, + toAmino(message: ValidatorUpdate): ValidatorUpdateAmino { + const obj: any = {}; + obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey) : undefined; + obj.power = message.power ? message.power.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorUpdateAminoMsg): ValidatorUpdate { + return ValidatorUpdate.fromAmino(object.value); + }, + fromProtoMsg(message: ValidatorUpdateProtoMsg): ValidatorUpdate { + return ValidatorUpdate.decode(message.value); + }, + toProto(message: ValidatorUpdate): Uint8Array { + return ValidatorUpdate.encode(message).finish(); + }, + toProtoMsg(message: ValidatorUpdate): ValidatorUpdateProtoMsg { + return { + typeUrl: "/tendermint.abci.ValidatorUpdate", + value: ValidatorUpdate.encode(message).finish() + }; } }; function createBaseVoteInfo(): VoteInfo { @@ -4514,6 +5814,7 @@ function createBaseVoteInfo(): VoteInfo { }; } export const VoteInfo = { + typeUrl: "/tendermint.abci.VoteInfo", encode(message: VoteInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validator !== undefined) { Validator.encode(message.validator, writer.uint32(10).fork()).ldelim(); @@ -4578,6 +5879,33 @@ export const VoteInfo = { message.validator !== undefined && (obj.validator = message.validator ? Validator.toSDK(message.validator) : undefined); obj.signed_last_block = message.signedLastBlock; return obj; + }, + fromAmino(object: VoteInfoAmino): VoteInfo { + return { + validator: object?.validator ? Validator.fromAmino(object.validator) : undefined, + signedLastBlock: object.signed_last_block + }; + }, + toAmino(message: VoteInfo): VoteInfoAmino { + const obj: any = {}; + obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; + obj.signed_last_block = message.signedLastBlock; + return obj; + }, + fromAminoMsg(object: VoteInfoAminoMsg): VoteInfo { + return VoteInfo.fromAmino(object.value); + }, + fromProtoMsg(message: VoteInfoProtoMsg): VoteInfo { + return VoteInfo.decode(message.value); + }, + toProto(message: VoteInfo): Uint8Array { + return VoteInfo.encode(message).finish(); + }, + toProtoMsg(message: VoteInfo): VoteInfoProtoMsg { + return { + typeUrl: "/tendermint.abci.VoteInfo", + value: VoteInfo.encode(message).finish() + }; } }; function createBaseEvidence(): Evidence { @@ -4590,6 +5918,7 @@ function createBaseEvidence(): Evidence { }; } export const Evidence = { + typeUrl: "/tendermint.abci.Evidence", encode(message: Evidence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== 0) { writer.uint32(8).int32(message.type); @@ -4690,6 +6019,39 @@ export const Evidence = { message.time !== undefined && (obj.time = message.time ?? undefined); obj.total_voting_power = message.totalVotingPower; return obj; + }, + fromAmino(object: EvidenceAmino): Evidence { + return { + type: isSet(object.type) ? evidenceTypeFromJSON(object.type) : -1, + validator: object?.validator ? Validator.fromAmino(object.validator) : undefined, + height: BigInt(object.height), + time: object.time, + totalVotingPower: BigInt(object.total_voting_power) + }; + }, + toAmino(message: Evidence): EvidenceAmino { + const obj: any = {}; + obj.type = message.type; + obj.validator = message.validator ? Validator.toAmino(message.validator) : undefined; + obj.height = message.height ? message.height.toString() : undefined; + obj.time = message.time; + obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EvidenceAminoMsg): Evidence { + return Evidence.fromAmino(object.value); + }, + fromProtoMsg(message: EvidenceProtoMsg): Evidence { + return Evidence.decode(message.value); + }, + toProto(message: Evidence): Uint8Array { + return Evidence.encode(message).finish(); + }, + toProtoMsg(message: Evidence): EvidenceProtoMsg { + return { + typeUrl: "/tendermint.abci.Evidence", + value: Evidence.encode(message).finish() + }; } }; function createBaseSnapshot(): Snapshot { @@ -4702,6 +6064,7 @@ function createBaseSnapshot(): Snapshot { }; } export const Snapshot = { + typeUrl: "/tendermint.abci.Snapshot", encode(message: Snapshot, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).uint64(message.height); @@ -4802,5 +6165,38 @@ export const Snapshot = { obj.hash = message.hash; obj.metadata = message.metadata; return obj; + }, + fromAmino(object: SnapshotAmino): Snapshot { + return { + height: BigInt(object.height), + format: object.format, + chunks: object.chunks, + hash: object.hash, + metadata: object.metadata + }; + }, + toAmino(message: Snapshot): SnapshotAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.format = message.format; + obj.chunks = message.chunks; + obj.hash = message.hash; + obj.metadata = message.metadata; + return obj; + }, + fromAminoMsg(object: SnapshotAminoMsg): Snapshot { + return Snapshot.fromAmino(object.value); + }, + fromProtoMsg(message: SnapshotProtoMsg): Snapshot { + return Snapshot.decode(message.value); + }, + toProto(message: Snapshot): Uint8Array { + return Snapshot.encode(message).finish(); + }, + toProtoMsg(message: Snapshot): SnapshotProtoMsg { + return { + typeUrl: "/tendermint.abci.Snapshot", + value: Snapshot.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/crypto/keys.ts b/__fixtures__/v-next/outputosmojs/tendermint/crypto/keys.ts index fa7d164542..49f1a2bd8a 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/crypto/keys.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/crypto/keys.ts @@ -18,6 +18,7 @@ function createBasePublicKey(): PublicKey { }; } export const PublicKey = { + typeUrl: "/tendermint.crypto.PublicKey", encode(message: PublicKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.ed25519 !== undefined) { writer.uint32(10).bytes(message.ed25519); @@ -82,5 +83,32 @@ export const PublicKey = { obj.ed25519 = message.ed25519; obj.secp256k1 = message.secp256k1; return obj; + }, + fromAmino(object: PublicKeyAmino): PublicKey { + return { + ed25519: object?.ed25519, + secp256k1: object?.secp256k1 + }; + }, + toAmino(message: PublicKey): PublicKeyAmino { + const obj: any = {}; + obj.ed25519 = message.ed25519; + obj.secp256k1 = message.secp256k1; + return obj; + }, + fromAminoMsg(object: PublicKeyAminoMsg): PublicKey { + return PublicKey.fromAmino(object.value); + }, + fromProtoMsg(message: PublicKeyProtoMsg): PublicKey { + return PublicKey.decode(message.value); + }, + toProto(message: PublicKey): Uint8Array { + return PublicKey.encode(message).finish(); + }, + toProtoMsg(message: PublicKey): PublicKeyProtoMsg { + return { + typeUrl: "/tendermint.crypto.PublicKey", + value: PublicKey.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts b/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts index 79d25abff1..b3983460da 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/crypto/proof.ts @@ -70,6 +70,7 @@ function createBaseProof(): Proof { }; } export const Proof = { + typeUrl: "/tendermint.crypto.Proof", encode(message: Proof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.total !== BigInt(0)) { writer.uint32(8).int64(message.total); @@ -166,6 +167,41 @@ export const Proof = { obj.aunts = []; } return obj; + }, + fromAmino(object: ProofAmino): Proof { + return { + total: BigInt(object.total), + index: BigInt(object.index), + leafHash: object.leaf_hash, + aunts: Array.isArray(object?.aunts) ? object.aunts.map((e: any) => e) : [] + }; + }, + toAmino(message: Proof): ProofAmino { + const obj: any = {}; + obj.total = message.total ? message.total.toString() : undefined; + obj.index = message.index ? message.index.toString() : undefined; + obj.leaf_hash = message.leafHash; + if (message.aunts) { + obj.aunts = message.aunts.map(e => e); + } else { + obj.aunts = []; + } + return obj; + }, + fromAminoMsg(object: ProofAminoMsg): Proof { + return Proof.fromAmino(object.value); + }, + fromProtoMsg(message: ProofProtoMsg): Proof { + return Proof.decode(message.value); + }, + toProto(message: Proof): Uint8Array { + return Proof.encode(message).finish(); + }, + toProtoMsg(message: Proof): ProofProtoMsg { + return { + typeUrl: "/tendermint.crypto.Proof", + value: Proof.encode(message).finish() + }; } }; function createBaseValueOp(): ValueOp { @@ -175,6 +211,7 @@ function createBaseValueOp(): ValueOp { }; } export const ValueOp = { + typeUrl: "/tendermint.crypto.ValueOp", encode(message: ValueOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); @@ -239,6 +276,33 @@ export const ValueOp = { obj.key = message.key; message.proof !== undefined && (obj.proof = message.proof ? Proof.toSDK(message.proof) : undefined); return obj; + }, + fromAmino(object: ValueOpAmino): ValueOp { + return { + key: object.key, + proof: object?.proof ? Proof.fromAmino(object.proof) : undefined + }; + }, + toAmino(message: ValueOp): ValueOpAmino { + const obj: any = {}; + obj.key = message.key; + obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; + return obj; + }, + fromAminoMsg(object: ValueOpAminoMsg): ValueOp { + return ValueOp.fromAmino(object.value); + }, + fromProtoMsg(message: ValueOpProtoMsg): ValueOp { + return ValueOp.decode(message.value); + }, + toProto(message: ValueOp): Uint8Array { + return ValueOp.encode(message).finish(); + }, + toProtoMsg(message: ValueOp): ValueOpProtoMsg { + return { + typeUrl: "/tendermint.crypto.ValueOp", + value: ValueOp.encode(message).finish() + }; } }; function createBaseDominoOp(): DominoOp { @@ -249,6 +313,7 @@ function createBaseDominoOp(): DominoOp { }; } export const DominoOp = { + typeUrl: "/tendermint.crypto.DominoOp", encode(message: DominoOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); @@ -325,6 +390,35 @@ export const DominoOp = { obj.input = message.input; obj.output = message.output; return obj; + }, + fromAmino(object: DominoOpAmino): DominoOp { + return { + key: object.key, + input: object.input, + output: object.output + }; + }, + toAmino(message: DominoOp): DominoOpAmino { + const obj: any = {}; + obj.key = message.key; + obj.input = message.input; + obj.output = message.output; + return obj; + }, + fromAminoMsg(object: DominoOpAminoMsg): DominoOp { + return DominoOp.fromAmino(object.value); + }, + fromProtoMsg(message: DominoOpProtoMsg): DominoOp { + return DominoOp.decode(message.value); + }, + toProto(message: DominoOp): Uint8Array { + return DominoOp.encode(message).finish(); + }, + toProtoMsg(message: DominoOp): DominoOpProtoMsg { + return { + typeUrl: "/tendermint.crypto.DominoOp", + value: DominoOp.encode(message).finish() + }; } }; function createBaseProofOp(): ProofOp { @@ -335,6 +429,7 @@ function createBaseProofOp(): ProofOp { }; } export const ProofOp = { + typeUrl: "/tendermint.crypto.ProofOp", encode(message: ProofOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); @@ -411,6 +506,35 @@ export const ProofOp = { obj.key = message.key; obj.data = message.data; return obj; + }, + fromAmino(object: ProofOpAmino): ProofOp { + return { + type: object.type, + key: object.key, + data: object.data + }; + }, + toAmino(message: ProofOp): ProofOpAmino { + const obj: any = {}; + obj.type = message.type; + obj.key = message.key; + obj.data = message.data; + return obj; + }, + fromAminoMsg(object: ProofOpAminoMsg): ProofOp { + return ProofOp.fromAmino(object.value); + }, + fromProtoMsg(message: ProofOpProtoMsg): ProofOp { + return ProofOp.decode(message.value); + }, + toProto(message: ProofOp): Uint8Array { + return ProofOp.encode(message).finish(); + }, + toProtoMsg(message: ProofOp): ProofOpProtoMsg { + return { + typeUrl: "/tendermint.crypto.ProofOp", + value: ProofOp.encode(message).finish() + }; } }; function createBaseProofOps(): ProofOps { @@ -419,6 +543,7 @@ function createBaseProofOps(): ProofOps { }; } export const ProofOps = { + typeUrl: "/tendermint.crypto.ProofOps", encode(message: ProofOps, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.ops) { ProofOp.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -479,5 +604,34 @@ export const ProofOps = { obj.ops = []; } return obj; + }, + fromAmino(object: ProofOpsAmino): ProofOps { + return { + ops: Array.isArray(object?.ops) ? object.ops.map((e: any) => ProofOp.fromAmino(e)) : [] + }; + }, + toAmino(message: ProofOps): ProofOpsAmino { + const obj: any = {}; + if (message.ops) { + obj.ops = message.ops.map(e => e ? ProofOp.toAmino(e) : undefined); + } else { + obj.ops = []; + } + return obj; + }, + fromAminoMsg(object: ProofOpsAminoMsg): ProofOps { + return ProofOps.fromAmino(object.value); + }, + fromProtoMsg(message: ProofOpsProtoMsg): ProofOps { + return ProofOps.decode(message.value); + }, + toProto(message: ProofOps): Uint8Array { + return ProofOps.encode(message).finish(); + }, + toProtoMsg(message: ProofOps): ProofOpsProtoMsg { + return { + typeUrl: "/tendermint.crypto.ProofOps", + value: ProofOps.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts index 8c59c6a090..93831d7fef 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/libs/bits/types.ts @@ -16,6 +16,7 @@ function createBaseBitArray(): BitArray { }; } export const BitArray = { + typeUrl: "/tendermint.libs.bits.BitArray", encode(message: BitArray, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bits !== BigInt(0)) { writer.uint32(8).int64(message.bits); @@ -97,5 +98,36 @@ export const BitArray = { obj.elems = []; } return obj; + }, + fromAmino(object: BitArrayAmino): BitArray { + return { + bits: BigInt(object.bits), + elems: Array.isArray(object?.elems) ? object.elems.map((e: any) => BigInt(e)) : [] + }; + }, + toAmino(message: BitArray): BitArrayAmino { + const obj: any = {}; + obj.bits = message.bits ? message.bits.toString() : undefined; + if (message.elems) { + obj.elems = message.elems.map(e => e.toString()); + } else { + obj.elems = []; + } + return obj; + }, + fromAminoMsg(object: BitArrayAminoMsg): BitArray { + return BitArray.fromAmino(object.value); + }, + fromProtoMsg(message: BitArrayProtoMsg): BitArray { + return BitArray.decode(message.value); + }, + toProto(message: BitArray): Uint8Array { + return BitArray.encode(message).finish(); + }, + toProtoMsg(message: BitArray): BitArrayProtoMsg { + return { + typeUrl: "/tendermint.libs.bits.BitArray", + value: BitArray.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts index c5ed9ea27f..61197cc17c 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/p2p/types.ts @@ -70,6 +70,7 @@ function createBaseProtocolVersion(): ProtocolVersion { }; } export const ProtocolVersion = { + typeUrl: "/tendermint.p2p.ProtocolVersion", encode(message: ProtocolVersion, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.p2p !== BigInt(0)) { writer.uint32(8).uint64(message.p2p); @@ -146,6 +147,35 @@ export const ProtocolVersion = { obj.block = message.block; obj.app = message.app; return obj; + }, + fromAmino(object: ProtocolVersionAmino): ProtocolVersion { + return { + p2p: BigInt(object.p2p), + block: BigInt(object.block), + app: BigInt(object.app) + }; + }, + toAmino(message: ProtocolVersion): ProtocolVersionAmino { + const obj: any = {}; + obj.p2p = message.p2p ? message.p2p.toString() : undefined; + obj.block = message.block ? message.block.toString() : undefined; + obj.app = message.app ? message.app.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ProtocolVersionAminoMsg): ProtocolVersion { + return ProtocolVersion.fromAmino(object.value); + }, + fromProtoMsg(message: ProtocolVersionProtoMsg): ProtocolVersion { + return ProtocolVersion.decode(message.value); + }, + toProto(message: ProtocolVersion): Uint8Array { + return ProtocolVersion.encode(message).finish(); + }, + toProtoMsg(message: ProtocolVersion): ProtocolVersionProtoMsg { + return { + typeUrl: "/tendermint.p2p.ProtocolVersion", + value: ProtocolVersion.encode(message).finish() + }; } }; function createBaseNodeInfo(): NodeInfo { @@ -161,6 +191,7 @@ function createBaseNodeInfo(): NodeInfo { }; } export const NodeInfo = { + typeUrl: "/tendermint.p2p.NodeInfo", encode(message: NodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.protocolVersion !== undefined) { ProtocolVersion.encode(message.protocolVersion, writer.uint32(10).fork()).ldelim(); @@ -297,6 +328,45 @@ export const NodeInfo = { obj.moniker = message.moniker; message.other !== undefined && (obj.other = message.other ? NodeInfoOther.toSDK(message.other) : undefined); return obj; + }, + fromAmino(object: NodeInfoAmino): NodeInfo { + return { + protocolVersion: object?.protocol_version ? ProtocolVersion.fromAmino(object.protocol_version) : undefined, + nodeId: object.node_id, + listenAddr: object.listen_addr, + network: object.network, + version: object.version, + channels: object.channels, + moniker: object.moniker, + other: object?.other ? NodeInfoOther.fromAmino(object.other) : undefined + }; + }, + toAmino(message: NodeInfo): NodeInfoAmino { + const obj: any = {}; + obj.protocol_version = message.protocolVersion ? ProtocolVersion.toAmino(message.protocolVersion) : undefined; + obj.node_id = message.nodeId; + obj.listen_addr = message.listenAddr; + obj.network = message.network; + obj.version = message.version; + obj.channels = message.channels; + obj.moniker = message.moniker; + obj.other = message.other ? NodeInfoOther.toAmino(message.other) : undefined; + return obj; + }, + fromAminoMsg(object: NodeInfoAminoMsg): NodeInfo { + return NodeInfo.fromAmino(object.value); + }, + fromProtoMsg(message: NodeInfoProtoMsg): NodeInfo { + return NodeInfo.decode(message.value); + }, + toProto(message: NodeInfo): Uint8Array { + return NodeInfo.encode(message).finish(); + }, + toProtoMsg(message: NodeInfo): NodeInfoProtoMsg { + return { + typeUrl: "/tendermint.p2p.NodeInfo", + value: NodeInfo.encode(message).finish() + }; } }; function createBaseNodeInfoOther(): NodeInfoOther { @@ -306,6 +376,7 @@ function createBaseNodeInfoOther(): NodeInfoOther { }; } export const NodeInfoOther = { + typeUrl: "/tendermint.p2p.NodeInfoOther", encode(message: NodeInfoOther, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.txIndex !== "") { writer.uint32(10).string(message.txIndex); @@ -370,6 +441,33 @@ export const NodeInfoOther = { obj.tx_index = message.txIndex; obj.rpc_address = message.rpcAddress; return obj; + }, + fromAmino(object: NodeInfoOtherAmino): NodeInfoOther { + return { + txIndex: object.tx_index, + rpcAddress: object.rpc_address + }; + }, + toAmino(message: NodeInfoOther): NodeInfoOtherAmino { + const obj: any = {}; + obj.tx_index = message.txIndex; + obj.rpc_address = message.rpcAddress; + return obj; + }, + fromAminoMsg(object: NodeInfoOtherAminoMsg): NodeInfoOther { + return NodeInfoOther.fromAmino(object.value); + }, + fromProtoMsg(message: NodeInfoOtherProtoMsg): NodeInfoOther { + return NodeInfoOther.decode(message.value); + }, + toProto(message: NodeInfoOther): Uint8Array { + return NodeInfoOther.encode(message).finish(); + }, + toProtoMsg(message: NodeInfoOther): NodeInfoOtherProtoMsg { + return { + typeUrl: "/tendermint.p2p.NodeInfoOther", + value: NodeInfoOther.encode(message).finish() + }; } }; function createBasePeerInfo(): PeerInfo { @@ -380,6 +478,7 @@ function createBasePeerInfo(): PeerInfo { }; } export const PeerInfo = { + typeUrl: "/tendermint.p2p.PeerInfo", encode(message: PeerInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); @@ -464,6 +563,39 @@ export const PeerInfo = { } message.lastConnected !== undefined && (obj.last_connected = message.lastConnected ?? undefined); return obj; + }, + fromAmino(object: PeerInfoAmino): PeerInfo { + return { + id: object.id, + addressInfo: Array.isArray(object?.address_info) ? object.address_info.map((e: any) => PeerAddressInfo.fromAmino(e)) : [], + lastConnected: object.last_connected + }; + }, + toAmino(message: PeerInfo): PeerInfoAmino { + const obj: any = {}; + obj.id = message.id; + if (message.addressInfo) { + obj.address_info = message.addressInfo.map(e => e ? PeerAddressInfo.toAmino(e) : undefined); + } else { + obj.address_info = []; + } + obj.last_connected = message.lastConnected; + return obj; + }, + fromAminoMsg(object: PeerInfoAminoMsg): PeerInfo { + return PeerInfo.fromAmino(object.value); + }, + fromProtoMsg(message: PeerInfoProtoMsg): PeerInfo { + return PeerInfo.decode(message.value); + }, + toProto(message: PeerInfo): Uint8Array { + return PeerInfo.encode(message).finish(); + }, + toProtoMsg(message: PeerInfo): PeerInfoProtoMsg { + return { + typeUrl: "/tendermint.p2p.PeerInfo", + value: PeerInfo.encode(message).finish() + }; } }; function createBasePeerAddressInfo(): PeerAddressInfo { @@ -475,6 +607,7 @@ function createBasePeerAddressInfo(): PeerAddressInfo { }; } export const PeerAddressInfo = { + typeUrl: "/tendermint.p2p.PeerAddressInfo", encode(message: PeerAddressInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); @@ -563,5 +696,36 @@ export const PeerAddressInfo = { message.lastDialFailure !== undefined && (obj.last_dial_failure = message.lastDialFailure ?? undefined); obj.dial_failures = message.dialFailures; return obj; + }, + fromAmino(object: PeerAddressInfoAmino): PeerAddressInfo { + return { + address: object.address, + lastDialSuccess: object.last_dial_success, + lastDialFailure: object.last_dial_failure, + dialFailures: object.dial_failures + }; + }, + toAmino(message: PeerAddressInfo): PeerAddressInfoAmino { + const obj: any = {}; + obj.address = message.address; + obj.last_dial_success = message.lastDialSuccess; + obj.last_dial_failure = message.lastDialFailure; + obj.dial_failures = message.dialFailures; + return obj; + }, + fromAminoMsg(object: PeerAddressInfoAminoMsg): PeerAddressInfo { + return PeerAddressInfo.fromAmino(object.value); + }, + fromProtoMsg(message: PeerAddressInfoProtoMsg): PeerAddressInfo { + return PeerAddressInfo.decode(message.value); + }, + toProto(message: PeerAddressInfo): Uint8Array { + return PeerAddressInfo.encode(message).finish(); + }, + toProtoMsg(message: PeerAddressInfo): PeerAddressInfoProtoMsg { + return { + typeUrl: "/tendermint.p2p.PeerAddressInfo", + value: PeerAddressInfo.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/block.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/block.ts index 1dfc032292..e538756127 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/block.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/block.ts @@ -24,6 +24,7 @@ function createBaseBlock(): Block { }; } export const Block = { + typeUrl: "/tendermint.types.Block", encode(message: Block, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.header !== undefined) { Header.encode(message.header, writer.uint32(10).fork()).ldelim(); @@ -112,5 +113,36 @@ export const Block = { message.evidence !== undefined && (obj.evidence = message.evidence ? EvidenceList.toSDK(message.evidence) : undefined); message.lastCommit !== undefined && (obj.last_commit = message.lastCommit ? Commit.toSDK(message.lastCommit) : undefined); return obj; + }, + fromAmino(object: BlockAmino): Block { + return { + header: object?.header ? Header.fromAmino(object.header) : undefined, + data: object?.data ? Data.fromAmino(object.data) : undefined, + evidence: object?.evidence ? EvidenceList.fromAmino(object.evidence) : undefined, + lastCommit: object?.last_commit ? Commit.fromAmino(object.last_commit) : undefined + }; + }, + toAmino(message: Block): BlockAmino { + const obj: any = {}; + obj.header = message.header ? Header.toAmino(message.header) : undefined; + obj.data = message.data ? Data.toAmino(message.data) : undefined; + obj.evidence = message.evidence ? EvidenceList.toAmino(message.evidence) : undefined; + obj.last_commit = message.lastCommit ? Commit.toAmino(message.lastCommit) : undefined; + return obj; + }, + fromAminoMsg(object: BlockAminoMsg): Block { + return Block.fromAmino(object.value); + }, + fromProtoMsg(message: BlockProtoMsg): Block { + return Block.decode(message.value); + }, + toProto(message: Block): Uint8Array { + return Block.encode(message).finish(); + }, + toProtoMsg(message: Block): BlockProtoMsg { + return { + typeUrl: "/tendermint.types.Block", + value: Block.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts index 0eeb7e9918..2d5c8deeda 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/evidence.ts @@ -57,6 +57,7 @@ function createBaseEvidence(): Evidence { }; } export const Evidence = { + typeUrl: "/tendermint.types.Evidence", encode(message: Evidence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.duplicateVoteEvidence !== undefined) { DuplicateVoteEvidence.encode(message.duplicateVoteEvidence, writer.uint32(10).fork()).ldelim(); @@ -121,6 +122,33 @@ export const Evidence = { message.duplicateVoteEvidence !== undefined && (obj.duplicate_vote_evidence = message.duplicateVoteEvidence ? DuplicateVoteEvidence.toSDK(message.duplicateVoteEvidence) : undefined); message.lightClientAttackEvidence !== undefined && (obj.light_client_attack_evidence = message.lightClientAttackEvidence ? LightClientAttackEvidence.toSDK(message.lightClientAttackEvidence) : undefined); return obj; + }, + fromAmino(object: EvidenceAmino): Evidence { + return { + duplicateVoteEvidence: object?.duplicate_vote_evidence ? DuplicateVoteEvidence.fromAmino(object.duplicate_vote_evidence) : undefined, + lightClientAttackEvidence: object?.light_client_attack_evidence ? LightClientAttackEvidence.fromAmino(object.light_client_attack_evidence) : undefined + }; + }, + toAmino(message: Evidence): EvidenceAmino { + const obj: any = {}; + obj.duplicate_vote_evidence = message.duplicateVoteEvidence ? DuplicateVoteEvidence.toAmino(message.duplicateVoteEvidence) : undefined; + obj.light_client_attack_evidence = message.lightClientAttackEvidence ? LightClientAttackEvidence.toAmino(message.lightClientAttackEvidence) : undefined; + return obj; + }, + fromAminoMsg(object: EvidenceAminoMsg): Evidence { + return Evidence.fromAmino(object.value); + }, + fromProtoMsg(message: EvidenceProtoMsg): Evidence { + return Evidence.decode(message.value); + }, + toProto(message: Evidence): Uint8Array { + return Evidence.encode(message).finish(); + }, + toProtoMsg(message: Evidence): EvidenceProtoMsg { + return { + typeUrl: "/tendermint.types.Evidence", + value: Evidence.encode(message).finish() + }; } }; function createBaseDuplicateVoteEvidence(): DuplicateVoteEvidence { @@ -133,6 +161,7 @@ function createBaseDuplicateVoteEvidence(): DuplicateVoteEvidence { }; } export const DuplicateVoteEvidence = { + typeUrl: "/tendermint.types.DuplicateVoteEvidence", encode(message: DuplicateVoteEvidence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.voteA !== undefined) { Vote.encode(message.voteA, writer.uint32(10).fork()).ldelim(); @@ -233,6 +262,39 @@ export const DuplicateVoteEvidence = { obj.validator_power = message.validatorPower; message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); return obj; + }, + fromAmino(object: DuplicateVoteEvidenceAmino): DuplicateVoteEvidence { + return { + voteA: object?.vote_a ? Vote.fromAmino(object.vote_a) : undefined, + voteB: object?.vote_b ? Vote.fromAmino(object.vote_b) : undefined, + totalVotingPower: BigInt(object.total_voting_power), + validatorPower: BigInt(object.validator_power), + timestamp: object.timestamp + }; + }, + toAmino(message: DuplicateVoteEvidence): DuplicateVoteEvidenceAmino { + const obj: any = {}; + obj.vote_a = message.voteA ? Vote.toAmino(message.voteA) : undefined; + obj.vote_b = message.voteB ? Vote.toAmino(message.voteB) : undefined; + obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.validator_power = message.validatorPower ? message.validatorPower.toString() : undefined; + obj.timestamp = message.timestamp; + return obj; + }, + fromAminoMsg(object: DuplicateVoteEvidenceAminoMsg): DuplicateVoteEvidence { + return DuplicateVoteEvidence.fromAmino(object.value); + }, + fromProtoMsg(message: DuplicateVoteEvidenceProtoMsg): DuplicateVoteEvidence { + return DuplicateVoteEvidence.decode(message.value); + }, + toProto(message: DuplicateVoteEvidence): Uint8Array { + return DuplicateVoteEvidence.encode(message).finish(); + }, + toProtoMsg(message: DuplicateVoteEvidence): DuplicateVoteEvidenceProtoMsg { + return { + typeUrl: "/tendermint.types.DuplicateVoteEvidence", + value: DuplicateVoteEvidence.encode(message).finish() + }; } }; function createBaseLightClientAttackEvidence(): LightClientAttackEvidence { @@ -245,6 +307,7 @@ function createBaseLightClientAttackEvidence(): LightClientAttackEvidence { }; } export const LightClientAttackEvidence = { + typeUrl: "/tendermint.types.LightClientAttackEvidence", encode(message: LightClientAttackEvidence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.conflictingBlock !== undefined) { LightBlock.encode(message.conflictingBlock, writer.uint32(10).fork()).ldelim(); @@ -353,6 +416,43 @@ export const LightClientAttackEvidence = { obj.total_voting_power = message.totalVotingPower; message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); return obj; + }, + fromAmino(object: LightClientAttackEvidenceAmino): LightClientAttackEvidence { + return { + conflictingBlock: object?.conflicting_block ? LightBlock.fromAmino(object.conflicting_block) : undefined, + commonHeight: BigInt(object.common_height), + byzantineValidators: Array.isArray(object?.byzantine_validators) ? object.byzantine_validators.map((e: any) => Validator.fromAmino(e)) : [], + totalVotingPower: BigInt(object.total_voting_power), + timestamp: object.timestamp + }; + }, + toAmino(message: LightClientAttackEvidence): LightClientAttackEvidenceAmino { + const obj: any = {}; + obj.conflicting_block = message.conflictingBlock ? LightBlock.toAmino(message.conflictingBlock) : undefined; + obj.common_height = message.commonHeight ? message.commonHeight.toString() : undefined; + if (message.byzantineValidators) { + obj.byzantine_validators = message.byzantineValidators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.byzantine_validators = []; + } + obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + obj.timestamp = message.timestamp; + return obj; + }, + fromAminoMsg(object: LightClientAttackEvidenceAminoMsg): LightClientAttackEvidence { + return LightClientAttackEvidence.fromAmino(object.value); + }, + fromProtoMsg(message: LightClientAttackEvidenceProtoMsg): LightClientAttackEvidence { + return LightClientAttackEvidence.decode(message.value); + }, + toProto(message: LightClientAttackEvidence): Uint8Array { + return LightClientAttackEvidence.encode(message).finish(); + }, + toProtoMsg(message: LightClientAttackEvidence): LightClientAttackEvidenceProtoMsg { + return { + typeUrl: "/tendermint.types.LightClientAttackEvidence", + value: LightClientAttackEvidence.encode(message).finish() + }; } }; function createBaseEvidenceList(): EvidenceList { @@ -361,6 +461,7 @@ function createBaseEvidenceList(): EvidenceList { }; } export const EvidenceList = { + typeUrl: "/tendermint.types.EvidenceList", encode(message: EvidenceList, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.evidence) { Evidence.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -421,5 +522,34 @@ export const EvidenceList = { obj.evidence = []; } return obj; + }, + fromAmino(object: EvidenceListAmino): EvidenceList { + return { + evidence: Array.isArray(object?.evidence) ? object.evidence.map((e: any) => Evidence.fromAmino(e)) : [] + }; + }, + toAmino(message: EvidenceList): EvidenceListAmino { + const obj: any = {}; + if (message.evidence) { + obj.evidence = message.evidence.map(e => e ? Evidence.toAmino(e) : undefined); + } else { + obj.evidence = []; + } + return obj; + }, + fromAminoMsg(object: EvidenceListAminoMsg): EvidenceList { + return EvidenceList.fromAmino(object.value); + }, + fromProtoMsg(message: EvidenceListProtoMsg): EvidenceList { + return EvidenceList.decode(message.value); + }, + toProto(message: EvidenceList): Uint8Array { + return EvidenceList.encode(message).finish(); + }, + toProtoMsg(message: EvidenceList): EvidenceListProtoMsg { + return { + typeUrl: "/tendermint.types.EvidenceList", + value: EvidenceList.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts index 0e566c65a5..6cc570365f 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/params.ts @@ -127,6 +127,7 @@ function createBaseConsensusParams(): ConsensusParams { }; } export const ConsensusParams = { + typeUrl: "/tendermint.types.ConsensusParams", encode(message: ConsensusParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.block !== undefined) { BlockParams.encode(message.block, writer.uint32(10).fork()).ldelim(); @@ -215,6 +216,37 @@ export const ConsensusParams = { message.validator !== undefined && (obj.validator = message.validator ? ValidatorParams.toSDK(message.validator) : undefined); message.version !== undefined && (obj.version = message.version ? VersionParams.toSDK(message.version) : undefined); return obj; + }, + fromAmino(object: ConsensusParamsAmino): ConsensusParams { + return { + block: object?.block ? BlockParams.fromAmino(object.block) : undefined, + evidence: object?.evidence ? EvidenceParams.fromAmino(object.evidence) : undefined, + validator: object?.validator ? ValidatorParams.fromAmino(object.validator) : undefined, + version: object?.version ? VersionParams.fromAmino(object.version) : undefined + }; + }, + toAmino(message: ConsensusParams): ConsensusParamsAmino { + const obj: any = {}; + obj.block = message.block ? BlockParams.toAmino(message.block) : undefined; + obj.evidence = message.evidence ? EvidenceParams.toAmino(message.evidence) : undefined; + obj.validator = message.validator ? ValidatorParams.toAmino(message.validator) : undefined; + obj.version = message.version ? VersionParams.toAmino(message.version) : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusParamsAminoMsg): ConsensusParams { + return ConsensusParams.fromAmino(object.value); + }, + fromProtoMsg(message: ConsensusParamsProtoMsg): ConsensusParams { + return ConsensusParams.decode(message.value); + }, + toProto(message: ConsensusParams): Uint8Array { + return ConsensusParams.encode(message).finish(); + }, + toProtoMsg(message: ConsensusParams): ConsensusParamsProtoMsg { + return { + typeUrl: "/tendermint.types.ConsensusParams", + value: ConsensusParams.encode(message).finish() + }; } }; function createBaseBlockParams(): BlockParams { @@ -225,6 +257,7 @@ function createBaseBlockParams(): BlockParams { }; } export const BlockParams = { + typeUrl: "/tendermint.types.BlockParams", encode(message: BlockParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxBytes !== BigInt(0)) { writer.uint32(8).int64(message.maxBytes); @@ -301,6 +334,35 @@ export const BlockParams = { obj.max_gas = message.maxGas; obj.time_iota_ms = message.timeIotaMs; return obj; + }, + fromAmino(object: BlockParamsAmino): BlockParams { + return { + maxBytes: BigInt(object.max_bytes), + maxGas: BigInt(object.max_gas), + timeIotaMs: BigInt(object.time_iota_ms) + }; + }, + toAmino(message: BlockParams): BlockParamsAmino { + const obj: any = {}; + obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + obj.max_gas = message.maxGas ? message.maxGas.toString() : undefined; + obj.time_iota_ms = message.timeIotaMs ? message.timeIotaMs.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BlockParamsAminoMsg): BlockParams { + return BlockParams.fromAmino(object.value); + }, + fromProtoMsg(message: BlockParamsProtoMsg): BlockParams { + return BlockParams.decode(message.value); + }, + toProto(message: BlockParams): Uint8Array { + return BlockParams.encode(message).finish(); + }, + toProtoMsg(message: BlockParams): BlockParamsProtoMsg { + return { + typeUrl: "/tendermint.types.BlockParams", + value: BlockParams.encode(message).finish() + }; } }; function createBaseEvidenceParams(): EvidenceParams { @@ -311,6 +373,7 @@ function createBaseEvidenceParams(): EvidenceParams { }; } export const EvidenceParams = { + typeUrl: "/tendermint.types.EvidenceParams", encode(message: EvidenceParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxAgeNumBlocks !== BigInt(0)) { writer.uint32(8).int64(message.maxAgeNumBlocks); @@ -387,6 +450,35 @@ export const EvidenceParams = { message.maxAgeDuration !== undefined && (obj.max_age_duration = message.maxAgeDuration ? Duration.toSDK(message.maxAgeDuration) : undefined); obj.max_bytes = message.maxBytes; return obj; + }, + fromAmino(object: EvidenceParamsAmino): EvidenceParams { + return { + maxAgeNumBlocks: BigInt(object.max_age_num_blocks), + maxAgeDuration: object?.max_age_duration ? Duration.fromAmino(object.max_age_duration) : undefined, + maxBytes: BigInt(object.max_bytes) + }; + }, + toAmino(message: EvidenceParams): EvidenceParamsAmino { + const obj: any = {}; + obj.max_age_num_blocks = message.maxAgeNumBlocks ? message.maxAgeNumBlocks.toString() : undefined; + obj.max_age_duration = message.maxAgeDuration ? Duration.toAmino(message.maxAgeDuration) : undefined; + obj.max_bytes = message.maxBytes ? message.maxBytes.toString() : undefined; + return obj; + }, + fromAminoMsg(object: EvidenceParamsAminoMsg): EvidenceParams { + return EvidenceParams.fromAmino(object.value); + }, + fromProtoMsg(message: EvidenceParamsProtoMsg): EvidenceParams { + return EvidenceParams.decode(message.value); + }, + toProto(message: EvidenceParams): Uint8Array { + return EvidenceParams.encode(message).finish(); + }, + toProtoMsg(message: EvidenceParams): EvidenceParamsProtoMsg { + return { + typeUrl: "/tendermint.types.EvidenceParams", + value: EvidenceParams.encode(message).finish() + }; } }; function createBaseValidatorParams(): ValidatorParams { @@ -395,6 +487,7 @@ function createBaseValidatorParams(): ValidatorParams { }; } export const ValidatorParams = { + typeUrl: "/tendermint.types.ValidatorParams", encode(message: ValidatorParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pubKeyTypes) { writer.uint32(10).string(v!); @@ -455,6 +548,35 @@ export const ValidatorParams = { obj.pub_key_types = []; } return obj; + }, + fromAmino(object: ValidatorParamsAmino): ValidatorParams { + return { + pubKeyTypes: Array.isArray(object?.pub_key_types) ? object.pub_key_types.map((e: any) => e) : [] + }; + }, + toAmino(message: ValidatorParams): ValidatorParamsAmino { + const obj: any = {}; + if (message.pubKeyTypes) { + obj.pub_key_types = message.pubKeyTypes.map(e => e); + } else { + obj.pub_key_types = []; + } + return obj; + }, + fromAminoMsg(object: ValidatorParamsAminoMsg): ValidatorParams { + return ValidatorParams.fromAmino(object.value); + }, + fromProtoMsg(message: ValidatorParamsProtoMsg): ValidatorParams { + return ValidatorParams.decode(message.value); + }, + toProto(message: ValidatorParams): Uint8Array { + return ValidatorParams.encode(message).finish(); + }, + toProtoMsg(message: ValidatorParams): ValidatorParamsProtoMsg { + return { + typeUrl: "/tendermint.types.ValidatorParams", + value: ValidatorParams.encode(message).finish() + }; } }; function createBaseVersionParams(): VersionParams { @@ -463,6 +585,7 @@ function createBaseVersionParams(): VersionParams { }; } export const VersionParams = { + typeUrl: "/tendermint.types.VersionParams", encode(message: VersionParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.appVersion !== BigInt(0)) { writer.uint32(8).uint64(message.appVersion); @@ -515,6 +638,31 @@ export const VersionParams = { const obj: any = {}; obj.app_version = message.appVersion; return obj; + }, + fromAmino(object: VersionParamsAmino): VersionParams { + return { + appVersion: BigInt(object.app_version) + }; + }, + toAmino(message: VersionParams): VersionParamsAmino { + const obj: any = {}; + obj.app_version = message.appVersion ? message.appVersion.toString() : undefined; + return obj; + }, + fromAminoMsg(object: VersionParamsAminoMsg): VersionParams { + return VersionParams.fromAmino(object.value); + }, + fromProtoMsg(message: VersionParamsProtoMsg): VersionParams { + return VersionParams.decode(message.value); + }, + toProto(message: VersionParams): Uint8Array { + return VersionParams.encode(message).finish(); + }, + toProtoMsg(message: VersionParams): VersionParamsProtoMsg { + return { + typeUrl: "/tendermint.types.VersionParams", + value: VersionParams.encode(message).finish() + }; } }; function createBaseHashedParams(): HashedParams { @@ -524,6 +672,7 @@ function createBaseHashedParams(): HashedParams { }; } export const HashedParams = { + typeUrl: "/tendermint.types.HashedParams", encode(message: HashedParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockMaxBytes !== BigInt(0)) { writer.uint32(8).int64(message.blockMaxBytes); @@ -588,5 +737,32 @@ export const HashedParams = { obj.block_max_bytes = message.blockMaxBytes; obj.block_max_gas = message.blockMaxGas; return obj; + }, + fromAmino(object: HashedParamsAmino): HashedParams { + return { + blockMaxBytes: BigInt(object.block_max_bytes), + blockMaxGas: BigInt(object.block_max_gas) + }; + }, + toAmino(message: HashedParams): HashedParamsAmino { + const obj: any = {}; + obj.block_max_bytes = message.blockMaxBytes ? message.blockMaxBytes.toString() : undefined; + obj.block_max_gas = message.blockMaxGas ? message.blockMaxGas.toString() : undefined; + return obj; + }, + fromAminoMsg(object: HashedParamsAminoMsg): HashedParams { + return HashedParams.fromAmino(object.value); + }, + fromProtoMsg(message: HashedParamsProtoMsg): HashedParams { + return HashedParams.decode(message.value); + }, + toProto(message: HashedParams): Uint8Array { + return HashedParams.encode(message).finish(); + }, + toProtoMsg(message: HashedParams): HashedParamsProtoMsg { + return { + typeUrl: "/tendermint.types.HashedParams", + value: HashedParams.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts index 146340684c..7ffc9ad27f 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/types.ts @@ -303,6 +303,7 @@ function createBasePartSetHeader(): PartSetHeader { }; } export const PartSetHeader = { + typeUrl: "/tendermint.types.PartSetHeader", encode(message: PartSetHeader, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.total !== 0) { writer.uint32(8).uint32(message.total); @@ -367,6 +368,33 @@ export const PartSetHeader = { obj.total = message.total; obj.hash = message.hash; return obj; + }, + fromAmino(object: PartSetHeaderAmino): PartSetHeader { + return { + total: object.total, + hash: object.hash + }; + }, + toAmino(message: PartSetHeader): PartSetHeaderAmino { + const obj: any = {}; + obj.total = message.total; + obj.hash = message.hash; + return obj; + }, + fromAminoMsg(object: PartSetHeaderAminoMsg): PartSetHeader { + return PartSetHeader.fromAmino(object.value); + }, + fromProtoMsg(message: PartSetHeaderProtoMsg): PartSetHeader { + return PartSetHeader.decode(message.value); + }, + toProto(message: PartSetHeader): Uint8Array { + return PartSetHeader.encode(message).finish(); + }, + toProtoMsg(message: PartSetHeader): PartSetHeaderProtoMsg { + return { + typeUrl: "/tendermint.types.PartSetHeader", + value: PartSetHeader.encode(message).finish() + }; } }; function createBasePart(): Part { @@ -377,6 +405,7 @@ function createBasePart(): Part { }; } export const Part = { + typeUrl: "/tendermint.types.Part", encode(message: Part, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.index !== 0) { writer.uint32(8).uint32(message.index); @@ -453,6 +482,35 @@ export const Part = { obj.bytes = message.bytes; message.proof !== undefined && (obj.proof = message.proof ? Proof.toSDK(message.proof) : undefined); return obj; + }, + fromAmino(object: PartAmino): Part { + return { + index: object.index, + bytes: object.bytes, + proof: object?.proof ? Proof.fromAmino(object.proof) : undefined + }; + }, + toAmino(message: Part): PartAmino { + const obj: any = {}; + obj.index = message.index; + obj.bytes = message.bytes; + obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; + return obj; + }, + fromAminoMsg(object: PartAminoMsg): Part { + return Part.fromAmino(object.value); + }, + fromProtoMsg(message: PartProtoMsg): Part { + return Part.decode(message.value); + }, + toProto(message: Part): Uint8Array { + return Part.encode(message).finish(); + }, + toProtoMsg(message: Part): PartProtoMsg { + return { + typeUrl: "/tendermint.types.Part", + value: Part.encode(message).finish() + }; } }; function createBaseBlockID(): BlockID { @@ -462,6 +520,7 @@ function createBaseBlockID(): BlockID { }; } export const BlockID = { + typeUrl: "/tendermint.types.BlockID", encode(message: BlockID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash.length !== 0) { writer.uint32(10).bytes(message.hash); @@ -526,6 +585,33 @@ export const BlockID = { obj.hash = message.hash; message.partSetHeader !== undefined && (obj.part_set_header = message.partSetHeader ? PartSetHeader.toSDK(message.partSetHeader) : undefined); return obj; + }, + fromAmino(object: BlockIDAmino): BlockID { + return { + hash: object.hash, + partSetHeader: object?.part_set_header ? PartSetHeader.fromAmino(object.part_set_header) : undefined + }; + }, + toAmino(message: BlockID): BlockIDAmino { + const obj: any = {}; + obj.hash = message.hash; + obj.part_set_header = message.partSetHeader ? PartSetHeader.toAmino(message.partSetHeader) : undefined; + return obj; + }, + fromAminoMsg(object: BlockIDAminoMsg): BlockID { + return BlockID.fromAmino(object.value); + }, + fromProtoMsg(message: BlockIDProtoMsg): BlockID { + return BlockID.decode(message.value); + }, + toProto(message: BlockID): Uint8Array { + return BlockID.encode(message).finish(); + }, + toProtoMsg(message: BlockID): BlockIDProtoMsg { + return { + typeUrl: "/tendermint.types.BlockID", + value: BlockID.encode(message).finish() + }; } }; function createBaseHeader(): Header { @@ -547,6 +633,7 @@ function createBaseHeader(): Header { }; } export const Header = { + typeUrl: "/tendermint.types.Header", encode(message: Header, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.version !== undefined) { Consensus.encode(message.version, writer.uint32(10).fork()).ldelim(); @@ -755,6 +842,57 @@ export const Header = { obj.evidence_hash = message.evidenceHash; obj.proposer_address = message.proposerAddress; return obj; + }, + fromAmino(object: HeaderAmino): Header { + return { + version: object?.version ? Consensus.fromAmino(object.version) : undefined, + chainId: object.chain_id, + height: BigInt(object.height), + time: object.time, + lastBlockId: object?.last_block_id ? BlockID.fromAmino(object.last_block_id) : undefined, + lastCommitHash: object.last_commit_hash, + dataHash: object.data_hash, + validatorsHash: object.validators_hash, + nextValidatorsHash: object.next_validators_hash, + consensusHash: object.consensus_hash, + appHash: object.app_hash, + lastResultsHash: object.last_results_hash, + evidenceHash: object.evidence_hash, + proposerAddress: object.proposer_address + }; + }, + toAmino(message: Header): HeaderAmino { + const obj: any = {}; + obj.version = message.version ? Consensus.toAmino(message.version) : undefined; + obj.chain_id = message.chainId; + obj.height = message.height ? message.height.toString() : undefined; + obj.time = message.time; + obj.last_block_id = message.lastBlockId ? BlockID.toAmino(message.lastBlockId) : undefined; + obj.last_commit_hash = message.lastCommitHash; + obj.data_hash = message.dataHash; + obj.validators_hash = message.validatorsHash; + obj.next_validators_hash = message.nextValidatorsHash; + obj.consensus_hash = message.consensusHash; + obj.app_hash = message.appHash; + obj.last_results_hash = message.lastResultsHash; + obj.evidence_hash = message.evidenceHash; + obj.proposer_address = message.proposerAddress; + return obj; + }, + fromAminoMsg(object: HeaderAminoMsg): Header { + return Header.fromAmino(object.value); + }, + fromProtoMsg(message: HeaderProtoMsg): Header { + return Header.decode(message.value); + }, + toProto(message: Header): Uint8Array { + return Header.encode(message).finish(); + }, + toProtoMsg(message: Header): HeaderProtoMsg { + return { + typeUrl: "/tendermint.types.Header", + value: Header.encode(message).finish() + }; } }; function createBaseData(): Data { @@ -763,6 +901,7 @@ function createBaseData(): Data { }; } export const Data = { + typeUrl: "/tendermint.types.Data", encode(message: Data, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.txs) { writer.uint32(10).bytes(v!); @@ -823,6 +962,35 @@ export const Data = { obj.txs = []; } return obj; + }, + fromAmino(object: DataAmino): Data { + return { + txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => e) : [] + }; + }, + toAmino(message: Data): DataAmino { + const obj: any = {}; + if (message.txs) { + obj.txs = message.txs.map(e => e); + } else { + obj.txs = []; + } + return obj; + }, + fromAminoMsg(object: DataAminoMsg): Data { + return Data.fromAmino(object.value); + }, + fromProtoMsg(message: DataProtoMsg): Data { + return Data.decode(message.value); + }, + toProto(message: Data): Uint8Array { + return Data.encode(message).finish(); + }, + toProtoMsg(message: Data): DataProtoMsg { + return { + typeUrl: "/tendermint.types.Data", + value: Data.encode(message).finish() + }; } }; function createBaseVote(): Vote { @@ -838,6 +1006,7 @@ function createBaseVote(): Vote { }; } export const Vote = { + typeUrl: "/tendermint.types.Vote", encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== 0) { writer.uint32(8).int32(message.type); @@ -974,6 +1143,45 @@ export const Vote = { obj.validator_index = message.validatorIndex; obj.signature = message.signature; return obj; + }, + fromAmino(object: VoteAmino): Vote { + return { + type: isSet(object.type) ? signedMsgTypeFromJSON(object.type) : -1, + height: BigInt(object.height), + round: object.round, + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + timestamp: object.timestamp, + validatorAddress: object.validator_address, + validatorIndex: object.validator_index, + signature: object.signature + }; + }, + toAmino(message: Vote): VoteAmino { + const obj: any = {}; + obj.type = message.type; + obj.height = message.height ? message.height.toString() : undefined; + obj.round = message.round; + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + obj.timestamp = message.timestamp; + obj.validator_address = message.validatorAddress; + obj.validator_index = message.validatorIndex; + obj.signature = message.signature; + return obj; + }, + fromAminoMsg(object: VoteAminoMsg): Vote { + return Vote.fromAmino(object.value); + }, + fromProtoMsg(message: VoteProtoMsg): Vote { + return Vote.decode(message.value); + }, + toProto(message: Vote): Uint8Array { + return Vote.encode(message).finish(); + }, + toProtoMsg(message: Vote): VoteProtoMsg { + return { + typeUrl: "/tendermint.types.Vote", + value: Vote.encode(message).finish() + }; } }; function createBaseCommit(): Commit { @@ -985,6 +1193,7 @@ function createBaseCommit(): Commit { }; } export const Commit = { + typeUrl: "/tendermint.types.Commit", encode(message: Commit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); @@ -1081,6 +1290,41 @@ export const Commit = { obj.signatures = []; } return obj; + }, + fromAmino(object: CommitAmino): Commit { + return { + height: BigInt(object.height), + round: object.round, + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => CommitSig.fromAmino(e)) : [] + }; + }, + toAmino(message: Commit): CommitAmino { + const obj: any = {}; + obj.height = message.height ? message.height.toString() : undefined; + obj.round = message.round; + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + if (message.signatures) { + obj.signatures = message.signatures.map(e => e ? CommitSig.toAmino(e) : undefined); + } else { + obj.signatures = []; + } + return obj; + }, + fromAminoMsg(object: CommitAminoMsg): Commit { + return Commit.fromAmino(object.value); + }, + fromProtoMsg(message: CommitProtoMsg): Commit { + return Commit.decode(message.value); + }, + toProto(message: Commit): Uint8Array { + return Commit.encode(message).finish(); + }, + toProtoMsg(message: Commit): CommitProtoMsg { + return { + typeUrl: "/tendermint.types.Commit", + value: Commit.encode(message).finish() + }; } }; function createBaseCommitSig(): CommitSig { @@ -1092,6 +1336,7 @@ function createBaseCommitSig(): CommitSig { }; } export const CommitSig = { + typeUrl: "/tendermint.types.CommitSig", encode(message: CommitSig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockIdFlag !== 0) { writer.uint32(8).int32(message.blockIdFlag); @@ -1180,6 +1425,37 @@ export const CommitSig = { message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); obj.signature = message.signature; return obj; + }, + fromAmino(object: CommitSigAmino): CommitSig { + return { + blockIdFlag: isSet(object.block_id_flag) ? blockIDFlagFromJSON(object.block_id_flag) : -1, + validatorAddress: object.validator_address, + timestamp: object.timestamp, + signature: object.signature + }; + }, + toAmino(message: CommitSig): CommitSigAmino { + const obj: any = {}; + obj.block_id_flag = message.blockIdFlag; + obj.validator_address = message.validatorAddress; + obj.timestamp = message.timestamp; + obj.signature = message.signature; + return obj; + }, + fromAminoMsg(object: CommitSigAminoMsg): CommitSig { + return CommitSig.fromAmino(object.value); + }, + fromProtoMsg(message: CommitSigProtoMsg): CommitSig { + return CommitSig.decode(message.value); + }, + toProto(message: CommitSig): Uint8Array { + return CommitSig.encode(message).finish(); + }, + toProtoMsg(message: CommitSig): CommitSigProtoMsg { + return { + typeUrl: "/tendermint.types.CommitSig", + value: CommitSig.encode(message).finish() + }; } }; function createBaseProposal(): Proposal { @@ -1194,6 +1470,7 @@ function createBaseProposal(): Proposal { }; } export const Proposal = { + typeUrl: "/tendermint.types.Proposal", encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== 0) { writer.uint32(8).int32(message.type); @@ -1318,6 +1595,43 @@ export const Proposal = { message.timestamp !== undefined && (obj.timestamp = message.timestamp ?? undefined); obj.signature = message.signature; return obj; + }, + fromAmino(object: ProposalAmino): Proposal { + return { + type: isSet(object.type) ? signedMsgTypeFromJSON(object.type) : -1, + height: BigInt(object.height), + round: object.round, + polRound: object.pol_round, + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + timestamp: object.timestamp, + signature: object.signature + }; + }, + toAmino(message: Proposal): ProposalAmino { + const obj: any = {}; + obj.type = message.type; + obj.height = message.height ? message.height.toString() : undefined; + obj.round = message.round; + obj.pol_round = message.polRound; + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + obj.timestamp = message.timestamp; + obj.signature = message.signature; + return obj; + }, + fromAminoMsg(object: ProposalAminoMsg): Proposal { + return Proposal.fromAmino(object.value); + }, + fromProtoMsg(message: ProposalProtoMsg): Proposal { + return Proposal.decode(message.value); + }, + toProto(message: Proposal): Uint8Array { + return Proposal.encode(message).finish(); + }, + toProtoMsg(message: Proposal): ProposalProtoMsg { + return { + typeUrl: "/tendermint.types.Proposal", + value: Proposal.encode(message).finish() + }; } }; function createBaseSignedHeader(): SignedHeader { @@ -1327,6 +1641,7 @@ function createBaseSignedHeader(): SignedHeader { }; } export const SignedHeader = { + typeUrl: "/tendermint.types.SignedHeader", encode(message: SignedHeader, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.header !== undefined) { Header.encode(message.header, writer.uint32(10).fork()).ldelim(); @@ -1391,6 +1706,33 @@ export const SignedHeader = { message.header !== undefined && (obj.header = message.header ? Header.toSDK(message.header) : undefined); message.commit !== undefined && (obj.commit = message.commit ? Commit.toSDK(message.commit) : undefined); return obj; + }, + fromAmino(object: SignedHeaderAmino): SignedHeader { + return { + header: object?.header ? Header.fromAmino(object.header) : undefined, + commit: object?.commit ? Commit.fromAmino(object.commit) : undefined + }; + }, + toAmino(message: SignedHeader): SignedHeaderAmino { + const obj: any = {}; + obj.header = message.header ? Header.toAmino(message.header) : undefined; + obj.commit = message.commit ? Commit.toAmino(message.commit) : undefined; + return obj; + }, + fromAminoMsg(object: SignedHeaderAminoMsg): SignedHeader { + return SignedHeader.fromAmino(object.value); + }, + fromProtoMsg(message: SignedHeaderProtoMsg): SignedHeader { + return SignedHeader.decode(message.value); + }, + toProto(message: SignedHeader): Uint8Array { + return SignedHeader.encode(message).finish(); + }, + toProtoMsg(message: SignedHeader): SignedHeaderProtoMsg { + return { + typeUrl: "/tendermint.types.SignedHeader", + value: SignedHeader.encode(message).finish() + }; } }; function createBaseLightBlock(): LightBlock { @@ -1400,6 +1742,7 @@ function createBaseLightBlock(): LightBlock { }; } export const LightBlock = { + typeUrl: "/tendermint.types.LightBlock", encode(message: LightBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedHeader !== undefined) { SignedHeader.encode(message.signedHeader, writer.uint32(10).fork()).ldelim(); @@ -1464,6 +1807,33 @@ export const LightBlock = { message.signedHeader !== undefined && (obj.signed_header = message.signedHeader ? SignedHeader.toSDK(message.signedHeader) : undefined); message.validatorSet !== undefined && (obj.validator_set = message.validatorSet ? ValidatorSet.toSDK(message.validatorSet) : undefined); return obj; + }, + fromAmino(object: LightBlockAmino): LightBlock { + return { + signedHeader: object?.signed_header ? SignedHeader.fromAmino(object.signed_header) : undefined, + validatorSet: object?.validator_set ? ValidatorSet.fromAmino(object.validator_set) : undefined + }; + }, + toAmino(message: LightBlock): LightBlockAmino { + const obj: any = {}; + obj.signed_header = message.signedHeader ? SignedHeader.toAmino(message.signedHeader) : undefined; + obj.validator_set = message.validatorSet ? ValidatorSet.toAmino(message.validatorSet) : undefined; + return obj; + }, + fromAminoMsg(object: LightBlockAminoMsg): LightBlock { + return LightBlock.fromAmino(object.value); + }, + fromProtoMsg(message: LightBlockProtoMsg): LightBlock { + return LightBlock.decode(message.value); + }, + toProto(message: LightBlock): Uint8Array { + return LightBlock.encode(message).finish(); + }, + toProtoMsg(message: LightBlock): LightBlockProtoMsg { + return { + typeUrl: "/tendermint.types.LightBlock", + value: LightBlock.encode(message).finish() + }; } }; function createBaseBlockMeta(): BlockMeta { @@ -1475,6 +1845,7 @@ function createBaseBlockMeta(): BlockMeta { }; } export const BlockMeta = { + typeUrl: "/tendermint.types.BlockMeta", encode(message: BlockMeta, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockId !== undefined) { BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim(); @@ -1563,6 +1934,37 @@ export const BlockMeta = { message.header !== undefined && (obj.header = message.header ? Header.toSDK(message.header) : undefined); obj.num_txs = message.numTxs; return obj; + }, + fromAmino(object: BlockMetaAmino): BlockMeta { + return { + blockId: object?.block_id ? BlockID.fromAmino(object.block_id) : undefined, + blockSize: BigInt(object.block_size), + header: object?.header ? Header.fromAmino(object.header) : undefined, + numTxs: BigInt(object.num_txs) + }; + }, + toAmino(message: BlockMeta): BlockMetaAmino { + const obj: any = {}; + obj.block_id = message.blockId ? BlockID.toAmino(message.blockId) : undefined; + obj.block_size = message.blockSize ? message.blockSize.toString() : undefined; + obj.header = message.header ? Header.toAmino(message.header) : undefined; + obj.num_txs = message.numTxs ? message.numTxs.toString() : undefined; + return obj; + }, + fromAminoMsg(object: BlockMetaAminoMsg): BlockMeta { + return BlockMeta.fromAmino(object.value); + }, + fromProtoMsg(message: BlockMetaProtoMsg): BlockMeta { + return BlockMeta.decode(message.value); + }, + toProto(message: BlockMeta): Uint8Array { + return BlockMeta.encode(message).finish(); + }, + toProtoMsg(message: BlockMeta): BlockMetaProtoMsg { + return { + typeUrl: "/tendermint.types.BlockMeta", + value: BlockMeta.encode(message).finish() + }; } }; function createBaseTxProof(): TxProof { @@ -1573,6 +1975,7 @@ function createBaseTxProof(): TxProof { }; } export const TxProof = { + typeUrl: "/tendermint.types.TxProof", encode(message: TxProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rootHash.length !== 0) { writer.uint32(10).bytes(message.rootHash); @@ -1649,5 +2052,34 @@ export const TxProof = { obj.data = message.data; message.proof !== undefined && (obj.proof = message.proof ? Proof.toSDK(message.proof) : undefined); return obj; + }, + fromAmino(object: TxProofAmino): TxProof { + return { + rootHash: object.root_hash, + data: object.data, + proof: object?.proof ? Proof.fromAmino(object.proof) : undefined + }; + }, + toAmino(message: TxProof): TxProofAmino { + const obj: any = {}; + obj.root_hash = message.rootHash; + obj.data = message.data; + obj.proof = message.proof ? Proof.toAmino(message.proof) : undefined; + return obj; + }, + fromAminoMsg(object: TxProofAminoMsg): TxProof { + return TxProof.fromAmino(object.value); + }, + fromProtoMsg(message: TxProofProtoMsg): TxProof { + return TxProof.decode(message.value); + }, + toProto(message: TxProof): Uint8Array { + return TxProof.encode(message).finish(); + }, + toProtoMsg(message: TxProof): TxProofProtoMsg { + return { + typeUrl: "/tendermint.types.TxProof", + value: TxProof.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts b/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts index 5d8420846b..da06a25a41 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/types/validator.ts @@ -40,6 +40,7 @@ function createBaseValidatorSet(): ValidatorSet { }; } export const ValidatorSet = { + typeUrl: "/tendermint.types.ValidatorSet", encode(message: ValidatorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { Validator.encode(v!, writer.uint32(10).fork()).ldelim(); @@ -124,6 +125,39 @@ export const ValidatorSet = { message.proposer !== undefined && (obj.proposer = message.proposer ? Validator.toSDK(message.proposer) : undefined); obj.total_voting_power = message.totalVotingPower; return obj; + }, + fromAmino(object: ValidatorSetAmino): ValidatorSet { + return { + validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], + proposer: object?.proposer ? Validator.fromAmino(object.proposer) : undefined, + totalVotingPower: BigInt(object.total_voting_power) + }; + }, + toAmino(message: ValidatorSet): ValidatorSetAmino { + const obj: any = {}; + if (message.validators) { + obj.validators = message.validators.map(e => e ? Validator.toAmino(e) : undefined); + } else { + obj.validators = []; + } + obj.proposer = message.proposer ? Validator.toAmino(message.proposer) : undefined; + obj.total_voting_power = message.totalVotingPower ? message.totalVotingPower.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorSetAminoMsg): ValidatorSet { + return ValidatorSet.fromAmino(object.value); + }, + fromProtoMsg(message: ValidatorSetProtoMsg): ValidatorSet { + return ValidatorSet.decode(message.value); + }, + toProto(message: ValidatorSet): Uint8Array { + return ValidatorSet.encode(message).finish(); + }, + toProtoMsg(message: ValidatorSet): ValidatorSetProtoMsg { + return { + typeUrl: "/tendermint.types.ValidatorSet", + value: ValidatorSet.encode(message).finish() + }; } }; function createBaseValidator(): Validator { @@ -135,6 +169,7 @@ function createBaseValidator(): Validator { }; } export const Validator = { + typeUrl: "/tendermint.types.Validator", encode(message: Validator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address.length !== 0) { writer.uint32(10).bytes(message.address); @@ -223,6 +258,37 @@ export const Validator = { obj.voting_power = message.votingPower; obj.proposer_priority = message.proposerPriority; return obj; + }, + fromAmino(object: ValidatorAmino): Validator { + return { + address: object.address, + pubKey: object?.pub_key ? PublicKey.fromAmino(object.pub_key) : undefined, + votingPower: BigInt(object.voting_power), + proposerPriority: BigInt(object.proposer_priority) + }; + }, + toAmino(message: Validator): ValidatorAmino { + const obj: any = {}; + obj.address = message.address; + obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey) : undefined; + obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined; + obj.proposer_priority = message.proposerPriority ? message.proposerPriority.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ValidatorAminoMsg): Validator { + return Validator.fromAmino(object.value); + }, + fromProtoMsg(message: ValidatorProtoMsg): Validator { + return Validator.decode(message.value); + }, + toProto(message: Validator): Uint8Array { + return Validator.encode(message).finish(); + }, + toProtoMsg(message: Validator): ValidatorProtoMsg { + return { + typeUrl: "/tendermint.types.Validator", + value: Validator.encode(message).finish() + }; } }; function createBaseSimpleValidator(): SimpleValidator { @@ -232,6 +298,7 @@ function createBaseSimpleValidator(): SimpleValidator { }; } export const SimpleValidator = { + typeUrl: "/tendermint.types.SimpleValidator", encode(message: SimpleValidator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pubKey !== undefined) { PublicKey.encode(message.pubKey, writer.uint32(10).fork()).ldelim(); @@ -296,5 +363,32 @@ export const SimpleValidator = { message.pubKey !== undefined && (obj.pub_key = message.pubKey ? PublicKey.toSDK(message.pubKey) : undefined); obj.voting_power = message.votingPower; return obj; + }, + fromAmino(object: SimpleValidatorAmino): SimpleValidator { + return { + pubKey: object?.pub_key ? PublicKey.fromAmino(object.pub_key) : undefined, + votingPower: BigInt(object.voting_power) + }; + }, + toAmino(message: SimpleValidator): SimpleValidatorAmino { + const obj: any = {}; + obj.pub_key = message.pubKey ? PublicKey.toAmino(message.pubKey) : undefined; + obj.voting_power = message.votingPower ? message.votingPower.toString() : undefined; + return obj; + }, + fromAminoMsg(object: SimpleValidatorAminoMsg): SimpleValidator { + return SimpleValidator.fromAmino(object.value); + }, + fromProtoMsg(message: SimpleValidatorProtoMsg): SimpleValidator { + return SimpleValidator.decode(message.value); + }, + toProto(message: SimpleValidator): Uint8Array { + return SimpleValidator.encode(message).finish(); + }, + toProtoMsg(message: SimpleValidator): SimpleValidatorProtoMsg { + return { + typeUrl: "/tendermint.types.SimpleValidator", + value: SimpleValidator.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts b/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts index a7d2c2305a..f71ce87cf5 100644 --- a/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts +++ b/__fixtures__/v-next/outputosmojs/tendermint/version/types.ts @@ -44,6 +44,7 @@ function createBaseApp(): App { }; } export const App = { + typeUrl: "/tendermint.version.App", encode(message: App, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.protocol !== BigInt(0)) { writer.uint32(8).uint64(message.protocol); @@ -108,6 +109,33 @@ export const App = { obj.protocol = message.protocol; obj.software = message.software; return obj; + }, + fromAmino(object: AppAmino): App { + return { + protocol: BigInt(object.protocol), + software: object.software + }; + }, + toAmino(message: App): AppAmino { + const obj: any = {}; + obj.protocol = message.protocol ? message.protocol.toString() : undefined; + obj.software = message.software; + return obj; + }, + fromAminoMsg(object: AppAminoMsg): App { + return App.fromAmino(object.value); + }, + fromProtoMsg(message: AppProtoMsg): App { + return App.decode(message.value); + }, + toProto(message: App): Uint8Array { + return App.encode(message).finish(); + }, + toProtoMsg(message: App): AppProtoMsg { + return { + typeUrl: "/tendermint.version.App", + value: App.encode(message).finish() + }; } }; function createBaseConsensus(): Consensus { @@ -117,6 +145,7 @@ function createBaseConsensus(): Consensus { }; } export const Consensus = { + typeUrl: "/tendermint.version.Consensus", encode(message: Consensus, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.block !== BigInt(0)) { writer.uint32(8).uint64(message.block); @@ -181,5 +210,32 @@ export const Consensus = { obj.block = message.block; obj.app = message.app; return obj; + }, + fromAmino(object: ConsensusAmino): Consensus { + return { + block: BigInt(object.block), + app: BigInt(object.app) + }; + }, + toAmino(message: Consensus): ConsensusAmino { + const obj: any = {}; + obj.block = message.block ? message.block.toString() : undefined; + obj.app = message.app ? message.app.toString() : undefined; + return obj; + }, + fromAminoMsg(object: ConsensusAminoMsg): Consensus { + return Consensus.fromAmino(object.value); + }, + fromProtoMsg(message: ConsensusProtoMsg): Consensus { + return Consensus.decode(message.value); + }, + toProto(message: Consensus): Uint8Array { + return Consensus.encode(message).finish(); + }, + toProtoMsg(message: Consensus): ConsensusProtoMsg { + return { + typeUrl: "/tendermint.version.Consensus", + value: Consensus.encode(message).finish() + }; } }; \ No newline at end of file diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts index b72fe914a6..2c4289427d 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta1/audit.ts @@ -1,5 +1,5 @@ import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.audit.v1beta1"; /** Provider stores owner auditor and attributes details */ @@ -186,7 +186,7 @@ function createBaseProvider(): Provider { } export const Provider = { typeUrl: "/akash.audit.v1beta1.Provider", - encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -198,8 +198,8 @@ export const Provider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Provider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Provider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProvider(); while (reader.pos < end) { @@ -222,11 +222,11 @@ export const Provider = { return message; }, fromJSON(object: any): Provider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: Provider): unknown { const obj: any = {}; @@ -307,7 +307,7 @@ function createBaseAuditedAttributes(): AuditedAttributes { } export const AuditedAttributes = { typeUrl: "/akash.audit.v1beta1.AuditedAttributes", - encode(message: AuditedAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuditedAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -319,8 +319,8 @@ export const AuditedAttributes = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuditedAttributes { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuditedAttributes { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuditedAttributes(); while (reader.pos < end) { @@ -343,11 +343,11 @@ export const AuditedAttributes = { return message; }, fromJSON(object: any): AuditedAttributes { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseAuditedAttributes(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: AuditedAttributes): unknown { const obj: any = {}; @@ -426,14 +426,14 @@ function createBaseAttributesResponse(): AttributesResponse { } export const AttributesResponse = { typeUrl: "/akash.audit.v1beta1.AttributesResponse", - encode(message: AttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.attributes) { AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AttributesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AttributesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttributesResponse(); while (reader.pos < end) { @@ -450,9 +450,9 @@ export const AttributesResponse = { return message; }, fromJSON(object: any): AttributesResponse { - return { - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => AuditedAttributes.fromJSON(e)) : [] - }; + const obj = createBaseAttributesResponse(); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => AuditedAttributes.fromJSON(e)); + return obj; }, toJSON(message: AttributesResponse): unknown { const obj: any = {}; @@ -520,7 +520,7 @@ function createBaseAttributesFilters(): AttributesFilters { } export const AttributesFilters = { typeUrl: "/akash.audit.v1beta1.AttributesFilters", - encode(message: AttributesFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AttributesFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.auditors) { writer.uint32(10).string(v!); } @@ -529,8 +529,8 @@ export const AttributesFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AttributesFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AttributesFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttributesFilters(); while (reader.pos < end) { @@ -550,10 +550,10 @@ export const AttributesFilters = { return message; }, fromJSON(object: any): AttributesFilters { - return { - auditors: Array.isArray(object?.auditors) ? object.auditors.map((e: any) => String(e)) : [], - owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => String(e)) : [] - }; + const obj = createBaseAttributesFilters(); + if (Array.isArray(object?.auditors)) object.auditors.map((e: any) => String(e)); + if (Array.isArray(object?.owners)) object.owners.map((e: any) => String(e)); + return obj; }, toJSON(message: AttributesFilters): unknown { const obj: any = {}; @@ -640,7 +640,7 @@ function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes { } export const MsgSignProviderAttributes = { typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributes", - encode(message: MsgSignProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSignProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -652,8 +652,8 @@ export const MsgSignProviderAttributes = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSignProviderAttributes { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSignProviderAttributes { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSignProviderAttributes(); while (reader.pos < end) { @@ -676,11 +676,11 @@ export const MsgSignProviderAttributes = { return message; }, fromJSON(object: any): MsgSignProviderAttributes { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseMsgSignProviderAttributes(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: MsgSignProviderAttributes): unknown { const obj: any = {}; @@ -757,11 +757,11 @@ function createBaseMsgSignProviderAttributesResponse(): MsgSignProviderAttribute } export const MsgSignProviderAttributesResponse = { typeUrl: "/akash.audit.v1beta1.MsgSignProviderAttributesResponse", - encode(_: MsgSignProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgSignProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSignProviderAttributesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSignProviderAttributesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSignProviderAttributesResponse(); while (reader.pos < end) { @@ -775,7 +775,8 @@ export const MsgSignProviderAttributesResponse = { return message; }, fromJSON(_: any): MsgSignProviderAttributesResponse { - return {}; + const obj = createBaseMsgSignProviderAttributesResponse(); + return obj; }, toJSON(_: MsgSignProviderAttributesResponse): unknown { const obj: any = {}; @@ -824,7 +825,7 @@ function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes { } export const MsgDeleteProviderAttributes = { typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributes", - encode(message: MsgDeleteProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDeleteProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -836,8 +837,8 @@ export const MsgDeleteProviderAttributes = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProviderAttributes { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProviderAttributes { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProviderAttributes(); while (reader.pos < end) { @@ -860,11 +861,11 @@ export const MsgDeleteProviderAttributes = { return message; }, fromJSON(object: any): MsgDeleteProviderAttributes { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => String(e)) : [] - }; + const obj = createBaseMsgDeleteProviderAttributes(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.keys)) object.keys.map((e: any) => String(e)); + return obj; }, toJSON(message: MsgDeleteProviderAttributes): unknown { const obj: any = {}; @@ -941,11 +942,11 @@ function createBaseMsgDeleteProviderAttributesResponse(): MsgDeleteProviderAttri } export const MsgDeleteProviderAttributesResponse = { typeUrl: "/akash.audit.v1beta1.MsgDeleteProviderAttributesResponse", - encode(_: MsgDeleteProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDeleteProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProviderAttributesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProviderAttributesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProviderAttributesResponse(); while (reader.pos < end) { @@ -959,7 +960,8 @@ export const MsgDeleteProviderAttributesResponse = { return message; }, fromJSON(_: any): MsgDeleteProviderAttributesResponse { - return {}; + const obj = createBaseMsgDeleteProviderAttributesResponse(); + return obj; }, toJSON(_: MsgDeleteProviderAttributesResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts index 5ee6248dfa..c262352827 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/audit.ts @@ -1,5 +1,5 @@ import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.audit.v1beta2"; /** Provider stores owner auditor and attributes details */ @@ -186,7 +186,7 @@ function createBaseProvider(): Provider { } export const Provider = { typeUrl: "/akash.audit.v1beta2.Provider", - encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -198,8 +198,8 @@ export const Provider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Provider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Provider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProvider(); while (reader.pos < end) { @@ -222,11 +222,11 @@ export const Provider = { return message; }, fromJSON(object: any): Provider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: Provider): unknown { const obj: any = {}; @@ -307,7 +307,7 @@ function createBaseAuditedAttributes(): AuditedAttributes { } export const AuditedAttributes = { typeUrl: "/akash.audit.v1beta2.AuditedAttributes", - encode(message: AuditedAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuditedAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -319,8 +319,8 @@ export const AuditedAttributes = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuditedAttributes { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuditedAttributes { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuditedAttributes(); while (reader.pos < end) { @@ -343,11 +343,11 @@ export const AuditedAttributes = { return message; }, fromJSON(object: any): AuditedAttributes { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseAuditedAttributes(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: AuditedAttributes): unknown { const obj: any = {}; @@ -426,14 +426,14 @@ function createBaseAttributesResponse(): AttributesResponse { } export const AttributesResponse = { typeUrl: "/akash.audit.v1beta2.AttributesResponse", - encode(message: AttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.attributes) { AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AttributesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AttributesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttributesResponse(); while (reader.pos < end) { @@ -450,9 +450,9 @@ export const AttributesResponse = { return message; }, fromJSON(object: any): AttributesResponse { - return { - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => AuditedAttributes.fromJSON(e)) : [] - }; + const obj = createBaseAttributesResponse(); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => AuditedAttributes.fromJSON(e)); + return obj; }, toJSON(message: AttributesResponse): unknown { const obj: any = {}; @@ -520,7 +520,7 @@ function createBaseAttributesFilters(): AttributesFilters { } export const AttributesFilters = { typeUrl: "/akash.audit.v1beta2.AttributesFilters", - encode(message: AttributesFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AttributesFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.auditors) { writer.uint32(10).string(v!); } @@ -529,8 +529,8 @@ export const AttributesFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AttributesFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AttributesFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttributesFilters(); while (reader.pos < end) { @@ -550,10 +550,10 @@ export const AttributesFilters = { return message; }, fromJSON(object: any): AttributesFilters { - return { - auditors: Array.isArray(object?.auditors) ? object.auditors.map((e: any) => String(e)) : [], - owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => String(e)) : [] - }; + const obj = createBaseAttributesFilters(); + if (Array.isArray(object?.auditors)) object.auditors.map((e: any) => String(e)); + if (Array.isArray(object?.owners)) object.owners.map((e: any) => String(e)); + return obj; }, toJSON(message: AttributesFilters): unknown { const obj: any = {}; @@ -640,7 +640,7 @@ function createBaseMsgSignProviderAttributes(): MsgSignProviderAttributes { } export const MsgSignProviderAttributes = { typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributes", - encode(message: MsgSignProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSignProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -652,8 +652,8 @@ export const MsgSignProviderAttributes = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSignProviderAttributes { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSignProviderAttributes { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSignProviderAttributes(); while (reader.pos < end) { @@ -676,11 +676,11 @@ export const MsgSignProviderAttributes = { return message; }, fromJSON(object: any): MsgSignProviderAttributes { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseMsgSignProviderAttributes(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: MsgSignProviderAttributes): unknown { const obj: any = {}; @@ -757,11 +757,11 @@ function createBaseMsgSignProviderAttributesResponse(): MsgSignProviderAttribute } export const MsgSignProviderAttributesResponse = { typeUrl: "/akash.audit.v1beta2.MsgSignProviderAttributesResponse", - encode(_: MsgSignProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgSignProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSignProviderAttributesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSignProviderAttributesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSignProviderAttributesResponse(); while (reader.pos < end) { @@ -775,7 +775,8 @@ export const MsgSignProviderAttributesResponse = { return message; }, fromJSON(_: any): MsgSignProviderAttributesResponse { - return {}; + const obj = createBaseMsgSignProviderAttributesResponse(); + return obj; }, toJSON(_: MsgSignProviderAttributesResponse): unknown { const obj: any = {}; @@ -824,7 +825,7 @@ function createBaseMsgDeleteProviderAttributes(): MsgDeleteProviderAttributes { } export const MsgDeleteProviderAttributes = { typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributes", - encode(message: MsgDeleteProviderAttributes, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDeleteProviderAttributes, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -836,8 +837,8 @@ export const MsgDeleteProviderAttributes = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProviderAttributes { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProviderAttributes { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProviderAttributes(); while (reader.pos < end) { @@ -860,11 +861,11 @@ export const MsgDeleteProviderAttributes = { return message; }, fromJSON(object: any): MsgDeleteProviderAttributes { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - auditor: isSet(object.auditor) ? String(object.auditor) : "", - keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => String(e)) : [] - }; + const obj = createBaseMsgDeleteProviderAttributes(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (Array.isArray(object?.keys)) object.keys.map((e: any) => String(e)); + return obj; }, toJSON(message: MsgDeleteProviderAttributes): unknown { const obj: any = {}; @@ -941,11 +942,11 @@ function createBaseMsgDeleteProviderAttributesResponse(): MsgDeleteProviderAttri } export const MsgDeleteProviderAttributesResponse = { typeUrl: "/akash.audit.v1beta2.MsgDeleteProviderAttributesResponse", - encode(_: MsgDeleteProviderAttributesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDeleteProviderAttributesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProviderAttributesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProviderAttributesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProviderAttributesResponse(); while (reader.pos < end) { @@ -959,7 +960,8 @@ export const MsgDeleteProviderAttributesResponse = { return message; }, fromJSON(_: any): MsgDeleteProviderAttributesResponse { - return {}; + const obj = createBaseMsgDeleteProviderAttributesResponse(); + return obj; }, toJSON(_: MsgDeleteProviderAttributesResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts index 1653b75050..8a4e20ce1a 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/genesis.ts @@ -1,5 +1,5 @@ import { AuditedAttributes, AuditedAttributesAmino, AuditedAttributesSDKType } from "./audit"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.audit.v1beta2"; /** GenesisState defines the basic genesis state used by audit module */ @@ -29,14 +29,14 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.audit.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.attributes) { AuditedAttributes.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -53,9 +53,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => AuditedAttributes.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => AuditedAttributes.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts index 5f82c5de84..e62ae82f24 100644 --- a/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/audit/v1beta2/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { Provider, ProviderAmino, ProviderSDKType } from "./audit"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.audit.v1beta2"; /** QueryProvidersResponse is response type for the Query/Providers RPC method */ @@ -146,7 +146,7 @@ function createBaseQueryProvidersResponse(): QueryProvidersResponse { } export const QueryProvidersResponse = { typeUrl: "/akash.audit.v1beta2.QueryProvidersResponse", - encode(message: QueryProvidersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProvidersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.providers) { Provider.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -155,8 +155,8 @@ export const QueryProvidersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProvidersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProvidersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProvidersResponse(); while (reader.pos < end) { @@ -176,10 +176,10 @@ export const QueryProvidersResponse = { return message; }, fromJSON(object: any): QueryProvidersResponse { - return { - providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => Provider.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProvidersResponse(); + if (Array.isArray(object?.providers)) object.providers.map((e: any) => Provider.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProvidersResponse): unknown { const obj: any = {}; @@ -194,7 +194,9 @@ export const QueryProvidersResponse = { fromPartial(object: DeepPartial): QueryProvidersResponse { const message = createBaseQueryProvidersResponse(); message.providers = object.providers?.map(e => Provider.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProvidersResponseSDKType): QueryProvidersResponse { @@ -253,7 +255,7 @@ function createBaseQueryProviderRequest(): QueryProviderRequest { } export const QueryProviderRequest = { typeUrl: "/akash.audit.v1beta2.QueryProviderRequest", - encode(message: QueryProviderRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProviderRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.auditor !== "") { writer.uint32(10).string(message.auditor); } @@ -262,8 +264,8 @@ export const QueryProviderRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProviderRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProviderRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProviderRequest(); while (reader.pos < end) { @@ -283,10 +285,10 @@ export const QueryProviderRequest = { return message; }, fromJSON(object: any): QueryProviderRequest { - return { - auditor: isSet(object.auditor) ? String(object.auditor) : "", - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseQueryProviderRequest(); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: QueryProviderRequest): unknown { const obj: any = {}; @@ -347,14 +349,14 @@ function createBaseQueryAllProvidersAttributesRequest(): QueryAllProvidersAttrib } export const QueryAllProvidersAttributesRequest = { typeUrl: "/akash.audit.v1beta2.QueryAllProvidersAttributesRequest", - encode(message: QueryAllProvidersAttributesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllProvidersAttributesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllProvidersAttributesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllProvidersAttributesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllProvidersAttributesRequest(); while (reader.pos < end) { @@ -371,9 +373,9 @@ export const QueryAllProvidersAttributesRequest = { return message; }, fromJSON(object: any): QueryAllProvidersAttributesRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllProvidersAttributesRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllProvidersAttributesRequest): unknown { const obj: any = {}; @@ -382,7 +384,9 @@ export const QueryAllProvidersAttributesRequest = { }, fromPartial(object: DeepPartial): QueryAllProvidersAttributesRequest { const message = createBaseQueryAllProvidersAttributesRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllProvidersAttributesRequestSDKType): QueryAllProvidersAttributesRequest { @@ -429,7 +433,7 @@ function createBaseQueryProviderAttributesRequest(): QueryProviderAttributesRequ } export const QueryProviderAttributesRequest = { typeUrl: "/akash.audit.v1beta2.QueryProviderAttributesRequest", - encode(message: QueryProviderAttributesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProviderAttributesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -438,8 +442,8 @@ export const QueryProviderAttributesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProviderAttributesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProviderAttributesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProviderAttributesRequest(); while (reader.pos < end) { @@ -459,10 +463,10 @@ export const QueryProviderAttributesRequest = { return message; }, fromJSON(object: any): QueryProviderAttributesRequest { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProviderAttributesRequest(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProviderAttributesRequest): unknown { const obj: any = {}; @@ -473,7 +477,9 @@ export const QueryProviderAttributesRequest = { fromPartial(object: DeepPartial): QueryProviderAttributesRequest { const message = createBaseQueryProviderAttributesRequest(); message.owner = object.owner ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProviderAttributesRequestSDKType): QueryProviderAttributesRequest { @@ -524,7 +530,7 @@ function createBaseQueryProviderAuditorRequest(): QueryProviderAuditorRequest { } export const QueryProviderAuditorRequest = { typeUrl: "/akash.audit.v1beta2.QueryProviderAuditorRequest", - encode(message: QueryProviderAuditorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProviderAuditorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.auditor !== "") { writer.uint32(10).string(message.auditor); } @@ -533,8 +539,8 @@ export const QueryProviderAuditorRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProviderAuditorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProviderAuditorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProviderAuditorRequest(); while (reader.pos < end) { @@ -554,10 +560,10 @@ export const QueryProviderAuditorRequest = { return message; }, fromJSON(object: any): QueryProviderAuditorRequest { - return { - auditor: isSet(object.auditor) ? String(object.auditor) : "", - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseQueryProviderAuditorRequest(); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: QueryProviderAuditorRequest): unknown { const obj: any = {}; @@ -619,7 +625,7 @@ function createBaseQueryAuditorAttributesRequest(): QueryAuditorAttributesReques } export const QueryAuditorAttributesRequest = { typeUrl: "/akash.audit.v1beta2.QueryAuditorAttributesRequest", - encode(message: QueryAuditorAttributesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAuditorAttributesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.auditor !== "") { writer.uint32(10).string(message.auditor); } @@ -628,8 +634,8 @@ export const QueryAuditorAttributesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAuditorAttributesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAuditorAttributesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAuditorAttributesRequest(); while (reader.pos < end) { @@ -649,10 +655,10 @@ export const QueryAuditorAttributesRequest = { return message; }, fromJSON(object: any): QueryAuditorAttributesRequest { - return { - auditor: isSet(object.auditor) ? String(object.auditor) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAuditorAttributesRequest(); + if (isSet(object.auditor)) obj.auditor = String(object.auditor); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAuditorAttributesRequest): unknown { const obj: any = {}; @@ -663,7 +669,9 @@ export const QueryAuditorAttributesRequest = { fromPartial(object: DeepPartial): QueryAuditorAttributesRequest { const message = createBaseQueryAuditorAttributesRequest(); message.auditor = object.auditor ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAuditorAttributesRequestSDKType): QueryAuditorAttributesRequest { diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts index 2ff3c4ea21..9b506a8a47 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/attribute.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta1"; /** Attribute represents key value pair */ @@ -101,7 +101,7 @@ function createBaseAttribute(): Attribute { } export const Attribute = { typeUrl: "/akash.base.v1beta1.Attribute", - encode(message: Attribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Attribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -110,8 +110,8 @@ export const Attribute = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Attribute { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Attribute { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttribute(); while (reader.pos < end) { @@ -131,10 +131,10 @@ export const Attribute = { return message; }, fromJSON(object: any): Attribute { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseAttribute(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: Attribute): unknown { const obj: any = {}; @@ -196,7 +196,7 @@ function createBaseSignedBy(): SignedBy { } export const SignedBy = { typeUrl: "/akash.base.v1beta1.SignedBy", - encode(message: SignedBy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignedBy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allOf) { writer.uint32(10).string(v!); } @@ -205,8 +205,8 @@ export const SignedBy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignedBy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignedBy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignedBy(); while (reader.pos < end) { @@ -226,10 +226,10 @@ export const SignedBy = { return message; }, fromJSON(object: any): SignedBy { - return { - allOf: Array.isArray(object?.allOf) ? object.allOf.map((e: any) => String(e)) : [], - anyOf: Array.isArray(object?.anyOf) ? object.anyOf.map((e: any) => String(e)) : [] - }; + const obj = createBaseSignedBy(); + if (Array.isArray(object?.allOf)) object.allOf.map((e: any) => String(e)); + if (Array.isArray(object?.anyOf)) object.anyOf.map((e: any) => String(e)); + return obj; }, toJSON(message: SignedBy): unknown { const obj: any = {}; @@ -315,7 +315,7 @@ function createBasePlacementRequirements(): PlacementRequirements { } export const PlacementRequirements = { typeUrl: "/akash.base.v1beta1.PlacementRequirements", - encode(message: PlacementRequirements, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PlacementRequirements, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedBy !== undefined) { SignedBy.encode(message.signedBy, writer.uint32(10).fork()).ldelim(); } @@ -324,8 +324,8 @@ export const PlacementRequirements = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PlacementRequirements { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PlacementRequirements { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePlacementRequirements(); while (reader.pos < end) { @@ -345,10 +345,10 @@ export const PlacementRequirements = { return message; }, fromJSON(object: any): PlacementRequirements { - return { - signedBy: isSet(object.signedBy) ? SignedBy.fromJSON(object.signedBy) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBasePlacementRequirements(); + if (isSet(object.signedBy)) obj.signedBy = SignedBy.fromJSON(object.signedBy); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: PlacementRequirements): unknown { const obj: any = {}; @@ -362,7 +362,9 @@ export const PlacementRequirements = { }, fromPartial(object: DeepPartial): PlacementRequirements { const message = createBasePlacementRequirements(); - message.signedBy = object.signedBy !== undefined && object.signedBy !== null ? SignedBy.fromPartial(object.signedBy) : undefined; + if (object.signedBy !== undefined && object.signedBy !== null) { + message.signedBy = SignedBy.fromPartial(object.signedBy); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts index 92bca98d83..8f01b44978 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/endpoint.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta1"; /** This describes how the endpoint is implemented when the lease is deployed */ @@ -63,14 +63,14 @@ function createBaseEndpoint(): Endpoint { } export const Endpoint = { typeUrl: "/akash.base.v1beta1.Endpoint", - encode(message: Endpoint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Endpoint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== 0) { writer.uint32(8).int32(message.kind); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Endpoint { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Endpoint { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEndpoint(); while (reader.pos < end) { @@ -87,9 +87,9 @@ export const Endpoint = { return message; }, fromJSON(object: any): Endpoint { - return { - kind: isSet(object.kind) ? endpoint_KindFromJSON(object.kind) : -1 - }; + const obj = createBaseEndpoint(); + if (isSet(object.kind)) obj.kind = endpoint_KindFromJSON(object.kind); + return obj; }, toJSON(message: Endpoint): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts index c68fceab7f..60b742ec79 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/resource.ts @@ -1,7 +1,7 @@ import { ResourceValue, ResourceValueAmino, ResourceValueSDKType } from "./resourcevalue"; import { Attribute, AttributeAmino, AttributeSDKType } from "./attribute"; import { Endpoint, EndpointAmino, EndpointSDKType } from "./endpoint"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta1"; /** CPU stores resource units and cpu config attributes */ @@ -119,7 +119,7 @@ function createBaseCPU(): CPU { } export const CPU = { typeUrl: "/akash.base.v1beta1.CPU", - encode(message: CPU, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CPU, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.units !== undefined) { ResourceValue.encode(message.units, writer.uint32(10).fork()).ldelim(); } @@ -128,8 +128,8 @@ export const CPU = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CPU { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CPU { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCPU(); while (reader.pos < end) { @@ -149,10 +149,10 @@ export const CPU = { return message; }, fromJSON(object: any): CPU { - return { - units: isSet(object.units) ? ResourceValue.fromJSON(object.units) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseCPU(); + if (isSet(object.units)) obj.units = ResourceValue.fromJSON(object.units); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: CPU): unknown { const obj: any = {}; @@ -166,7 +166,9 @@ export const CPU = { }, fromPartial(object: DeepPartial): CPU { const message = createBaseCPU(); - message.units = object.units !== undefined && object.units !== null ? ResourceValue.fromPartial(object.units) : undefined; + if (object.units !== undefined && object.units !== null) { + message.units = ResourceValue.fromPartial(object.units); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, @@ -226,7 +228,7 @@ function createBaseMemory(): Memory { } export const Memory = { typeUrl: "/akash.base.v1beta1.Memory", - encode(message: Memory, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Memory, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quantity !== undefined) { ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim(); } @@ -235,8 +237,8 @@ export const Memory = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Memory { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Memory { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMemory(); while (reader.pos < end) { @@ -256,10 +258,10 @@ export const Memory = { return message; }, fromJSON(object: any): Memory { - return { - quantity: isSet(object.quantity) ? ResourceValue.fromJSON(object.quantity) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseMemory(); + if (isSet(object.quantity)) obj.quantity = ResourceValue.fromJSON(object.quantity); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: Memory): unknown { const obj: any = {}; @@ -273,7 +275,9 @@ export const Memory = { }, fromPartial(object: DeepPartial): Memory { const message = createBaseMemory(); - message.quantity = object.quantity !== undefined && object.quantity !== null ? ResourceValue.fromPartial(object.quantity) : undefined; + if (object.quantity !== undefined && object.quantity !== null) { + message.quantity = ResourceValue.fromPartial(object.quantity); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, @@ -333,7 +337,7 @@ function createBaseStorage(): Storage { } export const Storage = { typeUrl: "/akash.base.v1beta1.Storage", - encode(message: Storage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Storage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quantity !== undefined) { ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim(); } @@ -342,8 +346,8 @@ export const Storage = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Storage { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Storage { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStorage(); while (reader.pos < end) { @@ -363,10 +367,10 @@ export const Storage = { return message; }, fromJSON(object: any): Storage { - return { - quantity: isSet(object.quantity) ? ResourceValue.fromJSON(object.quantity) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseStorage(); + if (isSet(object.quantity)) obj.quantity = ResourceValue.fromJSON(object.quantity); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: Storage): unknown { const obj: any = {}; @@ -380,7 +384,9 @@ export const Storage = { }, fromPartial(object: DeepPartial): Storage { const message = createBaseStorage(); - message.quantity = object.quantity !== undefined && object.quantity !== null ? ResourceValue.fromPartial(object.quantity) : undefined; + if (object.quantity !== undefined && object.quantity !== null) { + message.quantity = ResourceValue.fromPartial(object.quantity); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, @@ -442,7 +448,7 @@ function createBaseResourceUnits(): ResourceUnits { } export const ResourceUnits = { typeUrl: "/akash.base.v1beta1.ResourceUnits", - encode(message: ResourceUnits, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceUnits, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.cpu !== undefined) { CPU.encode(message.cpu, writer.uint32(10).fork()).ldelim(); } @@ -457,8 +463,8 @@ export const ResourceUnits = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceUnits { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceUnits { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceUnits(); while (reader.pos < end) { @@ -484,12 +490,12 @@ export const ResourceUnits = { return message; }, fromJSON(object: any): ResourceUnits { - return { - cpu: isSet(object.cpu) ? CPU.fromJSON(object.cpu) : undefined, - memory: isSet(object.memory) ? Memory.fromJSON(object.memory) : undefined, - storage: isSet(object.storage) ? Storage.fromJSON(object.storage) : undefined, - endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromJSON(e)) : [] - }; + const obj = createBaseResourceUnits(); + if (isSet(object.cpu)) obj.cpu = CPU.fromJSON(object.cpu); + if (isSet(object.memory)) obj.memory = Memory.fromJSON(object.memory); + if (isSet(object.storage)) obj.storage = Storage.fromJSON(object.storage); + if (Array.isArray(object?.endpoints)) object.endpoints.map((e: any) => Endpoint.fromJSON(e)); + return obj; }, toJSON(message: ResourceUnits): unknown { const obj: any = {}; @@ -505,9 +511,15 @@ export const ResourceUnits = { }, fromPartial(object: DeepPartial): ResourceUnits { const message = createBaseResourceUnits(); - message.cpu = object.cpu !== undefined && object.cpu !== null ? CPU.fromPartial(object.cpu) : undefined; - message.memory = object.memory !== undefined && object.memory !== null ? Memory.fromPartial(object.memory) : undefined; - message.storage = object.storage !== undefined && object.storage !== null ? Storage.fromPartial(object.storage) : undefined; + if (object.cpu !== undefined && object.cpu !== null) { + message.cpu = CPU.fromPartial(object.cpu); + } + if (object.memory !== undefined && object.memory !== null) { + message.memory = Memory.fromPartial(object.memory); + } + if (object.storage !== undefined && object.storage !== null) { + message.storage = Storage.fromPartial(object.storage); + } message.endpoints = object.endpoints?.map(e => Endpoint.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta1/resourcevalue.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta1/resourcevalue.ts index aa9d11233f..89d66df0f1 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta1/resourcevalue.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta1/resourcevalue.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta1"; /** Unit stores cpu, memory and storage metrics */ @@ -28,14 +28,14 @@ function createBaseResourceValue(): ResourceValue { } export const ResourceValue = { typeUrl: "/akash.base.v1beta1.ResourceValue", - encode(message: ResourceValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.val.length !== 0) { writer.uint32(10).bytes(message.val); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceValue(); while (reader.pos < end) { @@ -52,9 +52,9 @@ export const ResourceValue = { return message; }, fromJSON(object: any): ResourceValue { - return { - val: isSet(object.val) ? bytesFromBase64(object.val) : new Uint8Array() - }; + const obj = createBaseResourceValue(); + if (isSet(object.val)) obj.val = bytesFromBase64(object.val); + return obj; }, toJSON(message: ResourceValue): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts index f5127a9c0d..02c8b69314 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/attribute.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta2"; /** Attribute represents key value pair */ @@ -101,7 +101,7 @@ function createBaseAttribute(): Attribute { } export const Attribute = { typeUrl: "/akash.base.v1beta2.Attribute", - encode(message: Attribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Attribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -110,8 +110,8 @@ export const Attribute = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Attribute { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Attribute { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttribute(); while (reader.pos < end) { @@ -131,10 +131,10 @@ export const Attribute = { return message; }, fromJSON(object: any): Attribute { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseAttribute(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: Attribute): unknown { const obj: any = {}; @@ -196,7 +196,7 @@ function createBaseSignedBy(): SignedBy { } export const SignedBy = { typeUrl: "/akash.base.v1beta2.SignedBy", - encode(message: SignedBy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignedBy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allOf) { writer.uint32(10).string(v!); } @@ -205,8 +205,8 @@ export const SignedBy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignedBy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignedBy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignedBy(); while (reader.pos < end) { @@ -226,10 +226,10 @@ export const SignedBy = { return message; }, fromJSON(object: any): SignedBy { - return { - allOf: Array.isArray(object?.allOf) ? object.allOf.map((e: any) => String(e)) : [], - anyOf: Array.isArray(object?.anyOf) ? object.anyOf.map((e: any) => String(e)) : [] - }; + const obj = createBaseSignedBy(); + if (Array.isArray(object?.allOf)) object.allOf.map((e: any) => String(e)); + if (Array.isArray(object?.anyOf)) object.anyOf.map((e: any) => String(e)); + return obj; }, toJSON(message: SignedBy): unknown { const obj: any = {}; @@ -315,7 +315,7 @@ function createBasePlacementRequirements(): PlacementRequirements { } export const PlacementRequirements = { typeUrl: "/akash.base.v1beta2.PlacementRequirements", - encode(message: PlacementRequirements, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PlacementRequirements, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.signedBy !== undefined) { SignedBy.encode(message.signedBy, writer.uint32(10).fork()).ldelim(); } @@ -324,8 +324,8 @@ export const PlacementRequirements = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PlacementRequirements { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PlacementRequirements { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePlacementRequirements(); while (reader.pos < end) { @@ -345,10 +345,10 @@ export const PlacementRequirements = { return message; }, fromJSON(object: any): PlacementRequirements { - return { - signedBy: isSet(object.signedBy) ? SignedBy.fromJSON(object.signedBy) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBasePlacementRequirements(); + if (isSet(object.signedBy)) obj.signedBy = SignedBy.fromJSON(object.signedBy); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: PlacementRequirements): unknown { const obj: any = {}; @@ -362,7 +362,9 @@ export const PlacementRequirements = { }, fromPartial(object: DeepPartial): PlacementRequirements { const message = createBasePlacementRequirements(); - message.signedBy = object.signedBy !== undefined && object.signedBy !== null ? SignedBy.fromPartial(object.signedBy) : undefined; + if (object.signedBy !== undefined && object.signedBy !== null) { + message.signedBy = SignedBy.fromPartial(object.signedBy); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts index ed9175d47a..84c40f7c7d 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/endpoint.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta2"; /** This describes how the endpoint is implemented when the lease is deployed */ @@ -74,7 +74,7 @@ function createBaseEndpoint(): Endpoint { } export const Endpoint = { typeUrl: "/akash.base.v1beta2.Endpoint", - encode(message: Endpoint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Endpoint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== 0) { writer.uint32(8).int32(message.kind); } @@ -83,8 +83,8 @@ export const Endpoint = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Endpoint { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Endpoint { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEndpoint(); while (reader.pos < end) { @@ -104,10 +104,10 @@ export const Endpoint = { return message; }, fromJSON(object: any): Endpoint { - return { - kind: isSet(object.kind) ? endpoint_KindFromJSON(object.kind) : -1, - sequenceNumber: isSet(object.sequenceNumber) ? Number(object.sequenceNumber) : 0 - }; + const obj = createBaseEndpoint(); + if (isSet(object.kind)) obj.kind = endpoint_KindFromJSON(object.kind); + if (isSet(object.sequenceNumber)) obj.sequenceNumber = Number(object.sequenceNumber); + return obj; }, toJSON(message: Endpoint): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts index e0ac48ffb9..0c5922e0eb 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resource.ts @@ -1,6 +1,6 @@ import { ResourceValue, ResourceValueAmino, ResourceValueSDKType } from "./resourcevalue"; import { Attribute, AttributeAmino, AttributeSDKType } from "./attribute"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta2"; /** CPU stores resource units and cpu config attributes */ @@ -83,7 +83,7 @@ function createBaseCPU(): CPU { } export const CPU = { typeUrl: "/akash.base.v1beta2.CPU", - encode(message: CPU, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CPU, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.units !== undefined) { ResourceValue.encode(message.units, writer.uint32(10).fork()).ldelim(); } @@ -92,8 +92,8 @@ export const CPU = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CPU { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CPU { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCPU(); while (reader.pos < end) { @@ -113,10 +113,10 @@ export const CPU = { return message; }, fromJSON(object: any): CPU { - return { - units: isSet(object.units) ? ResourceValue.fromJSON(object.units) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseCPU(); + if (isSet(object.units)) obj.units = ResourceValue.fromJSON(object.units); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: CPU): unknown { const obj: any = {}; @@ -130,7 +130,9 @@ export const CPU = { }, fromPartial(object: DeepPartial): CPU { const message = createBaseCPU(); - message.units = object.units !== undefined && object.units !== null ? ResourceValue.fromPartial(object.units) : undefined; + if (object.units !== undefined && object.units !== null) { + message.units = ResourceValue.fromPartial(object.units); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, @@ -190,7 +192,7 @@ function createBaseMemory(): Memory { } export const Memory = { typeUrl: "/akash.base.v1beta2.Memory", - encode(message: Memory, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Memory, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quantity !== undefined) { ResourceValue.encode(message.quantity, writer.uint32(10).fork()).ldelim(); } @@ -199,8 +201,8 @@ export const Memory = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Memory { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Memory { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMemory(); while (reader.pos < end) { @@ -220,10 +222,10 @@ export const Memory = { return message; }, fromJSON(object: any): Memory { - return { - quantity: isSet(object.quantity) ? ResourceValue.fromJSON(object.quantity) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseMemory(); + if (isSet(object.quantity)) obj.quantity = ResourceValue.fromJSON(object.quantity); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: Memory): unknown { const obj: any = {}; @@ -237,7 +239,9 @@ export const Memory = { }, fromPartial(object: DeepPartial): Memory { const message = createBaseMemory(); - message.quantity = object.quantity !== undefined && object.quantity !== null ? ResourceValue.fromPartial(object.quantity) : undefined; + if (object.quantity !== undefined && object.quantity !== null) { + message.quantity = ResourceValue.fromPartial(object.quantity); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, @@ -298,7 +302,7 @@ function createBaseStorage(): Storage { } export const Storage = { typeUrl: "/akash.base.v1beta2.Storage", - encode(message: Storage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Storage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -310,8 +314,8 @@ export const Storage = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Storage { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Storage { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStorage(); while (reader.pos < end) { @@ -334,11 +338,11 @@ export const Storage = { return message; }, fromJSON(object: any): Storage { - return { - name: isSet(object.name) ? String(object.name) : "", - quantity: isSet(object.quantity) ? ResourceValue.fromJSON(object.quantity) : undefined, - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseStorage(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.quantity)) obj.quantity = ResourceValue.fromJSON(object.quantity); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: Storage): unknown { const obj: any = {}; @@ -354,7 +358,9 @@ export const Storage = { fromPartial(object: DeepPartial): Storage { const message = createBaseStorage(); message.name = object.name ?? ""; - message.quantity = object.quantity !== undefined && object.quantity !== null ? ResourceValue.fromPartial(object.quantity) : undefined; + if (object.quantity !== undefined && object.quantity !== null) { + message.quantity = ResourceValue.fromPartial(object.quantity); + } message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts index d9566465c0..b542f1c539 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourceunits.ts @@ -1,6 +1,6 @@ import { CPU, CPUAmino, CPUSDKType, Memory, MemoryAmino, MemorySDKType, Storage, StorageAmino, StorageSDKType } from "./resource"; import { Endpoint, EndpointAmino, EndpointSDKType } from "./endpoint"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta2"; /** @@ -51,7 +51,7 @@ function createBaseResourceUnits(): ResourceUnits { } export const ResourceUnits = { typeUrl: "/akash.base.v1beta2.ResourceUnits", - encode(message: ResourceUnits, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceUnits, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.cpu !== undefined) { CPU.encode(message.cpu, writer.uint32(10).fork()).ldelim(); } @@ -66,8 +66,8 @@ export const ResourceUnits = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceUnits { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceUnits { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceUnits(); while (reader.pos < end) { @@ -93,12 +93,12 @@ export const ResourceUnits = { return message; }, fromJSON(object: any): ResourceUnits { - return { - cpu: isSet(object.cpu) ? CPU.fromJSON(object.cpu) : undefined, - memory: isSet(object.memory) ? Memory.fromJSON(object.memory) : undefined, - storage: Array.isArray(object?.storage) ? object.storage.map((e: any) => Storage.fromJSON(e)) : [], - endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromJSON(e)) : [] - }; + const obj = createBaseResourceUnits(); + if (isSet(object.cpu)) obj.cpu = CPU.fromJSON(object.cpu); + if (isSet(object.memory)) obj.memory = Memory.fromJSON(object.memory); + if (Array.isArray(object?.storage)) object.storage.map((e: any) => Storage.fromJSON(e)); + if (Array.isArray(object?.endpoints)) object.endpoints.map((e: any) => Endpoint.fromJSON(e)); + return obj; }, toJSON(message: ResourceUnits): unknown { const obj: any = {}; @@ -118,8 +118,12 @@ export const ResourceUnits = { }, fromPartial(object: DeepPartial): ResourceUnits { const message = createBaseResourceUnits(); - message.cpu = object.cpu !== undefined && object.cpu !== null ? CPU.fromPartial(object.cpu) : undefined; - message.memory = object.memory !== undefined && object.memory !== null ? Memory.fromPartial(object.memory) : undefined; + if (object.cpu !== undefined && object.cpu !== null) { + message.cpu = CPU.fromPartial(object.cpu); + } + if (object.memory !== undefined && object.memory !== null) { + message.memory = Memory.fromPartial(object.memory); + } message.storage = object.storage?.map(e => Storage.fromPartial(e)) || []; message.endpoints = object.endpoints?.map(e => Endpoint.fromPartial(e)) || []; return message; diff --git a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourcevalue.ts b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourcevalue.ts index 04d8661490..3261b1a979 100644 --- a/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourcevalue.ts +++ b/__fixtures__/v-next/outputv2/akash/base/v1beta2/resourcevalue.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.base.v1beta2"; /** Unit stores cpu, memory and storage metrics */ @@ -28,14 +28,14 @@ function createBaseResourceValue(): ResourceValue { } export const ResourceValue = { typeUrl: "/akash.base.v1beta2.ResourceValue", - encode(message: ResourceValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.val.length !== 0) { writer.uint32(10).bytes(message.val); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceValue(); while (reader.pos < end) { @@ -52,9 +52,9 @@ export const ResourceValue = { return message; }, fromJSON(object: any): ResourceValue { - return { - val: isSet(object.val) ? bytesFromBase64(object.val) : new Uint8Array() - }; + const obj = createBaseResourceValue(); + if (isSet(object.val)) obj.val = bytesFromBase64(object.val); + return obj; }, toJSON(message: ResourceValue): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts index 22a5ff94ce..d72f2f3aff 100644 --- a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts +++ b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/cert.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "akash.cert.v1beta2"; /** State is an enum which refers to state of deployment */ @@ -200,7 +200,7 @@ function createBaseCertificateID(): CertificateID { } export const CertificateID = { typeUrl: "/akash.cert.v1beta2.CertificateID", - encode(message: CertificateID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CertificateID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -209,8 +209,8 @@ export const CertificateID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CertificateID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CertificateID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCertificateID(); while (reader.pos < end) { @@ -230,10 +230,10 @@ export const CertificateID = { return message; }, fromJSON(object: any): CertificateID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - serial: isSet(object.serial) ? String(object.serial) : "" - }; + const obj = createBaseCertificateID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.serial)) obj.serial = String(object.serial); + return obj; }, toJSON(message: CertificateID): unknown { const obj: any = {}; @@ -296,7 +296,7 @@ function createBaseCertificate(): Certificate { } export const Certificate = { typeUrl: "/akash.cert.v1beta2.Certificate", - encode(message: Certificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Certificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.state !== 0) { writer.uint32(16).int32(message.state); } @@ -308,8 +308,8 @@ export const Certificate = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Certificate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Certificate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCertificate(); while (reader.pos < end) { @@ -332,11 +332,11 @@ export const Certificate = { return message; }, fromJSON(object: any): Certificate { - return { - state: isSet(object.state) ? certificate_StateFromJSON(object.state) : -1, - cert: isSet(object.cert) ? bytesFromBase64(object.cert) : new Uint8Array(), - pubkey: isSet(object.pubkey) ? bytesFromBase64(object.pubkey) : new Uint8Array() - }; + const obj = createBaseCertificate(); + if (isSet(object.state)) obj.state = certificate_StateFromJSON(object.state); + if (isSet(object.cert)) obj.cert = bytesFromBase64(object.cert); + if (isSet(object.pubkey)) obj.pubkey = bytesFromBase64(object.pubkey); + return obj; }, toJSON(message: Certificate): unknown { const obj: any = {}; @@ -405,7 +405,7 @@ function createBaseCertificateFilter(): CertificateFilter { } export const CertificateFilter = { typeUrl: "/akash.cert.v1beta2.CertificateFilter", - encode(message: CertificateFilter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CertificateFilter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -417,8 +417,8 @@ export const CertificateFilter = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CertificateFilter { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CertificateFilter { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCertificateFilter(); while (reader.pos < end) { @@ -441,11 +441,11 @@ export const CertificateFilter = { return message; }, fromJSON(object: any): CertificateFilter { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - serial: isSet(object.serial) ? String(object.serial) : "", - state: isSet(object.state) ? String(object.state) : "" - }; + const obj = createBaseCertificateFilter(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.serial)) obj.serial = String(object.serial); + if (isSet(object.state)) obj.state = String(object.state); + return obj; }, toJSON(message: CertificateFilter): unknown { const obj: any = {}; @@ -514,7 +514,7 @@ function createBaseMsgCreateCertificate(): MsgCreateCertificate { } export const MsgCreateCertificate = { typeUrl: "/akash.cert.v1beta2.MsgCreateCertificate", - encode(message: MsgCreateCertificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateCertificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -526,8 +526,8 @@ export const MsgCreateCertificate = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateCertificate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateCertificate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateCertificate(); while (reader.pos < end) { @@ -550,11 +550,11 @@ export const MsgCreateCertificate = { return message; }, fromJSON(object: any): MsgCreateCertificate { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - cert: isSet(object.cert) ? bytesFromBase64(object.cert) : new Uint8Array(), - pubkey: isSet(object.pubkey) ? bytesFromBase64(object.pubkey) : new Uint8Array() - }; + const obj = createBaseMsgCreateCertificate(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.cert)) obj.cert = bytesFromBase64(object.cert); + if (isSet(object.pubkey)) obj.pubkey = bytesFromBase64(object.pubkey); + return obj; }, toJSON(message: MsgCreateCertificate): unknown { const obj: any = {}; @@ -619,11 +619,11 @@ function createBaseMsgCreateCertificateResponse(): MsgCreateCertificateResponse } export const MsgCreateCertificateResponse = { typeUrl: "/akash.cert.v1beta2.MsgCreateCertificateResponse", - encode(_: MsgCreateCertificateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateCertificateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateCertificateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateCertificateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateCertificateResponse(); while (reader.pos < end) { @@ -637,7 +637,8 @@ export const MsgCreateCertificateResponse = { return message; }, fromJSON(_: any): MsgCreateCertificateResponse { - return {}; + const obj = createBaseMsgCreateCertificateResponse(); + return obj; }, toJSON(_: MsgCreateCertificateResponse): unknown { const obj: any = {}; @@ -684,14 +685,14 @@ function createBaseMsgRevokeCertificate(): MsgRevokeCertificate { } export const MsgRevokeCertificate = { typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificate", - encode(message: MsgRevokeCertificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgRevokeCertificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { CertificateID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRevokeCertificate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRevokeCertificate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRevokeCertificate(); while (reader.pos < end) { @@ -708,9 +709,9 @@ export const MsgRevokeCertificate = { return message; }, fromJSON(object: any): MsgRevokeCertificate { - return { - id: isSet(object.id) ? CertificateID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgRevokeCertificate(); + if (isSet(object.id)) obj.id = CertificateID.fromJSON(object.id); + return obj; }, toJSON(message: MsgRevokeCertificate): unknown { const obj: any = {}; @@ -719,7 +720,9 @@ export const MsgRevokeCertificate = { }, fromPartial(object: DeepPartial): MsgRevokeCertificate { const message = createBaseMsgRevokeCertificate(); - message.id = object.id !== undefined && object.id !== null ? CertificateID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = CertificateID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgRevokeCertificateSDKType): MsgRevokeCertificate { @@ -763,11 +766,11 @@ function createBaseMsgRevokeCertificateResponse(): MsgRevokeCertificateResponse } export const MsgRevokeCertificateResponse = { typeUrl: "/akash.cert.v1beta2.MsgRevokeCertificateResponse", - encode(_: MsgRevokeCertificateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgRevokeCertificateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRevokeCertificateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRevokeCertificateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRevokeCertificateResponse(); while (reader.pos < end) { @@ -781,7 +784,8 @@ export const MsgRevokeCertificateResponse = { return message; }, fromJSON(_: any): MsgRevokeCertificateResponse { - return {}; + const obj = createBaseMsgRevokeCertificateResponse(); + return obj; }, toJSON(_: MsgRevokeCertificateResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts index 515dbb2602..289d15f57e 100644 --- a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/genesis.ts @@ -1,5 +1,5 @@ import { Certificate, CertificateAmino, CertificateSDKType } from "./cert"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.cert.v1beta2"; /** GenesisCertificate defines certificate entry at genesis */ @@ -53,7 +53,7 @@ function createBaseGenesisCertificate(): GenesisCertificate { } export const GenesisCertificate = { typeUrl: "/akash.cert.v1beta2.GenesisCertificate", - encode(message: GenesisCertificate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisCertificate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -62,8 +62,8 @@ export const GenesisCertificate = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisCertificate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisCertificate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisCertificate(); while (reader.pos < end) { @@ -83,10 +83,10 @@ export const GenesisCertificate = { return message; }, fromJSON(object: any): GenesisCertificate { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - certificate: isSet(object.certificate) ? Certificate.fromJSON(object.certificate) : undefined - }; + const obj = createBaseGenesisCertificate(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.certificate)) obj.certificate = Certificate.fromJSON(object.certificate); + return obj; }, toJSON(message: GenesisCertificate): unknown { const obj: any = {}; @@ -97,7 +97,9 @@ export const GenesisCertificate = { fromPartial(object: DeepPartial): GenesisCertificate { const message = createBaseGenesisCertificate(); message.owner = object.owner ?? ""; - message.certificate = object.certificate !== undefined && object.certificate !== null ? Certificate.fromPartial(object.certificate) : undefined; + if (object.certificate !== undefined && object.certificate !== null) { + message.certificate = Certificate.fromPartial(object.certificate); + } return message; }, fromSDK(object: GenesisCertificateSDKType): GenesisCertificate { @@ -147,14 +149,14 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.cert.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.certificates) { GenesisCertificate.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -171,9 +173,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - certificates: Array.isArray(object?.certificates) ? object.certificates.map((e: any) => GenesisCertificate.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.certificates)) object.certificates.map((e: any) => GenesisCertificate.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts index 6d56c89569..007e35de19 100644 --- a/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/cert/v1beta2/query.ts @@ -1,6 +1,6 @@ import { CertificateFilter, CertificateFilterAmino, CertificateFilterSDKType, Certificate, CertificateAmino, CertificateSDKType } from "./cert"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.cert.v1beta2"; /** CertificateResponse contains a single X509 certificate and its serial number */ @@ -80,7 +80,7 @@ function createBaseCertificateResponse(): CertificateResponse { } export const CertificateResponse = { typeUrl: "/akash.cert.v1beta2.CertificateResponse", - encode(message: CertificateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CertificateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.certificate !== undefined) { Certificate.encode(message.certificate, writer.uint32(10).fork()).ldelim(); } @@ -89,8 +89,8 @@ export const CertificateResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CertificateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CertificateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCertificateResponse(); while (reader.pos < end) { @@ -110,10 +110,10 @@ export const CertificateResponse = { return message; }, fromJSON(object: any): CertificateResponse { - return { - certificate: isSet(object.certificate) ? Certificate.fromJSON(object.certificate) : undefined, - serial: isSet(object.serial) ? String(object.serial) : "" - }; + const obj = createBaseCertificateResponse(); + if (isSet(object.certificate)) obj.certificate = Certificate.fromJSON(object.certificate); + if (isSet(object.serial)) obj.serial = String(object.serial); + return obj; }, toJSON(message: CertificateResponse): unknown { const obj: any = {}; @@ -123,7 +123,9 @@ export const CertificateResponse = { }, fromPartial(object: DeepPartial): CertificateResponse { const message = createBaseCertificateResponse(); - message.certificate = object.certificate !== undefined && object.certificate !== null ? Certificate.fromPartial(object.certificate) : undefined; + if (object.certificate !== undefined && object.certificate !== null) { + message.certificate = Certificate.fromPartial(object.certificate); + } message.serial = object.serial ?? ""; return message; }, @@ -175,7 +177,7 @@ function createBaseQueryCertificatesRequest(): QueryCertificatesRequest { } export const QueryCertificatesRequest = { typeUrl: "/akash.cert.v1beta2.QueryCertificatesRequest", - encode(message: QueryCertificatesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCertificatesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filter !== undefined) { CertificateFilter.encode(message.filter, writer.uint32(10).fork()).ldelim(); } @@ -184,8 +186,8 @@ export const QueryCertificatesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCertificatesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCertificatesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCertificatesRequest(); while (reader.pos < end) { @@ -205,10 +207,10 @@ export const QueryCertificatesRequest = { return message; }, fromJSON(object: any): QueryCertificatesRequest { - return { - filter: isSet(object.filter) ? CertificateFilter.fromJSON(object.filter) : undefined, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryCertificatesRequest(); + if (isSet(object.filter)) obj.filter = CertificateFilter.fromJSON(object.filter); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryCertificatesRequest): unknown { const obj: any = {}; @@ -218,8 +220,12 @@ export const QueryCertificatesRequest = { }, fromPartial(object: DeepPartial): QueryCertificatesRequest { const message = createBaseQueryCertificatesRequest(); - message.filter = object.filter !== undefined && object.filter !== null ? CertificateFilter.fromPartial(object.filter) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.filter !== undefined && object.filter !== null) { + message.filter = CertificateFilter.fromPartial(object.filter); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryCertificatesRequestSDKType): QueryCertificatesRequest { @@ -270,7 +276,7 @@ function createBaseQueryCertificatesResponse(): QueryCertificatesResponse { } export const QueryCertificatesResponse = { typeUrl: "/akash.cert.v1beta2.QueryCertificatesResponse", - encode(message: QueryCertificatesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCertificatesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.certificates) { CertificateResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -279,8 +285,8 @@ export const QueryCertificatesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCertificatesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCertificatesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCertificatesResponse(); while (reader.pos < end) { @@ -300,10 +306,10 @@ export const QueryCertificatesResponse = { return message; }, fromJSON(object: any): QueryCertificatesResponse { - return { - certificates: Array.isArray(object?.certificates) ? object.certificates.map((e: any) => CertificateResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryCertificatesResponse(); + if (Array.isArray(object?.certificates)) object.certificates.map((e: any) => CertificateResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryCertificatesResponse): unknown { const obj: any = {}; @@ -318,7 +324,9 @@ export const QueryCertificatesResponse = { fromPartial(object: DeepPartial): QueryCertificatesResponse { const message = createBaseQueryCertificatesResponse(); message.certificates = object.certificates?.map(e => CertificateResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryCertificatesResponseSDKType): QueryCertificatesResponse { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts index 596ac3a322..0689c5c9a0 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/authz.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta1"; /** @@ -7,6 +7,7 @@ export const protobufPackage = "akash.deployment.v1beta1"; * the granter's account for a deployment. */ export interface DepositDeploymentAuthorization { + $typeUrl?: string; /** * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. @@ -37,23 +38,25 @@ export interface DepositDeploymentAuthorizationAminoMsg { * the granter's account for a deployment. */ export interface DepositDeploymentAuthorizationSDKType { + $typeUrl?: string; spend_limit: CoinSDKType; } function createBaseDepositDeploymentAuthorization(): DepositDeploymentAuthorization { return { + $typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization", spendLimit: Coin.fromPartial({}) }; } export const DepositDeploymentAuthorization = { typeUrl: "/akash.deployment.v1beta1.DepositDeploymentAuthorization", - encode(message: DepositDeploymentAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DepositDeploymentAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spendLimit !== undefined) { Coin.encode(message.spendLimit, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DepositDeploymentAuthorization { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DepositDeploymentAuthorization { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDepositDeploymentAuthorization(); while (reader.pos < end) { @@ -70,9 +73,9 @@ export const DepositDeploymentAuthorization = { return message; }, fromJSON(object: any): DepositDeploymentAuthorization { - return { - spendLimit: isSet(object.spendLimit) ? Coin.fromJSON(object.spendLimit) : undefined - }; + const obj = createBaseDepositDeploymentAuthorization(); + if (isSet(object.spendLimit)) obj.spendLimit = Coin.fromJSON(object.spendLimit); + return obj; }, toJSON(message: DepositDeploymentAuthorization): unknown { const obj: any = {}; @@ -81,7 +84,9 @@ export const DepositDeploymentAuthorization = { }, fromPartial(object: DeepPartial): DepositDeploymentAuthorization { const message = createBaseDepositDeploymentAuthorization(); - message.spendLimit = object.spendLimit !== undefined && object.spendLimit !== null ? Coin.fromPartial(object.spendLimit) : undefined; + if (object.spendLimit !== undefined && object.spendLimit !== null) { + message.spendLimit = Coin.fromPartial(object.spendLimit); + } return message; }, fromSDK(object: DepositDeploymentAuthorizationSDKType): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts index 957829b9dc..97d2fe7f3f 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/deployment.ts @@ -2,8 +2,8 @@ /* eslint-disable */ import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "./group"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta1"; /** State is an enum which refers to state of deployment */ export enum Deployment_State { @@ -204,7 +204,7 @@ export interface MsgCloseDeploymentResponseSDKType {} /** DeploymentID stores owner and sequence number */ export interface DeploymentID { owner: string; - dseq: Long; + dseq: bigint; } export interface DeploymentIDProtoMsg { typeUrl: "/akash.deployment.v1beta1.DeploymentID"; @@ -222,14 +222,14 @@ export interface DeploymentIDAminoMsg { /** DeploymentID stores owner and sequence number */ export interface DeploymentIDSDKType { owner: string; - dseq: Long; + dseq: bigint; } /** Deployment stores deploymentID, state and version details */ export interface Deployment { deploymentId: DeploymentID; state: Deployment_State; version: Uint8Array; - createdAt: Long; + createdAt: bigint; } export interface DeploymentProtoMsg { typeUrl: "/akash.deployment.v1beta1.Deployment"; @@ -251,12 +251,12 @@ export interface DeploymentSDKType { deployment_id: DeploymentIDSDKType; state: Deployment_State; version: Uint8Array; - created_at: Long; + created_at: bigint; } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFilters { owner: string; - dseq: Long; + dseq: bigint; state: string; } export interface DeploymentFiltersProtoMsg { @@ -276,7 +276,7 @@ export interface DeploymentFiltersAminoMsg { /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersSDKType { owner: string; - dseq: Long; + dseq: bigint; state: string; } function createBaseMsgCreateDeployment(): MsgCreateDeployment { @@ -289,7 +289,7 @@ function createBaseMsgCreateDeployment(): MsgCreateDeployment { } export const MsgCreateDeployment = { typeUrl: "/akash.deployment.v1beta1.MsgCreateDeployment", - encode(message: MsgCreateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -304,8 +304,8 @@ export const MsgCreateDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateDeployment(); while (reader.pos < end) { @@ -331,12 +331,12 @@ export const MsgCreateDeployment = { return message; }, fromJSON(object: any): MsgCreateDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupSpec.fromJSON(e)) : [], - version: isSet(object.version) ? bytesFromBase64(object.version) : new Uint8Array(), - deposit: isSet(object.deposit) ? Coin.fromJSON(object.deposit) : undefined - }; + const obj = createBaseMsgCreateDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => GroupSpec.fromJSON(e)); + if (isSet(object.version)) obj.version = bytesFromBase64(object.version); + if (isSet(object.deposit)) obj.deposit = Coin.fromJSON(object.deposit); + return obj; }, toJSON(message: MsgCreateDeployment): unknown { const obj: any = {}; @@ -352,10 +352,14 @@ export const MsgCreateDeployment = { }, fromPartial(object: DeepPartial): MsgCreateDeployment { const message = createBaseMsgCreateDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } message.groups = object.groups?.map(e => GroupSpec.fromPartial(e)) || []; message.version = object.version ?? new Uint8Array(); - message.deposit = object.deposit !== undefined && object.deposit !== null ? Coin.fromPartial(object.deposit) : undefined; + if (object.deposit !== undefined && object.deposit !== null) { + message.deposit = Coin.fromPartial(object.deposit); + } return message; }, fromSDK(object: MsgCreateDeploymentSDKType): MsgCreateDeployment { @@ -419,11 +423,11 @@ function createBaseMsgCreateDeploymentResponse(): MsgCreateDeploymentResponse { } export const MsgCreateDeploymentResponse = { typeUrl: "/akash.deployment.v1beta1.MsgCreateDeploymentResponse", - encode(_: MsgCreateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateDeploymentResponse(); while (reader.pos < end) { @@ -437,7 +441,8 @@ export const MsgCreateDeploymentResponse = { return message; }, fromJSON(_: any): MsgCreateDeploymentResponse { - return {}; + const obj = createBaseMsgCreateDeploymentResponse(); + return obj; }, toJSON(_: MsgCreateDeploymentResponse): unknown { const obj: any = {}; @@ -485,7 +490,7 @@ function createBaseMsgDepositDeployment(): MsgDepositDeployment { } export const MsgDepositDeployment = { typeUrl: "/akash.deployment.v1beta1.MsgDepositDeployment", - encode(message: MsgDepositDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDepositDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -494,8 +499,8 @@ export const MsgDepositDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDepositDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDepositDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDepositDeployment(); while (reader.pos < end) { @@ -515,10 +520,10 @@ export const MsgDepositDeployment = { return message; }, fromJSON(object: any): MsgDepositDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined, - amount: isSet(object.amount) ? Coin.fromJSON(object.amount) : undefined - }; + const obj = createBaseMsgDepositDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + if (isSet(object.amount)) obj.amount = Coin.fromJSON(object.amount); + return obj; }, toJSON(message: MsgDepositDeployment): unknown { const obj: any = {}; @@ -528,8 +533,12 @@ export const MsgDepositDeployment = { }, fromPartial(object: DeepPartial): MsgDepositDeployment { const message = createBaseMsgDepositDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; - message.amount = object.amount !== undefined && object.amount !== null ? Coin.fromPartial(object.amount) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } + if (object.amount !== undefined && object.amount !== null) { + message.amount = Coin.fromPartial(object.amount); + } return message; }, fromSDK(object: MsgDepositDeploymentSDKType): MsgDepositDeployment { @@ -577,11 +586,11 @@ function createBaseMsgDepositDeploymentResponse(): MsgDepositDeploymentResponse } export const MsgDepositDeploymentResponse = { typeUrl: "/akash.deployment.v1beta1.MsgDepositDeploymentResponse", - encode(_: MsgDepositDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDepositDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDepositDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDepositDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDepositDeploymentResponse(); while (reader.pos < end) { @@ -595,7 +604,8 @@ export const MsgDepositDeploymentResponse = { return message; }, fromJSON(_: any): MsgDepositDeploymentResponse { - return {}; + const obj = createBaseMsgDepositDeploymentResponse(); + return obj; }, toJSON(_: MsgDepositDeploymentResponse): unknown { const obj: any = {}; @@ -644,7 +654,7 @@ function createBaseMsgUpdateDeployment(): MsgUpdateDeployment { } export const MsgUpdateDeployment = { typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeployment", - encode(message: MsgUpdateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -656,8 +666,8 @@ export const MsgUpdateDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateDeployment(); while (reader.pos < end) { @@ -680,11 +690,11 @@ export const MsgUpdateDeployment = { return message; }, fromJSON(object: any): MsgUpdateDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupSpec.fromJSON(e)) : [], - version: isSet(object.version) ? bytesFromBase64(object.version) : new Uint8Array() - }; + const obj = createBaseMsgUpdateDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => GroupSpec.fromJSON(e)); + if (isSet(object.version)) obj.version = bytesFromBase64(object.version); + return obj; }, toJSON(message: MsgUpdateDeployment): unknown { const obj: any = {}; @@ -699,7 +709,9 @@ export const MsgUpdateDeployment = { }, fromPartial(object: DeepPartial): MsgUpdateDeployment { const message = createBaseMsgUpdateDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } message.groups = object.groups?.map(e => GroupSpec.fromPartial(e)) || []; message.version = object.version ?? new Uint8Array(); return message; @@ -761,11 +773,11 @@ function createBaseMsgUpdateDeploymentResponse(): MsgUpdateDeploymentResponse { } export const MsgUpdateDeploymentResponse = { typeUrl: "/akash.deployment.v1beta1.MsgUpdateDeploymentResponse", - encode(_: MsgUpdateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateDeploymentResponse(); while (reader.pos < end) { @@ -779,7 +791,8 @@ export const MsgUpdateDeploymentResponse = { return message; }, fromJSON(_: any): MsgUpdateDeploymentResponse { - return {}; + const obj = createBaseMsgUpdateDeploymentResponse(); + return obj; }, toJSON(_: MsgUpdateDeploymentResponse): unknown { const obj: any = {}; @@ -826,14 +839,14 @@ function createBaseMsgCloseDeployment(): MsgCloseDeployment { } export const MsgCloseDeployment = { typeUrl: "/akash.deployment.v1beta1.MsgCloseDeployment", - encode(message: MsgCloseDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCloseDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseDeployment(); while (reader.pos < end) { @@ -850,9 +863,9 @@ export const MsgCloseDeployment = { return message; }, fromJSON(object: any): MsgCloseDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgCloseDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + return obj; }, toJSON(message: MsgCloseDeployment): unknown { const obj: any = {}; @@ -861,7 +874,9 @@ export const MsgCloseDeployment = { }, fromPartial(object: DeepPartial): MsgCloseDeployment { const message = createBaseMsgCloseDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgCloseDeploymentSDKType): MsgCloseDeployment { @@ -905,11 +920,11 @@ function createBaseMsgCloseDeploymentResponse(): MsgCloseDeploymentResponse { } export const MsgCloseDeploymentResponse = { typeUrl: "/akash.deployment.v1beta1.MsgCloseDeploymentResponse", - encode(_: MsgCloseDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCloseDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseDeploymentResponse(); while (reader.pos < end) { @@ -923,7 +938,8 @@ export const MsgCloseDeploymentResponse = { return message; }, fromJSON(_: any): MsgCloseDeploymentResponse { - return {}; + const obj = createBaseMsgCloseDeploymentResponse(); + return obj; }, toJSON(_: MsgCloseDeploymentResponse): unknown { const obj: any = {}; @@ -966,22 +982,22 @@ export const MsgCloseDeploymentResponse = { function createBaseDeploymentID(): DeploymentID { return { owner: "", - dseq: Long.UZERO + dseq: BigInt(0) }; } export const DeploymentID = { typeUrl: "/akash.deployment.v1beta1.DeploymentID", - encode(message: DeploymentID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeploymentID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeploymentID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeploymentID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeploymentID(); while (reader.pos < end) { @@ -991,7 +1007,7 @@ export const DeploymentID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1001,21 +1017,23 @@ export const DeploymentID = { return message; }, fromJSON(object: any): DeploymentID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO - }; + const obj = createBaseDeploymentID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + return obj; }, toJSON(message: DeploymentID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): DeploymentID { const message = createBaseDeploymentID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } return message; }, fromSDK(object: DeploymentIDSDKType): DeploymentID { @@ -1033,7 +1051,7 @@ export const DeploymentID = { fromAmino(object: DeploymentIDAmino): DeploymentID { return { owner: object.owner, - dseq: Long.fromString(object.dseq) + dseq: BigInt(object.dseq) }; }, toAmino(message: DeploymentID): DeploymentIDAmino { @@ -1063,12 +1081,12 @@ function createBaseDeployment(): Deployment { deploymentId: DeploymentID.fromPartial({}), state: 0, version: new Uint8Array(), - createdAt: Long.ZERO + createdAt: BigInt(0) }; } export const Deployment = { typeUrl: "/akash.deployment.v1beta1.Deployment", - encode(message: Deployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Deployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentId !== undefined) { DeploymentID.encode(message.deploymentId, writer.uint32(10).fork()).ldelim(); } @@ -1078,13 +1096,13 @@ export const Deployment = { if (message.version.length !== 0) { writer.uint32(26).bytes(message.version); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Deployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Deployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeployment(); while (reader.pos < end) { @@ -1100,7 +1118,7 @@ export const Deployment = { message.version = reader.bytes(); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -1110,27 +1128,31 @@ export const Deployment = { return message; }, fromJSON(object: any): Deployment { - return { - deploymentId: isSet(object.deploymentId) ? DeploymentID.fromJSON(object.deploymentId) : undefined, - state: isSet(object.state) ? deployment_StateFromJSON(object.state) : -1, - version: isSet(object.version) ? bytesFromBase64(object.version) : new Uint8Array(), - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO - }; + const obj = createBaseDeployment(); + if (isSet(object.deploymentId)) obj.deploymentId = DeploymentID.fromJSON(object.deploymentId); + if (isSet(object.state)) obj.state = deployment_StateFromJSON(object.state); + if (isSet(object.version)) obj.version = bytesFromBase64(object.version); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + return obj; }, toJSON(message: Deployment): unknown { const obj: any = {}; message.deploymentId !== undefined && (obj.deploymentId = message.deploymentId ? DeploymentID.toJSON(message.deploymentId) : undefined); message.state !== undefined && (obj.state = deployment_StateToJSON(message.state)); message.version !== undefined && (obj.version = base64FromBytes(message.version !== undefined ? message.version : new Uint8Array())); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Deployment { const message = createBaseDeployment(); - message.deploymentId = object.deploymentId !== undefined && object.deploymentId !== null ? DeploymentID.fromPartial(object.deploymentId) : undefined; + if (object.deploymentId !== undefined && object.deploymentId !== null) { + message.deploymentId = DeploymentID.fromPartial(object.deploymentId); + } message.state = object.state ?? 0; message.version = object.version ?? new Uint8Array(); - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } return message; }, fromSDK(object: DeploymentSDKType): Deployment { @@ -1154,7 +1176,7 @@ export const Deployment = { deploymentId: object?.deployment_id ? DeploymentID.fromAmino(object.deployment_id) : undefined, state: isSet(object.state) ? deployment_StateFromJSON(object.state) : -1, version: object.version, - createdAt: Long.fromString(object.created_at) + createdAt: BigInt(object.created_at) }; }, toAmino(message: Deployment): DeploymentAmino { @@ -1184,17 +1206,17 @@ export const Deployment = { function createBaseDeploymentFilters(): DeploymentFilters { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), state: "" }; } export const DeploymentFilters = { typeUrl: "/akash.deployment.v1beta1.DeploymentFilters", - encode(message: DeploymentFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeploymentFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.state !== "") { @@ -1202,8 +1224,8 @@ export const DeploymentFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeploymentFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeploymentFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeploymentFilters(); while (reader.pos < end) { @@ -1213,7 +1235,7 @@ export const DeploymentFilters = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.state = reader.string(); @@ -1226,23 +1248,25 @@ export const DeploymentFilters = { return message; }, fromJSON(object: any): DeploymentFilters { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - state: isSet(object.state) ? String(object.state) : "" - }; + const obj = createBaseDeploymentFilters(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.state)) obj.state = String(object.state); + return obj; }, toJSON(message: DeploymentFilters): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.state !== undefined && (obj.state = message.state); return obj; }, fromPartial(object: DeepPartial): DeploymentFilters { const message = createBaseDeploymentFilters(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.state = object.state ?? ""; return message; }, @@ -1263,7 +1287,7 @@ export const DeploymentFilters = { fromAmino(object: DeploymentFiltersAmino): DeploymentFilters { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), state: object.state }; }, diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts index 28043ebe7d..5cef4915fa 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/genesis.ts @@ -1,7 +1,7 @@ import { Deployment, DeploymentAmino, DeploymentSDKType } from "./deployment"; import { Group, GroupAmino, GroupSDKType } from "./group"; import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta1"; /** GenesisDeployment defines the basic genesis state used by deployment module */ @@ -58,7 +58,7 @@ function createBaseGenesisDeployment(): GenesisDeployment { } export const GenesisDeployment = { typeUrl: "/akash.deployment.v1beta1.GenesisDeployment", - encode(message: GenesisDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); } @@ -67,8 +67,8 @@ export const GenesisDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisDeployment(); while (reader.pos < end) { @@ -88,10 +88,10 @@ export const GenesisDeployment = { return message; }, fromJSON(object: any): GenesisDeployment { - return { - deployment: isSet(object.deployment) ? Deployment.fromJSON(object.deployment) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromJSON(e)) : [] - }; + const obj = createBaseGenesisDeployment(); + if (isSet(object.deployment)) obj.deployment = Deployment.fromJSON(object.deployment); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => Group.fromJSON(e)); + return obj; }, toJSON(message: GenesisDeployment): unknown { const obj: any = {}; @@ -105,7 +105,9 @@ export const GenesisDeployment = { }, fromPartial(object: DeepPartial): GenesisDeployment { const message = createBaseGenesisDeployment(); - message.deployment = object.deployment !== undefined && object.deployment !== null ? Deployment.fromPartial(object.deployment) : undefined; + if (object.deployment !== undefined && object.deployment !== null) { + message.deployment = Deployment.fromPartial(object.deployment); + } message.groups = object.groups?.map(e => Group.fromPartial(e)) || []; return message; }, @@ -165,7 +167,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.deployment.v1beta1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { GenesisDeployment.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -174,8 +176,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -195,10 +197,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => GenesisDeployment.fromJSON(e)) : [], - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.deployments)) object.deployments.map((e: any) => GenesisDeployment.fromJSON(e)); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -213,7 +215,9 @@ export const GenesisState = { fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); message.deployments = object.deployments?.map(e => GenesisDeployment.fromPartial(e)) || []; - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts index 142c9ab612..08b942ba82 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/group.ts @@ -1,8 +1,8 @@ import { PlacementRequirements, PlacementRequirementsAmino, PlacementRequirementsSDKType } from "../../base/v1beta1/attribute"; import { ResourceUnits, ResourceUnitsAmino, ResourceUnitsSDKType } from "../../base/v1beta1/resource"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta1"; /** State is an enum which refers to state of group */ export enum Group_State { @@ -165,7 +165,7 @@ export interface MsgStartGroupResponseSDKType {} /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupID { owner: string; - dseq: Long; + dseq: bigint; gseq: number; } export interface GroupIDProtoMsg { @@ -185,7 +185,7 @@ export interface GroupIDAminoMsg { /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; } /** GroupSpec stores group specifications */ @@ -219,7 +219,7 @@ export interface Group { groupId: GroupID; state: Group_State; groupSpec: GroupSpec; - createdAt: Long; + createdAt: bigint; } export interface GroupProtoMsg { typeUrl: "/akash.deployment.v1beta1.Group"; @@ -241,7 +241,7 @@ export interface GroupSDKType { group_id: GroupIDSDKType; state: Group_State; group_spec: GroupSpecSDKType; - created_at: Long; + created_at: bigint; } /** Resource stores unit, total count and price of resource */ export interface Resource { @@ -276,14 +276,14 @@ function createBaseMsgCloseGroup(): MsgCloseGroup { } export const MsgCloseGroup = { typeUrl: "/akash.deployment.v1beta1.MsgCloseGroup", - encode(message: MsgCloseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCloseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseGroup(); while (reader.pos < end) { @@ -300,9 +300,9 @@ export const MsgCloseGroup = { return message; }, fromJSON(object: any): MsgCloseGroup { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgCloseGroup(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: MsgCloseGroup): unknown { const obj: any = {}; @@ -311,7 +311,9 @@ export const MsgCloseGroup = { }, fromPartial(object: DeepPartial): MsgCloseGroup { const message = createBaseMsgCloseGroup(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgCloseGroupSDKType): MsgCloseGroup { @@ -355,11 +357,11 @@ function createBaseMsgCloseGroupResponse(): MsgCloseGroupResponse { } export const MsgCloseGroupResponse = { typeUrl: "/akash.deployment.v1beta1.MsgCloseGroupResponse", - encode(_: MsgCloseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCloseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseGroupResponse(); while (reader.pos < end) { @@ -373,7 +375,8 @@ export const MsgCloseGroupResponse = { return message; }, fromJSON(_: any): MsgCloseGroupResponse { - return {}; + const obj = createBaseMsgCloseGroupResponse(); + return obj; }, toJSON(_: MsgCloseGroupResponse): unknown { const obj: any = {}; @@ -420,14 +423,14 @@ function createBaseMsgPauseGroup(): MsgPauseGroup { } export const MsgPauseGroup = { typeUrl: "/akash.deployment.v1beta1.MsgPauseGroup", - encode(message: MsgPauseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgPauseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgPauseGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgPauseGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgPauseGroup(); while (reader.pos < end) { @@ -444,9 +447,9 @@ export const MsgPauseGroup = { return message; }, fromJSON(object: any): MsgPauseGroup { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgPauseGroup(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: MsgPauseGroup): unknown { const obj: any = {}; @@ -455,7 +458,9 @@ export const MsgPauseGroup = { }, fromPartial(object: DeepPartial): MsgPauseGroup { const message = createBaseMsgPauseGroup(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgPauseGroupSDKType): MsgPauseGroup { @@ -499,11 +504,11 @@ function createBaseMsgPauseGroupResponse(): MsgPauseGroupResponse { } export const MsgPauseGroupResponse = { typeUrl: "/akash.deployment.v1beta1.MsgPauseGroupResponse", - encode(_: MsgPauseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgPauseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgPauseGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgPauseGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgPauseGroupResponse(); while (reader.pos < end) { @@ -517,7 +522,8 @@ export const MsgPauseGroupResponse = { return message; }, fromJSON(_: any): MsgPauseGroupResponse { - return {}; + const obj = createBaseMsgPauseGroupResponse(); + return obj; }, toJSON(_: MsgPauseGroupResponse): unknown { const obj: any = {}; @@ -564,14 +570,14 @@ function createBaseMsgStartGroup(): MsgStartGroup { } export const MsgStartGroup = { typeUrl: "/akash.deployment.v1beta1.MsgStartGroup", - encode(message: MsgStartGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgStartGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgStartGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgStartGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgStartGroup(); while (reader.pos < end) { @@ -588,9 +594,9 @@ export const MsgStartGroup = { return message; }, fromJSON(object: any): MsgStartGroup { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgStartGroup(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: MsgStartGroup): unknown { const obj: any = {}; @@ -599,7 +605,9 @@ export const MsgStartGroup = { }, fromPartial(object: DeepPartial): MsgStartGroup { const message = createBaseMsgStartGroup(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgStartGroupSDKType): MsgStartGroup { @@ -643,11 +651,11 @@ function createBaseMsgStartGroupResponse(): MsgStartGroupResponse { } export const MsgStartGroupResponse = { typeUrl: "/akash.deployment.v1beta1.MsgStartGroupResponse", - encode(_: MsgStartGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgStartGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgStartGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgStartGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgStartGroupResponse(); while (reader.pos < end) { @@ -661,7 +669,8 @@ export const MsgStartGroupResponse = { return message; }, fromJSON(_: any): MsgStartGroupResponse { - return {}; + const obj = createBaseMsgStartGroupResponse(); + return obj; }, toJSON(_: MsgStartGroupResponse): unknown { const obj: any = {}; @@ -704,17 +713,17 @@ export const MsgStartGroupResponse = { function createBaseGroupID(): GroupID { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0 }; } export const GroupID = { typeUrl: "/akash.deployment.v1beta1.GroupID", - encode(message: GroupID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GroupID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -722,8 +731,8 @@ export const GroupID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupID(); while (reader.pos < end) { @@ -733,7 +742,7 @@ export const GroupID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -746,23 +755,25 @@ export const GroupID = { return message; }, fromJSON(object: any): GroupID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0 - }; + const obj = createBaseGroupID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + return obj; }, toJSON(message: GroupID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); return obj; }, fromPartial(object: DeepPartial): GroupID { const message = createBaseGroupID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; return message; }, @@ -783,7 +794,7 @@ export const GroupID = { fromAmino(object: GroupIDAmino): GroupID { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq }; }, @@ -819,7 +830,7 @@ function createBaseGroupSpec(): GroupSpec { } export const GroupSpec = { typeUrl: "/akash.deployment.v1beta1.GroupSpec", - encode(message: GroupSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GroupSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -831,8 +842,8 @@ export const GroupSpec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupSpec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupSpec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupSpec(); while (reader.pos < end) { @@ -855,11 +866,11 @@ export const GroupSpec = { return message; }, fromJSON(object: any): GroupSpec { - return { - name: isSet(object.name) ? String(object.name) : "", - requirements: isSet(object.requirements) ? PlacementRequirements.fromJSON(object.requirements) : undefined, - resources: Array.isArray(object?.resources) ? object.resources.map((e: any) => Resource.fromJSON(e)) : [] - }; + const obj = createBaseGroupSpec(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.requirements)) obj.requirements = PlacementRequirements.fromJSON(object.requirements); + if (Array.isArray(object?.resources)) object.resources.map((e: any) => Resource.fromJSON(e)); + return obj; }, toJSON(message: GroupSpec): unknown { const obj: any = {}; @@ -875,7 +886,9 @@ export const GroupSpec = { fromPartial(object: DeepPartial): GroupSpec { const message = createBaseGroupSpec(); message.name = object.name ?? ""; - message.requirements = object.requirements !== undefined && object.requirements !== null ? PlacementRequirements.fromPartial(object.requirements) : undefined; + if (object.requirements !== undefined && object.requirements !== null) { + message.requirements = PlacementRequirements.fromPartial(object.requirements); + } message.resources = object.resources?.map(e => Resource.fromPartial(e)) || []; return message; }, @@ -936,12 +949,12 @@ function createBaseGroup(): Group { groupId: GroupID.fromPartial({}), state: 0, groupSpec: GroupSpec.fromPartial({}), - createdAt: Long.ZERO + createdAt: BigInt(0) }; } export const Group = { typeUrl: "/akash.deployment.v1beta1.Group", - encode(message: Group, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Group, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== undefined) { GroupID.encode(message.groupId, writer.uint32(10).fork()).ldelim(); } @@ -951,13 +964,13 @@ export const Group = { if (message.groupSpec !== undefined) { GroupSpec.encode(message.groupSpec, writer.uint32(26).fork()).ldelim(); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Group { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Group { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroup(); while (reader.pos < end) { @@ -973,7 +986,7 @@ export const Group = { message.groupSpec = GroupSpec.decode(reader, reader.uint32()); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -983,27 +996,33 @@ export const Group = { return message; }, fromJSON(object: any): Group { - return { - groupId: isSet(object.groupId) ? GroupID.fromJSON(object.groupId) : undefined, - state: isSet(object.state) ? group_StateFromJSON(object.state) : -1, - groupSpec: isSet(object.groupSpec) ? GroupSpec.fromJSON(object.groupSpec) : undefined, - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO - }; + const obj = createBaseGroup(); + if (isSet(object.groupId)) obj.groupId = GroupID.fromJSON(object.groupId); + if (isSet(object.state)) obj.state = group_StateFromJSON(object.state); + if (isSet(object.groupSpec)) obj.groupSpec = GroupSpec.fromJSON(object.groupSpec); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + return obj; }, toJSON(message: Group): unknown { const obj: any = {}; message.groupId !== undefined && (obj.groupId = message.groupId ? GroupID.toJSON(message.groupId) : undefined); message.state !== undefined && (obj.state = group_StateToJSON(message.state)); message.groupSpec !== undefined && (obj.groupSpec = message.groupSpec ? GroupSpec.toJSON(message.groupSpec) : undefined); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Group { const message = createBaseGroup(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? GroupID.fromPartial(object.groupId) : undefined; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = GroupID.fromPartial(object.groupId); + } message.state = object.state ?? 0; - message.groupSpec = object.groupSpec !== undefined && object.groupSpec !== null ? GroupSpec.fromPartial(object.groupSpec) : undefined; - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; + if (object.groupSpec !== undefined && object.groupSpec !== null) { + message.groupSpec = GroupSpec.fromPartial(object.groupSpec); + } + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } return message; }, fromSDK(object: GroupSDKType): Group { @@ -1027,7 +1046,7 @@ export const Group = { groupId: object?.group_id ? GroupID.fromAmino(object.group_id) : undefined, state: isSet(object.state) ? group_StateFromJSON(object.state) : -1, groupSpec: object?.group_spec ? GroupSpec.fromAmino(object.group_spec) : undefined, - createdAt: Long.fromString(object.created_at) + createdAt: BigInt(object.created_at) }; }, toAmino(message: Group): GroupAmino { @@ -1063,7 +1082,7 @@ function createBaseResource(): Resource { } export const Resource = { typeUrl: "/akash.deployment.v1beta1.Resource", - encode(message: Resource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Resource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resources !== undefined) { ResourceUnits.encode(message.resources, writer.uint32(10).fork()).ldelim(); } @@ -1075,8 +1094,8 @@ export const Resource = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Resource { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Resource { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResource(); while (reader.pos < end) { @@ -1099,11 +1118,11 @@ export const Resource = { return message; }, fromJSON(object: any): Resource { - return { - resources: isSet(object.resources) ? ResourceUnits.fromJSON(object.resources) : undefined, - count: isSet(object.count) ? Number(object.count) : 0, - price: isSet(object.price) ? Coin.fromJSON(object.price) : undefined - }; + const obj = createBaseResource(); + if (isSet(object.resources)) obj.resources = ResourceUnits.fromJSON(object.resources); + if (isSet(object.count)) obj.count = Number(object.count); + if (isSet(object.price)) obj.price = Coin.fromJSON(object.price); + return obj; }, toJSON(message: Resource): unknown { const obj: any = {}; @@ -1114,9 +1133,13 @@ export const Resource = { }, fromPartial(object: DeepPartial): Resource { const message = createBaseResource(); - message.resources = object.resources !== undefined && object.resources !== null ? ResourceUnits.fromPartial(object.resources) : undefined; + if (object.resources !== undefined && object.resources !== null) { + message.resources = ResourceUnits.fromPartial(object.resources); + } message.count = object.count ?? 0; - message.price = object.price !== undefined && object.price !== null ? Coin.fromPartial(object.price) : undefined; + if (object.price !== undefined && object.price !== null) { + message.price = Coin.fromPartial(object.price); + } return message; }, fromSDK(object: ResourceSDKType): Resource { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts index 5a5177d7d8..324d85532b 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/params.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta1"; /** Params defines the parameters for the x/deployment package */ @@ -29,14 +29,14 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/akash.deployment.v1beta1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentMinDeposit !== undefined) { Coin.encode(message.deploymentMinDeposit, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -53,9 +53,9 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - deploymentMinDeposit: isSet(object.deploymentMinDeposit) ? Coin.fromJSON(object.deploymentMinDeposit) : undefined - }; + const obj = createBaseParams(); + if (isSet(object.deploymentMinDeposit)) obj.deploymentMinDeposit = Coin.fromJSON(object.deploymentMinDeposit); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -64,7 +64,9 @@ export const Params = { }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.deploymentMinDeposit = object.deploymentMinDeposit !== undefined && object.deploymentMinDeposit !== null ? Coin.fromPartial(object.deploymentMinDeposit) : undefined; + if (object.deploymentMinDeposit !== undefined && object.deploymentMinDeposit !== null) { + message.deploymentMinDeposit = Coin.fromPartial(object.deploymentMinDeposit); + } return message; }, fromSDK(object: ParamsSDKType): Params { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts index 7ab38d348b..627c31e0e5 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta1/query.ts @@ -2,7 +2,7 @@ import { DeploymentFilters, DeploymentFiltersAmino, DeploymentFiltersSDKType, De import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { GroupID, GroupIDAmino, GroupIDSDKType, Group, GroupAmino, GroupSDKType } from "./group"; import { Account, AccountAmino, AccountSDKType } from "../../escrow/v1beta1/types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta1"; /** QueryDeploymentsRequest is request type for the Query/Deployments RPC method */ @@ -145,7 +145,7 @@ function createBaseQueryDeploymentsRequest(): QueryDeploymentsRequest { } export const QueryDeploymentsRequest = { typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsRequest", - encode(message: QueryDeploymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { DeploymentFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); } @@ -154,8 +154,8 @@ export const QueryDeploymentsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentsRequest(); while (reader.pos < end) { @@ -175,10 +175,10 @@ export const QueryDeploymentsRequest = { return message; }, fromJSON(object: any): QueryDeploymentsRequest { - return { - filters: isSet(object.filters) ? DeploymentFilters.fromJSON(object.filters) : undefined, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDeploymentsRequest(); + if (isSet(object.filters)) obj.filters = DeploymentFilters.fromJSON(object.filters); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDeploymentsRequest): unknown { const obj: any = {}; @@ -188,8 +188,12 @@ export const QueryDeploymentsRequest = { }, fromPartial(object: DeepPartial): QueryDeploymentsRequest { const message = createBaseQueryDeploymentsRequest(); - message.filters = object.filters !== undefined && object.filters !== null ? DeploymentFilters.fromPartial(object.filters) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.filters !== undefined && object.filters !== null) { + message.filters = DeploymentFilters.fromPartial(object.filters); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDeploymentsRequestSDKType): QueryDeploymentsRequest { @@ -240,7 +244,7 @@ function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse { } export const QueryDeploymentsResponse = { typeUrl: "/akash.deployment.v1beta1.QueryDeploymentsResponse", - encode(message: QueryDeploymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { QueryDeploymentResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -249,8 +253,8 @@ export const QueryDeploymentsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentsResponse(); while (reader.pos < end) { @@ -270,10 +274,10 @@ export const QueryDeploymentsResponse = { return message; }, fromJSON(object: any): QueryDeploymentsResponse { - return { - deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => QueryDeploymentResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDeploymentsResponse(); + if (Array.isArray(object?.deployments)) object.deployments.map((e: any) => QueryDeploymentResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDeploymentsResponse): unknown { const obj: any = {}; @@ -288,7 +292,9 @@ export const QueryDeploymentsResponse = { fromPartial(object: DeepPartial): QueryDeploymentsResponse { const message = createBaseQueryDeploymentsResponse(); message.deployments = object.deployments?.map(e => QueryDeploymentResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDeploymentsResponseSDKType): QueryDeploymentsResponse { @@ -346,14 +352,14 @@ function createBaseQueryDeploymentRequest(): QueryDeploymentRequest { } export const QueryDeploymentRequest = { typeUrl: "/akash.deployment.v1beta1.QueryDeploymentRequest", - encode(message: QueryDeploymentRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentRequest(); while (reader.pos < end) { @@ -370,9 +376,9 @@ export const QueryDeploymentRequest = { return message; }, fromJSON(object: any): QueryDeploymentRequest { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryDeploymentRequest(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + return obj; }, toJSON(message: QueryDeploymentRequest): unknown { const obj: any = {}; @@ -381,7 +387,9 @@ export const QueryDeploymentRequest = { }, fromPartial(object: DeepPartial): QueryDeploymentRequest { const message = createBaseQueryDeploymentRequest(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryDeploymentRequestSDKType): QueryDeploymentRequest { @@ -429,7 +437,7 @@ function createBaseQueryDeploymentResponse(): QueryDeploymentResponse { } export const QueryDeploymentResponse = { typeUrl: "/akash.deployment.v1beta1.QueryDeploymentResponse", - encode(message: QueryDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); } @@ -441,8 +449,8 @@ export const QueryDeploymentResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentResponse(); while (reader.pos < end) { @@ -465,11 +473,11 @@ export const QueryDeploymentResponse = { return message; }, fromJSON(object: any): QueryDeploymentResponse { - return { - deployment: isSet(object.deployment) ? Deployment.fromJSON(object.deployment) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromJSON(e)) : [], - escrowAccount: isSet(object.escrowAccount) ? Account.fromJSON(object.escrowAccount) : undefined - }; + const obj = createBaseQueryDeploymentResponse(); + if (isSet(object.deployment)) obj.deployment = Deployment.fromJSON(object.deployment); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => Group.fromJSON(e)); + if (isSet(object.escrowAccount)) obj.escrowAccount = Account.fromJSON(object.escrowAccount); + return obj; }, toJSON(message: QueryDeploymentResponse): unknown { const obj: any = {}; @@ -484,9 +492,13 @@ export const QueryDeploymentResponse = { }, fromPartial(object: DeepPartial): QueryDeploymentResponse { const message = createBaseQueryDeploymentResponse(); - message.deployment = object.deployment !== undefined && object.deployment !== null ? Deployment.fromPartial(object.deployment) : undefined; + if (object.deployment !== undefined && object.deployment !== null) { + message.deployment = Deployment.fromPartial(object.deployment); + } message.groups = object.groups?.map(e => Group.fromPartial(e)) || []; - message.escrowAccount = object.escrowAccount !== undefined && object.escrowAccount !== null ? Account.fromPartial(object.escrowAccount) : undefined; + if (object.escrowAccount !== undefined && object.escrowAccount !== null) { + message.escrowAccount = Account.fromPartial(object.escrowAccount); + } return message; }, fromSDK(object: QueryDeploymentResponseSDKType): QueryDeploymentResponse { @@ -548,14 +560,14 @@ function createBaseQueryGroupRequest(): QueryGroupRequest { } export const QueryGroupRequest = { typeUrl: "/akash.deployment.v1beta1.QueryGroupRequest", - encode(message: QueryGroupRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupRequest(); while (reader.pos < end) { @@ -572,9 +584,9 @@ export const QueryGroupRequest = { return message; }, fromJSON(object: any): QueryGroupRequest { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryGroupRequest(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: QueryGroupRequest): unknown { const obj: any = {}; @@ -583,7 +595,9 @@ export const QueryGroupRequest = { }, fromPartial(object: DeepPartial): QueryGroupRequest { const message = createBaseQueryGroupRequest(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryGroupRequestSDKType): QueryGroupRequest { @@ -629,14 +643,14 @@ function createBaseQueryGroupResponse(): QueryGroupResponse { } export const QueryGroupResponse = { typeUrl: "/akash.deployment.v1beta1.QueryGroupResponse", - encode(message: QueryGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.group !== undefined) { Group.encode(message.group, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupResponse(); while (reader.pos < end) { @@ -653,9 +667,9 @@ export const QueryGroupResponse = { return message; }, fromJSON(object: any): QueryGroupResponse { - return { - group: isSet(object.group) ? Group.fromJSON(object.group) : undefined - }; + const obj = createBaseQueryGroupResponse(); + if (isSet(object.group)) obj.group = Group.fromJSON(object.group); + return obj; }, toJSON(message: QueryGroupResponse): unknown { const obj: any = {}; @@ -664,7 +678,9 @@ export const QueryGroupResponse = { }, fromPartial(object: DeepPartial): QueryGroupResponse { const message = createBaseQueryGroupResponse(); - message.group = object.group !== undefined && object.group !== null ? Group.fromPartial(object.group) : undefined; + if (object.group !== undefined && object.group !== null) { + message.group = Group.fromPartial(object.group); + } return message; }, fromSDK(object: QueryGroupResponseSDKType): QueryGroupResponse { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts index 53be024ad1..2215bdeff0 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/authz.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** @@ -7,6 +7,7 @@ export const protobufPackage = "akash.deployment.v1beta2"; * the granter's account for a deployment. */ export interface DepositDeploymentAuthorization { + $typeUrl?: string; /** * SpendLimit is the amount the grantee is authorized to spend from the granter's account for * the purpose of deployment. @@ -37,23 +38,25 @@ export interface DepositDeploymentAuthorizationAminoMsg { * the granter's account for a deployment. */ export interface DepositDeploymentAuthorizationSDKType { + $typeUrl?: string; spend_limit: CoinSDKType; } function createBaseDepositDeploymentAuthorization(): DepositDeploymentAuthorization { return { + $typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization", spendLimit: Coin.fromPartial({}) }; } export const DepositDeploymentAuthorization = { typeUrl: "/akash.deployment.v1beta2.DepositDeploymentAuthorization", - encode(message: DepositDeploymentAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DepositDeploymentAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.spendLimit !== undefined) { Coin.encode(message.spendLimit, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DepositDeploymentAuthorization { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DepositDeploymentAuthorization { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDepositDeploymentAuthorization(); while (reader.pos < end) { @@ -70,9 +73,9 @@ export const DepositDeploymentAuthorization = { return message; }, fromJSON(object: any): DepositDeploymentAuthorization { - return { - spendLimit: isSet(object.spendLimit) ? Coin.fromJSON(object.spendLimit) : undefined - }; + const obj = createBaseDepositDeploymentAuthorization(); + if (isSet(object.spendLimit)) obj.spendLimit = Coin.fromJSON(object.spendLimit); + return obj; }, toJSON(message: DepositDeploymentAuthorization): unknown { const obj: any = {}; @@ -81,7 +84,9 @@ export const DepositDeploymentAuthorization = { }, fromPartial(object: DeepPartial): DepositDeploymentAuthorization { const message = createBaseDepositDeploymentAuthorization(); - message.spendLimit = object.spendLimit !== undefined && object.spendLimit !== null ? Coin.fromPartial(object.spendLimit) : undefined; + if (object.spendLimit !== undefined && object.spendLimit !== null) { + message.spendLimit = Coin.fromPartial(object.spendLimit); + } return message; }, fromSDK(object: DepositDeploymentAuthorizationSDKType): DepositDeploymentAuthorization { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts index 8d5df8d297..04dafb7e03 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deployment.ts @@ -1,5 +1,5 @@ -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** State is an enum which refers to state of deployment */ export enum Deployment_State { @@ -46,7 +46,7 @@ export function deployment_StateToJSON(object: Deployment_State): string { /** DeploymentID stores owner and sequence number */ export interface DeploymentID { owner: string; - dseq: Long; + dseq: bigint; } export interface DeploymentIDProtoMsg { typeUrl: "/akash.deployment.v1beta2.DeploymentID"; @@ -64,14 +64,14 @@ export interface DeploymentIDAminoMsg { /** DeploymentID stores owner and sequence number */ export interface DeploymentIDSDKType { owner: string; - dseq: Long; + dseq: bigint; } /** Deployment stores deploymentID, state and version details */ export interface Deployment { deploymentId: DeploymentID; state: Deployment_State; version: Uint8Array; - createdAt: Long; + createdAt: bigint; } export interface DeploymentProtoMsg { typeUrl: "/akash.deployment.v1beta2.Deployment"; @@ -93,12 +93,12 @@ export interface DeploymentSDKType { deployment_id: DeploymentIDSDKType; state: Deployment_State; version: Uint8Array; - created_at: Long; + created_at: bigint; } /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFilters { owner: string; - dseq: Long; + dseq: bigint; state: string; } export interface DeploymentFiltersProtoMsg { @@ -118,28 +118,28 @@ export interface DeploymentFiltersAminoMsg { /** DeploymentFilters defines filters used to filter deployments */ export interface DeploymentFiltersSDKType { owner: string; - dseq: Long; + dseq: bigint; state: string; } function createBaseDeploymentID(): DeploymentID { return { owner: "", - dseq: Long.UZERO + dseq: BigInt(0) }; } export const DeploymentID = { typeUrl: "/akash.deployment.v1beta2.DeploymentID", - encode(message: DeploymentID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeploymentID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeploymentID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeploymentID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeploymentID(); while (reader.pos < end) { @@ -149,7 +149,7 @@ export const DeploymentID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -159,21 +159,23 @@ export const DeploymentID = { return message; }, fromJSON(object: any): DeploymentID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO - }; + const obj = createBaseDeploymentID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + return obj; }, toJSON(message: DeploymentID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): DeploymentID { const message = createBaseDeploymentID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } return message; }, fromSDK(object: DeploymentIDSDKType): DeploymentID { @@ -191,7 +193,7 @@ export const DeploymentID = { fromAmino(object: DeploymentIDAmino): DeploymentID { return { owner: object.owner, - dseq: Long.fromString(object.dseq) + dseq: BigInt(object.dseq) }; }, toAmino(message: DeploymentID): DeploymentIDAmino { @@ -221,12 +223,12 @@ function createBaseDeployment(): Deployment { deploymentId: DeploymentID.fromPartial({}), state: 0, version: new Uint8Array(), - createdAt: Long.ZERO + createdAt: BigInt(0) }; } export const Deployment = { typeUrl: "/akash.deployment.v1beta2.Deployment", - encode(message: Deployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Deployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentId !== undefined) { DeploymentID.encode(message.deploymentId, writer.uint32(10).fork()).ldelim(); } @@ -236,13 +238,13 @@ export const Deployment = { if (message.version.length !== 0) { writer.uint32(26).bytes(message.version); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Deployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Deployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeployment(); while (reader.pos < end) { @@ -258,7 +260,7 @@ export const Deployment = { message.version = reader.bytes(); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -268,27 +270,31 @@ export const Deployment = { return message; }, fromJSON(object: any): Deployment { - return { - deploymentId: isSet(object.deploymentId) ? DeploymentID.fromJSON(object.deploymentId) : undefined, - state: isSet(object.state) ? deployment_StateFromJSON(object.state) : -1, - version: isSet(object.version) ? bytesFromBase64(object.version) : new Uint8Array(), - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO - }; + const obj = createBaseDeployment(); + if (isSet(object.deploymentId)) obj.deploymentId = DeploymentID.fromJSON(object.deploymentId); + if (isSet(object.state)) obj.state = deployment_StateFromJSON(object.state); + if (isSet(object.version)) obj.version = bytesFromBase64(object.version); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + return obj; }, toJSON(message: Deployment): unknown { const obj: any = {}; message.deploymentId !== undefined && (obj.deploymentId = message.deploymentId ? DeploymentID.toJSON(message.deploymentId) : undefined); message.state !== undefined && (obj.state = deployment_StateToJSON(message.state)); message.version !== undefined && (obj.version = base64FromBytes(message.version !== undefined ? message.version : new Uint8Array())); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Deployment { const message = createBaseDeployment(); - message.deploymentId = object.deploymentId !== undefined && object.deploymentId !== null ? DeploymentID.fromPartial(object.deploymentId) : undefined; + if (object.deploymentId !== undefined && object.deploymentId !== null) { + message.deploymentId = DeploymentID.fromPartial(object.deploymentId); + } message.state = object.state ?? 0; message.version = object.version ?? new Uint8Array(); - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } return message; }, fromSDK(object: DeploymentSDKType): Deployment { @@ -312,7 +318,7 @@ export const Deployment = { deploymentId: object?.deployment_id ? DeploymentID.fromAmino(object.deployment_id) : undefined, state: isSet(object.state) ? deployment_StateFromJSON(object.state) : -1, version: object.version, - createdAt: Long.fromString(object.created_at) + createdAt: BigInt(object.created_at) }; }, toAmino(message: Deployment): DeploymentAmino { @@ -342,17 +348,17 @@ export const Deployment = { function createBaseDeploymentFilters(): DeploymentFilters { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), state: "" }; } export const DeploymentFilters = { typeUrl: "/akash.deployment.v1beta2.DeploymentFilters", - encode(message: DeploymentFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeploymentFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.state !== "") { @@ -360,8 +366,8 @@ export const DeploymentFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeploymentFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeploymentFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeploymentFilters(); while (reader.pos < end) { @@ -371,7 +377,7 @@ export const DeploymentFilters = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.state = reader.string(); @@ -384,23 +390,25 @@ export const DeploymentFilters = { return message; }, fromJSON(object: any): DeploymentFilters { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - state: isSet(object.state) ? String(object.state) : "" - }; + const obj = createBaseDeploymentFilters(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.state)) obj.state = String(object.state); + return obj; }, toJSON(message: DeploymentFilters): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.state !== undefined && (obj.state = message.state); return obj; }, fromPartial(object: DeepPartial): DeploymentFilters { const message = createBaseDeploymentFilters(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.state = object.state ?? ""; return message; }, @@ -421,7 +429,7 @@ export const DeploymentFilters = { fromAmino(object: DeploymentFiltersAmino): DeploymentFilters { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), state: object.state }; }, diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts index 2a4b87b4f9..7ad94206a3 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/deploymentmsg.ts @@ -1,7 +1,7 @@ import { DeploymentID, DeploymentIDAmino, DeploymentIDSDKType } from "./deployment"; import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "./groupspec"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** MsgCreateDeployment defines an SDK message for creating deployment */ @@ -176,7 +176,7 @@ function createBaseMsgCreateDeployment(): MsgCreateDeployment { } export const MsgCreateDeployment = { typeUrl: "/akash.deployment.v1beta2.MsgCreateDeployment", - encode(message: MsgCreateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -194,8 +194,8 @@ export const MsgCreateDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateDeployment(); while (reader.pos < end) { @@ -224,13 +224,13 @@ export const MsgCreateDeployment = { return message; }, fromJSON(object: any): MsgCreateDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupSpec.fromJSON(e)) : [], - version: isSet(object.version) ? bytesFromBase64(object.version) : new Uint8Array(), - deposit: isSet(object.deposit) ? Coin.fromJSON(object.deposit) : undefined, - depositor: isSet(object.depositor) ? String(object.depositor) : "" - }; + const obj = createBaseMsgCreateDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => GroupSpec.fromJSON(e)); + if (isSet(object.version)) obj.version = bytesFromBase64(object.version); + if (isSet(object.deposit)) obj.deposit = Coin.fromJSON(object.deposit); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + return obj; }, toJSON(message: MsgCreateDeployment): unknown { const obj: any = {}; @@ -247,10 +247,14 @@ export const MsgCreateDeployment = { }, fromPartial(object: DeepPartial): MsgCreateDeployment { const message = createBaseMsgCreateDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } message.groups = object.groups?.map(e => GroupSpec.fromPartial(e)) || []; message.version = object.version ?? new Uint8Array(); - message.deposit = object.deposit !== undefined && object.deposit !== null ? Coin.fromPartial(object.deposit) : undefined; + if (object.deposit !== undefined && object.deposit !== null) { + message.deposit = Coin.fromPartial(object.deposit); + } message.depositor = object.depositor ?? ""; return message; }, @@ -319,11 +323,11 @@ function createBaseMsgCreateDeploymentResponse(): MsgCreateDeploymentResponse { } export const MsgCreateDeploymentResponse = { typeUrl: "/akash.deployment.v1beta2.MsgCreateDeploymentResponse", - encode(_: MsgCreateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateDeploymentResponse(); while (reader.pos < end) { @@ -337,7 +341,8 @@ export const MsgCreateDeploymentResponse = { return message; }, fromJSON(_: any): MsgCreateDeploymentResponse { - return {}; + const obj = createBaseMsgCreateDeploymentResponse(); + return obj; }, toJSON(_: MsgCreateDeploymentResponse): unknown { const obj: any = {}; @@ -386,7 +391,7 @@ function createBaseMsgDepositDeployment(): MsgDepositDeployment { } export const MsgDepositDeployment = { typeUrl: "/akash.deployment.v1beta2.MsgDepositDeployment", - encode(message: MsgDepositDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDepositDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -398,8 +403,8 @@ export const MsgDepositDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDepositDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDepositDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDepositDeployment(); while (reader.pos < end) { @@ -422,11 +427,11 @@ export const MsgDepositDeployment = { return message; }, fromJSON(object: any): MsgDepositDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined, - amount: isSet(object.amount) ? Coin.fromJSON(object.amount) : undefined, - depositor: isSet(object.depositor) ? String(object.depositor) : "" - }; + const obj = createBaseMsgDepositDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + if (isSet(object.amount)) obj.amount = Coin.fromJSON(object.amount); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + return obj; }, toJSON(message: MsgDepositDeployment): unknown { const obj: any = {}; @@ -437,8 +442,12 @@ export const MsgDepositDeployment = { }, fromPartial(object: DeepPartial): MsgDepositDeployment { const message = createBaseMsgDepositDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; - message.amount = object.amount !== undefined && object.amount !== null ? Coin.fromPartial(object.amount) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } + if (object.amount !== undefined && object.amount !== null) { + message.amount = Coin.fromPartial(object.amount); + } message.depositor = object.depositor ?? ""; return message; }, @@ -491,11 +500,11 @@ function createBaseMsgDepositDeploymentResponse(): MsgDepositDeploymentResponse } export const MsgDepositDeploymentResponse = { typeUrl: "/akash.deployment.v1beta2.MsgDepositDeploymentResponse", - encode(_: MsgDepositDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDepositDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDepositDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDepositDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDepositDeploymentResponse(); while (reader.pos < end) { @@ -509,7 +518,8 @@ export const MsgDepositDeploymentResponse = { return message; }, fromJSON(_: any): MsgDepositDeploymentResponse { - return {}; + const obj = createBaseMsgDepositDeploymentResponse(); + return obj; }, toJSON(_: MsgDepositDeploymentResponse): unknown { const obj: any = {}; @@ -557,7 +567,7 @@ function createBaseMsgUpdateDeployment(): MsgUpdateDeployment { } export const MsgUpdateDeployment = { typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeployment", - encode(message: MsgUpdateDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -566,8 +576,8 @@ export const MsgUpdateDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateDeployment(); while (reader.pos < end) { @@ -587,10 +597,10 @@ export const MsgUpdateDeployment = { return message; }, fromJSON(object: any): MsgUpdateDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined, - version: isSet(object.version) ? bytesFromBase64(object.version) : new Uint8Array() - }; + const obj = createBaseMsgUpdateDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + if (isSet(object.version)) obj.version = bytesFromBase64(object.version); + return obj; }, toJSON(message: MsgUpdateDeployment): unknown { const obj: any = {}; @@ -600,7 +610,9 @@ export const MsgUpdateDeployment = { }, fromPartial(object: DeepPartial): MsgUpdateDeployment { const message = createBaseMsgUpdateDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } message.version = object.version ?? new Uint8Array(); return message; }, @@ -649,11 +661,11 @@ function createBaseMsgUpdateDeploymentResponse(): MsgUpdateDeploymentResponse { } export const MsgUpdateDeploymentResponse = { typeUrl: "/akash.deployment.v1beta2.MsgUpdateDeploymentResponse", - encode(_: MsgUpdateDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateDeploymentResponse(); while (reader.pos < end) { @@ -667,7 +679,8 @@ export const MsgUpdateDeploymentResponse = { return message; }, fromJSON(_: any): MsgUpdateDeploymentResponse { - return {}; + const obj = createBaseMsgUpdateDeploymentResponse(); + return obj; }, toJSON(_: MsgUpdateDeploymentResponse): unknown { const obj: any = {}; @@ -714,14 +727,14 @@ function createBaseMsgCloseDeployment(): MsgCloseDeployment { } export const MsgCloseDeployment = { typeUrl: "/akash.deployment.v1beta2.MsgCloseDeployment", - encode(message: MsgCloseDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCloseDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseDeployment(); while (reader.pos < end) { @@ -738,9 +751,9 @@ export const MsgCloseDeployment = { return message; }, fromJSON(object: any): MsgCloseDeployment { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgCloseDeployment(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + return obj; }, toJSON(message: MsgCloseDeployment): unknown { const obj: any = {}; @@ -749,7 +762,9 @@ export const MsgCloseDeployment = { }, fromPartial(object: DeepPartial): MsgCloseDeployment { const message = createBaseMsgCloseDeployment(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgCloseDeploymentSDKType): MsgCloseDeployment { @@ -793,11 +808,11 @@ function createBaseMsgCloseDeploymentResponse(): MsgCloseDeploymentResponse { } export const MsgCloseDeploymentResponse = { typeUrl: "/akash.deployment.v1beta2.MsgCloseDeploymentResponse", - encode(_: MsgCloseDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCloseDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseDeploymentResponse(); while (reader.pos < end) { @@ -811,7 +826,8 @@ export const MsgCloseDeploymentResponse = { return message; }, fromJSON(_: any): MsgCloseDeploymentResponse { - return {}; + const obj = createBaseMsgCloseDeploymentResponse(); + return obj; }, toJSON(_: MsgCloseDeploymentResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts index 8c24622d5a..159bc1668c 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/genesis.ts @@ -1,7 +1,7 @@ import { Deployment, DeploymentAmino, DeploymentSDKType } from "./deployment"; import { Group, GroupAmino, GroupSDKType } from "./group"; import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** GenesisDeployment defines the basic genesis state used by deployment module */ @@ -58,7 +58,7 @@ function createBaseGenesisDeployment(): GenesisDeployment { } export const GenesisDeployment = { typeUrl: "/akash.deployment.v1beta2.GenesisDeployment", - encode(message: GenesisDeployment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisDeployment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); } @@ -67,8 +67,8 @@ export const GenesisDeployment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisDeployment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisDeployment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisDeployment(); while (reader.pos < end) { @@ -88,10 +88,10 @@ export const GenesisDeployment = { return message; }, fromJSON(object: any): GenesisDeployment { - return { - deployment: isSet(object.deployment) ? Deployment.fromJSON(object.deployment) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromJSON(e)) : [] - }; + const obj = createBaseGenesisDeployment(); + if (isSet(object.deployment)) obj.deployment = Deployment.fromJSON(object.deployment); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => Group.fromJSON(e)); + return obj; }, toJSON(message: GenesisDeployment): unknown { const obj: any = {}; @@ -105,7 +105,9 @@ export const GenesisDeployment = { }, fromPartial(object: DeepPartial): GenesisDeployment { const message = createBaseGenesisDeployment(); - message.deployment = object.deployment !== undefined && object.deployment !== null ? Deployment.fromPartial(object.deployment) : undefined; + if (object.deployment !== undefined && object.deployment !== null) { + message.deployment = Deployment.fromPartial(object.deployment); + } message.groups = object.groups?.map(e => Group.fromPartial(e)) || []; return message; }, @@ -165,7 +167,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.deployment.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { GenesisDeployment.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -174,8 +176,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -195,10 +197,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => GenesisDeployment.fromJSON(e)) : [], - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.deployments)) object.deployments.map((e: any) => GenesisDeployment.fromJSON(e)); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -213,7 +215,9 @@ export const GenesisState = { fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); message.deployments = object.deployments?.map(e => GenesisDeployment.fromPartial(e)) || []; - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts index e2c4cc54a4..e7af877ac0 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/group.ts @@ -1,7 +1,7 @@ import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "./groupspec"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** State is an enum which refers to state of group */ export enum Group_State { @@ -64,7 +64,7 @@ export interface Group { groupId: GroupID; state: Group_State; groupSpec: GroupSpec; - createdAt: Long; + createdAt: bigint; } export interface GroupProtoMsg { typeUrl: "/akash.deployment.v1beta2.Group"; @@ -86,19 +86,19 @@ export interface GroupSDKType { group_id: GroupIDSDKType; state: Group_State; group_spec: GroupSpecSDKType; - created_at: Long; + created_at: bigint; } function createBaseGroup(): Group { return { groupId: GroupID.fromPartial({}), state: 0, groupSpec: GroupSpec.fromPartial({}), - createdAt: Long.ZERO + createdAt: BigInt(0) }; } export const Group = { typeUrl: "/akash.deployment.v1beta2.Group", - encode(message: Group, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Group, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.groupId !== undefined) { GroupID.encode(message.groupId, writer.uint32(10).fork()).ldelim(); } @@ -108,13 +108,13 @@ export const Group = { if (message.groupSpec !== undefined) { GroupSpec.encode(message.groupSpec, writer.uint32(26).fork()).ldelim(); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Group { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Group { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroup(); while (reader.pos < end) { @@ -130,7 +130,7 @@ export const Group = { message.groupSpec = GroupSpec.decode(reader, reader.uint32()); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -140,27 +140,33 @@ export const Group = { return message; }, fromJSON(object: any): Group { - return { - groupId: isSet(object.groupId) ? GroupID.fromJSON(object.groupId) : undefined, - state: isSet(object.state) ? group_StateFromJSON(object.state) : -1, - groupSpec: isSet(object.groupSpec) ? GroupSpec.fromJSON(object.groupSpec) : undefined, - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO - }; + const obj = createBaseGroup(); + if (isSet(object.groupId)) obj.groupId = GroupID.fromJSON(object.groupId); + if (isSet(object.state)) obj.state = group_StateFromJSON(object.state); + if (isSet(object.groupSpec)) obj.groupSpec = GroupSpec.fromJSON(object.groupSpec); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + return obj; }, toJSON(message: Group): unknown { const obj: any = {}; message.groupId !== undefined && (obj.groupId = message.groupId ? GroupID.toJSON(message.groupId) : undefined); message.state !== undefined && (obj.state = group_StateToJSON(message.state)); message.groupSpec !== undefined && (obj.groupSpec = message.groupSpec ? GroupSpec.toJSON(message.groupSpec) : undefined); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Group { const message = createBaseGroup(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? GroupID.fromPartial(object.groupId) : undefined; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = GroupID.fromPartial(object.groupId); + } message.state = object.state ?? 0; - message.groupSpec = object.groupSpec !== undefined && object.groupSpec !== null ? GroupSpec.fromPartial(object.groupSpec) : undefined; - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; + if (object.groupSpec !== undefined && object.groupSpec !== null) { + message.groupSpec = GroupSpec.fromPartial(object.groupSpec); + } + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } return message; }, fromSDK(object: GroupSDKType): Group { @@ -184,7 +190,7 @@ export const Group = { groupId: object?.group_id ? GroupID.fromAmino(object.group_id) : undefined, state: isSet(object.state) ? group_StateFromJSON(object.state) : -1, groupSpec: object?.group_spec ? GroupSpec.fromAmino(object.group_spec) : undefined, - createdAt: Long.fromString(object.created_at) + createdAt: BigInt(object.created_at) }; }, toAmino(message: Group): GroupAmino { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts index 2fec44fe13..fa0766e6dc 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupid.ts @@ -1,10 +1,10 @@ -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupID { owner: string; - dseq: Long; + dseq: bigint; gseq: number; } export interface GroupIDProtoMsg { @@ -24,23 +24,23 @@ export interface GroupIDAminoMsg { /** GroupID stores owner, deployment sequence number and group sequence number */ export interface GroupIDSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; } function createBaseGroupID(): GroupID { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0 }; } export const GroupID = { typeUrl: "/akash.deployment.v1beta2.GroupID", - encode(message: GroupID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GroupID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -48,8 +48,8 @@ export const GroupID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupID(); while (reader.pos < end) { @@ -59,7 +59,7 @@ export const GroupID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -72,23 +72,25 @@ export const GroupID = { return message; }, fromJSON(object: any): GroupID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0 - }; + const obj = createBaseGroupID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + return obj; }, toJSON(message: GroupID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); return obj; }, fromPartial(object: DeepPartial): GroupID { const message = createBaseGroupID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; return message; }, @@ -109,7 +111,7 @@ export const GroupID = { fromAmino(object: GroupIDAmino): GroupID { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq }; }, diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts index dc6e5a1cba..b8f6ce6d30 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupmsg.ts @@ -1,5 +1,5 @@ import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** MsgCloseGroup defines SDK message to close a single Group within a Deployment. */ @@ -111,14 +111,14 @@ function createBaseMsgCloseGroup(): MsgCloseGroup { } export const MsgCloseGroup = { typeUrl: "/akash.deployment.v1beta2.MsgCloseGroup", - encode(message: MsgCloseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCloseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseGroup(); while (reader.pos < end) { @@ -135,9 +135,9 @@ export const MsgCloseGroup = { return message; }, fromJSON(object: any): MsgCloseGroup { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgCloseGroup(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: MsgCloseGroup): unknown { const obj: any = {}; @@ -146,7 +146,9 @@ export const MsgCloseGroup = { }, fromPartial(object: DeepPartial): MsgCloseGroup { const message = createBaseMsgCloseGroup(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgCloseGroupSDKType): MsgCloseGroup { @@ -190,11 +192,11 @@ function createBaseMsgCloseGroupResponse(): MsgCloseGroupResponse { } export const MsgCloseGroupResponse = { typeUrl: "/akash.deployment.v1beta2.MsgCloseGroupResponse", - encode(_: MsgCloseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCloseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseGroupResponse(); while (reader.pos < end) { @@ -208,7 +210,8 @@ export const MsgCloseGroupResponse = { return message; }, fromJSON(_: any): MsgCloseGroupResponse { - return {}; + const obj = createBaseMsgCloseGroupResponse(); + return obj; }, toJSON(_: MsgCloseGroupResponse): unknown { const obj: any = {}; @@ -255,14 +258,14 @@ function createBaseMsgPauseGroup(): MsgPauseGroup { } export const MsgPauseGroup = { typeUrl: "/akash.deployment.v1beta2.MsgPauseGroup", - encode(message: MsgPauseGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgPauseGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgPauseGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgPauseGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgPauseGroup(); while (reader.pos < end) { @@ -279,9 +282,9 @@ export const MsgPauseGroup = { return message; }, fromJSON(object: any): MsgPauseGroup { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgPauseGroup(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: MsgPauseGroup): unknown { const obj: any = {}; @@ -290,7 +293,9 @@ export const MsgPauseGroup = { }, fromPartial(object: DeepPartial): MsgPauseGroup { const message = createBaseMsgPauseGroup(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgPauseGroupSDKType): MsgPauseGroup { @@ -334,11 +339,11 @@ function createBaseMsgPauseGroupResponse(): MsgPauseGroupResponse { } export const MsgPauseGroupResponse = { typeUrl: "/akash.deployment.v1beta2.MsgPauseGroupResponse", - encode(_: MsgPauseGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgPauseGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgPauseGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgPauseGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgPauseGroupResponse(); while (reader.pos < end) { @@ -352,7 +357,8 @@ export const MsgPauseGroupResponse = { return message; }, fromJSON(_: any): MsgPauseGroupResponse { - return {}; + const obj = createBaseMsgPauseGroupResponse(); + return obj; }, toJSON(_: MsgPauseGroupResponse): unknown { const obj: any = {}; @@ -399,14 +405,14 @@ function createBaseMsgStartGroup(): MsgStartGroup { } export const MsgStartGroup = { typeUrl: "/akash.deployment.v1beta2.MsgStartGroup", - encode(message: MsgStartGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgStartGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgStartGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgStartGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgStartGroup(); while (reader.pos < end) { @@ -423,9 +429,9 @@ export const MsgStartGroup = { return message; }, fromJSON(object: any): MsgStartGroup { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseMsgStartGroup(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: MsgStartGroup): unknown { const obj: any = {}; @@ -434,7 +440,9 @@ export const MsgStartGroup = { }, fromPartial(object: DeepPartial): MsgStartGroup { const message = createBaseMsgStartGroup(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: MsgStartGroupSDKType): MsgStartGroup { @@ -478,11 +486,11 @@ function createBaseMsgStartGroupResponse(): MsgStartGroupResponse { } export const MsgStartGroupResponse = { typeUrl: "/akash.deployment.v1beta2.MsgStartGroupResponse", - encode(_: MsgStartGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgStartGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgStartGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgStartGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgStartGroupResponse(); while (reader.pos < end) { @@ -496,7 +504,8 @@ export const MsgStartGroupResponse = { return message; }, fromJSON(_: any): MsgStartGroupResponse { - return {}; + const obj = createBaseMsgStartGroupResponse(); + return obj; }, toJSON(_: MsgStartGroupResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts index 87b9b6bb60..d872254ad6 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/groupspec.ts @@ -1,6 +1,6 @@ import { PlacementRequirements, PlacementRequirementsAmino, PlacementRequirementsSDKType } from "../../base/v1beta2/attribute"; import { Resource, ResourceAmino, ResourceSDKType } from "./resource"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** GroupSpec stores group specifications */ @@ -38,7 +38,7 @@ function createBaseGroupSpec(): GroupSpec { } export const GroupSpec = { typeUrl: "/akash.deployment.v1beta2.GroupSpec", - encode(message: GroupSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GroupSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -50,8 +50,8 @@ export const GroupSpec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupSpec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupSpec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupSpec(); while (reader.pos < end) { @@ -74,11 +74,11 @@ export const GroupSpec = { return message; }, fromJSON(object: any): GroupSpec { - return { - name: isSet(object.name) ? String(object.name) : "", - requirements: isSet(object.requirements) ? PlacementRequirements.fromJSON(object.requirements) : undefined, - resources: Array.isArray(object?.resources) ? object.resources.map((e: any) => Resource.fromJSON(e)) : [] - }; + const obj = createBaseGroupSpec(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.requirements)) obj.requirements = PlacementRequirements.fromJSON(object.requirements); + if (Array.isArray(object?.resources)) object.resources.map((e: any) => Resource.fromJSON(e)); + return obj; }, toJSON(message: GroupSpec): unknown { const obj: any = {}; @@ -94,7 +94,9 @@ export const GroupSpec = { fromPartial(object: DeepPartial): GroupSpec { const message = createBaseGroupSpec(); message.name = object.name ?? ""; - message.requirements = object.requirements !== undefined && object.requirements !== null ? PlacementRequirements.fromPartial(object.requirements) : undefined; + if (object.requirements !== undefined && object.requirements !== null) { + message.requirements = PlacementRequirements.fromPartial(object.requirements); + } message.resources = object.resources?.map(e => Resource.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts index b1f2a65b8c..b55ed66cfe 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/params.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** Params defines the parameters for the x/deployment package */ @@ -29,14 +29,14 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/akash.deployment.v1beta2.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deploymentMinDeposit !== undefined) { Coin.encode(message.deploymentMinDeposit, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -53,9 +53,9 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - deploymentMinDeposit: isSet(object.deploymentMinDeposit) ? Coin.fromJSON(object.deploymentMinDeposit) : undefined - }; + const obj = createBaseParams(); + if (isSet(object.deploymentMinDeposit)) obj.deploymentMinDeposit = Coin.fromJSON(object.deploymentMinDeposit); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -64,7 +64,9 @@ export const Params = { }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.deploymentMinDeposit = object.deploymentMinDeposit !== undefined && object.deploymentMinDeposit !== null ? Coin.fromPartial(object.deploymentMinDeposit) : undefined; + if (object.deploymentMinDeposit !== undefined && object.deploymentMinDeposit !== null) { + message.deploymentMinDeposit = Coin.fromPartial(object.deploymentMinDeposit); + } return message; }, fromSDK(object: ParamsSDKType): Params { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts index e33853c2a8..4ec3e8ad7c 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/query.ts @@ -3,7 +3,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageRe import { GroupID, GroupIDAmino, GroupIDSDKType } from "./groupid"; import { Group, GroupAmino, GroupSDKType } from "./group"; import { Account, AccountAmino, AccountSDKType } from "../../escrow/v1beta2/types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** QueryDeploymentsRequest is request type for the Query/Deployments RPC method */ @@ -146,7 +146,7 @@ function createBaseQueryDeploymentsRequest(): QueryDeploymentsRequest { } export const QueryDeploymentsRequest = { typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsRequest", - encode(message: QueryDeploymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { DeploymentFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); } @@ -155,8 +155,8 @@ export const QueryDeploymentsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentsRequest(); while (reader.pos < end) { @@ -176,10 +176,10 @@ export const QueryDeploymentsRequest = { return message; }, fromJSON(object: any): QueryDeploymentsRequest { - return { - filters: isSet(object.filters) ? DeploymentFilters.fromJSON(object.filters) : undefined, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDeploymentsRequest(); + if (isSet(object.filters)) obj.filters = DeploymentFilters.fromJSON(object.filters); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDeploymentsRequest): unknown { const obj: any = {}; @@ -189,8 +189,12 @@ export const QueryDeploymentsRequest = { }, fromPartial(object: DeepPartial): QueryDeploymentsRequest { const message = createBaseQueryDeploymentsRequest(); - message.filters = object.filters !== undefined && object.filters !== null ? DeploymentFilters.fromPartial(object.filters) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.filters !== undefined && object.filters !== null) { + message.filters = DeploymentFilters.fromPartial(object.filters); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDeploymentsRequestSDKType): QueryDeploymentsRequest { @@ -241,7 +245,7 @@ function createBaseQueryDeploymentsResponse(): QueryDeploymentsResponse { } export const QueryDeploymentsResponse = { typeUrl: "/akash.deployment.v1beta2.QueryDeploymentsResponse", - encode(message: QueryDeploymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deployments) { QueryDeploymentResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -250,8 +254,8 @@ export const QueryDeploymentsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentsResponse(); while (reader.pos < end) { @@ -271,10 +275,10 @@ export const QueryDeploymentsResponse = { return message; }, fromJSON(object: any): QueryDeploymentsResponse { - return { - deployments: Array.isArray(object?.deployments) ? object.deployments.map((e: any) => QueryDeploymentResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDeploymentsResponse(); + if (Array.isArray(object?.deployments)) object.deployments.map((e: any) => QueryDeploymentResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDeploymentsResponse): unknown { const obj: any = {}; @@ -289,7 +293,9 @@ export const QueryDeploymentsResponse = { fromPartial(object: DeepPartial): QueryDeploymentsResponse { const message = createBaseQueryDeploymentsResponse(); message.deployments = object.deployments?.map(e => QueryDeploymentResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDeploymentsResponseSDKType): QueryDeploymentsResponse { @@ -347,14 +353,14 @@ function createBaseQueryDeploymentRequest(): QueryDeploymentRequest { } export const QueryDeploymentRequest = { typeUrl: "/akash.deployment.v1beta2.QueryDeploymentRequest", - encode(message: QueryDeploymentRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { DeploymentID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentRequest(); while (reader.pos < end) { @@ -371,9 +377,9 @@ export const QueryDeploymentRequest = { return message; }, fromJSON(object: any): QueryDeploymentRequest { - return { - id: isSet(object.id) ? DeploymentID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryDeploymentRequest(); + if (isSet(object.id)) obj.id = DeploymentID.fromJSON(object.id); + return obj; }, toJSON(message: QueryDeploymentRequest): unknown { const obj: any = {}; @@ -382,7 +388,9 @@ export const QueryDeploymentRequest = { }, fromPartial(object: DeepPartial): QueryDeploymentRequest { const message = createBaseQueryDeploymentRequest(); - message.id = object.id !== undefined && object.id !== null ? DeploymentID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = DeploymentID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryDeploymentRequestSDKType): QueryDeploymentRequest { @@ -430,7 +438,7 @@ function createBaseQueryDeploymentResponse(): QueryDeploymentResponse { } export const QueryDeploymentResponse = { typeUrl: "/akash.deployment.v1beta2.QueryDeploymentResponse", - encode(message: QueryDeploymentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDeploymentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployment !== undefined) { Deployment.encode(message.deployment, writer.uint32(10).fork()).ldelim(); } @@ -442,8 +450,8 @@ export const QueryDeploymentResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDeploymentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDeploymentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDeploymentResponse(); while (reader.pos < end) { @@ -466,11 +474,11 @@ export const QueryDeploymentResponse = { return message; }, fromJSON(object: any): QueryDeploymentResponse { - return { - deployment: isSet(object.deployment) ? Deployment.fromJSON(object.deployment) : undefined, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => Group.fromJSON(e)) : [], - escrowAccount: isSet(object.escrowAccount) ? Account.fromJSON(object.escrowAccount) : undefined - }; + const obj = createBaseQueryDeploymentResponse(); + if (isSet(object.deployment)) obj.deployment = Deployment.fromJSON(object.deployment); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => Group.fromJSON(e)); + if (isSet(object.escrowAccount)) obj.escrowAccount = Account.fromJSON(object.escrowAccount); + return obj; }, toJSON(message: QueryDeploymentResponse): unknown { const obj: any = {}; @@ -485,9 +493,13 @@ export const QueryDeploymentResponse = { }, fromPartial(object: DeepPartial): QueryDeploymentResponse { const message = createBaseQueryDeploymentResponse(); - message.deployment = object.deployment !== undefined && object.deployment !== null ? Deployment.fromPartial(object.deployment) : undefined; + if (object.deployment !== undefined && object.deployment !== null) { + message.deployment = Deployment.fromPartial(object.deployment); + } message.groups = object.groups?.map(e => Group.fromPartial(e)) || []; - message.escrowAccount = object.escrowAccount !== undefined && object.escrowAccount !== null ? Account.fromPartial(object.escrowAccount) : undefined; + if (object.escrowAccount !== undefined && object.escrowAccount !== null) { + message.escrowAccount = Account.fromPartial(object.escrowAccount); + } return message; }, fromSDK(object: QueryDeploymentResponseSDKType): QueryDeploymentResponse { @@ -549,14 +561,14 @@ function createBaseQueryGroupRequest(): QueryGroupRequest { } export const QueryGroupRequest = { typeUrl: "/akash.deployment.v1beta2.QueryGroupRequest", - encode(message: QueryGroupRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { GroupID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupRequest(); while (reader.pos < end) { @@ -573,9 +585,9 @@ export const QueryGroupRequest = { return message; }, fromJSON(object: any): QueryGroupRequest { - return { - id: isSet(object.id) ? GroupID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryGroupRequest(); + if (isSet(object.id)) obj.id = GroupID.fromJSON(object.id); + return obj; }, toJSON(message: QueryGroupRequest): unknown { const obj: any = {}; @@ -584,7 +596,9 @@ export const QueryGroupRequest = { }, fromPartial(object: DeepPartial): QueryGroupRequest { const message = createBaseQueryGroupRequest(); - message.id = object.id !== undefined && object.id !== null ? GroupID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = GroupID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryGroupRequestSDKType): QueryGroupRequest { @@ -630,14 +644,14 @@ function createBaseQueryGroupResponse(): QueryGroupResponse { } export const QueryGroupResponse = { typeUrl: "/akash.deployment.v1beta2.QueryGroupResponse", - encode(message: QueryGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.group !== undefined) { Group.encode(message.group, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupResponse(); while (reader.pos < end) { @@ -654,9 +668,9 @@ export const QueryGroupResponse = { return message; }, fromJSON(object: any): QueryGroupResponse { - return { - group: isSet(object.group) ? Group.fromJSON(object.group) : undefined - }; + const obj = createBaseQueryGroupResponse(); + if (isSet(object.group)) obj.group = Group.fromJSON(object.group); + return obj; }, toJSON(message: QueryGroupResponse): unknown { const obj: any = {}; @@ -665,7 +679,9 @@ export const QueryGroupResponse = { }, fromPartial(object: DeepPartial): QueryGroupResponse { const message = createBaseQueryGroupResponse(); - message.group = object.group !== undefined && object.group !== null ? Group.fromPartial(object.group) : undefined; + if (object.group !== undefined && object.group !== null) { + message.group = Group.fromPartial(object.group); + } return message; }, fromSDK(object: QueryGroupResponseSDKType): QueryGroupResponse { diff --git a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts index 04dcc1d9d2..ff2d6a554f 100644 --- a/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts +++ b/__fixtures__/v-next/outputv2/akash/deployment/v1beta2/resource.ts @@ -1,6 +1,6 @@ import { ResourceUnits, ResourceUnitsAmino, ResourceUnitsSDKType } from "../../base/v1beta2/resourceunits"; import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.deployment.v1beta2"; /** Resource stores unit, total count and price of resource */ @@ -38,7 +38,7 @@ function createBaseResource(): Resource { } export const Resource = { typeUrl: "/akash.deployment.v1beta2.Resource", - encode(message: Resource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Resource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resources !== undefined) { ResourceUnits.encode(message.resources, writer.uint32(10).fork()).ldelim(); } @@ -50,8 +50,8 @@ export const Resource = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Resource { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Resource { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResource(); while (reader.pos < end) { @@ -74,11 +74,11 @@ export const Resource = { return message; }, fromJSON(object: any): Resource { - return { - resources: isSet(object.resources) ? ResourceUnits.fromJSON(object.resources) : undefined, - count: isSet(object.count) ? Number(object.count) : 0, - price: isSet(object.price) ? DecCoin.fromJSON(object.price) : undefined - }; + const obj = createBaseResource(); + if (isSet(object.resources)) obj.resources = ResourceUnits.fromJSON(object.resources); + if (isSet(object.count)) obj.count = Number(object.count); + if (isSet(object.price)) obj.price = DecCoin.fromJSON(object.price); + return obj; }, toJSON(message: Resource): unknown { const obj: any = {}; @@ -89,9 +89,13 @@ export const Resource = { }, fromPartial(object: DeepPartial): Resource { const message = createBaseResource(); - message.resources = object.resources !== undefined && object.resources !== null ? ResourceUnits.fromPartial(object.resources) : undefined; + if (object.resources !== undefined && object.resources !== null) { + message.resources = ResourceUnits.fromPartial(object.resources); + } message.count = object.count ?? 0; - message.price = object.price !== undefined && object.price !== null ? DecCoin.fromPartial(object.price) : undefined; + if (object.price !== undefined && object.price !== null) { + message.price = DecCoin.fromPartial(object.price); + } return message; }, fromSDK(object: ResourceSDKType): Resource { diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts index 3281ea1880..2165855a94 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Account, AccountAmino, AccountSDKType, Payment, PaymentAmino, PaymentSDKType } from "./types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.escrow.v1beta1"; /** GenesisState defines the basic genesis state used by escrow module */ @@ -33,7 +33,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.escrow.v1beta1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -42,8 +42,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -63,10 +63,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromJSON(e)) : [], - payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => Payment.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Account.fromJSON(e)); + if (Array.isArray(object?.payments)) object.payments.map((e: any) => Payment.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts index 6bea7f65be..e15399bb86 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { Account, AccountAmino, AccountSDKType, Payment, PaymentAmino, PaymentSDKType } from "./types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.escrow.v1beta1"; /** QueryAccountRequest is request type for the Query/Account RPC method */ @@ -127,7 +127,7 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest { } export const QueryAccountsRequest = { typeUrl: "/akash.escrow.v1beta1.QueryAccountsRequest", - encode(message: QueryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); } @@ -145,8 +145,8 @@ export const QueryAccountsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountsRequest(); while (reader.pos < end) { @@ -175,13 +175,13 @@ export const QueryAccountsRequest = { return message; }, fromJSON(object: any): QueryAccountsRequest { - return { - scope: isSet(object.scope) ? String(object.scope) : "", - xid: isSet(object.xid) ? String(object.xid) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? String(object.state) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAccountsRequest(); + if (isSet(object.scope)) obj.scope = String(object.scope); + if (isSet(object.xid)) obj.xid = String(object.xid); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = String(object.state); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAccountsRequest): unknown { const obj: any = {}; @@ -198,7 +198,9 @@ export const QueryAccountsRequest = { message.xid = object.xid ?? ""; message.owner = object.owner ?? ""; message.state = object.state ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAccountsRequestSDKType): QueryAccountsRequest { @@ -261,7 +263,7 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse { } export const QueryAccountsResponse = { typeUrl: "/akash.escrow.v1beta1.QueryAccountsResponse", - encode(message: QueryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -270,8 +272,8 @@ export const QueryAccountsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountsResponse(); while (reader.pos < end) { @@ -291,10 +293,10 @@ export const QueryAccountsResponse = { return message; }, fromJSON(object: any): QueryAccountsResponse { - return { - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAccountsResponse(); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Account.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAccountsResponse): unknown { const obj: any = {}; @@ -309,7 +311,9 @@ export const QueryAccountsResponse = { fromPartial(object: DeepPartial): QueryAccountsResponse { const message = createBaseQueryAccountsResponse(); message.accounts = object.accounts?.map(e => Account.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAccountsResponseSDKType): QueryAccountsResponse { @@ -372,7 +376,7 @@ function createBaseQueryPaymentsRequest(): QueryPaymentsRequest { } export const QueryPaymentsRequest = { typeUrl: "/akash.escrow.v1beta1.QueryPaymentsRequest", - encode(message: QueryPaymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPaymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); } @@ -393,8 +397,8 @@ export const QueryPaymentsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPaymentsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPaymentsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPaymentsRequest(); while (reader.pos < end) { @@ -426,14 +430,14 @@ export const QueryPaymentsRequest = { return message; }, fromJSON(object: any): QueryPaymentsRequest { - return { - scope: isSet(object.scope) ? String(object.scope) : "", - xid: isSet(object.xid) ? String(object.xid) : "", - id: isSet(object.id) ? String(object.id) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? String(object.state) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryPaymentsRequest(); + if (isSet(object.scope)) obj.scope = String(object.scope); + if (isSet(object.xid)) obj.xid = String(object.xid); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = String(object.state); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryPaymentsRequest): unknown { const obj: any = {}; @@ -452,7 +456,9 @@ export const QueryPaymentsRequest = { message.id = object.id ?? ""; message.owner = object.owner ?? ""; message.state = object.state ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryPaymentsRequestSDKType): QueryPaymentsRequest { @@ -519,7 +525,7 @@ function createBaseQueryPaymentsResponse(): QueryPaymentsResponse { } export const QueryPaymentsResponse = { typeUrl: "/akash.escrow.v1beta1.QueryPaymentsResponse", - encode(message: QueryPaymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPaymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.payments) { Payment.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -528,8 +534,8 @@ export const QueryPaymentsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPaymentsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPaymentsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPaymentsResponse(); while (reader.pos < end) { @@ -549,10 +555,10 @@ export const QueryPaymentsResponse = { return message; }, fromJSON(object: any): QueryPaymentsResponse { - return { - payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => Payment.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryPaymentsResponse(); + if (Array.isArray(object?.payments)) object.payments.map((e: any) => Payment.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryPaymentsResponse): unknown { const obj: any = {}; @@ -567,7 +573,9 @@ export const QueryPaymentsResponse = { fromPartial(object: DeepPartial): QueryPaymentsResponse { const message = createBaseQueryPaymentsResponse(); message.payments = object.payments?.map(e => Payment.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryPaymentsResponseSDKType): QueryPaymentsResponse { diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts index ec8600b9d1..82f70526f6 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta1/types.ts @@ -1,6 +1,6 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.escrow.v1beta1"; /** State stores state for an escrow account */ export enum Account_State { @@ -136,7 +136,7 @@ export interface Account { /** total coins spent by this account */ transferred: Coin; /** block height at which this account was last settled */ - settledAt: Long; + settledAt: bigint; } export interface AccountProtoMsg { typeUrl: "/akash.escrow.v1beta1.Account"; @@ -168,7 +168,7 @@ export interface AccountSDKType { state: Account_State; balance: CoinSDKType; transferred: CoinSDKType; - settled_at: Long; + settled_at: bigint; } /** Payment stores state for a payment */ export interface Payment { @@ -216,7 +216,7 @@ function createBaseAccountID(): AccountID { } export const AccountID = { typeUrl: "/akash.escrow.v1beta1.AccountID", - encode(message: AccountID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AccountID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); } @@ -225,8 +225,8 @@ export const AccountID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AccountID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AccountID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAccountID(); while (reader.pos < end) { @@ -246,10 +246,10 @@ export const AccountID = { return message; }, fromJSON(object: any): AccountID { - return { - scope: isSet(object.scope) ? String(object.scope) : "", - xid: isSet(object.xid) ? String(object.xid) : "" - }; + const obj = createBaseAccountID(); + if (isSet(object.scope)) obj.scope = String(object.scope); + if (isSet(object.xid)) obj.xid = String(object.xid); + return obj; }, toJSON(message: AccountID): unknown { const obj: any = {}; @@ -310,12 +310,12 @@ function createBaseAccount(): Account { state: 0, balance: Coin.fromPartial({}), transferred: Coin.fromPartial({}), - settledAt: Long.ZERO + settledAt: BigInt(0) }; } export const Account = { typeUrl: "/akash.escrow.v1beta1.Account", - encode(message: Account, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Account, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { AccountID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -331,13 +331,13 @@ export const Account = { if (message.transferred !== undefined) { Coin.encode(message.transferred, writer.uint32(42).fork()).ldelim(); } - if (!message.settledAt.isZero()) { + if (message.settledAt !== BigInt(0)) { writer.uint32(48).int64(message.settledAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Account { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Account { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAccount(); while (reader.pos < end) { @@ -359,7 +359,7 @@ export const Account = { message.transferred = Coin.decode(reader, reader.uint32()); break; case 6: - message.settledAt = (reader.int64() as Long); + message.settledAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -369,14 +369,14 @@ export const Account = { return message; }, fromJSON(object: any): Account { - return { - id: isSet(object.id) ? AccountID.fromJSON(object.id) : undefined, - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? account_StateFromJSON(object.state) : -1, - balance: isSet(object.balance) ? Coin.fromJSON(object.balance) : undefined, - transferred: isSet(object.transferred) ? Coin.fromJSON(object.transferred) : undefined, - settledAt: isSet(object.settledAt) ? Long.fromValue(object.settledAt) : Long.ZERO - }; + const obj = createBaseAccount(); + if (isSet(object.id)) obj.id = AccountID.fromJSON(object.id); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = account_StateFromJSON(object.state); + if (isSet(object.balance)) obj.balance = Coin.fromJSON(object.balance); + if (isSet(object.transferred)) obj.transferred = Coin.fromJSON(object.transferred); + if (isSet(object.settledAt)) obj.settledAt = BigInt(object.settledAt.toString()); + return obj; }, toJSON(message: Account): unknown { const obj: any = {}; @@ -385,17 +385,25 @@ export const Account = { message.state !== undefined && (obj.state = account_StateToJSON(message.state)); message.balance !== undefined && (obj.balance = message.balance ? Coin.toJSON(message.balance) : undefined); message.transferred !== undefined && (obj.transferred = message.transferred ? Coin.toJSON(message.transferred) : undefined); - message.settledAt !== undefined && (obj.settledAt = (message.settledAt || Long.ZERO).toString()); + message.settledAt !== undefined && (obj.settledAt = (message.settledAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Account { const message = createBaseAccount(); - message.id = object.id !== undefined && object.id !== null ? AccountID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = AccountID.fromPartial(object.id); + } message.owner = object.owner ?? ""; message.state = object.state ?? 0; - message.balance = object.balance !== undefined && object.balance !== null ? Coin.fromPartial(object.balance) : undefined; - message.transferred = object.transferred !== undefined && object.transferred !== null ? Coin.fromPartial(object.transferred) : undefined; - message.settledAt = object.settledAt !== undefined && object.settledAt !== null ? Long.fromValue(object.settledAt) : Long.ZERO; + if (object.balance !== undefined && object.balance !== null) { + message.balance = Coin.fromPartial(object.balance); + } + if (object.transferred !== undefined && object.transferred !== null) { + message.transferred = Coin.fromPartial(object.transferred); + } + if (object.settledAt !== undefined && object.settledAt !== null) { + message.settledAt = BigInt(object.settledAt.toString()); + } return message; }, fromSDK(object: AccountSDKType): Account { @@ -425,7 +433,7 @@ export const Account = { state: isSet(object.state) ? account_StateFromJSON(object.state) : -1, balance: object?.balance ? Coin.fromAmino(object.balance) : undefined, transferred: object?.transferred ? Coin.fromAmino(object.transferred) : undefined, - settledAt: Long.fromString(object.settled_at) + settledAt: BigInt(object.settled_at) }; }, toAmino(message: Account): AccountAmino { @@ -467,7 +475,7 @@ function createBasePayment(): Payment { } export const Payment = { typeUrl: "/akash.escrow.v1beta1.Payment", - encode(message: Payment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Payment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.accountId !== undefined) { AccountID.encode(message.accountId, writer.uint32(10).fork()).ldelim(); } @@ -491,8 +499,8 @@ export const Payment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Payment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Payment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePayment(); while (reader.pos < end) { @@ -527,15 +535,15 @@ export const Payment = { return message; }, fromJSON(object: any): Payment { - return { - accountId: isSet(object.accountId) ? AccountID.fromJSON(object.accountId) : undefined, - paymentId: isSet(object.paymentId) ? String(object.paymentId) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? payment_StateFromJSON(object.state) : -1, - rate: isSet(object.rate) ? Coin.fromJSON(object.rate) : undefined, - balance: isSet(object.balance) ? Coin.fromJSON(object.balance) : undefined, - withdrawn: isSet(object.withdrawn) ? Coin.fromJSON(object.withdrawn) : undefined - }; + const obj = createBasePayment(); + if (isSet(object.accountId)) obj.accountId = AccountID.fromJSON(object.accountId); + if (isSet(object.paymentId)) obj.paymentId = String(object.paymentId); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = payment_StateFromJSON(object.state); + if (isSet(object.rate)) obj.rate = Coin.fromJSON(object.rate); + if (isSet(object.balance)) obj.balance = Coin.fromJSON(object.balance); + if (isSet(object.withdrawn)) obj.withdrawn = Coin.fromJSON(object.withdrawn); + return obj; }, toJSON(message: Payment): unknown { const obj: any = {}; @@ -550,13 +558,21 @@ export const Payment = { }, fromPartial(object: DeepPartial): Payment { const message = createBasePayment(); - message.accountId = object.accountId !== undefined && object.accountId !== null ? AccountID.fromPartial(object.accountId) : undefined; + if (object.accountId !== undefined && object.accountId !== null) { + message.accountId = AccountID.fromPartial(object.accountId); + } message.paymentId = object.paymentId ?? ""; message.owner = object.owner ?? ""; message.state = object.state ?? 0; - message.rate = object.rate !== undefined && object.rate !== null ? Coin.fromPartial(object.rate) : undefined; - message.balance = object.balance !== undefined && object.balance !== null ? Coin.fromPartial(object.balance) : undefined; - message.withdrawn = object.withdrawn !== undefined && object.withdrawn !== null ? Coin.fromPartial(object.withdrawn) : undefined; + if (object.rate !== undefined && object.rate !== null) { + message.rate = Coin.fromPartial(object.rate); + } + if (object.balance !== undefined && object.balance !== null) { + message.balance = Coin.fromPartial(object.balance); + } + if (object.withdrawn !== undefined && object.withdrawn !== null) { + message.withdrawn = Coin.fromPartial(object.withdrawn); + } return message; }, fromSDK(object: PaymentSDKType): Payment { diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts index 9863272f6a..bfd545fada 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/genesis.ts @@ -1,5 +1,5 @@ import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "./types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.escrow.v1beta2"; /** GenesisState defines the basic genesis state used by escrow module */ @@ -33,7 +33,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.escrow.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -42,8 +42,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -63,10 +63,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromJSON(e)) : [], - payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => FractionalPayment.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Account.fromJSON(e)); + if (Array.isArray(object?.payments)) object.payments.map((e: any) => FractionalPayment.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts index f855ea7962..72a7d4888a 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "./types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.escrow.v1beta2"; /** QueryAccountRequest is request type for the Query/Account RPC method */ @@ -127,7 +127,7 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest { } export const QueryAccountsRequest = { typeUrl: "/akash.escrow.v1beta2.QueryAccountsRequest", - encode(message: QueryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); } @@ -145,8 +145,8 @@ export const QueryAccountsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountsRequest(); while (reader.pos < end) { @@ -175,13 +175,13 @@ export const QueryAccountsRequest = { return message; }, fromJSON(object: any): QueryAccountsRequest { - return { - scope: isSet(object.scope) ? String(object.scope) : "", - xid: isSet(object.xid) ? String(object.xid) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? String(object.state) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAccountsRequest(); + if (isSet(object.scope)) obj.scope = String(object.scope); + if (isSet(object.xid)) obj.xid = String(object.xid); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = String(object.state); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAccountsRequest): unknown { const obj: any = {}; @@ -198,7 +198,9 @@ export const QueryAccountsRequest = { message.xid = object.xid ?? ""; message.owner = object.owner ?? ""; message.state = object.state ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAccountsRequestSDKType): QueryAccountsRequest { @@ -261,7 +263,7 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse { } export const QueryAccountsResponse = { typeUrl: "/akash.escrow.v1beta2.QueryAccountsResponse", - encode(message: QueryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Account.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -270,8 +272,8 @@ export const QueryAccountsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountsResponse(); while (reader.pos < end) { @@ -291,10 +293,10 @@ export const QueryAccountsResponse = { return message; }, fromJSON(object: any): QueryAccountsResponse { - return { - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Account.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAccountsResponse(); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Account.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAccountsResponse): unknown { const obj: any = {}; @@ -309,7 +311,9 @@ export const QueryAccountsResponse = { fromPartial(object: DeepPartial): QueryAccountsResponse { const message = createBaseQueryAccountsResponse(); message.accounts = object.accounts?.map(e => Account.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAccountsResponseSDKType): QueryAccountsResponse { @@ -372,7 +376,7 @@ function createBaseQueryPaymentsRequest(): QueryPaymentsRequest { } export const QueryPaymentsRequest = { typeUrl: "/akash.escrow.v1beta2.QueryPaymentsRequest", - encode(message: QueryPaymentsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPaymentsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); } @@ -393,8 +397,8 @@ export const QueryPaymentsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPaymentsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPaymentsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPaymentsRequest(); while (reader.pos < end) { @@ -426,14 +430,14 @@ export const QueryPaymentsRequest = { return message; }, fromJSON(object: any): QueryPaymentsRequest { - return { - scope: isSet(object.scope) ? String(object.scope) : "", - xid: isSet(object.xid) ? String(object.xid) : "", - id: isSet(object.id) ? String(object.id) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? String(object.state) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryPaymentsRequest(); + if (isSet(object.scope)) obj.scope = String(object.scope); + if (isSet(object.xid)) obj.xid = String(object.xid); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = String(object.state); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryPaymentsRequest): unknown { const obj: any = {}; @@ -452,7 +456,9 @@ export const QueryPaymentsRequest = { message.id = object.id ?? ""; message.owner = object.owner ?? ""; message.state = object.state ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryPaymentsRequestSDKType): QueryPaymentsRequest { @@ -519,7 +525,7 @@ function createBaseQueryPaymentsResponse(): QueryPaymentsResponse { } export const QueryPaymentsResponse = { typeUrl: "/akash.escrow.v1beta2.QueryPaymentsResponse", - encode(message: QueryPaymentsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPaymentsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.payments) { FractionalPayment.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -528,8 +534,8 @@ export const QueryPaymentsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPaymentsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPaymentsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPaymentsResponse(); while (reader.pos < end) { @@ -549,10 +555,10 @@ export const QueryPaymentsResponse = { return message; }, fromJSON(object: any): QueryPaymentsResponse { - return { - payments: Array.isArray(object?.payments) ? object.payments.map((e: any) => FractionalPayment.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryPaymentsResponse(); + if (Array.isArray(object?.payments)) object.payments.map((e: any) => FractionalPayment.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryPaymentsResponse): unknown { const obj: any = {}; @@ -567,7 +573,9 @@ export const QueryPaymentsResponse = { fromPartial(object: DeepPartial): QueryPaymentsResponse { const message = createBaseQueryPaymentsResponse(); message.payments = object.payments?.map(e => FractionalPayment.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryPaymentsResponseSDKType): QueryPaymentsResponse { diff --git a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts index 24a99b6573..f402ec4856 100644 --- a/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts +++ b/__fixtures__/v-next/outputv2/akash/escrow/v1beta2/types.ts @@ -1,6 +1,6 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.escrow.v1beta2"; /** State stores state for an escrow account */ export enum Account_State { @@ -136,7 +136,7 @@ export interface Account { /** total coins spent by this account */ transferred: DecCoin; /** block height at which this account was last settled */ - settledAt: Long; + settledAt: bigint; /** * bech32 encoded account address of the depositor. * If depositor is same as the owner, then any incoming coins are added to the Balance. @@ -190,7 +190,7 @@ export interface AccountSDKType { state: Account_State; balance: DecCoinSDKType; transferred: DecCoinSDKType; - settled_at: Long; + settled_at: bigint; depositor: string; funds: DecCoinSDKType; } @@ -240,7 +240,7 @@ function createBaseAccountID(): AccountID { } export const AccountID = { typeUrl: "/akash.escrow.v1beta2.AccountID", - encode(message: AccountID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AccountID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.scope !== "") { writer.uint32(10).string(message.scope); } @@ -249,8 +249,8 @@ export const AccountID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AccountID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AccountID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAccountID(); while (reader.pos < end) { @@ -270,10 +270,10 @@ export const AccountID = { return message; }, fromJSON(object: any): AccountID { - return { - scope: isSet(object.scope) ? String(object.scope) : "", - xid: isSet(object.xid) ? String(object.xid) : "" - }; + const obj = createBaseAccountID(); + if (isSet(object.scope)) obj.scope = String(object.scope); + if (isSet(object.xid)) obj.xid = String(object.xid); + return obj; }, toJSON(message: AccountID): unknown { const obj: any = {}; @@ -334,14 +334,14 @@ function createBaseAccount(): Account { state: 0, balance: DecCoin.fromPartial({}), transferred: DecCoin.fromPartial({}), - settledAt: Long.ZERO, + settledAt: BigInt(0), depositor: "", funds: DecCoin.fromPartial({}) }; } export const Account = { typeUrl: "/akash.escrow.v1beta2.Account", - encode(message: Account, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Account, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { AccountID.encode(message.id, writer.uint32(10).fork()).ldelim(); } @@ -357,7 +357,7 @@ export const Account = { if (message.transferred !== undefined) { DecCoin.encode(message.transferred, writer.uint32(42).fork()).ldelim(); } - if (!message.settledAt.isZero()) { + if (message.settledAt !== BigInt(0)) { writer.uint32(48).int64(message.settledAt); } if (message.depositor !== "") { @@ -368,8 +368,8 @@ export const Account = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Account { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Account { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAccount(); while (reader.pos < end) { @@ -391,7 +391,7 @@ export const Account = { message.transferred = DecCoin.decode(reader, reader.uint32()); break; case 6: - message.settledAt = (reader.int64() as Long); + message.settledAt = reader.int64(); break; case 7: message.depositor = reader.string(); @@ -407,16 +407,16 @@ export const Account = { return message; }, fromJSON(object: any): Account { - return { - id: isSet(object.id) ? AccountID.fromJSON(object.id) : undefined, - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? account_StateFromJSON(object.state) : -1, - balance: isSet(object.balance) ? DecCoin.fromJSON(object.balance) : undefined, - transferred: isSet(object.transferred) ? DecCoin.fromJSON(object.transferred) : undefined, - settledAt: isSet(object.settledAt) ? Long.fromValue(object.settledAt) : Long.ZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "", - funds: isSet(object.funds) ? DecCoin.fromJSON(object.funds) : undefined - }; + const obj = createBaseAccount(); + if (isSet(object.id)) obj.id = AccountID.fromJSON(object.id); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = account_StateFromJSON(object.state); + if (isSet(object.balance)) obj.balance = DecCoin.fromJSON(object.balance); + if (isSet(object.transferred)) obj.transferred = DecCoin.fromJSON(object.transferred); + if (isSet(object.settledAt)) obj.settledAt = BigInt(object.settledAt.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (isSet(object.funds)) obj.funds = DecCoin.fromJSON(object.funds); + return obj; }, toJSON(message: Account): unknown { const obj: any = {}; @@ -425,21 +425,31 @@ export const Account = { message.state !== undefined && (obj.state = account_StateToJSON(message.state)); message.balance !== undefined && (obj.balance = message.balance ? DecCoin.toJSON(message.balance) : undefined); message.transferred !== undefined && (obj.transferred = message.transferred ? DecCoin.toJSON(message.transferred) : undefined); - message.settledAt !== undefined && (obj.settledAt = (message.settledAt || Long.ZERO).toString()); + message.settledAt !== undefined && (obj.settledAt = (message.settledAt || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); message.funds !== undefined && (obj.funds = message.funds ? DecCoin.toJSON(message.funds) : undefined); return obj; }, fromPartial(object: DeepPartial): Account { const message = createBaseAccount(); - message.id = object.id !== undefined && object.id !== null ? AccountID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = AccountID.fromPartial(object.id); + } message.owner = object.owner ?? ""; message.state = object.state ?? 0; - message.balance = object.balance !== undefined && object.balance !== null ? DecCoin.fromPartial(object.balance) : undefined; - message.transferred = object.transferred !== undefined && object.transferred !== null ? DecCoin.fromPartial(object.transferred) : undefined; - message.settledAt = object.settledAt !== undefined && object.settledAt !== null ? Long.fromValue(object.settledAt) : Long.ZERO; + if (object.balance !== undefined && object.balance !== null) { + message.balance = DecCoin.fromPartial(object.balance); + } + if (object.transferred !== undefined && object.transferred !== null) { + message.transferred = DecCoin.fromPartial(object.transferred); + } + if (object.settledAt !== undefined && object.settledAt !== null) { + message.settledAt = BigInt(object.settledAt.toString()); + } message.depositor = object.depositor ?? ""; - message.funds = object.funds !== undefined && object.funds !== null ? DecCoin.fromPartial(object.funds) : undefined; + if (object.funds !== undefined && object.funds !== null) { + message.funds = DecCoin.fromPartial(object.funds); + } return message; }, fromSDK(object: AccountSDKType): Account { @@ -473,7 +483,7 @@ export const Account = { state: isSet(object.state) ? account_StateFromJSON(object.state) : -1, balance: object?.balance ? DecCoin.fromAmino(object.balance) : undefined, transferred: object?.transferred ? DecCoin.fromAmino(object.transferred) : undefined, - settledAt: Long.fromString(object.settled_at), + settledAt: BigInt(object.settled_at), depositor: object.depositor, funds: object?.funds ? DecCoin.fromAmino(object.funds) : undefined }; @@ -519,7 +529,7 @@ function createBaseFractionalPayment(): FractionalPayment { } export const FractionalPayment = { typeUrl: "/akash.escrow.v1beta2.FractionalPayment", - encode(message: FractionalPayment, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FractionalPayment, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.accountId !== undefined) { AccountID.encode(message.accountId, writer.uint32(10).fork()).ldelim(); } @@ -543,8 +553,8 @@ export const FractionalPayment = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FractionalPayment { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FractionalPayment { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFractionalPayment(); while (reader.pos < end) { @@ -579,15 +589,15 @@ export const FractionalPayment = { return message; }, fromJSON(object: any): FractionalPayment { - return { - accountId: isSet(object.accountId) ? AccountID.fromJSON(object.accountId) : undefined, - paymentId: isSet(object.paymentId) ? String(object.paymentId) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - state: isSet(object.state) ? fractionalPayment_StateFromJSON(object.state) : -1, - rate: isSet(object.rate) ? DecCoin.fromJSON(object.rate) : undefined, - balance: isSet(object.balance) ? DecCoin.fromJSON(object.balance) : undefined, - withdrawn: isSet(object.withdrawn) ? Coin.fromJSON(object.withdrawn) : undefined - }; + const obj = createBaseFractionalPayment(); + if (isSet(object.accountId)) obj.accountId = AccountID.fromJSON(object.accountId); + if (isSet(object.paymentId)) obj.paymentId = String(object.paymentId); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.state)) obj.state = fractionalPayment_StateFromJSON(object.state); + if (isSet(object.rate)) obj.rate = DecCoin.fromJSON(object.rate); + if (isSet(object.balance)) obj.balance = DecCoin.fromJSON(object.balance); + if (isSet(object.withdrawn)) obj.withdrawn = Coin.fromJSON(object.withdrawn); + return obj; }, toJSON(message: FractionalPayment): unknown { const obj: any = {}; @@ -602,13 +612,21 @@ export const FractionalPayment = { }, fromPartial(object: DeepPartial): FractionalPayment { const message = createBaseFractionalPayment(); - message.accountId = object.accountId !== undefined && object.accountId !== null ? AccountID.fromPartial(object.accountId) : undefined; + if (object.accountId !== undefined && object.accountId !== null) { + message.accountId = AccountID.fromPartial(object.accountId); + } message.paymentId = object.paymentId ?? ""; message.owner = object.owner ?? ""; message.state = object.state ?? 0; - message.rate = object.rate !== undefined && object.rate !== null ? DecCoin.fromPartial(object.rate) : undefined; - message.balance = object.balance !== undefined && object.balance !== null ? DecCoin.fromPartial(object.balance) : undefined; - message.withdrawn = object.withdrawn !== undefined && object.withdrawn !== null ? Coin.fromPartial(object.withdrawn) : undefined; + if (object.rate !== undefined && object.rate !== null) { + message.rate = DecCoin.fromPartial(object.rate); + } + if (object.balance !== undefined && object.balance !== null) { + message.balance = DecCoin.fromPartial(object.balance); + } + if (object.withdrawn !== undefined && object.withdrawn !== null) { + message.withdrawn = Coin.fromPartial(object.withdrawn); + } return message; }, fromSDK(object: FractionalPaymentSDKType): FractionalPayment { diff --git a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts index ee80733d91..61f1d9afec 100644 --- a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/genesis.ts @@ -1,5 +1,5 @@ import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.inflation.v1beta2"; /** GenesisState stores slice of genesis deployment instance */ @@ -29,14 +29,14 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.inflation.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -53,9 +53,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -64,7 +64,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts index b462114089..e84c8105eb 100644 --- a/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv2/akash/inflation/v1beta2/params.ts @@ -1,4 +1,5 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { Decimal } from "@cosmjs/math"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.inflation.v1beta2"; /** Params defines the parameters for the x/deployment package */ @@ -54,33 +55,33 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/akash.inflation.v1beta2.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflationDecayFactor !== "") { - writer.uint32(10).string(message.inflationDecayFactor); + writer.uint32(10).string(Decimal.fromUserInput(message.inflationDecayFactor, 18).atomics); } if (message.initialInflation !== "") { - writer.uint32(18).string(message.initialInflation); + writer.uint32(18).string(Decimal.fromUserInput(message.initialInflation, 18).atomics); } if (message.variance !== "") { - writer.uint32(26).string(message.variance); + writer.uint32(26).string(Decimal.fromUserInput(message.variance, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.inflationDecayFactor = reader.string(); + message.inflationDecayFactor = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 2: - message.initialInflation = reader.string(); + message.initialInflation = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.variance = reader.string(); + message.variance = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -90,11 +91,11 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - inflationDecayFactor: isSet(object.inflationDecayFactor) ? String(object.inflationDecayFactor) : "", - initialInflation: isSet(object.initialInflation) ? String(object.initialInflation) : "", - variance: isSet(object.variance) ? String(object.variance) : "" - }; + const obj = createBaseParams(); + if (isSet(object.inflationDecayFactor)) obj.inflationDecayFactor = String(object.inflationDecayFactor); + if (isSet(object.initialInflation)) obj.initialInflation = String(object.initialInflation); + if (isSet(object.variance)) obj.variance = String(object.variance); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts index c896fc73fe..958cd6f747 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/bid.ts @@ -1,7 +1,7 @@ import { OrderID, OrderIDAmino, OrderIDSDKType } from "./order"; import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.market.v1beta2"; /** State is an enum which refers to state of bid */ export enum Bid_State { @@ -142,7 +142,7 @@ export interface MsgCloseBidResponseSDKType {} */ export interface BidID { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -172,7 +172,7 @@ export interface BidIDAminoMsg { */ export interface BidIDSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -182,7 +182,7 @@ export interface Bid { bidId: BidID; state: Bid_State; price: DecCoin; - createdAt: Long; + createdAt: bigint; } export interface BidProtoMsg { typeUrl: "/akash.market.v1beta2.Bid"; @@ -204,12 +204,12 @@ export interface BidSDKType { bid_id: BidIDSDKType; state: Bid_State; price: DecCoinSDKType; - created_at: Long; + created_at: bigint; } /** BidFilters defines flags for bid list filter */ export interface BidFilters { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -235,7 +235,7 @@ export interface BidFiltersAminoMsg { /** BidFilters defines flags for bid list filter */ export interface BidFiltersSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -251,7 +251,7 @@ function createBaseMsgCreateBid(): MsgCreateBid { } export const MsgCreateBid = { typeUrl: "/akash.market.v1beta2.MsgCreateBid", - encode(message: MsgCreateBid, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateBid, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.order !== undefined) { OrderID.encode(message.order, writer.uint32(10).fork()).ldelim(); } @@ -266,8 +266,8 @@ export const MsgCreateBid = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateBid { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateBid { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateBid(); while (reader.pos < end) { @@ -293,12 +293,12 @@ export const MsgCreateBid = { return message; }, fromJSON(object: any): MsgCreateBid { - return { - order: isSet(object.order) ? OrderID.fromJSON(object.order) : undefined, - provider: isSet(object.provider) ? String(object.provider) : "", - price: isSet(object.price) ? DecCoin.fromJSON(object.price) : undefined, - deposit: isSet(object.deposit) ? Coin.fromJSON(object.deposit) : undefined - }; + const obj = createBaseMsgCreateBid(); + if (isSet(object.order)) obj.order = OrderID.fromJSON(object.order); + if (isSet(object.provider)) obj.provider = String(object.provider); + if (isSet(object.price)) obj.price = DecCoin.fromJSON(object.price); + if (isSet(object.deposit)) obj.deposit = Coin.fromJSON(object.deposit); + return obj; }, toJSON(message: MsgCreateBid): unknown { const obj: any = {}; @@ -310,10 +310,16 @@ export const MsgCreateBid = { }, fromPartial(object: DeepPartial): MsgCreateBid { const message = createBaseMsgCreateBid(); - message.order = object.order !== undefined && object.order !== null ? OrderID.fromPartial(object.order) : undefined; + if (object.order !== undefined && object.order !== null) { + message.order = OrderID.fromPartial(object.order); + } message.provider = object.provider ?? ""; - message.price = object.price !== undefined && object.price !== null ? DecCoin.fromPartial(object.price) : undefined; - message.deposit = object.deposit !== undefined && object.deposit !== null ? Coin.fromPartial(object.deposit) : undefined; + if (object.price !== undefined && object.price !== null) { + message.price = DecCoin.fromPartial(object.price); + } + if (object.deposit !== undefined && object.deposit !== null) { + message.deposit = Coin.fromPartial(object.deposit); + } return message; }, fromSDK(object: MsgCreateBidSDKType): MsgCreateBid { @@ -369,11 +375,11 @@ function createBaseMsgCreateBidResponse(): MsgCreateBidResponse { } export const MsgCreateBidResponse = { typeUrl: "/akash.market.v1beta2.MsgCreateBidResponse", - encode(_: MsgCreateBidResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateBidResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateBidResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateBidResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateBidResponse(); while (reader.pos < end) { @@ -387,7 +393,8 @@ export const MsgCreateBidResponse = { return message; }, fromJSON(_: any): MsgCreateBidResponse { - return {}; + const obj = createBaseMsgCreateBidResponse(); + return obj; }, toJSON(_: MsgCreateBidResponse): unknown { const obj: any = {}; @@ -434,14 +441,14 @@ function createBaseMsgCloseBid(): MsgCloseBid { } export const MsgCloseBid = { typeUrl: "/akash.market.v1beta2.MsgCloseBid", - encode(message: MsgCloseBid, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCloseBid, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseBid { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseBid { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseBid(); while (reader.pos < end) { @@ -458,9 +465,9 @@ export const MsgCloseBid = { return message; }, fromJSON(object: any): MsgCloseBid { - return { - bidId: isSet(object.bidId) ? BidID.fromJSON(object.bidId) : undefined - }; + const obj = createBaseMsgCloseBid(); + if (isSet(object.bidId)) obj.bidId = BidID.fromJSON(object.bidId); + return obj; }, toJSON(message: MsgCloseBid): unknown { const obj: any = {}; @@ -469,7 +476,9 @@ export const MsgCloseBid = { }, fromPartial(object: DeepPartial): MsgCloseBid { const message = createBaseMsgCloseBid(); - message.bidId = object.bidId !== undefined && object.bidId !== null ? BidID.fromPartial(object.bidId) : undefined; + if (object.bidId !== undefined && object.bidId !== null) { + message.bidId = BidID.fromPartial(object.bidId); + } return message; }, fromSDK(object: MsgCloseBidSDKType): MsgCloseBid { @@ -513,11 +522,11 @@ function createBaseMsgCloseBidResponse(): MsgCloseBidResponse { } export const MsgCloseBidResponse = { typeUrl: "/akash.market.v1beta2.MsgCloseBidResponse", - encode(_: MsgCloseBidResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCloseBidResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseBidResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseBidResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseBidResponse(); while (reader.pos < end) { @@ -531,7 +540,8 @@ export const MsgCloseBidResponse = { return message; }, fromJSON(_: any): MsgCloseBidResponse { - return {}; + const obj = createBaseMsgCloseBidResponse(); + return obj; }, toJSON(_: MsgCloseBidResponse): unknown { const obj: any = {}; @@ -574,7 +584,7 @@ export const MsgCloseBidResponse = { function createBaseBidID(): BidID { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0, oseq: 0, provider: "" @@ -582,11 +592,11 @@ function createBaseBidID(): BidID { } export const BidID = { typeUrl: "/akash.market.v1beta2.BidID", - encode(message: BidID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BidID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -600,8 +610,8 @@ export const BidID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BidID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BidID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBidID(); while (reader.pos < end) { @@ -611,7 +621,7 @@ export const BidID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -630,18 +640,18 @@ export const BidID = { return message; }, fromJSON(object: any): BidID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0, - oseq: isSet(object.oseq) ? Number(object.oseq) : 0, - provider: isSet(object.provider) ? String(object.provider) : "" - }; + const obj = createBaseBidID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + if (isSet(object.oseq)) obj.oseq = Number(object.oseq); + if (isSet(object.provider)) obj.provider = String(object.provider); + return obj; }, toJSON(message: BidID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); message.oseq !== undefined && (obj.oseq = Math.round(message.oseq)); message.provider !== undefined && (obj.provider = message.provider); @@ -650,7 +660,9 @@ export const BidID = { fromPartial(object: DeepPartial): BidID { const message = createBaseBidID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; message.oseq = object.oseq ?? 0; message.provider = object.provider ?? ""; @@ -677,7 +689,7 @@ export const BidID = { fromAmino(object: BidIDAmino): BidID { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq, oseq: object.oseq, provider: object.provider @@ -713,12 +725,12 @@ function createBaseBid(): Bid { bidId: BidID.fromPartial({}), state: 0, price: DecCoin.fromPartial({}), - createdAt: Long.ZERO + createdAt: BigInt(0) }; } export const Bid = { typeUrl: "/akash.market.v1beta2.Bid", - encode(message: Bid, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Bid, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); } @@ -728,13 +740,13 @@ export const Bid = { if (message.price !== undefined) { DecCoin.encode(message.price, writer.uint32(26).fork()).ldelim(); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Bid { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Bid { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBid(); while (reader.pos < end) { @@ -750,7 +762,7 @@ export const Bid = { message.price = DecCoin.decode(reader, reader.uint32()); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -760,27 +772,33 @@ export const Bid = { return message; }, fromJSON(object: any): Bid { - return { - bidId: isSet(object.bidId) ? BidID.fromJSON(object.bidId) : undefined, - state: isSet(object.state) ? bid_StateFromJSON(object.state) : -1, - price: isSet(object.price) ? DecCoin.fromJSON(object.price) : undefined, - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO - }; + const obj = createBaseBid(); + if (isSet(object.bidId)) obj.bidId = BidID.fromJSON(object.bidId); + if (isSet(object.state)) obj.state = bid_StateFromJSON(object.state); + if (isSet(object.price)) obj.price = DecCoin.fromJSON(object.price); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + return obj; }, toJSON(message: Bid): unknown { const obj: any = {}; message.bidId !== undefined && (obj.bidId = message.bidId ? BidID.toJSON(message.bidId) : undefined); message.state !== undefined && (obj.state = bid_StateToJSON(message.state)); message.price !== undefined && (obj.price = message.price ? DecCoin.toJSON(message.price) : undefined); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Bid { const message = createBaseBid(); - message.bidId = object.bidId !== undefined && object.bidId !== null ? BidID.fromPartial(object.bidId) : undefined; + if (object.bidId !== undefined && object.bidId !== null) { + message.bidId = BidID.fromPartial(object.bidId); + } message.state = object.state ?? 0; - message.price = object.price !== undefined && object.price !== null ? DecCoin.fromPartial(object.price) : undefined; - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; + if (object.price !== undefined && object.price !== null) { + message.price = DecCoin.fromPartial(object.price); + } + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } return message; }, fromSDK(object: BidSDKType): Bid { @@ -804,7 +822,7 @@ export const Bid = { bidId: object?.bid_id ? BidID.fromAmino(object.bid_id) : undefined, state: isSet(object.state) ? bid_StateFromJSON(object.state) : -1, price: object?.price ? DecCoin.fromAmino(object.price) : undefined, - createdAt: Long.fromString(object.created_at) + createdAt: BigInt(object.created_at) }; }, toAmino(message: Bid): BidAmino { @@ -834,7 +852,7 @@ export const Bid = { function createBaseBidFilters(): BidFilters { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0, oseq: 0, provider: "", @@ -843,11 +861,11 @@ function createBaseBidFilters(): BidFilters { } export const BidFilters = { typeUrl: "/akash.market.v1beta2.BidFilters", - encode(message: BidFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BidFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -864,8 +882,8 @@ export const BidFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BidFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BidFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBidFilters(); while (reader.pos < end) { @@ -875,7 +893,7 @@ export const BidFilters = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -897,19 +915,19 @@ export const BidFilters = { return message; }, fromJSON(object: any): BidFilters { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0, - oseq: isSet(object.oseq) ? Number(object.oseq) : 0, - provider: isSet(object.provider) ? String(object.provider) : "", - state: isSet(object.state) ? String(object.state) : "" - }; + const obj = createBaseBidFilters(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + if (isSet(object.oseq)) obj.oseq = Number(object.oseq); + if (isSet(object.provider)) obj.provider = String(object.provider); + if (isSet(object.state)) obj.state = String(object.state); + return obj; }, toJSON(message: BidFilters): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); message.oseq !== undefined && (obj.oseq = Math.round(message.oseq)); message.provider !== undefined && (obj.provider = message.provider); @@ -919,7 +937,9 @@ export const BidFilters = { fromPartial(object: DeepPartial): BidFilters { const message = createBaseBidFilters(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; message.oseq = object.oseq ?? 0; message.provider = object.provider ?? ""; @@ -949,7 +969,7 @@ export const BidFilters = { fromAmino(object: BidFiltersAmino): BidFilters { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq, oseq: object.oseq, provider: object.provider, diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts index 7532cfbf1f..36cd6d3b09 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/genesis.ts @@ -1,7 +1,7 @@ import { Order, OrderAmino, OrderSDKType } from "./order"; import { Lease, LeaseAmino, LeaseSDKType } from "./lease"; import { Params, ParamsAmino, ParamsSDKType } from "./params"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.market.v1beta2"; /** GenesisState defines the basic genesis state used by market module */ @@ -39,7 +39,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.market.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.orders) { Order.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -51,8 +51,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -75,11 +75,11 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - orders: Array.isArray(object?.orders) ? object.orders.map((e: any) => Order.fromJSON(e)) : [], - leases: Array.isArray(object?.leases) ? object.leases.map((e: any) => Lease.fromJSON(e)) : [], - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.orders)) object.orders.map((e: any) => Order.fromJSON(e)); + if (Array.isArray(object?.leases)) object.leases.map((e: any) => Lease.fromJSON(e)); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -100,7 +100,9 @@ export const GenesisState = { const message = createBaseGenesisState(); message.orders = object.orders?.map(e => Order.fromPartial(e)) || []; message.leases = object.leases?.map(e => Lease.fromPartial(e)) || []; - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts index 396b563e44..f7ae60dc62 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/lease.ts @@ -1,7 +1,7 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { BidID, BidIDAmino, BidIDSDKType } from "./bid"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.market.v1beta2"; /** State is an enum which refers to state of lease */ export enum Lease_State { @@ -55,7 +55,7 @@ export function lease_StateToJSON(object: Lease_State): string { /** LeaseID stores bid details of lease */ export interface LeaseID { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -79,7 +79,7 @@ export interface LeaseIDAminoMsg { /** LeaseID stores bid details of lease */ export interface LeaseIDSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -89,8 +89,8 @@ export interface Lease { leaseId: LeaseID; state: Lease_State; price: DecCoin; - createdAt: Long; - closedOn: Long; + createdAt: bigint; + closedOn: bigint; } export interface LeaseProtoMsg { typeUrl: "/akash.market.v1beta2.Lease"; @@ -113,13 +113,13 @@ export interface LeaseSDKType { lease_id: LeaseIDSDKType; state: Lease_State; price: DecCoinSDKType; - created_at: Long; - closed_on: Long; + created_at: bigint; + closed_on: bigint; } /** LeaseFilters defines flags for lease list filter */ export interface LeaseFilters { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -145,7 +145,7 @@ export interface LeaseFiltersAminoMsg { /** LeaseFilters defines flags for lease list filter */ export interface LeaseFiltersSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; provider: string; @@ -256,7 +256,7 @@ export interface MsgCloseLeaseResponseSDKType {} function createBaseLeaseID(): LeaseID { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0, oseq: 0, provider: "" @@ -264,11 +264,11 @@ function createBaseLeaseID(): LeaseID { } export const LeaseID = { typeUrl: "/akash.market.v1beta2.LeaseID", - encode(message: LeaseID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LeaseID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -282,8 +282,8 @@ export const LeaseID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LeaseID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LeaseID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLeaseID(); while (reader.pos < end) { @@ -293,7 +293,7 @@ export const LeaseID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -312,18 +312,18 @@ export const LeaseID = { return message; }, fromJSON(object: any): LeaseID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0, - oseq: isSet(object.oseq) ? Number(object.oseq) : 0, - provider: isSet(object.provider) ? String(object.provider) : "" - }; + const obj = createBaseLeaseID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + if (isSet(object.oseq)) obj.oseq = Number(object.oseq); + if (isSet(object.provider)) obj.provider = String(object.provider); + return obj; }, toJSON(message: LeaseID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); message.oseq !== undefined && (obj.oseq = Math.round(message.oseq)); message.provider !== undefined && (obj.provider = message.provider); @@ -332,7 +332,9 @@ export const LeaseID = { fromPartial(object: DeepPartial): LeaseID { const message = createBaseLeaseID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; message.oseq = object.oseq ?? 0; message.provider = object.provider ?? ""; @@ -359,7 +361,7 @@ export const LeaseID = { fromAmino(object: LeaseIDAmino): LeaseID { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq, oseq: object.oseq, provider: object.provider @@ -395,13 +397,13 @@ function createBaseLease(): Lease { leaseId: LeaseID.fromPartial({}), state: 0, price: DecCoin.fromPartial({}), - createdAt: Long.ZERO, - closedOn: Long.ZERO + createdAt: BigInt(0), + closedOn: BigInt(0) }; } export const Lease = { typeUrl: "/akash.market.v1beta2.Lease", - encode(message: Lease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Lease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leaseId !== undefined) { LeaseID.encode(message.leaseId, writer.uint32(10).fork()).ldelim(); } @@ -411,16 +413,16 @@ export const Lease = { if (message.price !== undefined) { DecCoin.encode(message.price, writer.uint32(26).fork()).ldelim(); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } - if (!message.closedOn.isZero()) { + if (message.closedOn !== BigInt(0)) { writer.uint32(40).int64(message.closedOn); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Lease { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Lease { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLease(); while (reader.pos < end) { @@ -436,10 +438,10 @@ export const Lease = { message.price = DecCoin.decode(reader, reader.uint32()); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; case 5: - message.closedOn = (reader.int64() as Long); + message.closedOn = reader.int64(); break; default: reader.skipType(tag & 7); @@ -449,30 +451,38 @@ export const Lease = { return message; }, fromJSON(object: any): Lease { - return { - leaseId: isSet(object.leaseId) ? LeaseID.fromJSON(object.leaseId) : undefined, - state: isSet(object.state) ? lease_StateFromJSON(object.state) : -1, - price: isSet(object.price) ? DecCoin.fromJSON(object.price) : undefined, - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO, - closedOn: isSet(object.closedOn) ? Long.fromValue(object.closedOn) : Long.ZERO - }; + const obj = createBaseLease(); + if (isSet(object.leaseId)) obj.leaseId = LeaseID.fromJSON(object.leaseId); + if (isSet(object.state)) obj.state = lease_StateFromJSON(object.state); + if (isSet(object.price)) obj.price = DecCoin.fromJSON(object.price); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + if (isSet(object.closedOn)) obj.closedOn = BigInt(object.closedOn.toString()); + return obj; }, toJSON(message: Lease): unknown { const obj: any = {}; message.leaseId !== undefined && (obj.leaseId = message.leaseId ? LeaseID.toJSON(message.leaseId) : undefined); message.state !== undefined && (obj.state = lease_StateToJSON(message.state)); message.price !== undefined && (obj.price = message.price ? DecCoin.toJSON(message.price) : undefined); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); - message.closedOn !== undefined && (obj.closedOn = (message.closedOn || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); + message.closedOn !== undefined && (obj.closedOn = (message.closedOn || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Lease { const message = createBaseLease(); - message.leaseId = object.leaseId !== undefined && object.leaseId !== null ? LeaseID.fromPartial(object.leaseId) : undefined; + if (object.leaseId !== undefined && object.leaseId !== null) { + message.leaseId = LeaseID.fromPartial(object.leaseId); + } message.state = object.state ?? 0; - message.price = object.price !== undefined && object.price !== null ? DecCoin.fromPartial(object.price) : undefined; - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; - message.closedOn = object.closedOn !== undefined && object.closedOn !== null ? Long.fromValue(object.closedOn) : Long.ZERO; + if (object.price !== undefined && object.price !== null) { + message.price = DecCoin.fromPartial(object.price); + } + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } + if (object.closedOn !== undefined && object.closedOn !== null) { + message.closedOn = BigInt(object.closedOn.toString()); + } return message; }, fromSDK(object: LeaseSDKType): Lease { @@ -498,8 +508,8 @@ export const Lease = { leaseId: object?.lease_id ? LeaseID.fromAmino(object.lease_id) : undefined, state: isSet(object.state) ? lease_StateFromJSON(object.state) : -1, price: object?.price ? DecCoin.fromAmino(object.price) : undefined, - createdAt: Long.fromString(object.created_at), - closedOn: Long.fromString(object.closed_on) + createdAt: BigInt(object.created_at), + closedOn: BigInt(object.closed_on) }; }, toAmino(message: Lease): LeaseAmino { @@ -530,7 +540,7 @@ export const Lease = { function createBaseLeaseFilters(): LeaseFilters { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0, oseq: 0, provider: "", @@ -539,11 +549,11 @@ function createBaseLeaseFilters(): LeaseFilters { } export const LeaseFilters = { typeUrl: "/akash.market.v1beta2.LeaseFilters", - encode(message: LeaseFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LeaseFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -560,8 +570,8 @@ export const LeaseFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LeaseFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LeaseFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLeaseFilters(); while (reader.pos < end) { @@ -571,7 +581,7 @@ export const LeaseFilters = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -593,19 +603,19 @@ export const LeaseFilters = { return message; }, fromJSON(object: any): LeaseFilters { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0, - oseq: isSet(object.oseq) ? Number(object.oseq) : 0, - provider: isSet(object.provider) ? String(object.provider) : "", - state: isSet(object.state) ? String(object.state) : "" - }; + const obj = createBaseLeaseFilters(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + if (isSet(object.oseq)) obj.oseq = Number(object.oseq); + if (isSet(object.provider)) obj.provider = String(object.provider); + if (isSet(object.state)) obj.state = String(object.state); + return obj; }, toJSON(message: LeaseFilters): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); message.oseq !== undefined && (obj.oseq = Math.round(message.oseq)); message.provider !== undefined && (obj.provider = message.provider); @@ -615,7 +625,9 @@ export const LeaseFilters = { fromPartial(object: DeepPartial): LeaseFilters { const message = createBaseLeaseFilters(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; message.oseq = object.oseq ?? 0; message.provider = object.provider ?? ""; @@ -645,7 +657,7 @@ export const LeaseFilters = { fromAmino(object: LeaseFiltersAmino): LeaseFilters { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq, oseq: object.oseq, provider: object.provider, @@ -685,14 +697,14 @@ function createBaseMsgCreateLease(): MsgCreateLease { } export const MsgCreateLease = { typeUrl: "/akash.market.v1beta2.MsgCreateLease", - encode(message: MsgCreateLease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateLease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { BidID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateLease { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateLease { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateLease(); while (reader.pos < end) { @@ -709,9 +721,9 @@ export const MsgCreateLease = { return message; }, fromJSON(object: any): MsgCreateLease { - return { - bidId: isSet(object.bidId) ? BidID.fromJSON(object.bidId) : undefined - }; + const obj = createBaseMsgCreateLease(); + if (isSet(object.bidId)) obj.bidId = BidID.fromJSON(object.bidId); + return obj; }, toJSON(message: MsgCreateLease): unknown { const obj: any = {}; @@ -720,7 +732,9 @@ export const MsgCreateLease = { }, fromPartial(object: DeepPartial): MsgCreateLease { const message = createBaseMsgCreateLease(); - message.bidId = object.bidId !== undefined && object.bidId !== null ? BidID.fromPartial(object.bidId) : undefined; + if (object.bidId !== undefined && object.bidId !== null) { + message.bidId = BidID.fromPartial(object.bidId); + } return message; }, fromSDK(object: MsgCreateLeaseSDKType): MsgCreateLease { @@ -764,11 +778,11 @@ function createBaseMsgCreateLeaseResponse(): MsgCreateLeaseResponse { } export const MsgCreateLeaseResponse = { typeUrl: "/akash.market.v1beta2.MsgCreateLeaseResponse", - encode(_: MsgCreateLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateLeaseResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateLeaseResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateLeaseResponse(); while (reader.pos < end) { @@ -782,7 +796,8 @@ export const MsgCreateLeaseResponse = { return message; }, fromJSON(_: any): MsgCreateLeaseResponse { - return {}; + const obj = createBaseMsgCreateLeaseResponse(); + return obj; }, toJSON(_: MsgCreateLeaseResponse): unknown { const obj: any = {}; @@ -829,14 +844,14 @@ function createBaseMsgWithdrawLease(): MsgWithdrawLease { } export const MsgWithdrawLease = { typeUrl: "/akash.market.v1beta2.MsgWithdrawLease", - encode(message: MsgWithdrawLease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgWithdrawLease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidId !== undefined) { LeaseID.encode(message.bidId, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawLease { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawLease { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawLease(); while (reader.pos < end) { @@ -853,9 +868,9 @@ export const MsgWithdrawLease = { return message; }, fromJSON(object: any): MsgWithdrawLease { - return { - bidId: isSet(object.bidId) ? LeaseID.fromJSON(object.bidId) : undefined - }; + const obj = createBaseMsgWithdrawLease(); + if (isSet(object.bidId)) obj.bidId = LeaseID.fromJSON(object.bidId); + return obj; }, toJSON(message: MsgWithdrawLease): unknown { const obj: any = {}; @@ -864,7 +879,9 @@ export const MsgWithdrawLease = { }, fromPartial(object: DeepPartial): MsgWithdrawLease { const message = createBaseMsgWithdrawLease(); - message.bidId = object.bidId !== undefined && object.bidId !== null ? LeaseID.fromPartial(object.bidId) : undefined; + if (object.bidId !== undefined && object.bidId !== null) { + message.bidId = LeaseID.fromPartial(object.bidId); + } return message; }, fromSDK(object: MsgWithdrawLeaseSDKType): MsgWithdrawLease { @@ -908,11 +925,11 @@ function createBaseMsgWithdrawLeaseResponse(): MsgWithdrawLeaseResponse { } export const MsgWithdrawLeaseResponse = { typeUrl: "/akash.market.v1beta2.MsgWithdrawLeaseResponse", - encode(_: MsgWithdrawLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgWithdrawLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawLeaseResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawLeaseResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawLeaseResponse(); while (reader.pos < end) { @@ -926,7 +943,8 @@ export const MsgWithdrawLeaseResponse = { return message; }, fromJSON(_: any): MsgWithdrawLeaseResponse { - return {}; + const obj = createBaseMsgWithdrawLeaseResponse(); + return obj; }, toJSON(_: MsgWithdrawLeaseResponse): unknown { const obj: any = {}; @@ -973,14 +991,14 @@ function createBaseMsgCloseLease(): MsgCloseLease { } export const MsgCloseLease = { typeUrl: "/akash.market.v1beta2.MsgCloseLease", - encode(message: MsgCloseLease, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCloseLease, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leaseId !== undefined) { LeaseID.encode(message.leaseId, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseLease { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseLease { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseLease(); while (reader.pos < end) { @@ -997,9 +1015,9 @@ export const MsgCloseLease = { return message; }, fromJSON(object: any): MsgCloseLease { - return { - leaseId: isSet(object.leaseId) ? LeaseID.fromJSON(object.leaseId) : undefined - }; + const obj = createBaseMsgCloseLease(); + if (isSet(object.leaseId)) obj.leaseId = LeaseID.fromJSON(object.leaseId); + return obj; }, toJSON(message: MsgCloseLease): unknown { const obj: any = {}; @@ -1008,7 +1026,9 @@ export const MsgCloseLease = { }, fromPartial(object: DeepPartial): MsgCloseLease { const message = createBaseMsgCloseLease(); - message.leaseId = object.leaseId !== undefined && object.leaseId !== null ? LeaseID.fromPartial(object.leaseId) : undefined; + if (object.leaseId !== undefined && object.leaseId !== null) { + message.leaseId = LeaseID.fromPartial(object.leaseId); + } return message; }, fromSDK(object: MsgCloseLeaseSDKType): MsgCloseLease { @@ -1052,11 +1072,11 @@ function createBaseMsgCloseLeaseResponse(): MsgCloseLeaseResponse { } export const MsgCloseLeaseResponse = { typeUrl: "/akash.market.v1beta2.MsgCloseLeaseResponse", - encode(_: MsgCloseLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCloseLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCloseLeaseResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCloseLeaseResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCloseLeaseResponse(); while (reader.pos < end) { @@ -1070,7 +1090,8 @@ export const MsgCloseLeaseResponse = { return message; }, fromJSON(_: any): MsgCloseLeaseResponse { - return {}; + const obj = createBaseMsgCloseLeaseResponse(); + return obj; }, toJSON(_: MsgCloseLeaseResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts index 599cb1856b..4fb8ab7620 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/order.ts @@ -1,6 +1,6 @@ import { GroupSpec, GroupSpecAmino, GroupSpecSDKType } from "../../deployment/v1beta2/groupspec"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.market.v1beta2"; /** State is an enum which refers to state of order */ export enum Order_State { @@ -54,7 +54,7 @@ export function order_StateToJSON(object: Order_State): string { /** OrderID stores owner and all other seq numbers */ export interface OrderID { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; } @@ -76,7 +76,7 @@ export interface OrderIDAminoMsg { /** OrderID stores owner and all other seq numbers */ export interface OrderIDSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; } @@ -85,7 +85,7 @@ export interface Order { orderId: OrderID; state: Order_State; spec: GroupSpec; - createdAt: Long; + createdAt: bigint; } export interface OrderProtoMsg { typeUrl: "/akash.market.v1beta2.Order"; @@ -107,12 +107,12 @@ export interface OrderSDKType { order_id: OrderIDSDKType; state: Order_State; spec: GroupSpecSDKType; - created_at: Long; + created_at: bigint; } /** OrderFilters defines flags for order list filter */ export interface OrderFilters { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; state: string; @@ -136,7 +136,7 @@ export interface OrderFiltersAminoMsg { /** OrderFilters defines flags for order list filter */ export interface OrderFiltersSDKType { owner: string; - dseq: Long; + dseq: bigint; gseq: number; oseq: number; state: string; @@ -144,18 +144,18 @@ export interface OrderFiltersSDKType { function createBaseOrderID(): OrderID { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0, oseq: 0 }; } export const OrderID = { typeUrl: "/akash.market.v1beta2.OrderID", - encode(message: OrderID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OrderID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -166,8 +166,8 @@ export const OrderID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OrderID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OrderID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOrderID(); while (reader.pos < end) { @@ -177,7 +177,7 @@ export const OrderID = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -193,17 +193,17 @@ export const OrderID = { return message; }, fromJSON(object: any): OrderID { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0, - oseq: isSet(object.oseq) ? Number(object.oseq) : 0 - }; + const obj = createBaseOrderID(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + if (isSet(object.oseq)) obj.oseq = Number(object.oseq); + return obj; }, toJSON(message: OrderID): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); message.oseq !== undefined && (obj.oseq = Math.round(message.oseq)); return obj; @@ -211,7 +211,9 @@ export const OrderID = { fromPartial(object: DeepPartial): OrderID { const message = createBaseOrderID(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; message.oseq = object.oseq ?? 0; return message; @@ -235,7 +237,7 @@ export const OrderID = { fromAmino(object: OrderIDAmino): OrderID { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq, oseq: object.oseq }; @@ -269,12 +271,12 @@ function createBaseOrder(): Order { orderId: OrderID.fromPartial({}), state: 0, spec: GroupSpec.fromPartial({}), - createdAt: Long.ZERO + createdAt: BigInt(0) }; } export const Order = { typeUrl: "/akash.market.v1beta2.Order", - encode(message: Order, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Order, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.orderId !== undefined) { OrderID.encode(message.orderId, writer.uint32(10).fork()).ldelim(); } @@ -284,13 +286,13 @@ export const Order = { if (message.spec !== undefined) { GroupSpec.encode(message.spec, writer.uint32(26).fork()).ldelim(); } - if (!message.createdAt.isZero()) { + if (message.createdAt !== BigInt(0)) { writer.uint32(32).int64(message.createdAt); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Order { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Order { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOrder(); while (reader.pos < end) { @@ -306,7 +308,7 @@ export const Order = { message.spec = GroupSpec.decode(reader, reader.uint32()); break; case 4: - message.createdAt = (reader.int64() as Long); + message.createdAt = reader.int64(); break; default: reader.skipType(tag & 7); @@ -316,27 +318,33 @@ export const Order = { return message; }, fromJSON(object: any): Order { - return { - orderId: isSet(object.orderId) ? OrderID.fromJSON(object.orderId) : undefined, - state: isSet(object.state) ? order_StateFromJSON(object.state) : -1, - spec: isSet(object.spec) ? GroupSpec.fromJSON(object.spec) : undefined, - createdAt: isSet(object.createdAt) ? Long.fromValue(object.createdAt) : Long.ZERO - }; + const obj = createBaseOrder(); + if (isSet(object.orderId)) obj.orderId = OrderID.fromJSON(object.orderId); + if (isSet(object.state)) obj.state = order_StateFromJSON(object.state); + if (isSet(object.spec)) obj.spec = GroupSpec.fromJSON(object.spec); + if (isSet(object.createdAt)) obj.createdAt = BigInt(object.createdAt.toString()); + return obj; }, toJSON(message: Order): unknown { const obj: any = {}; message.orderId !== undefined && (obj.orderId = message.orderId ? OrderID.toJSON(message.orderId) : undefined); message.state !== undefined && (obj.state = order_StateToJSON(message.state)); message.spec !== undefined && (obj.spec = message.spec ? GroupSpec.toJSON(message.spec) : undefined); - message.createdAt !== undefined && (obj.createdAt = (message.createdAt || Long.ZERO).toString()); + message.createdAt !== undefined && (obj.createdAt = (message.createdAt || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Order { const message = createBaseOrder(); - message.orderId = object.orderId !== undefined && object.orderId !== null ? OrderID.fromPartial(object.orderId) : undefined; + if (object.orderId !== undefined && object.orderId !== null) { + message.orderId = OrderID.fromPartial(object.orderId); + } message.state = object.state ?? 0; - message.spec = object.spec !== undefined && object.spec !== null ? GroupSpec.fromPartial(object.spec) : undefined; - message.createdAt = object.createdAt !== undefined && object.createdAt !== null ? Long.fromValue(object.createdAt) : Long.ZERO; + if (object.spec !== undefined && object.spec !== null) { + message.spec = GroupSpec.fromPartial(object.spec); + } + if (object.createdAt !== undefined && object.createdAt !== null) { + message.createdAt = BigInt(object.createdAt.toString()); + } return message; }, fromSDK(object: OrderSDKType): Order { @@ -360,7 +368,7 @@ export const Order = { orderId: object?.order_id ? OrderID.fromAmino(object.order_id) : undefined, state: isSet(object.state) ? order_StateFromJSON(object.state) : -1, spec: object?.spec ? GroupSpec.fromAmino(object.spec) : undefined, - createdAt: Long.fromString(object.created_at) + createdAt: BigInt(object.created_at) }; }, toAmino(message: Order): OrderAmino { @@ -390,7 +398,7 @@ export const Order = { function createBaseOrderFilters(): OrderFilters { return { owner: "", - dseq: Long.UZERO, + dseq: BigInt(0), gseq: 0, oseq: 0, state: "" @@ -398,11 +406,11 @@ function createBaseOrderFilters(): OrderFilters { } export const OrderFilters = { typeUrl: "/akash.market.v1beta2.OrderFilters", - encode(message: OrderFilters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OrderFilters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } - if (!message.dseq.isZero()) { + if (message.dseq !== BigInt(0)) { writer.uint32(16).uint64(message.dseq); } if (message.gseq !== 0) { @@ -416,8 +424,8 @@ export const OrderFilters = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OrderFilters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OrderFilters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOrderFilters(); while (reader.pos < end) { @@ -427,7 +435,7 @@ export const OrderFilters = { message.owner = reader.string(); break; case 2: - message.dseq = (reader.uint64() as Long); + message.dseq = reader.uint64(); break; case 3: message.gseq = reader.uint32(); @@ -446,18 +454,18 @@ export const OrderFilters = { return message; }, fromJSON(object: any): OrderFilters { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - dseq: isSet(object.dseq) ? Long.fromValue(object.dseq) : Long.UZERO, - gseq: isSet(object.gseq) ? Number(object.gseq) : 0, - oseq: isSet(object.oseq) ? Number(object.oseq) : 0, - state: isSet(object.state) ? String(object.state) : "" - }; + const obj = createBaseOrderFilters(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.dseq)) obj.dseq = BigInt(object.dseq.toString()); + if (isSet(object.gseq)) obj.gseq = Number(object.gseq); + if (isSet(object.oseq)) obj.oseq = Number(object.oseq); + if (isSet(object.state)) obj.state = String(object.state); + return obj; }, toJSON(message: OrderFilters): unknown { const obj: any = {}; message.owner !== undefined && (obj.owner = message.owner); - message.dseq !== undefined && (obj.dseq = (message.dseq || Long.UZERO).toString()); + message.dseq !== undefined && (obj.dseq = (message.dseq || BigInt(0)).toString()); message.gseq !== undefined && (obj.gseq = Math.round(message.gseq)); message.oseq !== undefined && (obj.oseq = Math.round(message.oseq)); message.state !== undefined && (obj.state = message.state); @@ -466,7 +474,9 @@ export const OrderFilters = { fromPartial(object: DeepPartial): OrderFilters { const message = createBaseOrderFilters(); message.owner = object.owner ?? ""; - message.dseq = object.dseq !== undefined && object.dseq !== null ? Long.fromValue(object.dseq) : Long.UZERO; + if (object.dseq !== undefined && object.dseq !== null) { + message.dseq = BigInt(object.dseq.toString()); + } message.gseq = object.gseq ?? 0; message.oseq = object.oseq ?? 0; message.state = object.state ?? ""; @@ -493,7 +503,7 @@ export const OrderFilters = { fromAmino(object: OrderFiltersAmino): OrderFilters { return { owner: object.owner, - dseq: Long.fromString(object.dseq), + dseq: BigInt(object.dseq), gseq: object.gseq, oseq: object.oseq, state: object.state diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts index da144ac591..385c86a3a6 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/params.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.market.v1beta2"; /** Params is the params for the x/market module */ @@ -33,7 +33,7 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/akash.market.v1beta2.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bidMinDeposit !== undefined) { Coin.encode(message.bidMinDeposit, writer.uint32(10).fork()).ldelim(); } @@ -42,8 +42,8 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -63,10 +63,10 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - bidMinDeposit: isSet(object.bidMinDeposit) ? Coin.fromJSON(object.bidMinDeposit) : undefined, - orderMaxBids: isSet(object.orderMaxBids) ? Number(object.orderMaxBids) : 0 - }; + const obj = createBaseParams(); + if (isSet(object.bidMinDeposit)) obj.bidMinDeposit = Coin.fromJSON(object.bidMinDeposit); + if (isSet(object.orderMaxBids)) obj.orderMaxBids = Number(object.orderMaxBids); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -76,7 +76,9 @@ export const Params = { }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.bidMinDeposit = object.bidMinDeposit !== undefined && object.bidMinDeposit !== null ? Coin.fromPartial(object.bidMinDeposit) : undefined; + if (object.bidMinDeposit !== undefined && object.bidMinDeposit !== null) { + message.bidMinDeposit = Coin.fromPartial(object.bidMinDeposit); + } message.orderMaxBids = object.orderMaxBids ?? 0; return message; }, diff --git a/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts index bc016a2f7c..087a862bd8 100644 --- a/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/market/v1beta2/query.ts @@ -3,7 +3,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageRe import { BidFilters, BidFiltersAmino, BidFiltersSDKType, BidID, BidIDAmino, BidIDSDKType, Bid, BidAmino, BidSDKType } from "./bid"; import { LeaseFilters, LeaseFiltersAmino, LeaseFiltersSDKType, LeaseID, LeaseIDAmino, LeaseIDSDKType, Lease, LeaseAmino, LeaseSDKType } from "./lease"; import { Account, AccountAmino, AccountSDKType, FractionalPayment, FractionalPaymentAmino, FractionalPaymentSDKType } from "../../escrow/v1beta2/types"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.market.v1beta2"; /** QueryOrdersRequest is request type for the Query/Orders RPC method */ @@ -278,7 +278,7 @@ function createBaseQueryOrdersRequest(): QueryOrdersRequest { } export const QueryOrdersRequest = { typeUrl: "/akash.market.v1beta2.QueryOrdersRequest", - encode(message: QueryOrdersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryOrdersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { OrderFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); } @@ -287,8 +287,8 @@ export const QueryOrdersRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryOrdersRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryOrdersRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryOrdersRequest(); while (reader.pos < end) { @@ -308,10 +308,10 @@ export const QueryOrdersRequest = { return message; }, fromJSON(object: any): QueryOrdersRequest { - return { - filters: isSet(object.filters) ? OrderFilters.fromJSON(object.filters) : undefined, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryOrdersRequest(); + if (isSet(object.filters)) obj.filters = OrderFilters.fromJSON(object.filters); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryOrdersRequest): unknown { const obj: any = {}; @@ -321,8 +321,12 @@ export const QueryOrdersRequest = { }, fromPartial(object: DeepPartial): QueryOrdersRequest { const message = createBaseQueryOrdersRequest(); - message.filters = object.filters !== undefined && object.filters !== null ? OrderFilters.fromPartial(object.filters) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.filters !== undefined && object.filters !== null) { + message.filters = OrderFilters.fromPartial(object.filters); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryOrdersRequestSDKType): QueryOrdersRequest { @@ -373,7 +377,7 @@ function createBaseQueryOrdersResponse(): QueryOrdersResponse { } export const QueryOrdersResponse = { typeUrl: "/akash.market.v1beta2.QueryOrdersResponse", - encode(message: QueryOrdersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryOrdersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.orders) { Order.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -382,8 +386,8 @@ export const QueryOrdersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryOrdersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryOrdersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryOrdersResponse(); while (reader.pos < end) { @@ -403,10 +407,10 @@ export const QueryOrdersResponse = { return message; }, fromJSON(object: any): QueryOrdersResponse { - return { - orders: Array.isArray(object?.orders) ? object.orders.map((e: any) => Order.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryOrdersResponse(); + if (Array.isArray(object?.orders)) object.orders.map((e: any) => Order.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryOrdersResponse): unknown { const obj: any = {}; @@ -421,7 +425,9 @@ export const QueryOrdersResponse = { fromPartial(object: DeepPartial): QueryOrdersResponse { const message = createBaseQueryOrdersResponse(); message.orders = object.orders?.map(e => Order.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryOrdersResponseSDKType): QueryOrdersResponse { @@ -479,14 +485,14 @@ function createBaseQueryOrderRequest(): QueryOrderRequest { } export const QueryOrderRequest = { typeUrl: "/akash.market.v1beta2.QueryOrderRequest", - encode(message: QueryOrderRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryOrderRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { OrderID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryOrderRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryOrderRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryOrderRequest(); while (reader.pos < end) { @@ -503,9 +509,9 @@ export const QueryOrderRequest = { return message; }, fromJSON(object: any): QueryOrderRequest { - return { - id: isSet(object.id) ? OrderID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryOrderRequest(); + if (isSet(object.id)) obj.id = OrderID.fromJSON(object.id); + return obj; }, toJSON(message: QueryOrderRequest): unknown { const obj: any = {}; @@ -514,7 +520,9 @@ export const QueryOrderRequest = { }, fromPartial(object: DeepPartial): QueryOrderRequest { const message = createBaseQueryOrderRequest(); - message.id = object.id !== undefined && object.id !== null ? OrderID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = OrderID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryOrderRequestSDKType): QueryOrderRequest { @@ -560,14 +568,14 @@ function createBaseQueryOrderResponse(): QueryOrderResponse { } export const QueryOrderResponse = { typeUrl: "/akash.market.v1beta2.QueryOrderResponse", - encode(message: QueryOrderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryOrderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.order !== undefined) { Order.encode(message.order, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryOrderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryOrderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryOrderResponse(); while (reader.pos < end) { @@ -584,9 +592,9 @@ export const QueryOrderResponse = { return message; }, fromJSON(object: any): QueryOrderResponse { - return { - order: isSet(object.order) ? Order.fromJSON(object.order) : undefined - }; + const obj = createBaseQueryOrderResponse(); + if (isSet(object.order)) obj.order = Order.fromJSON(object.order); + return obj; }, toJSON(message: QueryOrderResponse): unknown { const obj: any = {}; @@ -595,7 +603,9 @@ export const QueryOrderResponse = { }, fromPartial(object: DeepPartial): QueryOrderResponse { const message = createBaseQueryOrderResponse(); - message.order = object.order !== undefined && object.order !== null ? Order.fromPartial(object.order) : undefined; + if (object.order !== undefined && object.order !== null) { + message.order = Order.fromPartial(object.order); + } return message; }, fromSDK(object: QueryOrderResponseSDKType): QueryOrderResponse { @@ -642,7 +652,7 @@ function createBaseQueryBidsRequest(): QueryBidsRequest { } export const QueryBidsRequest = { typeUrl: "/akash.market.v1beta2.QueryBidsRequest", - encode(message: QueryBidsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBidsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { BidFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); } @@ -651,8 +661,8 @@ export const QueryBidsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBidsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBidsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBidsRequest(); while (reader.pos < end) { @@ -672,10 +682,10 @@ export const QueryBidsRequest = { return message; }, fromJSON(object: any): QueryBidsRequest { - return { - filters: isSet(object.filters) ? BidFilters.fromJSON(object.filters) : undefined, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryBidsRequest(); + if (isSet(object.filters)) obj.filters = BidFilters.fromJSON(object.filters); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryBidsRequest): unknown { const obj: any = {}; @@ -685,8 +695,12 @@ export const QueryBidsRequest = { }, fromPartial(object: DeepPartial): QueryBidsRequest { const message = createBaseQueryBidsRequest(); - message.filters = object.filters !== undefined && object.filters !== null ? BidFilters.fromPartial(object.filters) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.filters !== undefined && object.filters !== null) { + message.filters = BidFilters.fromPartial(object.filters); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryBidsRequestSDKType): QueryBidsRequest { @@ -737,7 +751,7 @@ function createBaseQueryBidsResponse(): QueryBidsResponse { } export const QueryBidsResponse = { typeUrl: "/akash.market.v1beta2.QueryBidsResponse", - encode(message: QueryBidsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBidsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.bids) { QueryBidResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -746,8 +760,8 @@ export const QueryBidsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBidsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBidsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBidsResponse(); while (reader.pos < end) { @@ -767,10 +781,10 @@ export const QueryBidsResponse = { return message; }, fromJSON(object: any): QueryBidsResponse { - return { - bids: Array.isArray(object?.bids) ? object.bids.map((e: any) => QueryBidResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryBidsResponse(); + if (Array.isArray(object?.bids)) object.bids.map((e: any) => QueryBidResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryBidsResponse): unknown { const obj: any = {}; @@ -785,7 +799,9 @@ export const QueryBidsResponse = { fromPartial(object: DeepPartial): QueryBidsResponse { const message = createBaseQueryBidsResponse(); message.bids = object.bids?.map(e => QueryBidResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryBidsResponseSDKType): QueryBidsResponse { @@ -843,14 +859,14 @@ function createBaseQueryBidRequest(): QueryBidRequest { } export const QueryBidRequest = { typeUrl: "/akash.market.v1beta2.QueryBidRequest", - encode(message: QueryBidRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBidRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { BidID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBidRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBidRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBidRequest(); while (reader.pos < end) { @@ -867,9 +883,9 @@ export const QueryBidRequest = { return message; }, fromJSON(object: any): QueryBidRequest { - return { - id: isSet(object.id) ? BidID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryBidRequest(); + if (isSet(object.id)) obj.id = BidID.fromJSON(object.id); + return obj; }, toJSON(message: QueryBidRequest): unknown { const obj: any = {}; @@ -878,7 +894,9 @@ export const QueryBidRequest = { }, fromPartial(object: DeepPartial): QueryBidRequest { const message = createBaseQueryBidRequest(); - message.id = object.id !== undefined && object.id !== null ? BidID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = BidID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryBidRequestSDKType): QueryBidRequest { @@ -925,7 +943,7 @@ function createBaseQueryBidResponse(): QueryBidResponse { } export const QueryBidResponse = { typeUrl: "/akash.market.v1beta2.QueryBidResponse", - encode(message: QueryBidResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBidResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bid !== undefined) { Bid.encode(message.bid, writer.uint32(10).fork()).ldelim(); } @@ -934,8 +952,8 @@ export const QueryBidResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBidResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBidResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBidResponse(); while (reader.pos < end) { @@ -955,10 +973,10 @@ export const QueryBidResponse = { return message; }, fromJSON(object: any): QueryBidResponse { - return { - bid: isSet(object.bid) ? Bid.fromJSON(object.bid) : undefined, - escrowAccount: isSet(object.escrowAccount) ? Account.fromJSON(object.escrowAccount) : undefined - }; + const obj = createBaseQueryBidResponse(); + if (isSet(object.bid)) obj.bid = Bid.fromJSON(object.bid); + if (isSet(object.escrowAccount)) obj.escrowAccount = Account.fromJSON(object.escrowAccount); + return obj; }, toJSON(message: QueryBidResponse): unknown { const obj: any = {}; @@ -968,8 +986,12 @@ export const QueryBidResponse = { }, fromPartial(object: DeepPartial): QueryBidResponse { const message = createBaseQueryBidResponse(); - message.bid = object.bid !== undefined && object.bid !== null ? Bid.fromPartial(object.bid) : undefined; - message.escrowAccount = object.escrowAccount !== undefined && object.escrowAccount !== null ? Account.fromPartial(object.escrowAccount) : undefined; + if (object.bid !== undefined && object.bid !== null) { + message.bid = Bid.fromPartial(object.bid); + } + if (object.escrowAccount !== undefined && object.escrowAccount !== null) { + message.escrowAccount = Account.fromPartial(object.escrowAccount); + } return message; }, fromSDK(object: QueryBidResponseSDKType): QueryBidResponse { @@ -1020,7 +1042,7 @@ function createBaseQueryLeasesRequest(): QueryLeasesRequest { } export const QueryLeasesRequest = { typeUrl: "/akash.market.v1beta2.QueryLeasesRequest", - encode(message: QueryLeasesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryLeasesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filters !== undefined) { LeaseFilters.encode(message.filters, writer.uint32(10).fork()).ldelim(); } @@ -1029,8 +1051,8 @@ export const QueryLeasesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryLeasesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryLeasesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryLeasesRequest(); while (reader.pos < end) { @@ -1050,10 +1072,10 @@ export const QueryLeasesRequest = { return message; }, fromJSON(object: any): QueryLeasesRequest { - return { - filters: isSet(object.filters) ? LeaseFilters.fromJSON(object.filters) : undefined, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryLeasesRequest(); + if (isSet(object.filters)) obj.filters = LeaseFilters.fromJSON(object.filters); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryLeasesRequest): unknown { const obj: any = {}; @@ -1063,8 +1085,12 @@ export const QueryLeasesRequest = { }, fromPartial(object: DeepPartial): QueryLeasesRequest { const message = createBaseQueryLeasesRequest(); - message.filters = object.filters !== undefined && object.filters !== null ? LeaseFilters.fromPartial(object.filters) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.filters !== undefined && object.filters !== null) { + message.filters = LeaseFilters.fromPartial(object.filters); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryLeasesRequestSDKType): QueryLeasesRequest { @@ -1115,7 +1141,7 @@ function createBaseQueryLeasesResponse(): QueryLeasesResponse { } export const QueryLeasesResponse = { typeUrl: "/akash.market.v1beta2.QueryLeasesResponse", - encode(message: QueryLeasesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryLeasesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.leases) { QueryLeaseResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1124,8 +1150,8 @@ export const QueryLeasesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryLeasesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryLeasesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryLeasesResponse(); while (reader.pos < end) { @@ -1145,10 +1171,10 @@ export const QueryLeasesResponse = { return message; }, fromJSON(object: any): QueryLeasesResponse { - return { - leases: Array.isArray(object?.leases) ? object.leases.map((e: any) => QueryLeaseResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryLeasesResponse(); + if (Array.isArray(object?.leases)) object.leases.map((e: any) => QueryLeaseResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryLeasesResponse): unknown { const obj: any = {}; @@ -1163,7 +1189,9 @@ export const QueryLeasesResponse = { fromPartial(object: DeepPartial): QueryLeasesResponse { const message = createBaseQueryLeasesResponse(); message.leases = object.leases?.map(e => QueryLeaseResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryLeasesResponseSDKType): QueryLeasesResponse { @@ -1221,14 +1249,14 @@ function createBaseQueryLeaseRequest(): QueryLeaseRequest { } export const QueryLeaseRequest = { typeUrl: "/akash.market.v1beta2.QueryLeaseRequest", - encode(message: QueryLeaseRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryLeaseRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== undefined) { LeaseID.encode(message.id, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryLeaseRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryLeaseRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryLeaseRequest(); while (reader.pos < end) { @@ -1245,9 +1273,9 @@ export const QueryLeaseRequest = { return message; }, fromJSON(object: any): QueryLeaseRequest { - return { - id: isSet(object.id) ? LeaseID.fromJSON(object.id) : undefined - }; + const obj = createBaseQueryLeaseRequest(); + if (isSet(object.id)) obj.id = LeaseID.fromJSON(object.id); + return obj; }, toJSON(message: QueryLeaseRequest): unknown { const obj: any = {}; @@ -1256,7 +1284,9 @@ export const QueryLeaseRequest = { }, fromPartial(object: DeepPartial): QueryLeaseRequest { const message = createBaseQueryLeaseRequest(); - message.id = object.id !== undefined && object.id !== null ? LeaseID.fromPartial(object.id) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = LeaseID.fromPartial(object.id); + } return message; }, fromSDK(object: QueryLeaseRequestSDKType): QueryLeaseRequest { @@ -1303,7 +1333,7 @@ function createBaseQueryLeaseResponse(): QueryLeaseResponse { } export const QueryLeaseResponse = { typeUrl: "/akash.market.v1beta2.QueryLeaseResponse", - encode(message: QueryLeaseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryLeaseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.lease !== undefined) { Lease.encode(message.lease, writer.uint32(10).fork()).ldelim(); } @@ -1312,8 +1342,8 @@ export const QueryLeaseResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryLeaseResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryLeaseResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryLeaseResponse(); while (reader.pos < end) { @@ -1333,10 +1363,10 @@ export const QueryLeaseResponse = { return message; }, fromJSON(object: any): QueryLeaseResponse { - return { - lease: isSet(object.lease) ? Lease.fromJSON(object.lease) : undefined, - escrowPayment: isSet(object.escrowPayment) ? FractionalPayment.fromJSON(object.escrowPayment) : undefined - }; + const obj = createBaseQueryLeaseResponse(); + if (isSet(object.lease)) obj.lease = Lease.fromJSON(object.lease); + if (isSet(object.escrowPayment)) obj.escrowPayment = FractionalPayment.fromJSON(object.escrowPayment); + return obj; }, toJSON(message: QueryLeaseResponse): unknown { const obj: any = {}; @@ -1346,8 +1376,12 @@ export const QueryLeaseResponse = { }, fromPartial(object: DeepPartial): QueryLeaseResponse { const message = createBaseQueryLeaseResponse(); - message.lease = object.lease !== undefined && object.lease !== null ? Lease.fromPartial(object.lease) : undefined; - message.escrowPayment = object.escrowPayment !== undefined && object.escrowPayment !== null ? FractionalPayment.fromPartial(object.escrowPayment) : undefined; + if (object.lease !== undefined && object.lease !== null) { + message.lease = Lease.fromPartial(object.lease); + } + if (object.escrowPayment !== undefined && object.escrowPayment !== null) { + message.escrowPayment = FractionalPayment.fromPartial(object.escrowPayment); + } return message; }, fromSDK(object: QueryLeaseResponseSDKType): QueryLeaseResponse { diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts index 60bfc16331..03219435c6 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta1/provider.ts @@ -1,5 +1,5 @@ import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta1/attribute"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.provider.v1beta1"; /** ProviderInfo */ @@ -182,7 +182,7 @@ function createBaseProviderInfo(): ProviderInfo { } export const ProviderInfo = { typeUrl: "/akash.provider.v1beta1.ProviderInfo", - encode(message: ProviderInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ProviderInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.email !== "") { writer.uint32(10).string(message.email); } @@ -191,8 +191,8 @@ export const ProviderInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ProviderInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ProviderInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProviderInfo(); while (reader.pos < end) { @@ -212,10 +212,10 @@ export const ProviderInfo = { return message; }, fromJSON(object: any): ProviderInfo { - return { - email: isSet(object.email) ? String(object.email) : "", - website: isSet(object.website) ? String(object.website) : "" - }; + const obj = createBaseProviderInfo(); + if (isSet(object.email)) obj.email = String(object.email); + if (isSet(object.website)) obj.website = String(object.website); + return obj; }, toJSON(message: ProviderInfo): unknown { const obj: any = {}; @@ -279,7 +279,7 @@ function createBaseMsgCreateProvider(): MsgCreateProvider { } export const MsgCreateProvider = { typeUrl: "/akash.provider.v1beta1.MsgCreateProvider", - encode(message: MsgCreateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -294,8 +294,8 @@ export const MsgCreateProvider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateProvider(); while (reader.pos < end) { @@ -321,12 +321,12 @@ export const MsgCreateProvider = { return message; }, fromJSON(object: any): MsgCreateProvider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - hostUri: isSet(object.hostUri) ? String(object.hostUri) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [], - info: isSet(object.info) ? ProviderInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseMsgCreateProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.hostUri)) obj.hostUri = String(object.hostUri); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + if (isSet(object.info)) obj.info = ProviderInfo.fromJSON(object.info); + return obj; }, toJSON(message: MsgCreateProvider): unknown { const obj: any = {}; @@ -345,7 +345,9 @@ export const MsgCreateProvider = { message.owner = object.owner ?? ""; message.hostUri = object.hostUri ?? ""; message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; - message.info = object.info !== undefined && object.info !== null ? ProviderInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = ProviderInfo.fromPartial(object.info); + } return message; }, fromSDK(object: MsgCreateProviderSDKType): MsgCreateProvider { @@ -409,11 +411,11 @@ function createBaseMsgCreateProviderResponse(): MsgCreateProviderResponse { } export const MsgCreateProviderResponse = { typeUrl: "/akash.provider.v1beta1.MsgCreateProviderResponse", - encode(_: MsgCreateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateProviderResponse(); while (reader.pos < end) { @@ -427,7 +429,8 @@ export const MsgCreateProviderResponse = { return message; }, fromJSON(_: any): MsgCreateProviderResponse { - return {}; + const obj = createBaseMsgCreateProviderResponse(); + return obj; }, toJSON(_: MsgCreateProviderResponse): unknown { const obj: any = {}; @@ -477,7 +480,7 @@ function createBaseMsgUpdateProvider(): MsgUpdateProvider { } export const MsgUpdateProvider = { typeUrl: "/akash.provider.v1beta1.MsgUpdateProvider", - encode(message: MsgUpdateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -492,8 +495,8 @@ export const MsgUpdateProvider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateProvider(); while (reader.pos < end) { @@ -519,12 +522,12 @@ export const MsgUpdateProvider = { return message; }, fromJSON(object: any): MsgUpdateProvider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - hostUri: isSet(object.hostUri) ? String(object.hostUri) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [], - info: isSet(object.info) ? ProviderInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseMsgUpdateProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.hostUri)) obj.hostUri = String(object.hostUri); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + if (isSet(object.info)) obj.info = ProviderInfo.fromJSON(object.info); + return obj; }, toJSON(message: MsgUpdateProvider): unknown { const obj: any = {}; @@ -543,7 +546,9 @@ export const MsgUpdateProvider = { message.owner = object.owner ?? ""; message.hostUri = object.hostUri ?? ""; message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; - message.info = object.info !== undefined && object.info !== null ? ProviderInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = ProviderInfo.fromPartial(object.info); + } return message; }, fromSDK(object: MsgUpdateProviderSDKType): MsgUpdateProvider { @@ -607,11 +612,11 @@ function createBaseMsgUpdateProviderResponse(): MsgUpdateProviderResponse { } export const MsgUpdateProviderResponse = { typeUrl: "/akash.provider.v1beta1.MsgUpdateProviderResponse", - encode(_: MsgUpdateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateProviderResponse(); while (reader.pos < end) { @@ -625,7 +630,8 @@ export const MsgUpdateProviderResponse = { return message; }, fromJSON(_: any): MsgUpdateProviderResponse { - return {}; + const obj = createBaseMsgUpdateProviderResponse(); + return obj; }, toJSON(_: MsgUpdateProviderResponse): unknown { const obj: any = {}; @@ -672,14 +678,14 @@ function createBaseMsgDeleteProvider(): MsgDeleteProvider { } export const MsgDeleteProvider = { typeUrl: "/akash.provider.v1beta1.MsgDeleteProvider", - encode(message: MsgDeleteProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDeleteProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProvider(); while (reader.pos < end) { @@ -696,9 +702,9 @@ export const MsgDeleteProvider = { return message; }, fromJSON(object: any): MsgDeleteProvider { - return { - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseMsgDeleteProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: MsgDeleteProvider): unknown { const obj: any = {}; @@ -751,11 +757,11 @@ function createBaseMsgDeleteProviderResponse(): MsgDeleteProviderResponse { } export const MsgDeleteProviderResponse = { typeUrl: "/akash.provider.v1beta1.MsgDeleteProviderResponse", - encode(_: MsgDeleteProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDeleteProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProviderResponse(); while (reader.pos < end) { @@ -769,7 +775,8 @@ export const MsgDeleteProviderResponse = { return message; }, fromJSON(_: any): MsgDeleteProviderResponse { - return {}; + const obj = createBaseMsgDeleteProviderResponse(); + return obj; }, toJSON(_: MsgDeleteProviderResponse): unknown { const obj: any = {}; @@ -819,7 +826,7 @@ function createBaseProvider(): Provider { } export const Provider = { typeUrl: "/akash.provider.v1beta1.Provider", - encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -834,8 +841,8 @@ export const Provider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Provider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Provider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProvider(); while (reader.pos < end) { @@ -861,12 +868,12 @@ export const Provider = { return message; }, fromJSON(object: any): Provider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - hostUri: isSet(object.hostUri) ? String(object.hostUri) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [], - info: isSet(object.info) ? ProviderInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.hostUri)) obj.hostUri = String(object.hostUri); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + if (isSet(object.info)) obj.info = ProviderInfo.fromJSON(object.info); + return obj; }, toJSON(message: Provider): unknown { const obj: any = {}; @@ -885,7 +892,9 @@ export const Provider = { message.owner = object.owner ?? ""; message.hostUri = object.hostUri ?? ""; message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; - message.info = object.info !== undefined && object.info !== null ? ProviderInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = ProviderInfo.fromPartial(object.info); + } return message; }, fromSDK(object: ProviderSDKType): Provider { diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts index 7b298efd08..b150f1798d 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/genesis.ts @@ -1,5 +1,5 @@ import { Provider, ProviderAmino, ProviderSDKType } from "./provider"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.provider.v1beta2"; /** GenesisState defines the basic genesis state used by provider module */ @@ -29,14 +29,14 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/akash.provider.v1beta2.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.providers) { Provider.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -53,9 +53,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => Provider.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.providers)) object.providers.map((e: any) => Provider.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts index 9f6be2bcae..c4d2382459 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/provider.ts @@ -1,5 +1,5 @@ import { Attribute, AttributeAmino, AttributeSDKType } from "../../base/v1beta2/attribute"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.provider.v1beta2"; /** ProviderInfo */ @@ -182,7 +182,7 @@ function createBaseProviderInfo(): ProviderInfo { } export const ProviderInfo = { typeUrl: "/akash.provider.v1beta2.ProviderInfo", - encode(message: ProviderInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ProviderInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.email !== "") { writer.uint32(10).string(message.email); } @@ -191,8 +191,8 @@ export const ProviderInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ProviderInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ProviderInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProviderInfo(); while (reader.pos < end) { @@ -212,10 +212,10 @@ export const ProviderInfo = { return message; }, fromJSON(object: any): ProviderInfo { - return { - email: isSet(object.email) ? String(object.email) : "", - website: isSet(object.website) ? String(object.website) : "" - }; + const obj = createBaseProviderInfo(); + if (isSet(object.email)) obj.email = String(object.email); + if (isSet(object.website)) obj.website = String(object.website); + return obj; }, toJSON(message: ProviderInfo): unknown { const obj: any = {}; @@ -279,7 +279,7 @@ function createBaseMsgCreateProvider(): MsgCreateProvider { } export const MsgCreateProvider = { typeUrl: "/akash.provider.v1beta2.MsgCreateProvider", - encode(message: MsgCreateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -294,8 +294,8 @@ export const MsgCreateProvider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateProvider(); while (reader.pos < end) { @@ -321,12 +321,12 @@ export const MsgCreateProvider = { return message; }, fromJSON(object: any): MsgCreateProvider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - hostUri: isSet(object.hostUri) ? String(object.hostUri) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [], - info: isSet(object.info) ? ProviderInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseMsgCreateProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.hostUri)) obj.hostUri = String(object.hostUri); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + if (isSet(object.info)) obj.info = ProviderInfo.fromJSON(object.info); + return obj; }, toJSON(message: MsgCreateProvider): unknown { const obj: any = {}; @@ -345,7 +345,9 @@ export const MsgCreateProvider = { message.owner = object.owner ?? ""; message.hostUri = object.hostUri ?? ""; message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; - message.info = object.info !== undefined && object.info !== null ? ProviderInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = ProviderInfo.fromPartial(object.info); + } return message; }, fromSDK(object: MsgCreateProviderSDKType): MsgCreateProvider { @@ -409,11 +411,11 @@ function createBaseMsgCreateProviderResponse(): MsgCreateProviderResponse { } export const MsgCreateProviderResponse = { typeUrl: "/akash.provider.v1beta2.MsgCreateProviderResponse", - encode(_: MsgCreateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateProviderResponse(); while (reader.pos < end) { @@ -427,7 +429,8 @@ export const MsgCreateProviderResponse = { return message; }, fromJSON(_: any): MsgCreateProviderResponse { - return {}; + const obj = createBaseMsgCreateProviderResponse(); + return obj; }, toJSON(_: MsgCreateProviderResponse): unknown { const obj: any = {}; @@ -477,7 +480,7 @@ function createBaseMsgUpdateProvider(): MsgUpdateProvider { } export const MsgUpdateProvider = { typeUrl: "/akash.provider.v1beta2.MsgUpdateProvider", - encode(message: MsgUpdateProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -492,8 +495,8 @@ export const MsgUpdateProvider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateProvider(); while (reader.pos < end) { @@ -519,12 +522,12 @@ export const MsgUpdateProvider = { return message; }, fromJSON(object: any): MsgUpdateProvider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - hostUri: isSet(object.hostUri) ? String(object.hostUri) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [], - info: isSet(object.info) ? ProviderInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseMsgUpdateProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.hostUri)) obj.hostUri = String(object.hostUri); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + if (isSet(object.info)) obj.info = ProviderInfo.fromJSON(object.info); + return obj; }, toJSON(message: MsgUpdateProvider): unknown { const obj: any = {}; @@ -543,7 +546,9 @@ export const MsgUpdateProvider = { message.owner = object.owner ?? ""; message.hostUri = object.hostUri ?? ""; message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; - message.info = object.info !== undefined && object.info !== null ? ProviderInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = ProviderInfo.fromPartial(object.info); + } return message; }, fromSDK(object: MsgUpdateProviderSDKType): MsgUpdateProvider { @@ -607,11 +612,11 @@ function createBaseMsgUpdateProviderResponse(): MsgUpdateProviderResponse { } export const MsgUpdateProviderResponse = { typeUrl: "/akash.provider.v1beta2.MsgUpdateProviderResponse", - encode(_: MsgUpdateProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateProviderResponse(); while (reader.pos < end) { @@ -625,7 +630,8 @@ export const MsgUpdateProviderResponse = { return message; }, fromJSON(_: any): MsgUpdateProviderResponse { - return {}; + const obj = createBaseMsgUpdateProviderResponse(); + return obj; }, toJSON(_: MsgUpdateProviderResponse): unknown { const obj: any = {}; @@ -672,14 +678,14 @@ function createBaseMsgDeleteProvider(): MsgDeleteProvider { } export const MsgDeleteProvider = { typeUrl: "/akash.provider.v1beta2.MsgDeleteProvider", - encode(message: MsgDeleteProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDeleteProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProvider(); while (reader.pos < end) { @@ -696,9 +702,9 @@ export const MsgDeleteProvider = { return message; }, fromJSON(object: any): MsgDeleteProvider { - return { - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseMsgDeleteProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: MsgDeleteProvider): unknown { const obj: any = {}; @@ -751,11 +757,11 @@ function createBaseMsgDeleteProviderResponse(): MsgDeleteProviderResponse { } export const MsgDeleteProviderResponse = { typeUrl: "/akash.provider.v1beta2.MsgDeleteProviderResponse", - encode(_: MsgDeleteProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDeleteProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeleteProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeleteProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeleteProviderResponse(); while (reader.pos < end) { @@ -769,7 +775,8 @@ export const MsgDeleteProviderResponse = { return message; }, fromJSON(_: any): MsgDeleteProviderResponse { - return {}; + const obj = createBaseMsgDeleteProviderResponse(); + return obj; }, toJSON(_: MsgDeleteProviderResponse): unknown { const obj: any = {}; @@ -819,7 +826,7 @@ function createBaseProvider(): Provider { } export const Provider = { typeUrl: "/akash.provider.v1beta2.Provider", - encode(message: Provider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Provider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -834,8 +841,8 @@ export const Provider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Provider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Provider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProvider(); while (reader.pos < end) { @@ -861,12 +868,12 @@ export const Provider = { return message; }, fromJSON(object: any): Provider { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - hostUri: isSet(object.hostUri) ? String(object.hostUri) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [], - info: isSet(object.info) ? ProviderInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseProvider(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.hostUri)) obj.hostUri = String(object.hostUri); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + if (isSet(object.info)) obj.info = ProviderInfo.fromJSON(object.info); + return obj; }, toJSON(message: Provider): unknown { const obj: any = {}; @@ -885,7 +892,9 @@ export const Provider = { message.owner = object.owner ?? ""; message.hostUri = object.hostUri ?? ""; message.attributes = object.attributes?.map(e => Attribute.fromPartial(e)) || []; - message.info = object.info !== undefined && object.info !== null ? ProviderInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = ProviderInfo.fromPartial(object.info); + } return message; }, fromSDK(object: ProviderSDKType): Provider { diff --git a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts index 4e391a0ae2..5604946371 100644 --- a/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts +++ b/__fixtures__/v-next/outputv2/akash/provider/v1beta2/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { Provider, ProviderAmino, ProviderSDKType } from "./provider"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "akash.provider.v1beta2"; /** QueryProvidersRequest is request type for the Query/Providers RPC method */ @@ -93,14 +93,14 @@ function createBaseQueryProvidersRequest(): QueryProvidersRequest { } export const QueryProvidersRequest = { typeUrl: "/akash.provider.v1beta2.QueryProvidersRequest", - encode(message: QueryProvidersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProvidersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProvidersRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProvidersRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProvidersRequest(); while (reader.pos < end) { @@ -117,9 +117,9 @@ export const QueryProvidersRequest = { return message; }, fromJSON(object: any): QueryProvidersRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProvidersRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProvidersRequest): unknown { const obj: any = {}; @@ -128,7 +128,9 @@ export const QueryProvidersRequest = { }, fromPartial(object: DeepPartial): QueryProvidersRequest { const message = createBaseQueryProvidersRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProvidersRequestSDKType): QueryProvidersRequest { @@ -175,7 +177,7 @@ function createBaseQueryProvidersResponse(): QueryProvidersResponse { } export const QueryProvidersResponse = { typeUrl: "/akash.provider.v1beta2.QueryProvidersResponse", - encode(message: QueryProvidersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProvidersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.providers) { Provider.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -184,8 +186,8 @@ export const QueryProvidersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProvidersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProvidersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProvidersResponse(); while (reader.pos < end) { @@ -205,10 +207,10 @@ export const QueryProvidersResponse = { return message; }, fromJSON(object: any): QueryProvidersResponse { - return { - providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => Provider.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProvidersResponse(); + if (Array.isArray(object?.providers)) object.providers.map((e: any) => Provider.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProvidersResponse): unknown { const obj: any = {}; @@ -223,7 +225,9 @@ export const QueryProvidersResponse = { fromPartial(object: DeepPartial): QueryProvidersResponse { const message = createBaseQueryProvidersResponse(); message.providers = object.providers?.map(e => Provider.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProvidersResponseSDKType): QueryProvidersResponse { @@ -281,14 +285,14 @@ function createBaseQueryProviderRequest(): QueryProviderRequest { } export const QueryProviderRequest = { typeUrl: "/akash.provider.v1beta2.QueryProviderRequest", - encode(message: QueryProviderRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProviderRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProviderRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProviderRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProviderRequest(); while (reader.pos < end) { @@ -305,9 +309,9 @@ export const QueryProviderRequest = { return message; }, fromJSON(object: any): QueryProviderRequest { - return { - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseQueryProviderRequest(); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: QueryProviderRequest): unknown { const obj: any = {}; @@ -362,14 +366,14 @@ function createBaseQueryProviderResponse(): QueryProviderResponse { } export const QueryProviderResponse = { typeUrl: "/akash.provider.v1beta2.QueryProviderResponse", - encode(message: QueryProviderResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProviderResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.provider !== undefined) { Provider.encode(message.provider, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProviderResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProviderResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProviderResponse(); while (reader.pos < end) { @@ -386,9 +390,9 @@ export const QueryProviderResponse = { return message; }, fromJSON(object: any): QueryProviderResponse { - return { - provider: isSet(object.provider) ? Provider.fromJSON(object.provider) : undefined - }; + const obj = createBaseQueryProviderResponse(); + if (isSet(object.provider)) obj.provider = Provider.fromJSON(object.provider); + return obj; }, toJSON(message: QueryProviderResponse): unknown { const obj: any = {}; @@ -397,7 +401,9 @@ export const QueryProviderResponse = { }, fromPartial(object: DeepPartial): QueryProviderResponse { const message = createBaseQueryProviderResponse(); - message.provider = object.provider !== undefined && object.provider !== null ? Provider.fromPartial(object.provider) : undefined; + if (object.provider !== undefined && object.provider !== null) { + message.provider = Provider.fromPartial(object.provider); + } return message; }, fromSDK(object: QueryProviderResponseSDKType): QueryProviderResponse { diff --git a/__fixtures__/v-next/outputv2/binary.ts b/__fixtures__/v-next/outputv2/binary.ts new file mode 100644 index 0000000000..8ee00df050 --- /dev/null +++ b/__fixtures__/v-next/outputv2/binary.ts @@ -0,0 +1,534 @@ +/** +* This file and any referenced files were automatically generated by @cosmology/telescope@latest +* DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain +* and run the transpile command or yarn proto command to regenerate this bundle. +*/ + + +// Copyright (c) 2016, Daniel Wirtz All rights reserved. + +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: + +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// * Neither the name of its author, nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. + +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// --- + +// Code generated by the command line utilities is owned by the owner +// of the input file used when generating it. This code is not +// standalone and requires a support library to be linked with it. This +// support library is itself covered by the above license. + +import { utf8Length, utf8Read, utf8Write } from "./utf8"; +import { + int64ToString, + readInt32, + readUInt32, + uInt64ToString, + varint32read, + varint64read, + writeVarint32, + writeVarint64, + int64FromString, + int64Length, + writeFixed32, + writeByte, + zzDecode, + zzEncode, +} from "./varint"; + +export enum WireType { + Varint = 0, + + Fixed64 = 1, + + Bytes = 2, + + Fixed32 = 5, +} + +// Reader +export interface IBinaryReader { + buf: Uint8Array; + pos: number; + type: number; + len: number; + tag(): [number, WireType, number]; + skip(length?: number): this; + skipType(wireType: number): this; + uint32(): number; + int32(): number; + sint32(): number; + fixed32(): number; + sfixed32(): number; + int64(): bigint; + uint64(): bigint; + sint64(): bigint; + fixed64(): bigint; + sfixed64(): bigint; + float(): number; + double(): number; + bool(): boolean; + bytes(): Uint8Array; + string(): string; +} + +export class BinaryReader implements IBinaryReader { + buf: Uint8Array; + pos: number; + type: number; + len: number; + + assertBounds(): void { + if (this.pos > this.len) throw new RangeError("premature EOF"); + } + + constructor(buf?: ArrayLike) { + this.buf = buf ? new Uint8Array(buf) : new Uint8Array(0); + this.pos = 0; + this.type = 0; + this.len = this.buf.length; + } + + tag(): [number, WireType, number] { + const tag = this.uint32(), + fieldNo = tag >>> 3, + wireType = tag & 7; + if (fieldNo <= 0 || wireType < 0 || wireType > 5) + throw new Error( + "illegal tag: field no " + fieldNo + " wire type " + wireType + ); + return [fieldNo, wireType, tag]; + } + + skip(length?: number) { + if (typeof length === "number") { + if (this.pos + length > this.len) throw indexOutOfRange(this, length); + this.pos += length; + } else { + do { + if (this.pos >= this.len) throw indexOutOfRange(this); + } while (this.buf[this.pos++] & 128); + } + return this; + } + + skipType(wireType: number) { + switch (wireType) { + case WireType.Varint: + this.skip(); + break; + case WireType.Fixed64: + this.skip(8); + break; + case WireType.Bytes: + this.skip(this.uint32()); + break; + case 3: + while ((wireType = this.uint32() & 7) !== 4) { + this.skipType(wireType); + } + break; + case WireType.Fixed32: + this.skip(4); + break; + + /* istanbul ignore next */ + default: + throw Error("invalid wire type " + wireType + " at offset " + this.pos); + } + return this; + } + + uint32(): number { + return varint32read.bind(this)(); + } + + int32(): number { + return this.uint32() | 0; + } + + sint32(): number { + const num = this.uint32(); + return num % 2 === 1 ? (num + 1) / -2 : num / 2; // zigzag encoding + } + + fixed32(): number { + const val = readUInt32(this.buf, this.pos); + this.pos += 4; + return val; + } + + sfixed32(): number { + const val = readInt32(this.buf, this.pos); + this.pos += 4; + return val; + } + + int64(): bigint { + const [lo, hi] = varint64read.bind(this)(); + return BigInt(int64ToString(lo, hi)); + } + + uint64(): bigint { + const [lo, hi] = varint64read.bind(this)(); + return BigInt(uInt64ToString(lo, hi)); + } + + sint64(): bigint { + let [lo, hi] = varint64read.bind(this)(); + // zig zag + [lo, hi] = zzDecode(lo, hi); + return BigInt(int64ToString(lo, hi)); + } + + fixed64(): bigint { + const lo = this.sfixed32(); + const hi = this.sfixed32(); + return BigInt(uInt64ToString(lo, hi)); + } + sfixed64(): bigint { + const lo = this.sfixed32(); + const hi = this.sfixed32(); + return BigInt(int64ToString(lo, hi)); + } + + float(): number { + throw new Error("float not supported"); + } + + double(): number { + throw new Error("double not supported"); + } + + bool(): boolean { + const [lo, hi] = varint64read.bind(this)(); + return lo !== 0 || hi !== 0; + } + + bytes(): Uint8Array { + const len = this.uint32(), + start = this.pos; + this.pos += len; + this.assertBounds(); + return this.buf.subarray(start, start + len); + } + + string(): string { + const bytes = this.bytes(); + return utf8Read(bytes, 0, bytes.length); + } +} + +// Writer +export interface IBinaryWriter { + len: number; + head: IOp; + tail: IOp; + states: State | null; + finish(): Uint8Array; + fork(): IBinaryWriter; + reset(): IBinaryWriter; + ldelim(): IBinaryWriter; + tag(fieldNo: number, type: WireType): IBinaryWriter; + uint32(value: number): IBinaryWriter; + int32(value: number): IBinaryWriter; + sint32(value: number): IBinaryWriter; + int64(value: string | number | bigint): IBinaryWriter; + uint64: (value: string | number | bigint) => IBinaryWriter; + sint64(value: string | number | bigint): IBinaryWriter; + fixed64(value: string | number | bigint): IBinaryWriter; + sfixed64: (value: string | number | bigint) => IBinaryWriter; + bool(value: boolean): IBinaryWriter; + fixed32(value: number): IBinaryWriter; + sfixed32: (value: number) => IBinaryWriter; + float(value: number): IBinaryWriter; + double(value: number): IBinaryWriter; + bytes(value: Uint8Array): IBinaryWriter; + string(value: string): IBinaryWriter; +} + +interface IOp { + len: number; + next?: IOp; + proceed(buf: Uint8Array | number[], pos: number): void; +} + +class Op implements IOp { + fn?: ((val: T, buf: Uint8Array | number[], pos: number) => void) | null; + len: number; + val: T; + next?: IOp; + + constructor( + fn: + | (( + val: T, + buf: Uint8Array | number[], + pos: number + ) => void | undefined | null) + | null, + len: number, + val: T + ) { + this.fn = fn; + this.len = len; + this.val = val; + } + + proceed(buf: Uint8Array | number[], pos: number) { + if (this.fn) { + this.fn(this.val, buf, pos); + } + } +} + +class State { + head: IOp; + tail: IOp; + len: number; + next: State | null; + + constructor(writer: BinaryWriter) { + this.head = writer.head; + this.tail = writer.tail; + this.len = writer.len; + this.next = writer.states; + } +} + +export class BinaryWriter implements IBinaryWriter { + len = 0; + head: IOp; + tail: IOp; + states: State | null; + + constructor() { + this.head = new Op(null, 0, 0); + this.tail = this.head; + this.states = null; + } + + static create() { + return new BinaryWriter(); + } + + static alloc(size: number): Uint8Array | number[] { + if (typeof Uint8Array !== "undefined") { + return pool( + (size) => new Uint8Array(size), + Uint8Array.prototype.subarray + )(size); + } else { + return new Array(size); + } + } + + private _push( + fn: (val: T, buf: Uint8Array | number[], pos: number) => void, + len: number, + val: T + ) { + this.tail = this.tail.next = new Op(fn, len, val); + this.len += len; + return this; + } + + finish(): Uint8Array { + let head = this.head.next, + pos = 0; + const buf = BinaryWriter.alloc(this.len); + while (head) { + head.proceed(buf, pos); + pos += head.len; + head = head.next; + } + return buf as Uint8Array; + } + + fork(): BinaryWriter { + this.states = new State(this); + this.head = this.tail = new Op(null, 0, 0); + this.len = 0; + return this; + } + + reset(): BinaryWriter { + if (this.states) { + this.head = this.states.head; + this.tail = this.states.tail; + this.len = this.states.len; + this.states = this.states.next; + } else { + this.head = this.tail = new Op(null, 0, 0); + this.len = 0; + } + return this; + } + + ldelim(): BinaryWriter { + const head = this.head, + tail = this.tail, + len = this.len; + this.reset().uint32(len); + if (len) { + this.tail.next = head.next; // skip noop + this.tail = tail; + this.len += len; + } + return this; + } + + tag(fieldNo: number, type: WireType): BinaryWriter { + return this.uint32(((fieldNo << 3) | type) >>> 0); + } + + uint32(value: number): BinaryWriter { + this.len += (this.tail = this.tail.next = + new Op( + writeVarint32, + (value = value >>> 0) < 128 + ? 1 + : value < 16384 + ? 2 + : value < 2097152 + ? 3 + : value < 268435456 + ? 4 + : 5, + value + )).len; + return this; + } + + int32(value: number): BinaryWriter { + return value < 0 + ? this._push(writeVarint64, 10, int64FromString(value.toString())) // 10 bytes per spec + : this.uint32(value); + } + + sint32(value: number): BinaryWriter { + return this.uint32(((value << 1) ^ (value >> 31)) >>> 0); + } + + int64(value: string | number | bigint): BinaryWriter { + const { lo, hi } = int64FromString(value.toString()); + return this._push(writeVarint64, int64Length(lo, hi), { lo, hi }); + } + + // uint64 is the same with int64 + uint64 = BinaryWriter.prototype.int64; + + sint64(value: string | number | bigint): BinaryWriter { + let { lo, hi } = int64FromString(value.toString()); + // zig zag + [lo, hi] = zzEncode(lo, hi); + return this._push(writeVarint64, int64Length(lo, hi), { lo, hi }); + } + + fixed64(value: string | number | bigint): BinaryWriter { + const { lo, hi } = int64FromString(value.toString()); + return this._push(writeFixed32, 4, lo)._push(writeFixed32, 4, hi); + } + + // sfixed64 is the same with fixed64 + sfixed64 = BinaryWriter.prototype.fixed64; + + bool(value: boolean): BinaryWriter { + return this._push(writeByte, 1, value ? 1 : 0); + } + + fixed32(value: number): BinaryWriter { + return this._push(writeFixed32, 4, value >>> 0); + } + + // sfixed32 is the same with fixed32 + sfixed32 = BinaryWriter.prototype.fixed32; + + float(value: number): BinaryWriter { + throw new Error("float not supported" + value); + } + + double(value: number): BinaryWriter { + throw new Error("double not supported" + value); + } + + bytes(value: Uint8Array): BinaryWriter { + const len = value.length >>> 0; + if (!len) return this._push(writeByte, 1, 0); + return this.uint32(len)._push(writeBytes, len, value); + } + + string(value: string): BinaryWriter { + const len = utf8Length(value); + return len + ? this.uint32(len)._push(utf8Write, len, value) + : this._push(writeByte, 1, 0); + } +} + +function writeBytes( + val: Uint8Array | number[], + buf: Uint8Array | number[], + pos: number +) { + if (typeof Uint8Array !== "undefined") { + (buf as Uint8Array).set(val, pos); + } else { + for (let i = 0; i < val.length; ++i) buf[pos + i] = val[i]; + } +} + +function pool( + alloc: (size: number) => Uint8Array, + slice: (begin?: number, end?: number) => Uint8Array, + size?: number +): (size: number) => Uint8Array { + const SIZE = size || 8192; + const MAX = SIZE >>> 1; + let slab: Uint8Array | null = null; + let offset = SIZE; + return function pool_alloc(size): Uint8Array { + if (size < 1 || size > MAX) return alloc(size); + if (offset + size > SIZE) { + slab = alloc(SIZE); + offset = 0; + } + const buf: Uint8Array = slice.call(slab, offset, (offset += size)); + if (offset & 7) + // align to 32 bit + offset = (offset | 7) + 1; + return buf; + }; +} + +function indexOutOfRange(reader: BinaryReader, writeLength?: number) { + return RangeError( + "index out of range: " + + reader.pos + + " + " + + (writeLength || 1) + + " > " + + reader.len + ); +} diff --git a/__fixtures__/v-next/outputv2/confio/proofs.ts b/__fixtures__/v-next/outputv2/confio/proofs.ts index 0ac5bf37c1..8415a60a47 100644 --- a/__fixtures__/v-next/outputv2/confio/proofs.ts +++ b/__fixtures__/v-next/outputv2/confio/proofs.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../helpers"; export const protobufPackage = "ics23"; export enum HashOp { @@ -764,7 +764,7 @@ function createBaseExistenceProof(): ExistenceProof { } export const ExistenceProof = { typeUrl: "/ics23.ExistenceProof", - encode(message: ExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -779,8 +779,8 @@ export const ExistenceProof = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ExistenceProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ExistenceProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExistenceProof(); while (reader.pos < end) { @@ -806,12 +806,12 @@ export const ExistenceProof = { return message; }, fromJSON(object: any): ExistenceProof { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array(), - leaf: isSet(object.leaf) ? LeafOp.fromJSON(object.leaf) : undefined, - path: Array.isArray(object?.path) ? object.path.map((e: any) => InnerOp.fromJSON(e)) : [] - }; + const obj = createBaseExistenceProof(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + if (isSet(object.leaf)) obj.leaf = LeafOp.fromJSON(object.leaf); + if (Array.isArray(object?.path)) object.path.map((e: any) => InnerOp.fromJSON(e)); + return obj; }, toJSON(message: ExistenceProof): unknown { const obj: any = {}; @@ -829,7 +829,9 @@ export const ExistenceProof = { const message = createBaseExistenceProof(); message.key = object.key ?? new Uint8Array(); message.value = object.value ?? new Uint8Array(); - message.leaf = object.leaf !== undefined && object.leaf !== null ? LeafOp.fromPartial(object.leaf) : undefined; + if (object.leaf !== undefined && object.leaf !== null) { + message.leaf = LeafOp.fromPartial(object.leaf); + } message.path = object.path?.map(e => InnerOp.fromPartial(e)) || []; return message; }, @@ -898,7 +900,7 @@ function createBaseNonExistenceProof(): NonExistenceProof { } export const NonExistenceProof = { typeUrl: "/ics23.NonExistenceProof", - encode(message: NonExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: NonExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -910,8 +912,8 @@ export const NonExistenceProof = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): NonExistenceProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): NonExistenceProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseNonExistenceProof(); while (reader.pos < end) { @@ -934,11 +936,11 @@ export const NonExistenceProof = { return message; }, fromJSON(object: any): NonExistenceProof { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - left: isSet(object.left) ? ExistenceProof.fromJSON(object.left) : undefined, - right: isSet(object.right) ? ExistenceProof.fromJSON(object.right) : undefined - }; + const obj = createBaseNonExistenceProof(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.left)) obj.left = ExistenceProof.fromJSON(object.left); + if (isSet(object.right)) obj.right = ExistenceProof.fromJSON(object.right); + return obj; }, toJSON(message: NonExistenceProof): unknown { const obj: any = {}; @@ -950,8 +952,12 @@ export const NonExistenceProof = { fromPartial(object: DeepPartial): NonExistenceProof { const message = createBaseNonExistenceProof(); message.key = object.key ?? new Uint8Array(); - message.left = object.left !== undefined && object.left !== null ? ExistenceProof.fromPartial(object.left) : undefined; - message.right = object.right !== undefined && object.right !== null ? ExistenceProof.fromPartial(object.right) : undefined; + if (object.left !== undefined && object.left !== null) { + message.left = ExistenceProof.fromPartial(object.left); + } + if (object.right !== undefined && object.right !== null) { + message.right = ExistenceProof.fromPartial(object.right); + } return message; }, fromSDK(object: NonExistenceProofSDKType): NonExistenceProof { @@ -1008,7 +1014,7 @@ function createBaseCommitmentProof(): CommitmentProof { } export const CommitmentProof = { typeUrl: "/ics23.CommitmentProof", - encode(message: CommitmentProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CommitmentProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); } @@ -1023,8 +1029,8 @@ export const CommitmentProof = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CommitmentProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CommitmentProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommitmentProof(); while (reader.pos < end) { @@ -1050,12 +1056,12 @@ export const CommitmentProof = { return message; }, fromJSON(object: any): CommitmentProof { - return { - exist: isSet(object.exist) ? ExistenceProof.fromJSON(object.exist) : undefined, - nonexist: isSet(object.nonexist) ? NonExistenceProof.fromJSON(object.nonexist) : undefined, - batch: isSet(object.batch) ? BatchProof.fromJSON(object.batch) : undefined, - compressed: isSet(object.compressed) ? CompressedBatchProof.fromJSON(object.compressed) : undefined - }; + const obj = createBaseCommitmentProof(); + if (isSet(object.exist)) obj.exist = ExistenceProof.fromJSON(object.exist); + if (isSet(object.nonexist)) obj.nonexist = NonExistenceProof.fromJSON(object.nonexist); + if (isSet(object.batch)) obj.batch = BatchProof.fromJSON(object.batch); + if (isSet(object.compressed)) obj.compressed = CompressedBatchProof.fromJSON(object.compressed); + return obj; }, toJSON(message: CommitmentProof): unknown { const obj: any = {}; @@ -1067,10 +1073,18 @@ export const CommitmentProof = { }, fromPartial(object: DeepPartial): CommitmentProof { const message = createBaseCommitmentProof(); - message.exist = object.exist !== undefined && object.exist !== null ? ExistenceProof.fromPartial(object.exist) : undefined; - message.nonexist = object.nonexist !== undefined && object.nonexist !== null ? NonExistenceProof.fromPartial(object.nonexist) : undefined; - message.batch = object.batch !== undefined && object.batch !== null ? BatchProof.fromPartial(object.batch) : undefined; - message.compressed = object.compressed !== undefined && object.compressed !== null ? CompressedBatchProof.fromPartial(object.compressed) : undefined; + if (object.exist !== undefined && object.exist !== null) { + message.exist = ExistenceProof.fromPartial(object.exist); + } + if (object.nonexist !== undefined && object.nonexist !== null) { + message.nonexist = NonExistenceProof.fromPartial(object.nonexist); + } + if (object.batch !== undefined && object.batch !== null) { + message.batch = BatchProof.fromPartial(object.batch); + } + if (object.compressed !== undefined && object.compressed !== null) { + message.compressed = CompressedBatchProof.fromPartial(object.compressed); + } return message; }, fromSDK(object: CommitmentProofSDKType): CommitmentProof { @@ -1132,7 +1146,7 @@ function createBaseLeafOp(): LeafOp { } export const LeafOp = { typeUrl: "/ics23.LeafOp", - encode(message: LeafOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LeafOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== 0) { writer.uint32(8).int32(message.hash); } @@ -1150,8 +1164,8 @@ export const LeafOp = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LeafOp { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LeafOp { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLeafOp(); while (reader.pos < end) { @@ -1180,13 +1194,13 @@ export const LeafOp = { return message; }, fromJSON(object: any): LeafOp { - return { - hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1, - prehashKey: isSet(object.prehashKey) ? hashOpFromJSON(object.prehashKey) : -1, - prehashValue: isSet(object.prehashValue) ? hashOpFromJSON(object.prehashValue) : -1, - length: isSet(object.length) ? lengthOpFromJSON(object.length) : -1, - prefix: isSet(object.prefix) ? bytesFromBase64(object.prefix) : new Uint8Array() - }; + const obj = createBaseLeafOp(); + if (isSet(object.hash)) obj.hash = hashOpFromJSON(object.hash); + if (isSet(object.prehashKey)) obj.prehashKey = hashOpFromJSON(object.prehashKey); + if (isSet(object.prehashValue)) obj.prehashValue = hashOpFromJSON(object.prehashValue); + if (isSet(object.length)) obj.length = lengthOpFromJSON(object.length); + if (isSet(object.prefix)) obj.prefix = bytesFromBase64(object.prefix); + return obj; }, toJSON(message: LeafOp): unknown { const obj: any = {}; @@ -1267,7 +1281,7 @@ function createBaseInnerOp(): InnerOp { } export const InnerOp = { typeUrl: "/ics23.InnerOp", - encode(message: InnerOp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InnerOp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== 0) { writer.uint32(8).int32(message.hash); } @@ -1279,8 +1293,8 @@ export const InnerOp = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InnerOp { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InnerOp { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInnerOp(); while (reader.pos < end) { @@ -1303,11 +1317,11 @@ export const InnerOp = { return message; }, fromJSON(object: any): InnerOp { - return { - hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1, - prefix: isSet(object.prefix) ? bytesFromBase64(object.prefix) : new Uint8Array(), - suffix: isSet(object.suffix) ? bytesFromBase64(object.suffix) : new Uint8Array() - }; + const obj = createBaseInnerOp(); + if (isSet(object.hash)) obj.hash = hashOpFromJSON(object.hash); + if (isSet(object.prefix)) obj.prefix = bytesFromBase64(object.prefix); + if (isSet(object.suffix)) obj.suffix = bytesFromBase64(object.suffix); + return obj; }, toJSON(message: InnerOp): unknown { const obj: any = {}; @@ -1377,7 +1391,7 @@ function createBaseProofSpec(): ProofSpec { } export const ProofSpec = { typeUrl: "/ics23.ProofSpec", - encode(message: ProofSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ProofSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.leafSpec !== undefined) { LeafOp.encode(message.leafSpec, writer.uint32(10).fork()).ldelim(); } @@ -1392,8 +1406,8 @@ export const ProofSpec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ProofSpec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ProofSpec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProofSpec(); while (reader.pos < end) { @@ -1419,12 +1433,12 @@ export const ProofSpec = { return message; }, fromJSON(object: any): ProofSpec { - return { - leafSpec: isSet(object.leafSpec) ? LeafOp.fromJSON(object.leafSpec) : undefined, - innerSpec: isSet(object.innerSpec) ? InnerSpec.fromJSON(object.innerSpec) : undefined, - maxDepth: isSet(object.maxDepth) ? Number(object.maxDepth) : 0, - minDepth: isSet(object.minDepth) ? Number(object.minDepth) : 0 - }; + const obj = createBaseProofSpec(); + if (isSet(object.leafSpec)) obj.leafSpec = LeafOp.fromJSON(object.leafSpec); + if (isSet(object.innerSpec)) obj.innerSpec = InnerSpec.fromJSON(object.innerSpec); + if (isSet(object.maxDepth)) obj.maxDepth = Number(object.maxDepth); + if (isSet(object.minDepth)) obj.minDepth = Number(object.minDepth); + return obj; }, toJSON(message: ProofSpec): unknown { const obj: any = {}; @@ -1436,8 +1450,12 @@ export const ProofSpec = { }, fromPartial(object: DeepPartial): ProofSpec { const message = createBaseProofSpec(); - message.leafSpec = object.leafSpec !== undefined && object.leafSpec !== null ? LeafOp.fromPartial(object.leafSpec) : undefined; - message.innerSpec = object.innerSpec !== undefined && object.innerSpec !== null ? InnerSpec.fromPartial(object.innerSpec) : undefined; + if (object.leafSpec !== undefined && object.leafSpec !== null) { + message.leafSpec = LeafOp.fromPartial(object.leafSpec); + } + if (object.innerSpec !== undefined && object.innerSpec !== null) { + message.innerSpec = InnerSpec.fromPartial(object.innerSpec); + } message.maxDepth = object.maxDepth ?? 0; message.minDepth = object.minDepth ?? 0; return message; @@ -1502,7 +1520,7 @@ function createBaseInnerSpec(): InnerSpec { } export const InnerSpec = { typeUrl: "/ics23.InnerSpec", - encode(message: InnerSpec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InnerSpec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.childOrder) { writer.int32(v); @@ -1525,8 +1543,8 @@ export const InnerSpec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InnerSpec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InnerSpec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInnerSpec(); while (reader.pos < end) { @@ -1565,14 +1583,14 @@ export const InnerSpec = { return message; }, fromJSON(object: any): InnerSpec { - return { - childOrder: Array.isArray(object?.childOrder) ? object.childOrder.map((e: any) => Number(e)) : [], - childSize: isSet(object.childSize) ? Number(object.childSize) : 0, - minPrefixLength: isSet(object.minPrefixLength) ? Number(object.minPrefixLength) : 0, - maxPrefixLength: isSet(object.maxPrefixLength) ? Number(object.maxPrefixLength) : 0, - emptyChild: isSet(object.emptyChild) ? bytesFromBase64(object.emptyChild) : new Uint8Array(), - hash: isSet(object.hash) ? hashOpFromJSON(object.hash) : -1 - }; + const obj = createBaseInnerSpec(); + if (Array.isArray(object?.childOrder)) object.childOrder.map((e: any) => Number(e)); + if (isSet(object.childSize)) obj.childSize = Number(object.childSize); + if (isSet(object.minPrefixLength)) obj.minPrefixLength = Number(object.minPrefixLength); + if (isSet(object.maxPrefixLength)) obj.maxPrefixLength = Number(object.maxPrefixLength); + if (isSet(object.emptyChild)) obj.emptyChild = bytesFromBase64(object.emptyChild); + if (isSet(object.hash)) obj.hash = hashOpFromJSON(object.hash); + return obj; }, toJSON(message: InnerSpec): unknown { const obj: any = {}; @@ -1669,14 +1687,14 @@ function createBaseBatchProof(): BatchProof { } export const BatchProof = { typeUrl: "/ics23.BatchProof", - encode(message: BatchProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { BatchEntry.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchProof(); while (reader.pos < end) { @@ -1693,9 +1711,9 @@ export const BatchProof = { return message; }, fromJSON(object: any): BatchProof { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => BatchEntry.fromJSON(e)) : [] - }; + const obj = createBaseBatchProof(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => BatchEntry.fromJSON(e)); + return obj; }, toJSON(message: BatchProof): unknown { const obj: any = {}; @@ -1763,7 +1781,7 @@ function createBaseBatchEntry(): BatchEntry { } export const BatchEntry = { typeUrl: "/ics23.BatchEntry", - encode(message: BatchEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { ExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); } @@ -1772,8 +1790,8 @@ export const BatchEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchEntry(); while (reader.pos < end) { @@ -1793,10 +1811,10 @@ export const BatchEntry = { return message; }, fromJSON(object: any): BatchEntry { - return { - exist: isSet(object.exist) ? ExistenceProof.fromJSON(object.exist) : undefined, - nonexist: isSet(object.nonexist) ? NonExistenceProof.fromJSON(object.nonexist) : undefined - }; + const obj = createBaseBatchEntry(); + if (isSet(object.exist)) obj.exist = ExistenceProof.fromJSON(object.exist); + if (isSet(object.nonexist)) obj.nonexist = NonExistenceProof.fromJSON(object.nonexist); + return obj; }, toJSON(message: BatchEntry): unknown { const obj: any = {}; @@ -1806,8 +1824,12 @@ export const BatchEntry = { }, fromPartial(object: DeepPartial): BatchEntry { const message = createBaseBatchEntry(); - message.exist = object.exist !== undefined && object.exist !== null ? ExistenceProof.fromPartial(object.exist) : undefined; - message.nonexist = object.nonexist !== undefined && object.nonexist !== null ? NonExistenceProof.fromPartial(object.nonexist) : undefined; + if (object.exist !== undefined && object.exist !== null) { + message.exist = ExistenceProof.fromPartial(object.exist); + } + if (object.nonexist !== undefined && object.nonexist !== null) { + message.nonexist = NonExistenceProof.fromPartial(object.nonexist); + } return message; }, fromSDK(object: BatchEntrySDKType): BatchEntry { @@ -1858,7 +1880,7 @@ function createBaseCompressedBatchProof(): CompressedBatchProof { } export const CompressedBatchProof = { typeUrl: "/ics23.CompressedBatchProof", - encode(message: CompressedBatchProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CompressedBatchProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { CompressedBatchEntry.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1867,8 +1889,8 @@ export const CompressedBatchProof = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CompressedBatchProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CompressedBatchProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCompressedBatchProof(); while (reader.pos < end) { @@ -1888,10 +1910,10 @@ export const CompressedBatchProof = { return message; }, fromJSON(object: any): CompressedBatchProof { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => CompressedBatchEntry.fromJSON(e)) : [], - lookupInners: Array.isArray(object?.lookupInners) ? object.lookupInners.map((e: any) => InnerOp.fromJSON(e)) : [] - }; + const obj = createBaseCompressedBatchProof(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => CompressedBatchEntry.fromJSON(e)); + if (Array.isArray(object?.lookupInners)) object.lookupInners.map((e: any) => InnerOp.fromJSON(e)); + return obj; }, toJSON(message: CompressedBatchProof): unknown { const obj: any = {}; @@ -1977,7 +1999,7 @@ function createBaseCompressedBatchEntry(): CompressedBatchEntry { } export const CompressedBatchEntry = { typeUrl: "/ics23.CompressedBatchEntry", - encode(message: CompressedBatchEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CompressedBatchEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.exist !== undefined) { CompressedExistenceProof.encode(message.exist, writer.uint32(10).fork()).ldelim(); } @@ -1986,8 +2008,8 @@ export const CompressedBatchEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CompressedBatchEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CompressedBatchEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCompressedBatchEntry(); while (reader.pos < end) { @@ -2007,10 +2029,10 @@ export const CompressedBatchEntry = { return message; }, fromJSON(object: any): CompressedBatchEntry { - return { - exist: isSet(object.exist) ? CompressedExistenceProof.fromJSON(object.exist) : undefined, - nonexist: isSet(object.nonexist) ? CompressedNonExistenceProof.fromJSON(object.nonexist) : undefined - }; + const obj = createBaseCompressedBatchEntry(); + if (isSet(object.exist)) obj.exist = CompressedExistenceProof.fromJSON(object.exist); + if (isSet(object.nonexist)) obj.nonexist = CompressedNonExistenceProof.fromJSON(object.nonexist); + return obj; }, toJSON(message: CompressedBatchEntry): unknown { const obj: any = {}; @@ -2020,8 +2042,12 @@ export const CompressedBatchEntry = { }, fromPartial(object: DeepPartial): CompressedBatchEntry { const message = createBaseCompressedBatchEntry(); - message.exist = object.exist !== undefined && object.exist !== null ? CompressedExistenceProof.fromPartial(object.exist) : undefined; - message.nonexist = object.nonexist !== undefined && object.nonexist !== null ? CompressedNonExistenceProof.fromPartial(object.nonexist) : undefined; + if (object.exist !== undefined && object.exist !== null) { + message.exist = CompressedExistenceProof.fromPartial(object.exist); + } + if (object.nonexist !== undefined && object.nonexist !== null) { + message.nonexist = CompressedNonExistenceProof.fromPartial(object.nonexist); + } return message; }, fromSDK(object: CompressedBatchEntrySDKType): CompressedBatchEntry { @@ -2074,7 +2100,7 @@ function createBaseCompressedExistenceProof(): CompressedExistenceProof { } export const CompressedExistenceProof = { typeUrl: "/ics23.CompressedExistenceProof", - encode(message: CompressedExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CompressedExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -2091,8 +2117,8 @@ export const CompressedExistenceProof = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CompressedExistenceProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CompressedExistenceProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCompressedExistenceProof(); while (reader.pos < end) { @@ -2125,12 +2151,12 @@ export const CompressedExistenceProof = { return message; }, fromJSON(object: any): CompressedExistenceProof { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array(), - leaf: isSet(object.leaf) ? LeafOp.fromJSON(object.leaf) : undefined, - path: Array.isArray(object?.path) ? object.path.map((e: any) => Number(e)) : [] - }; + const obj = createBaseCompressedExistenceProof(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + if (isSet(object.leaf)) obj.leaf = LeafOp.fromJSON(object.leaf); + if (Array.isArray(object?.path)) object.path.map((e: any) => Number(e)); + return obj; }, toJSON(message: CompressedExistenceProof): unknown { const obj: any = {}; @@ -2148,7 +2174,9 @@ export const CompressedExistenceProof = { const message = createBaseCompressedExistenceProof(); message.key = object.key ?? new Uint8Array(); message.value = object.value ?? new Uint8Array(); - message.leaf = object.leaf !== undefined && object.leaf !== null ? LeafOp.fromPartial(object.leaf) : undefined; + if (object.leaf !== undefined && object.leaf !== null) { + message.leaf = LeafOp.fromPartial(object.leaf); + } message.path = object.path?.map(e => e) || []; return message; }, @@ -2217,7 +2245,7 @@ function createBaseCompressedNonExistenceProof(): CompressedNonExistenceProof { } export const CompressedNonExistenceProof = { typeUrl: "/ics23.CompressedNonExistenceProof", - encode(message: CompressedNonExistenceProof, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CompressedNonExistenceProof, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -2229,8 +2257,8 @@ export const CompressedNonExistenceProof = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CompressedNonExistenceProof { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CompressedNonExistenceProof { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCompressedNonExistenceProof(); while (reader.pos < end) { @@ -2253,11 +2281,11 @@ export const CompressedNonExistenceProof = { return message; }, fromJSON(object: any): CompressedNonExistenceProof { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - left: isSet(object.left) ? CompressedExistenceProof.fromJSON(object.left) : undefined, - right: isSet(object.right) ? CompressedExistenceProof.fromJSON(object.right) : undefined - }; + const obj = createBaseCompressedNonExistenceProof(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.left)) obj.left = CompressedExistenceProof.fromJSON(object.left); + if (isSet(object.right)) obj.right = CompressedExistenceProof.fromJSON(object.right); + return obj; }, toJSON(message: CompressedNonExistenceProof): unknown { const obj: any = {}; @@ -2269,8 +2297,12 @@ export const CompressedNonExistenceProof = { fromPartial(object: DeepPartial): CompressedNonExistenceProof { const message = createBaseCompressedNonExistenceProof(); message.key = object.key ?? new Uint8Array(); - message.left = object.left !== undefined && object.left !== null ? CompressedExistenceProof.fromPartial(object.left) : undefined; - message.right = object.right !== undefined && object.right !== null ? CompressedExistenceProof.fromPartial(object.right) : undefined; + if (object.left !== undefined && object.left !== null) { + message.left = CompressedExistenceProof.fromPartial(object.left); + } + if (object.right !== undefined && object.right !== null) { + message.right = CompressedExistenceProof.fromPartial(object.right); + } return message; }, fromSDK(object: CompressedNonExistenceProofSDKType): CompressedNonExistenceProof { diff --git a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts index 8408b6a311..061ad94954 100644 --- a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts +++ b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/config.ts @@ -1,5 +1,5 @@ import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "cosmos.app.v1alpha1"; /** @@ -111,14 +111,14 @@ function createBaseConfig(): Config { export const Config = { typeUrl: "/cosmos.app.v1alpha1.Config", aminoType: "cosmos-sdk/Config", - encode(message: Config, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Config, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.modules) { ModuleConfig.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Config { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Config { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConfig(); while (reader.pos < end) { @@ -135,9 +135,9 @@ export const Config = { return message; }, fromJSON(object: any): Config { - return { - modules: Array.isArray(object?.modules) ? object.modules.map((e: any) => ModuleConfig.fromJSON(e)) : [] - }; + const obj = createBaseConfig(); + if (Array.isArray(object?.modules)) object.modules.map((e: any) => ModuleConfig.fromJSON(e)); + return obj; }, toJSON(message: Config): unknown { const obj: any = {}; @@ -212,7 +212,7 @@ function createBaseModuleConfig(): ModuleConfig { export const ModuleConfig = { typeUrl: "/cosmos.app.v1alpha1.ModuleConfig", aminoType: "cosmos-sdk/ModuleConfig", - encode(message: ModuleConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModuleConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -221,8 +221,8 @@ export const ModuleConfig = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleConfig { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModuleConfig { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModuleConfig(); while (reader.pos < end) { @@ -242,10 +242,10 @@ export const ModuleConfig = { return message; }, fromJSON(object: any): ModuleConfig { - return { - name: isSet(object.name) ? String(object.name) : "", - config: isSet(object.config) ? Any.fromJSON(object.config) : undefined - }; + const obj = createBaseModuleConfig(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.config)) obj.config = Any.fromJSON(object.config); + return obj; }, toJSON(message: ModuleConfig): unknown { const obj: any = {}; @@ -256,7 +256,9 @@ export const ModuleConfig = { fromPartial(object: DeepPartial): ModuleConfig { const message = createBaseModuleConfig(); message.name = object.name ?? ""; - message.config = object.config !== undefined && object.config !== null ? Any.fromPartial(object.config) : undefined; + if (object.config !== undefined && object.config !== null) { + message.config = Any.fromPartial(object.config); + } return message; }, fromSDK(object: ModuleConfigSDKType): ModuleConfig { diff --git a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts index 5e5ea42941..eb871ebba3 100644 --- a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/module.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.app.v1alpha1"; /** ModuleDescriptor describes an app module. */ @@ -217,7 +217,7 @@ function createBaseModuleDescriptor(): ModuleDescriptor { export const ModuleDescriptor = { typeUrl: "/cosmos.app.v1alpha1.ModuleDescriptor", aminoType: "cosmos-sdk/ModuleDescriptor", - encode(message: ModuleDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModuleDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.goImport !== "") { writer.uint32(10).string(message.goImport); } @@ -229,8 +229,8 @@ export const ModuleDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModuleDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModuleDescriptor(); while (reader.pos < end) { @@ -253,11 +253,11 @@ export const ModuleDescriptor = { return message; }, fromJSON(object: any): ModuleDescriptor { - return { - goImport: isSet(object.goImport) ? String(object.goImport) : "", - usePackage: Array.isArray(object?.usePackage) ? object.usePackage.map((e: any) => PackageReference.fromJSON(e)) : [], - canMigrateFrom: Array.isArray(object?.canMigrateFrom) ? object.canMigrateFrom.map((e: any) => MigrateFromInfo.fromJSON(e)) : [] - }; + const obj = createBaseModuleDescriptor(); + if (isSet(object.goImport)) obj.goImport = String(object.goImport); + if (Array.isArray(object?.usePackage)) object.usePackage.map((e: any) => PackageReference.fromJSON(e)); + if (Array.isArray(object?.canMigrateFrom)) object.canMigrateFrom.map((e: any) => MigrateFromInfo.fromJSON(e)); + return obj; }, toJSON(message: ModuleDescriptor): unknown { const obj: any = {}; @@ -356,7 +356,7 @@ function createBasePackageReference(): PackageReference { export const PackageReference = { typeUrl: "/cosmos.app.v1alpha1.PackageReference", aminoType: "cosmos-sdk/PackageReference", - encode(message: PackageReference, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PackageReference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -365,8 +365,8 @@ export const PackageReference = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PackageReference { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PackageReference { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePackageReference(); while (reader.pos < end) { @@ -386,10 +386,10 @@ export const PackageReference = { return message; }, fromJSON(object: any): PackageReference { - return { - name: isSet(object.name) ? String(object.name) : "", - revision: isSet(object.revision) ? Number(object.revision) : 0 - }; + const obj = createBasePackageReference(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.revision)) obj.revision = Number(object.revision); + return obj; }, toJSON(message: PackageReference): unknown { const obj: any = {}; @@ -457,14 +457,14 @@ function createBaseMigrateFromInfo(): MigrateFromInfo { export const MigrateFromInfo = { typeUrl: "/cosmos.app.v1alpha1.MigrateFromInfo", aminoType: "cosmos-sdk/MigrateFromInfo", - encode(message: MigrateFromInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MigrateFromInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.module !== "") { writer.uint32(10).string(message.module); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MigrateFromInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MigrateFromInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMigrateFromInfo(); while (reader.pos < end) { @@ -481,9 +481,9 @@ export const MigrateFromInfo = { return message; }, fromJSON(object: any): MigrateFromInfo { - return { - module: isSet(object.module) ? String(object.module) : "" - }; + const obj = createBaseMigrateFromInfo(); + if (isSet(object.module)) obj.module = String(object.module); + return obj; }, toJSON(message: MigrateFromInfo): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/query.ts b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/query.ts index f9eb8bdfe4..943b1d5331 100644 --- a/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/app/v1alpha1/query.ts @@ -1,5 +1,5 @@ import { Config, ConfigAmino, ConfigSDKType } from "./config"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "cosmos.app.v1alpha1"; /** QueryConfigRequest is the Query/Config request type. */ @@ -44,11 +44,11 @@ function createBaseQueryConfigRequest(): QueryConfigRequest { export const QueryConfigRequest = { typeUrl: "/cosmos.app.v1alpha1.QueryConfigRequest", aminoType: "cosmos-sdk/QueryConfigRequest", - encode(_: QueryConfigRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryConfigRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryConfigRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryConfigRequest(); while (reader.pos < end) { @@ -62,7 +62,8 @@ export const QueryConfigRequest = { return message; }, fromJSON(_: any): QueryConfigRequest { - return {}; + const obj = createBaseQueryConfigRequest(); + return obj; }, toJSON(_: QueryConfigRequest): unknown { const obj: any = {}; @@ -116,14 +117,14 @@ function createBaseQueryConfigResponse(): QueryConfigResponse { export const QueryConfigResponse = { typeUrl: "/cosmos.app.v1alpha1.QueryConfigResponse", aminoType: "cosmos-sdk/QueryConfigResponse", - encode(message: QueryConfigResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryConfigResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.config !== undefined) { Config.encode(message.config, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryConfigResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryConfigResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryConfigResponse(); while (reader.pos < end) { @@ -140,9 +141,9 @@ export const QueryConfigResponse = { return message; }, fromJSON(object: any): QueryConfigResponse { - return { - config: isSet(object.config) ? Config.fromJSON(object.config) : undefined - }; + const obj = createBaseQueryConfigResponse(); + if (isSet(object.config)) obj.config = Config.fromJSON(object.config); + return obj; }, toJSON(message: QueryConfigResponse): unknown { const obj: any = {}; @@ -151,7 +152,9 @@ export const QueryConfigResponse = { }, fromPartial(object: DeepPartial): QueryConfigResponse { const message = createBaseQueryConfigResponse(); - message.config = object.config !== undefined && object.config !== null ? Config.fromPartial(object.config) : undefined; + if (object.config !== undefined && object.config !== null) { + message.config = Config.fromPartial(object.config); + } return message; }, fromSDK(object: QueryConfigResponseSDKType): QueryConfigResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts index bc8f5b9a1e..ca2edd827a 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/auth.ts @@ -1,6 +1,6 @@ import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.auth.v1beta1"; /** * BaseAccount defines a base account type. It contains all the necessary fields @@ -8,10 +8,11 @@ export const protobufPackage = "cosmos.auth.v1beta1"; * type for additional functionality (e.g. vesting). */ export interface BaseAccount { + $typeUrl?: string; address: string; pubKey: Any; - accountNumber: Long; - sequence: Long; + accountNumber: bigint; + sequence: bigint; } export interface BaseAccountProtoMsg { typeUrl: "/cosmos.auth.v1beta1.BaseAccount"; @@ -38,13 +39,15 @@ export interface BaseAccountAminoMsg { * type for additional functionality (e.g. vesting). */ export interface BaseAccountSDKType { + $typeUrl?: string; address: string; pub_key: AnySDKType; - account_number: Long; - sequence: Long; + account_number: bigint; + sequence: bigint; } /** ModuleAccount defines an account for modules that holds coins on a pool. */ export interface ModuleAccount { + $typeUrl?: string; baseAccount: BaseAccount; name: string; permissions: string[]; @@ -65,17 +68,18 @@ export interface ModuleAccountAminoMsg { } /** ModuleAccount defines an account for modules that holds coins on a pool. */ export interface ModuleAccountSDKType { + $typeUrl?: string; base_account: BaseAccountSDKType; name: string; permissions: string[]; } /** Params defines the parameters for the auth module. */ export interface Params { - maxMemoCharacters: Long; - txSigLimit: Long; - txSizeCostPerByte: Long; - sigVerifyCostEd25519: Long; - sigVerifyCostSecp256k1: Long; + maxMemoCharacters: bigint; + txSigLimit: bigint; + txSizeCostPerByte: bigint; + sigVerifyCostEd25519: bigint; + sigVerifyCostSecp256k1: bigint; } export interface ParamsProtoMsg { typeUrl: "/cosmos.auth.v1beta1.Params"; @@ -95,40 +99,41 @@ export interface ParamsAminoMsg { } /** Params defines the parameters for the auth module. */ export interface ParamsSDKType { - max_memo_characters: Long; - tx_sig_limit: Long; - tx_size_cost_per_byte: Long; - sig_verify_cost_ed25519: Long; - sig_verify_cost_secp256k1: Long; + max_memo_characters: bigint; + tx_sig_limit: bigint; + tx_size_cost_per_byte: bigint; + sig_verify_cost_ed25519: bigint; + sig_verify_cost_secp256k1: bigint; } function createBaseBaseAccount(): BaseAccount { return { + $typeUrl: "/cosmos.auth.v1beta1.BaseAccount", address: "", pubKey: Any.fromPartial({}), - accountNumber: Long.UZERO, - sequence: Long.UZERO + accountNumber: BigInt(0), + sequence: BigInt(0) }; } export const BaseAccount = { typeUrl: "/cosmos.auth.v1beta1.BaseAccount", aminoType: "cosmos-sdk/BaseAccount", - encode(message: BaseAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BaseAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } if (message.pubKey !== undefined) { Any.encode(message.pubKey, writer.uint32(18).fork()).ldelim(); } - if (!message.accountNumber.isZero()) { + if (message.accountNumber !== BigInt(0)) { writer.uint32(24).uint64(message.accountNumber); } - if (!message.sequence.isZero()) { + if (message.sequence !== BigInt(0)) { writer.uint32(32).uint64(message.sequence); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BaseAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BaseAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBaseAccount(); while (reader.pos < end) { @@ -141,10 +146,10 @@ export const BaseAccount = { message.pubKey = Any.decode(reader, reader.uint32()); break; case 3: - message.accountNumber = (reader.uint64() as Long); + message.accountNumber = reader.uint64(); break; case 4: - message.sequence = (reader.uint64() as Long); + message.sequence = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -154,27 +159,33 @@ export const BaseAccount = { return message; }, fromJSON(object: any): BaseAccount { - return { - address: isSet(object.address) ? String(object.address) : "", - pubKey: isSet(object.pubKey) ? Any.fromJSON(object.pubKey) : undefined, - accountNumber: isSet(object.accountNumber) ? Long.fromValue(object.accountNumber) : Long.UZERO, - sequence: isSet(object.sequence) ? Long.fromValue(object.sequence) : Long.UZERO - }; + const obj = createBaseBaseAccount(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pubKey)) obj.pubKey = Any.fromJSON(object.pubKey); + if (isSet(object.accountNumber)) obj.accountNumber = BigInt(object.accountNumber.toString()); + if (isSet(object.sequence)) obj.sequence = BigInt(object.sequence.toString()); + return obj; }, toJSON(message: BaseAccount): unknown { const obj: any = {}; message.address !== undefined && (obj.address = message.address); message.pubKey !== undefined && (obj.pubKey = message.pubKey ? Any.toJSON(message.pubKey) : undefined); - message.accountNumber !== undefined && (obj.accountNumber = (message.accountNumber || Long.UZERO).toString()); - message.sequence !== undefined && (obj.sequence = (message.sequence || Long.UZERO).toString()); + message.accountNumber !== undefined && (obj.accountNumber = (message.accountNumber || BigInt(0)).toString()); + message.sequence !== undefined && (obj.sequence = (message.sequence || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): BaseAccount { const message = createBaseBaseAccount(); message.address = object.address ?? ""; - message.pubKey = object.pubKey !== undefined && object.pubKey !== null ? Any.fromPartial(object.pubKey) : undefined; - message.accountNumber = object.accountNumber !== undefined && object.accountNumber !== null ? Long.fromValue(object.accountNumber) : Long.UZERO; - message.sequence = object.sequence !== undefined && object.sequence !== null ? Long.fromValue(object.sequence) : Long.UZERO; + if (object.pubKey !== undefined && object.pubKey !== null) { + message.pubKey = Any.fromPartial(object.pubKey); + } + if (object.accountNumber !== undefined && object.accountNumber !== null) { + message.accountNumber = BigInt(object.accountNumber.toString()); + } + if (object.sequence !== undefined && object.sequence !== null) { + message.sequence = BigInt(object.sequence.toString()); + } return message; }, fromSDK(object: BaseAccountSDKType): BaseAccount { @@ -197,8 +208,8 @@ export const BaseAccount = { return { address: object.address, pubKey: object?.pub_key ? Any.fromAmino(object.pub_key) : undefined, - accountNumber: Long.fromString(object.account_number), - sequence: Long.fromString(object.sequence) + accountNumber: BigInt(object.account_number), + sequence: BigInt(object.sequence) }; }, toAmino(message: BaseAccount): BaseAccountAmino { @@ -233,6 +244,7 @@ export const BaseAccount = { }; function createBaseModuleAccount(): ModuleAccount { return { + $typeUrl: "/cosmos.auth.v1beta1.ModuleAccount", baseAccount: BaseAccount.fromPartial({}), name: "", permissions: [] @@ -241,7 +253,7 @@ function createBaseModuleAccount(): ModuleAccount { export const ModuleAccount = { typeUrl: "/cosmos.auth.v1beta1.ModuleAccount", aminoType: "cosmos-sdk/ModuleAccount", - encode(message: ModuleAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModuleAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseAccount !== undefined) { BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim(); } @@ -253,8 +265,8 @@ export const ModuleAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModuleAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModuleAccount(); while (reader.pos < end) { @@ -277,11 +289,11 @@ export const ModuleAccount = { return message; }, fromJSON(object: any): ModuleAccount { - return { - baseAccount: isSet(object.baseAccount) ? BaseAccount.fromJSON(object.baseAccount) : undefined, - name: isSet(object.name) ? String(object.name) : "", - permissions: Array.isArray(object?.permissions) ? object.permissions.map((e: any) => String(e)) : [] - }; + const obj = createBaseModuleAccount(); + if (isSet(object.baseAccount)) obj.baseAccount = BaseAccount.fromJSON(object.baseAccount); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.permissions)) object.permissions.map((e: any) => String(e)); + return obj; }, toJSON(message: ModuleAccount): unknown { const obj: any = {}; @@ -296,7 +308,9 @@ export const ModuleAccount = { }, fromPartial(object: DeepPartial): ModuleAccount { const message = createBaseModuleAccount(); - message.baseAccount = object.baseAccount !== undefined && object.baseAccount !== null ? BaseAccount.fromPartial(object.baseAccount) : undefined; + if (object.baseAccount !== undefined && object.baseAccount !== null) { + message.baseAccount = BaseAccount.fromPartial(object.baseAccount); + } message.name = object.name ?? ""; message.permissions = object.permissions?.map(e => e) || []; return message; @@ -361,55 +375,55 @@ export const ModuleAccount = { }; function createBaseParams(): Params { return { - maxMemoCharacters: Long.UZERO, - txSigLimit: Long.UZERO, - txSizeCostPerByte: Long.UZERO, - sigVerifyCostEd25519: Long.UZERO, - sigVerifyCostSecp256k1: Long.UZERO + maxMemoCharacters: BigInt(0), + txSigLimit: BigInt(0), + txSizeCostPerByte: BigInt(0), + sigVerifyCostEd25519: BigInt(0), + sigVerifyCostSecp256k1: BigInt(0) }; } export const Params = { typeUrl: "/cosmos.auth.v1beta1.Params", aminoType: "cosmos-sdk/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.maxMemoCharacters.isZero()) { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.maxMemoCharacters !== BigInt(0)) { writer.uint32(8).uint64(message.maxMemoCharacters); } - if (!message.txSigLimit.isZero()) { + if (message.txSigLimit !== BigInt(0)) { writer.uint32(16).uint64(message.txSigLimit); } - if (!message.txSizeCostPerByte.isZero()) { + if (message.txSizeCostPerByte !== BigInt(0)) { writer.uint32(24).uint64(message.txSizeCostPerByte); } - if (!message.sigVerifyCostEd25519.isZero()) { + if (message.sigVerifyCostEd25519 !== BigInt(0)) { writer.uint32(32).uint64(message.sigVerifyCostEd25519); } - if (!message.sigVerifyCostSecp256k1.isZero()) { + if (message.sigVerifyCostSecp256k1 !== BigInt(0)) { writer.uint32(40).uint64(message.sigVerifyCostSecp256k1); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.maxMemoCharacters = (reader.uint64() as Long); + message.maxMemoCharacters = reader.uint64(); break; case 2: - message.txSigLimit = (reader.uint64() as Long); + message.txSigLimit = reader.uint64(); break; case 3: - message.txSizeCostPerByte = (reader.uint64() as Long); + message.txSizeCostPerByte = reader.uint64(); break; case 4: - message.sigVerifyCostEd25519 = (reader.uint64() as Long); + message.sigVerifyCostEd25519 = reader.uint64(); break; case 5: - message.sigVerifyCostSecp256k1 = (reader.uint64() as Long); + message.sigVerifyCostSecp256k1 = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -419,30 +433,40 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - maxMemoCharacters: isSet(object.maxMemoCharacters) ? Long.fromValue(object.maxMemoCharacters) : Long.UZERO, - txSigLimit: isSet(object.txSigLimit) ? Long.fromValue(object.txSigLimit) : Long.UZERO, - txSizeCostPerByte: isSet(object.txSizeCostPerByte) ? Long.fromValue(object.txSizeCostPerByte) : Long.UZERO, - sigVerifyCostEd25519: isSet(object.sigVerifyCostEd25519) ? Long.fromValue(object.sigVerifyCostEd25519) : Long.UZERO, - sigVerifyCostSecp256k1: isSet(object.sigVerifyCostSecp256k1) ? Long.fromValue(object.sigVerifyCostSecp256k1) : Long.UZERO - }; + const obj = createBaseParams(); + if (isSet(object.maxMemoCharacters)) obj.maxMemoCharacters = BigInt(object.maxMemoCharacters.toString()); + if (isSet(object.txSigLimit)) obj.txSigLimit = BigInt(object.txSigLimit.toString()); + if (isSet(object.txSizeCostPerByte)) obj.txSizeCostPerByte = BigInt(object.txSizeCostPerByte.toString()); + if (isSet(object.sigVerifyCostEd25519)) obj.sigVerifyCostEd25519 = BigInt(object.sigVerifyCostEd25519.toString()); + if (isSet(object.sigVerifyCostSecp256k1)) obj.sigVerifyCostSecp256k1 = BigInt(object.sigVerifyCostSecp256k1.toString()); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; - message.maxMemoCharacters !== undefined && (obj.maxMemoCharacters = (message.maxMemoCharacters || Long.UZERO).toString()); - message.txSigLimit !== undefined && (obj.txSigLimit = (message.txSigLimit || Long.UZERO).toString()); - message.txSizeCostPerByte !== undefined && (obj.txSizeCostPerByte = (message.txSizeCostPerByte || Long.UZERO).toString()); - message.sigVerifyCostEd25519 !== undefined && (obj.sigVerifyCostEd25519 = (message.sigVerifyCostEd25519 || Long.UZERO).toString()); - message.sigVerifyCostSecp256k1 !== undefined && (obj.sigVerifyCostSecp256k1 = (message.sigVerifyCostSecp256k1 || Long.UZERO).toString()); + message.maxMemoCharacters !== undefined && (obj.maxMemoCharacters = (message.maxMemoCharacters || BigInt(0)).toString()); + message.txSigLimit !== undefined && (obj.txSigLimit = (message.txSigLimit || BigInt(0)).toString()); + message.txSizeCostPerByte !== undefined && (obj.txSizeCostPerByte = (message.txSizeCostPerByte || BigInt(0)).toString()); + message.sigVerifyCostEd25519 !== undefined && (obj.sigVerifyCostEd25519 = (message.sigVerifyCostEd25519 || BigInt(0)).toString()); + message.sigVerifyCostSecp256k1 !== undefined && (obj.sigVerifyCostSecp256k1 = (message.sigVerifyCostSecp256k1 || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.maxMemoCharacters = object.maxMemoCharacters !== undefined && object.maxMemoCharacters !== null ? Long.fromValue(object.maxMemoCharacters) : Long.UZERO; - message.txSigLimit = object.txSigLimit !== undefined && object.txSigLimit !== null ? Long.fromValue(object.txSigLimit) : Long.UZERO; - message.txSizeCostPerByte = object.txSizeCostPerByte !== undefined && object.txSizeCostPerByte !== null ? Long.fromValue(object.txSizeCostPerByte) : Long.UZERO; - message.sigVerifyCostEd25519 = object.sigVerifyCostEd25519 !== undefined && object.sigVerifyCostEd25519 !== null ? Long.fromValue(object.sigVerifyCostEd25519) : Long.UZERO; - message.sigVerifyCostSecp256k1 = object.sigVerifyCostSecp256k1 !== undefined && object.sigVerifyCostSecp256k1 !== null ? Long.fromValue(object.sigVerifyCostSecp256k1) : Long.UZERO; + if (object.maxMemoCharacters !== undefined && object.maxMemoCharacters !== null) { + message.maxMemoCharacters = BigInt(object.maxMemoCharacters.toString()); + } + if (object.txSigLimit !== undefined && object.txSigLimit !== null) { + message.txSigLimit = BigInt(object.txSigLimit.toString()); + } + if (object.txSizeCostPerByte !== undefined && object.txSizeCostPerByte !== null) { + message.txSizeCostPerByte = BigInt(object.txSizeCostPerByte.toString()); + } + if (object.sigVerifyCostEd25519 !== undefined && object.sigVerifyCostEd25519 !== null) { + message.sigVerifyCostEd25519 = BigInt(object.sigVerifyCostEd25519.toString()); + } + if (object.sigVerifyCostSecp256k1 !== undefined && object.sigVerifyCostSecp256k1 !== null) { + message.sigVerifyCostSecp256k1 = BigInt(object.sigVerifyCostSecp256k1.toString()); + } return message; }, fromSDK(object: ParamsSDKType): Params { @@ -465,11 +489,11 @@ export const Params = { }, fromAmino(object: ParamsAmino): Params { return { - maxMemoCharacters: Long.fromString(object.max_memo_characters), - txSigLimit: Long.fromString(object.tx_sig_limit), - txSizeCostPerByte: Long.fromString(object.tx_size_cost_per_byte), - sigVerifyCostEd25519: Long.fromString(object.sig_verify_cost_ed25519), - sigVerifyCostSecp256k1: Long.fromString(object.sig_verify_cost_secp256k1) + maxMemoCharacters: BigInt(object.max_memo_characters), + txSigLimit: BigInt(object.tx_sig_limit), + txSizeCostPerByte: BigInt(object.tx_size_cost_per_byte), + sigVerifyCostEd25519: BigInt(object.sig_verify_cost_ed25519), + sigVerifyCostSecp256k1: BigInt(object.sig_verify_cost_secp256k1) }; }, toAmino(message: Params): ParamsAmino { diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts index 4ff5c258c8..ae098b3ca0 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/genesis.ts @@ -1,6 +1,6 @@ import { Params, ParamsAmino, ParamsSDKType } from "./auth"; import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.auth.v1beta1"; /** GenesisState defines the auth module's genesis state. */ @@ -39,7 +39,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.auth.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -48,8 +48,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -69,10 +69,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -86,7 +86,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.accounts = object.accounts?.map(e => Any.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts index d20626f4ab..aeaedcafdd 100644 --- a/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/auth/v1beta1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Params, ParamsAmino, ParamsSDKType, BaseAccount, BaseAccountProtoMsg, BaseAccountSDKType, ModuleAccount, ModuleAccountProtoMsg, ModuleAccountSDKType } from "./auth"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.auth.v1beta1"; /** @@ -322,14 +322,14 @@ function createBaseQueryAccountsRequest(): QueryAccountsRequest { export const QueryAccountsRequest = { typeUrl: "/cosmos.auth.v1beta1.QueryAccountsRequest", aminoType: "cosmos-sdk/QueryAccountsRequest", - encode(message: QueryAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountsRequest(); while (reader.pos < end) { @@ -346,9 +346,9 @@ export const QueryAccountsRequest = { return message; }, fromJSON(object: any): QueryAccountsRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAccountsRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAccountsRequest): unknown { const obj: any = {}; @@ -357,7 +357,9 @@ export const QueryAccountsRequest = { }, fromPartial(object: DeepPartial): QueryAccountsRequest { const message = createBaseQueryAccountsRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAccountsRequestSDKType): QueryAccountsRequest { @@ -411,7 +413,7 @@ function createBaseQueryAccountsResponse(): QueryAccountsResponse { export const QueryAccountsResponse = { typeUrl: "/cosmos.auth.v1beta1.QueryAccountsResponse", aminoType: "cosmos-sdk/QueryAccountsResponse", - encode(message: QueryAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Any.encode((v! as Any), writer.uint32(10).fork()).ldelim(); } @@ -420,8 +422,8 @@ export const QueryAccountsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountsResponse(); while (reader.pos < end) { @@ -441,10 +443,10 @@ export const QueryAccountsResponse = { return message; }, fromJSON(object: any): QueryAccountsResponse { - return { - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Any.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAccountsResponse(); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Any.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAccountsResponse): unknown { const obj: any = {}; @@ -459,7 +461,9 @@ export const QueryAccountsResponse = { fromPartial(object: DeepPartial): QueryAccountsResponse { const message = createBaseQueryAccountsResponse(); message.accounts = object.accounts?.map(e => Any.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAccountsResponseSDKType): QueryAccountsResponse { @@ -524,14 +528,14 @@ function createBaseQueryAccountRequest(): QueryAccountRequest { export const QueryAccountRequest = { typeUrl: "/cosmos.auth.v1beta1.QueryAccountRequest", aminoType: "cosmos-sdk/QueryAccountRequest", - encode(message: QueryAccountRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountRequest(); while (reader.pos < end) { @@ -548,9 +552,9 @@ export const QueryAccountRequest = { return message; }, fromJSON(object: any): QueryAccountRequest { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseQueryAccountRequest(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: QueryAccountRequest): unknown { const obj: any = {}; @@ -610,11 +614,11 @@ function createBaseQueryModuleAccountsRequest(): QueryModuleAccountsRequest { export const QueryModuleAccountsRequest = { typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsRequest", aminoType: "cosmos-sdk/QueryModuleAccountsRequest", - encode(_: QueryModuleAccountsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryModuleAccountsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryModuleAccountsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryModuleAccountsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryModuleAccountsRequest(); while (reader.pos < end) { @@ -628,7 +632,8 @@ export const QueryModuleAccountsRequest = { return message; }, fromJSON(_: any): QueryModuleAccountsRequest { - return {}; + const obj = createBaseQueryModuleAccountsRequest(); + return obj; }, toJSON(_: QueryModuleAccountsRequest): unknown { const obj: any = {}; @@ -682,14 +687,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.auth.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -706,9 +711,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -717,7 +722,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -770,14 +777,14 @@ function createBaseQueryAccountResponse(): QueryAccountResponse { export const QueryAccountResponse = { typeUrl: "/cosmos.auth.v1beta1.QueryAccountResponse", aminoType: "cosmos-sdk/QueryAccountResponse", - encode(message: QueryAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.account !== undefined) { Any.encode((message.account as Any), writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAccountResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAccountResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAccountResponse(); while (reader.pos < end) { @@ -794,9 +801,9 @@ export const QueryAccountResponse = { return message; }, fromJSON(object: any): QueryAccountResponse { - return { - account: isSet(object.account) ? Any.fromJSON(object.account) : undefined - }; + const obj = createBaseQueryAccountResponse(); + if (isSet(object.account)) obj.account = Any.fromJSON(object.account); + return obj; }, toJSON(message: QueryAccountResponse): unknown { const obj: any = {}; @@ -805,7 +812,9 @@ export const QueryAccountResponse = { }, fromPartial(object: DeepPartial): QueryAccountResponse { const message = createBaseQueryAccountResponse(); - message.account = object.account !== undefined && object.account !== null ? Any.fromPartial(object.account) : undefined; + if (object.account !== undefined && object.account !== null) { + message.account = Any.fromPartial(object.account); + } return message; }, fromSDK(object: QueryAccountResponseSDKType): QueryAccountResponse { @@ -856,11 +865,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.auth.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -874,7 +883,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -928,14 +938,14 @@ function createBaseQueryModuleAccountsResponse(): QueryModuleAccountsResponse { export const QueryModuleAccountsResponse = { typeUrl: "/cosmos.auth.v1beta1.QueryModuleAccountsResponse", aminoType: "cosmos-sdk/QueryModuleAccountsResponse", - encode(message: QueryModuleAccountsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryModuleAccountsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.accounts) { Any.encode((v! as Any), writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryModuleAccountsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryModuleAccountsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryModuleAccountsResponse(); while (reader.pos < end) { @@ -952,9 +962,9 @@ export const QueryModuleAccountsResponse = { return message; }, fromJSON(object: any): QueryModuleAccountsResponse { - return { - accounts: Array.isArray(object?.accounts) ? object.accounts.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseQueryModuleAccountsResponse(); + if (Array.isArray(object?.accounts)) object.accounts.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: QueryModuleAccountsResponse): unknown { const obj: any = {}; @@ -1026,11 +1036,11 @@ function createBaseBech32PrefixRequest(): Bech32PrefixRequest { export const Bech32PrefixRequest = { typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixRequest", aminoType: "cosmos-sdk/Bech32PrefixRequest", - encode(_: Bech32PrefixRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: Bech32PrefixRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Bech32PrefixRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Bech32PrefixRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBech32PrefixRequest(); while (reader.pos < end) { @@ -1044,7 +1054,8 @@ export const Bech32PrefixRequest = { return message; }, fromJSON(_: any): Bech32PrefixRequest { - return {}; + const obj = createBaseBech32PrefixRequest(); + return obj; }, toJSON(_: Bech32PrefixRequest): unknown { const obj: any = {}; @@ -1098,14 +1109,14 @@ function createBaseBech32PrefixResponse(): Bech32PrefixResponse { export const Bech32PrefixResponse = { typeUrl: "/cosmos.auth.v1beta1.Bech32PrefixResponse", aminoType: "cosmos-sdk/Bech32PrefixResponse", - encode(message: Bech32PrefixResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Bech32PrefixResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bech32Prefix !== "") { writer.uint32(10).string(message.bech32Prefix); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Bech32PrefixResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Bech32PrefixResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBech32PrefixResponse(); while (reader.pos < end) { @@ -1122,9 +1133,9 @@ export const Bech32PrefixResponse = { return message; }, fromJSON(object: any): Bech32PrefixResponse { - return { - bech32Prefix: isSet(object.bech32Prefix) ? String(object.bech32Prefix) : "" - }; + const obj = createBaseBech32PrefixResponse(); + if (isSet(object.bech32Prefix)) obj.bech32Prefix = String(object.bech32Prefix); + return obj; }, toJSON(message: Bech32PrefixResponse): unknown { const obj: any = {}; @@ -1186,14 +1197,14 @@ function createBaseAddressBytesToStringRequest(): AddressBytesToStringRequest { export const AddressBytesToStringRequest = { typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringRequest", aminoType: "cosmos-sdk/AddressBytesToStringRequest", - encode(message: AddressBytesToStringRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AddressBytesToStringRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressBytes.length !== 0) { writer.uint32(10).bytes(message.addressBytes); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AddressBytesToStringRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AddressBytesToStringRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAddressBytesToStringRequest(); while (reader.pos < end) { @@ -1210,9 +1221,9 @@ export const AddressBytesToStringRequest = { return message; }, fromJSON(object: any): AddressBytesToStringRequest { - return { - addressBytes: isSet(object.addressBytes) ? bytesFromBase64(object.addressBytes) : new Uint8Array() - }; + const obj = createBaseAddressBytesToStringRequest(); + if (isSet(object.addressBytes)) obj.addressBytes = bytesFromBase64(object.addressBytes); + return obj; }, toJSON(message: AddressBytesToStringRequest): unknown { const obj: any = {}; @@ -1274,14 +1285,14 @@ function createBaseAddressBytesToStringResponse(): AddressBytesToStringResponse export const AddressBytesToStringResponse = { typeUrl: "/cosmos.auth.v1beta1.AddressBytesToStringResponse", aminoType: "cosmos-sdk/AddressBytesToStringResponse", - encode(message: AddressBytesToStringResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AddressBytesToStringResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressString !== "") { writer.uint32(10).string(message.addressString); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AddressBytesToStringResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AddressBytesToStringResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAddressBytesToStringResponse(); while (reader.pos < end) { @@ -1298,9 +1309,9 @@ export const AddressBytesToStringResponse = { return message; }, fromJSON(object: any): AddressBytesToStringResponse { - return { - addressString: isSet(object.addressString) ? String(object.addressString) : "" - }; + const obj = createBaseAddressBytesToStringResponse(); + if (isSet(object.addressString)) obj.addressString = String(object.addressString); + return obj; }, toJSON(message: AddressBytesToStringResponse): unknown { const obj: any = {}; @@ -1362,14 +1373,14 @@ function createBaseAddressStringToBytesRequest(): AddressStringToBytesRequest { export const AddressStringToBytesRequest = { typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesRequest", aminoType: "cosmos-sdk/AddressStringToBytesRequest", - encode(message: AddressStringToBytesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AddressStringToBytesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressString !== "") { writer.uint32(10).string(message.addressString); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AddressStringToBytesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AddressStringToBytesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAddressStringToBytesRequest(); while (reader.pos < end) { @@ -1386,9 +1397,9 @@ export const AddressStringToBytesRequest = { return message; }, fromJSON(object: any): AddressStringToBytesRequest { - return { - addressString: isSet(object.addressString) ? String(object.addressString) : "" - }; + const obj = createBaseAddressStringToBytesRequest(); + if (isSet(object.addressString)) obj.addressString = String(object.addressString); + return obj; }, toJSON(message: AddressStringToBytesRequest): unknown { const obj: any = {}; @@ -1450,14 +1461,14 @@ function createBaseAddressStringToBytesResponse(): AddressStringToBytesResponse export const AddressStringToBytesResponse = { typeUrl: "/cosmos.auth.v1beta1.AddressStringToBytesResponse", aminoType: "cosmos-sdk/AddressStringToBytesResponse", - encode(message: AddressStringToBytesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AddressStringToBytesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.addressBytes.length !== 0) { writer.uint32(10).bytes(message.addressBytes); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AddressStringToBytesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AddressStringToBytesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAddressStringToBytesResponse(); while (reader.pos < end) { @@ -1474,9 +1485,9 @@ export const AddressStringToBytesResponse = { return message; }, fromJSON(object: any): AddressStringToBytesResponse { - return { - addressBytes: isSet(object.addressBytes) ? bytesFromBase64(object.addressBytes) : new Uint8Array() - }; + const obj = createBaseAddressStringToBytesResponse(); + if (isSet(object.addressBytes)) obj.addressBytes = bytesFromBase64(object.addressBytes); + return obj; }, toJSON(message: AddressStringToBytesResponse): unknown { const obj: any = {}; @@ -1530,8 +1541,8 @@ export const AddressStringToBytesResponse = { }; } }; -export const AccountI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): BaseAccount | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const AccountI_InterfaceDecoder = (input: BinaryReader | Uint8Array): BaseAccount | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.auth.v1beta1.BaseAccount": @@ -1562,8 +1573,8 @@ export const AccountI_ToAmino = (content: Any) => { return Any.toAmino(content); } }; -export const ModuleAccountI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): ModuleAccount | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const ModuleAccountI_InterfaceDecoder = (input: BinaryReader | Uint8Array): ModuleAccount | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.auth.v1beta1.ModuleAccount": diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts index ea6a4a7624..7597fcd50e 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/authz.ts @@ -8,7 +8,7 @@ import { DepositDeploymentAuthorizationProtoMsg as DepositDeploymentAuthorizatio import { DepositDeploymentAuthorizationSDKType as DepositDeploymentAuthorization2SDKType } from "../../../akash/deployment/v1beta2/authz"; import { SendAuthorization, SendAuthorizationProtoMsg, SendAuthorizationSDKType } from "../../bank/v1beta1/authz"; import { StakeAuthorization, StakeAuthorizationProtoMsg, StakeAuthorizationSDKType } from "../../staking/v1beta1/authz"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; export const protobufPackage = "cosmos.authz.v1beta1"; /** @@ -16,6 +16,7 @@ export const protobufPackage = "cosmos.authz.v1beta1"; * the provided method on behalf of the granter's account. */ export interface GenericAuthorization { + $typeUrl?: string; /** Msg, identified by it's type URL, to grant unrestricted permissions to execute */ msg: string; } @@ -40,6 +41,7 @@ export interface GenericAuthorizationAminoMsg { * the provided method on behalf of the granter's account. */ export interface GenericAuthorizationSDKType { + $typeUrl?: string; msg: string; } /** @@ -152,20 +154,21 @@ export interface GrantQueueItemSDKType { } function createBaseGenericAuthorization(): GenericAuthorization { return { + $typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization", msg: "" }; } export const GenericAuthorization = { typeUrl: "/cosmos.authz.v1beta1.GenericAuthorization", aminoType: "cosmos-sdk/GenericAuthorization", - encode(message: GenericAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenericAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msg !== "") { writer.uint32(10).string(message.msg); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenericAuthorization { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenericAuthorization { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenericAuthorization(); while (reader.pos < end) { @@ -182,9 +185,9 @@ export const GenericAuthorization = { return message; }, fromJSON(object: any): GenericAuthorization { - return { - msg: isSet(object.msg) ? String(object.msg) : "" - }; + const obj = createBaseGenericAuthorization(); + if (isSet(object.msg)) obj.msg = String(object.msg); + return obj; }, toJSON(message: GenericAuthorization): unknown { const obj: any = {}; @@ -247,7 +250,7 @@ function createBaseGrant(): Grant { export const Grant = { typeUrl: "/cosmos.authz.v1beta1.Grant", aminoType: "cosmos-sdk/Grant", - encode(message: Grant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Grant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authorization !== undefined) { Any.encode((message.authorization as Any), writer.uint32(10).fork()).ldelim(); } @@ -256,8 +259,8 @@ export const Grant = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Grant { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Grant { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGrant(); while (reader.pos < end) { @@ -277,10 +280,10 @@ export const Grant = { return message; }, fromJSON(object: any): Grant { - return { - authorization: isSet(object.authorization) ? Any.fromJSON(object.authorization) : undefined, - expiration: isSet(object.expiration) ? new Date(object.expiration) : undefined - }; + const obj = createBaseGrant(); + if (isSet(object.authorization)) obj.authorization = Any.fromJSON(object.authorization); + if (isSet(object.expiration)) obj.expiration = new Date(object.expiration); + return obj; }, toJSON(message: Grant): unknown { const obj: any = {}; @@ -290,7 +293,9 @@ export const Grant = { }, fromPartial(object: DeepPartial): Grant { const message = createBaseGrant(); - message.authorization = object.authorization !== undefined && object.authorization !== null ? Any.fromPartial(object.authorization) : undefined; + if (object.authorization !== undefined && object.authorization !== null) { + message.authorization = Any.fromPartial(object.authorization); + } message.expiration = object.expiration ?? undefined; return message; }, @@ -351,7 +356,7 @@ function createBaseGrantAuthorization(): GrantAuthorization { export const GrantAuthorization = { typeUrl: "/cosmos.authz.v1beta1.GrantAuthorization", aminoType: "cosmos-sdk/GrantAuthorization", - encode(message: GrantAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GrantAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -366,8 +371,8 @@ export const GrantAuthorization = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GrantAuthorization { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GrantAuthorization { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGrantAuthorization(); while (reader.pos < end) { @@ -393,12 +398,12 @@ export const GrantAuthorization = { return message; }, fromJSON(object: any): GrantAuthorization { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "", - authorization: isSet(object.authorization) ? Any.fromJSON(object.authorization) : undefined, - expiration: isSet(object.expiration) ? new Date(object.expiration) : undefined - }; + const obj = createBaseGrantAuthorization(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.authorization)) obj.authorization = Any.fromJSON(object.authorization); + if (isSet(object.expiration)) obj.expiration = new Date(object.expiration); + return obj; }, toJSON(message: GrantAuthorization): unknown { const obj: any = {}; @@ -412,7 +417,9 @@ export const GrantAuthorization = { const message = createBaseGrantAuthorization(); message.granter = object.granter ?? ""; message.grantee = object.grantee ?? ""; - message.authorization = object.authorization !== undefined && object.authorization !== null ? Any.fromPartial(object.authorization) : undefined; + if (object.authorization !== undefined && object.authorization !== null) { + message.authorization = Any.fromPartial(object.authorization); + } message.expiration = object.expiration ?? undefined; return message; }, @@ -478,14 +485,14 @@ function createBaseGrantQueueItem(): GrantQueueItem { export const GrantQueueItem = { typeUrl: "/cosmos.authz.v1beta1.GrantQueueItem", aminoType: "cosmos-sdk/GrantQueueItem", - encode(message: GrantQueueItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GrantQueueItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.msgTypeUrls) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GrantQueueItem { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GrantQueueItem { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGrantQueueItem(); while (reader.pos < end) { @@ -502,9 +509,9 @@ export const GrantQueueItem = { return message; }, fromJSON(object: any): GrantQueueItem { - return { - msgTypeUrls: Array.isArray(object?.msgTypeUrls) ? object.msgTypeUrls.map((e: any) => String(e)) : [] - }; + const obj = createBaseGrantQueueItem(); + if (Array.isArray(object?.msgTypeUrls)) object.msgTypeUrls.map((e: any) => String(e)); + return obj; }, toJSON(message: GrantQueueItem): unknown { const obj: any = {}; @@ -570,8 +577,8 @@ export const GrantQueueItem = { }; } }; -export const Authorization_InterfaceDecoder = (input: _m0.Reader | Uint8Array): DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | GenericAuthorization | SendAuthorization | StakeAuthorization | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const Authorization_InterfaceDecoder = (input: BinaryReader | Uint8Array): DepositDeploymentAuthorization1 | DepositDeploymentAuthorization2 | GenericAuthorization | SendAuthorization | StakeAuthorization | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/akash.deployment.v1beta1.DepositDeploymentAuthorization": diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts index dff561e91d..cb7b9022f0 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { GrantAuthorization, GrantAuthorizationAmino, GrantAuthorizationSDKType } from "./authz"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.authz.v1beta1"; /** GenesisState defines the authz module's genesis state. */ @@ -30,14 +30,14 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.authz.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.authorization) { GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -54,9 +54,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - authorization: Array.isArray(object?.authorization) ? object.authorization.map((e: any) => GrantAuthorization.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.authorization)) object.authorization.map((e: any) => GrantAuthorization.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts index e2b7aae27e..df5e32f7fe 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Grant, GrantAmino, GrantSDKType, GrantAuthorization, GrantAuthorizationAmino, GrantAuthorizationSDKType } from "./authz"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.authz.v1beta1"; /** QueryGrantsRequest is the request type for the Query/Grants RPC method. */ @@ -178,7 +178,7 @@ function createBaseQueryGrantsRequest(): QueryGrantsRequest { export const QueryGrantsRequest = { typeUrl: "/cosmos.authz.v1beta1.QueryGrantsRequest", aminoType: "cosmos-sdk/QueryGrantsRequest", - encode(message: QueryGrantsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGrantsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -193,8 +193,8 @@ export const QueryGrantsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGrantsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGrantsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGrantsRequest(); while (reader.pos < end) { @@ -220,12 +220,12 @@ export const QueryGrantsRequest = { return message; }, fromJSON(object: any): QueryGrantsRequest { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "", - msgTypeUrl: isSet(object.msgTypeUrl) ? String(object.msgTypeUrl) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGrantsRequest(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.msgTypeUrl)) obj.msgTypeUrl = String(object.msgTypeUrl); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGrantsRequest): unknown { const obj: any = {}; @@ -240,7 +240,9 @@ export const QueryGrantsRequest = { message.granter = object.granter ?? ""; message.grantee = object.grantee ?? ""; message.msgTypeUrl = object.msgTypeUrl ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGrantsRequestSDKType): QueryGrantsRequest { @@ -306,7 +308,7 @@ function createBaseQueryGrantsResponse(): QueryGrantsResponse { export const QueryGrantsResponse = { typeUrl: "/cosmos.authz.v1beta1.QueryGrantsResponse", aminoType: "cosmos-sdk/QueryGrantsResponse", - encode(message: QueryGrantsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGrantsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -315,8 +317,8 @@ export const QueryGrantsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGrantsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGrantsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGrantsResponse(); while (reader.pos < end) { @@ -336,10 +338,10 @@ export const QueryGrantsResponse = { return message; }, fromJSON(object: any): QueryGrantsResponse { - return { - grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => Grant.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGrantsResponse(); + if (Array.isArray(object?.grants)) object.grants.map((e: any) => Grant.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGrantsResponse): unknown { const obj: any = {}; @@ -354,7 +356,9 @@ export const QueryGrantsResponse = { fromPartial(object: DeepPartial): QueryGrantsResponse { const message = createBaseQueryGrantsResponse(); message.grants = object.grants?.map(e => Grant.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGrantsResponseSDKType): QueryGrantsResponse { @@ -420,7 +424,7 @@ function createBaseQueryGranterGrantsRequest(): QueryGranterGrantsRequest { export const QueryGranterGrantsRequest = { typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsRequest", aminoType: "cosmos-sdk/QueryGranterGrantsRequest", - encode(message: QueryGranterGrantsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGranterGrantsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -429,8 +433,8 @@ export const QueryGranterGrantsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGranterGrantsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGranterGrantsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGranterGrantsRequest(); while (reader.pos < end) { @@ -450,10 +454,10 @@ export const QueryGranterGrantsRequest = { return message; }, fromJSON(object: any): QueryGranterGrantsRequest { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGranterGrantsRequest(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGranterGrantsRequest): unknown { const obj: any = {}; @@ -464,7 +468,9 @@ export const QueryGranterGrantsRequest = { fromPartial(object: DeepPartial): QueryGranterGrantsRequest { const message = createBaseQueryGranterGrantsRequest(); message.granter = object.granter ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGranterGrantsRequestSDKType): QueryGranterGrantsRequest { @@ -522,7 +528,7 @@ function createBaseQueryGranterGrantsResponse(): QueryGranterGrantsResponse { export const QueryGranterGrantsResponse = { typeUrl: "/cosmos.authz.v1beta1.QueryGranterGrantsResponse", aminoType: "cosmos-sdk/QueryGranterGrantsResponse", - encode(message: QueryGranterGrantsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGranterGrantsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -531,8 +537,8 @@ export const QueryGranterGrantsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGranterGrantsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGranterGrantsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGranterGrantsResponse(); while (reader.pos < end) { @@ -552,10 +558,10 @@ export const QueryGranterGrantsResponse = { return message; }, fromJSON(object: any): QueryGranterGrantsResponse { - return { - grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => GrantAuthorization.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGranterGrantsResponse(); + if (Array.isArray(object?.grants)) object.grants.map((e: any) => GrantAuthorization.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGranterGrantsResponse): unknown { const obj: any = {}; @@ -570,7 +576,9 @@ export const QueryGranterGrantsResponse = { fromPartial(object: DeepPartial): QueryGranterGrantsResponse { const message = createBaseQueryGranterGrantsResponse(); message.grants = object.grants?.map(e => GrantAuthorization.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGranterGrantsResponseSDKType): QueryGranterGrantsResponse { @@ -636,7 +644,7 @@ function createBaseQueryGranteeGrantsRequest(): QueryGranteeGrantsRequest { export const QueryGranteeGrantsRequest = { typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsRequest", aminoType: "cosmos-sdk/QueryGranteeGrantsRequest", - encode(message: QueryGranteeGrantsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGranteeGrantsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.grantee !== "") { writer.uint32(10).string(message.grantee); } @@ -645,8 +653,8 @@ export const QueryGranteeGrantsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGranteeGrantsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGranteeGrantsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGranteeGrantsRequest(); while (reader.pos < end) { @@ -666,10 +674,10 @@ export const QueryGranteeGrantsRequest = { return message; }, fromJSON(object: any): QueryGranteeGrantsRequest { - return { - grantee: isSet(object.grantee) ? String(object.grantee) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGranteeGrantsRequest(); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGranteeGrantsRequest): unknown { const obj: any = {}; @@ -680,7 +688,9 @@ export const QueryGranteeGrantsRequest = { fromPartial(object: DeepPartial): QueryGranteeGrantsRequest { const message = createBaseQueryGranteeGrantsRequest(); message.grantee = object.grantee ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGranteeGrantsRequestSDKType): QueryGranteeGrantsRequest { @@ -738,7 +748,7 @@ function createBaseQueryGranteeGrantsResponse(): QueryGranteeGrantsResponse { export const QueryGranteeGrantsResponse = { typeUrl: "/cosmos.authz.v1beta1.QueryGranteeGrantsResponse", aminoType: "cosmos-sdk/QueryGranteeGrantsResponse", - encode(message: QueryGranteeGrantsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGranteeGrantsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.grants) { GrantAuthorization.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -747,8 +757,8 @@ export const QueryGranteeGrantsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGranteeGrantsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGranteeGrantsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGranteeGrantsResponse(); while (reader.pos < end) { @@ -768,10 +778,10 @@ export const QueryGranteeGrantsResponse = { return message; }, fromJSON(object: any): QueryGranteeGrantsResponse { - return { - grants: Array.isArray(object?.grants) ? object.grants.map((e: any) => GrantAuthorization.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGranteeGrantsResponse(); + if (Array.isArray(object?.grants)) object.grants.map((e: any) => GrantAuthorization.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGranteeGrantsResponse): unknown { const obj: any = {}; @@ -786,7 +796,9 @@ export const QueryGranteeGrantsResponse = { fromPartial(object: DeepPartial): QueryGranteeGrantsResponse { const message = createBaseQueryGranteeGrantsResponse(); message.grants = object.grants?.map(e => GrantAuthorization.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGranteeGrantsResponseSDKType): QueryGranteeGrantsResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts index 62617b432f..372d9d351e 100644 --- a/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/authz/v1beta1/tx.ts @@ -1,6 +1,6 @@ import { Grant, GrantAmino, GrantSDKType } from "./authz"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.authz.v1beta1"; /** @@ -184,7 +184,7 @@ function createBaseMsgGrant(): MsgGrant { export const MsgGrant = { typeUrl: "/cosmos.authz.v1beta1.MsgGrant", aminoType: "cosmos-sdk/MsgGrant", - encode(message: MsgGrant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgGrant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -196,8 +196,8 @@ export const MsgGrant = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgGrant { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgGrant { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgGrant(); while (reader.pos < end) { @@ -220,11 +220,11 @@ export const MsgGrant = { return message; }, fromJSON(object: any): MsgGrant { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "", - grant: isSet(object.grant) ? Grant.fromJSON(object.grant) : undefined - }; + const obj = createBaseMsgGrant(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.grant)) obj.grant = Grant.fromJSON(object.grant); + return obj; }, toJSON(message: MsgGrant): unknown { const obj: any = {}; @@ -237,7 +237,9 @@ export const MsgGrant = { const message = createBaseMsgGrant(); message.granter = object.granter ?? ""; message.grantee = object.grantee ?? ""; - message.grant = object.grant !== undefined && object.grant !== null ? Grant.fromPartial(object.grant) : undefined; + if (object.grant !== undefined && object.grant !== null) { + message.grant = Grant.fromPartial(object.grant); + } return message; }, fromSDK(object: MsgGrantSDKType): MsgGrant { @@ -298,14 +300,14 @@ function createBaseMsgExecResponse(): MsgExecResponse { export const MsgExecResponse = { typeUrl: "/cosmos.authz.v1beta1.MsgExecResponse", aminoType: "cosmos-sdk/MsgExecResponse", - encode(message: MsgExecResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgExecResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.results) { writer.uint32(10).bytes(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExecResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExecResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExecResponse(); while (reader.pos < end) { @@ -322,9 +324,9 @@ export const MsgExecResponse = { return message; }, fromJSON(object: any): MsgExecResponse { - return { - results: Array.isArray(object?.results) ? object.results.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseMsgExecResponse(); + if (Array.isArray(object?.results)) object.results.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: MsgExecResponse): unknown { const obj: any = {}; @@ -399,7 +401,7 @@ function createBaseMsgExec(): MsgExec { export const MsgExec = { typeUrl: "/cosmos.authz.v1beta1.MsgExec", aminoType: "cosmos-sdk/MsgExec", - encode(message: MsgExec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgExec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.grantee !== "") { writer.uint32(10).string(message.grantee); } @@ -408,8 +410,8 @@ export const MsgExec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExec(); while (reader.pos < end) { @@ -429,10 +431,10 @@ export const MsgExec = { return message; }, fromJSON(object: any): MsgExec { - return { - grantee: isSet(object.grantee) ? String(object.grantee) : "", - msgs: Array.isArray(object?.msgs) ? object.msgs.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseMsgExec(); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (Array.isArray(object?.msgs)) object.msgs.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: MsgExec): unknown { const obj: any = {}; @@ -510,11 +512,11 @@ function createBaseMsgGrantResponse(): MsgGrantResponse { export const MsgGrantResponse = { typeUrl: "/cosmos.authz.v1beta1.MsgGrantResponse", aminoType: "cosmos-sdk/MsgGrantResponse", - encode(_: MsgGrantResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgGrantResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgGrantResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgGrantResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgGrantResponse(); while (reader.pos < end) { @@ -528,7 +530,8 @@ export const MsgGrantResponse = { return message; }, fromJSON(_: any): MsgGrantResponse { - return {}; + const obj = createBaseMsgGrantResponse(); + return obj; }, toJSON(_: MsgGrantResponse): unknown { const obj: any = {}; @@ -584,7 +587,7 @@ function createBaseMsgRevoke(): MsgRevoke { export const MsgRevoke = { typeUrl: "/cosmos.authz.v1beta1.MsgRevoke", aminoType: "cosmos-sdk/MsgRevoke", - encode(message: MsgRevoke, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgRevoke, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -596,8 +599,8 @@ export const MsgRevoke = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRevoke { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRevoke { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRevoke(); while (reader.pos < end) { @@ -620,11 +623,11 @@ export const MsgRevoke = { return message; }, fromJSON(object: any): MsgRevoke { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "", - msgTypeUrl: isSet(object.msgTypeUrl) ? String(object.msgTypeUrl) : "" - }; + const obj = createBaseMsgRevoke(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.msgTypeUrl)) obj.msgTypeUrl = String(object.msgTypeUrl); + return obj; }, toJSON(message: MsgRevoke): unknown { const obj: any = {}; @@ -696,11 +699,11 @@ function createBaseMsgRevokeResponse(): MsgRevokeResponse { export const MsgRevokeResponse = { typeUrl: "/cosmos.authz.v1beta1.MsgRevokeResponse", aminoType: "cosmos-sdk/MsgRevokeResponse", - encode(_: MsgRevokeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgRevokeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRevokeResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRevokeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRevokeResponse(); while (reader.pos < end) { @@ -714,7 +717,8 @@ export const MsgRevokeResponse = { return message; }, fromJSON(_: any): MsgRevokeResponse { - return {}; + const obj = createBaseMsgRevokeResponse(); + return obj; }, toJSON(_: MsgRevokeResponse): unknown { const obj: any = {}; @@ -760,8 +764,8 @@ export const MsgRevokeResponse = { }; } }; -export const Sdk_Msg_InterfaceDecoder = (input: _m0.Reader | Uint8Array): Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const Sdk_Msg_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { default: @@ -774,8 +778,8 @@ export const Sdk_Msg_FromAmino = (content: AnyAmino) => { export const Sdk_Msg_ToAmino = (content: Any) => { return Any.toAmino(content); }; -export const Authz_Authorization_InterfaceDecoder = (input: _m0.Reader | Uint8Array): Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const Authz_Authorization_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { default: diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts index 66e902dfd5..951795c8c4 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/authz.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.bank.v1beta1"; /** @@ -9,6 +9,7 @@ export const protobufPackage = "cosmos.bank.v1beta1"; * Since: cosmos-sdk 0.43 */ export interface SendAuthorization { + $typeUrl?: string; spendLimit: Coin[]; } export interface SendAuthorizationProtoMsg { @@ -35,24 +36,26 @@ export interface SendAuthorizationAminoMsg { * Since: cosmos-sdk 0.43 */ export interface SendAuthorizationSDKType { + $typeUrl?: string; spend_limit: CoinSDKType[]; } function createBaseSendAuthorization(): SendAuthorization { return { + $typeUrl: "/cosmos.bank.v1beta1.SendAuthorization", spendLimit: [] }; } export const SendAuthorization = { typeUrl: "/cosmos.bank.v1beta1.SendAuthorization", aminoType: "cosmos-sdk/SendAuthorization", - encode(message: SendAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SendAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.spendLimit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SendAuthorization { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SendAuthorization { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSendAuthorization(); while (reader.pos < end) { @@ -69,9 +72,9 @@ export const SendAuthorization = { return message; }, fromJSON(object: any): SendAuthorization { - return { - spendLimit: Array.isArray(object?.spendLimit) ? object.spendLimit.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseSendAuthorization(); + if (Array.isArray(object?.spendLimit)) object.spendLimit.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: SendAuthorization): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts index f6f23502a6..1bfed3aedc 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/bank.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.bank.v1beta1"; /** Params defines the parameters for the bank module. */ @@ -110,6 +110,7 @@ export interface OutputSDKType { */ /** @deprecated */ export interface Supply { + $typeUrl?: string; total: Coin[]; } export interface SupplyProtoMsg { @@ -136,6 +137,7 @@ export interface SupplyAminoMsg { */ /** @deprecated */ export interface SupplySDKType { + $typeUrl?: string; total: CoinSDKType[]; } /** @@ -306,7 +308,7 @@ function createBaseParams(): Params { export const Params = { typeUrl: "/cosmos.bank.v1beta1.Params", aminoType: "cosmos-sdk/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.sendEnabled) { SendEnabled.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -315,8 +317,8 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -336,10 +338,10 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - sendEnabled: Array.isArray(object?.sendEnabled) ? object.sendEnabled.map((e: any) => SendEnabled.fromJSON(e)) : [], - defaultSendEnabled: isSet(object.defaultSendEnabled) ? Boolean(object.defaultSendEnabled) : false - }; + const obj = createBaseParams(); + if (Array.isArray(object?.sendEnabled)) object.sendEnabled.map((e: any) => SendEnabled.fromJSON(e)); + if (isSet(object.defaultSendEnabled)) obj.defaultSendEnabled = Boolean(object.defaultSendEnabled); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -420,7 +422,7 @@ function createBaseSendEnabled(): SendEnabled { export const SendEnabled = { typeUrl: "/cosmos.bank.v1beta1.SendEnabled", aminoType: "cosmos-sdk/SendEnabled", - encode(message: SendEnabled, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SendEnabled, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } @@ -429,8 +431,8 @@ export const SendEnabled = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SendEnabled { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SendEnabled { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSendEnabled(); while (reader.pos < end) { @@ -450,10 +452,10 @@ export const SendEnabled = { return message; }, fromJSON(object: any): SendEnabled { - return { - denom: isSet(object.denom) ? String(object.denom) : "", - enabled: isSet(object.enabled) ? Boolean(object.enabled) : false - }; + const obj = createBaseSendEnabled(); + if (isSet(object.denom)) obj.denom = String(object.denom); + if (isSet(object.enabled)) obj.enabled = Boolean(object.enabled); + return obj; }, toJSON(message: SendEnabled): unknown { const obj: any = {}; @@ -522,7 +524,7 @@ function createBaseInput(): Input { export const Input = { typeUrl: "/cosmos.bank.v1beta1.Input", aminoType: "cosmos-sdk/Input", - encode(message: Input, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Input, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -531,8 +533,8 @@ export const Input = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Input { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Input { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInput(); while (reader.pos < end) { @@ -552,10 +554,10 @@ export const Input = { return message; }, fromJSON(object: any): Input { - return { - address: isSet(object.address) ? String(object.address) : "", - coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseInput(); + if (isSet(object.address)) obj.address = String(object.address); + if (Array.isArray(object?.coins)) object.coins.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Input): unknown { const obj: any = {}; @@ -636,7 +638,7 @@ function createBaseOutput(): Output { export const Output = { typeUrl: "/cosmos.bank.v1beta1.Output", aminoType: "cosmos-sdk/Output", - encode(message: Output, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Output, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -645,8 +647,8 @@ export const Output = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Output { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Output { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOutput(); while (reader.pos < end) { @@ -666,10 +668,10 @@ export const Output = { return message; }, fromJSON(object: any): Output { - return { - address: isSet(object.address) ? String(object.address) : "", - coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseOutput(); + if (isSet(object.address)) obj.address = String(object.address); + if (Array.isArray(object?.coins)) object.coins.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Output): unknown { const obj: any = {}; @@ -743,20 +745,21 @@ export const Output = { }; function createBaseSupply(): Supply { return { + $typeUrl: "/cosmos.bank.v1beta1.Supply", total: [] }; } export const Supply = { typeUrl: "/cosmos.bank.v1beta1.Supply", aminoType: "cosmos-sdk/Supply", - encode(message: Supply, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Supply, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.total) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Supply { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Supply { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSupply(); while (reader.pos < end) { @@ -773,9 +776,9 @@ export const Supply = { return message; }, fromJSON(object: any): Supply { - return { - total: Array.isArray(object?.total) ? object.total.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseSupply(); + if (Array.isArray(object?.total)) object.total.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Supply): unknown { const obj: any = {}; @@ -851,7 +854,7 @@ function createBaseDenomUnit(): DenomUnit { export const DenomUnit = { typeUrl: "/cosmos.bank.v1beta1.DenomUnit", aminoType: "cosmos-sdk/DenomUnit", - encode(message: DenomUnit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DenomUnit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } @@ -863,8 +866,8 @@ export const DenomUnit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DenomUnit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DenomUnit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDenomUnit(); while (reader.pos < end) { @@ -887,11 +890,11 @@ export const DenomUnit = { return message; }, fromJSON(object: any): DenomUnit { - return { - denom: isSet(object.denom) ? String(object.denom) : "", - exponent: isSet(object.exponent) ? Number(object.exponent) : 0, - aliases: Array.isArray(object?.aliases) ? object.aliases.map((e: any) => String(e)) : [] - }; + const obj = createBaseDenomUnit(); + if (isSet(object.denom)) obj.denom = String(object.denom); + if (isSet(object.exponent)) obj.exponent = Number(object.exponent); + if (Array.isArray(object?.aliases)) object.aliases.map((e: any) => String(e)); + return obj; }, toJSON(message: DenomUnit): unknown { const obj: any = {}; @@ -984,7 +987,7 @@ function createBaseMetadata(): Metadata { export const Metadata = { typeUrl: "/cosmos.bank.v1beta1.Metadata", aminoType: "cosmos-sdk/Metadata", - encode(message: Metadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Metadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(10).string(message.description); } @@ -1011,8 +1014,8 @@ export const Metadata = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Metadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Metadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetadata(); while (reader.pos < end) { @@ -1050,16 +1053,16 @@ export const Metadata = { return message; }, fromJSON(object: any): Metadata { - return { - description: isSet(object.description) ? String(object.description) : "", - denomUnits: Array.isArray(object?.denomUnits) ? object.denomUnits.map((e: any) => DenomUnit.fromJSON(e)) : [], - base: isSet(object.base) ? String(object.base) : "", - display: isSet(object.display) ? String(object.display) : "", - name: isSet(object.name) ? String(object.name) : "", - symbol: isSet(object.symbol) ? String(object.symbol) : "", - uri: isSet(object.uri) ? String(object.uri) : "", - uriHash: isSet(object.uriHash) ? String(object.uriHash) : "" - }; + const obj = createBaseMetadata(); + if (isSet(object.description)) obj.description = String(object.description); + if (Array.isArray(object?.denomUnits)) object.denomUnits.map((e: any) => DenomUnit.fromJSON(e)); + if (isSet(object.base)) obj.base = String(object.base); + if (isSet(object.display)) obj.display = String(object.display); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.symbol)) obj.symbol = String(object.symbol); + if (isSet(object.uri)) obj.uri = String(object.uri); + if (isSet(object.uriHash)) obj.uriHash = String(object.uriHash); + return obj; }, toJSON(message: Metadata): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts index 382f9b49f8..878c29e7b7 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/genesis.ts @@ -1,6 +1,6 @@ import { Params, ParamsAmino, ParamsSDKType, Metadata, MetadataAmino, MetadataSDKType } from "./bank"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.bank.v1beta1"; /** GenesisState defines the bank module's genesis state. */ @@ -93,7 +93,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.bank.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -108,8 +108,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -135,12 +135,12 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - balances: Array.isArray(object?.balances) ? object.balances.map((e: any) => Balance.fromJSON(e)) : [], - supply: Array.isArray(object?.supply) ? object.supply.map((e: any) => Coin.fromJSON(e)) : [], - denomMetadata: Array.isArray(object?.denomMetadata) ? object.denomMetadata.map((e: any) => Metadata.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.balances)) object.balances.map((e: any) => Balance.fromJSON(e)); + if (Array.isArray(object?.supply)) object.supply.map((e: any) => Coin.fromJSON(e)); + if (Array.isArray(object?.denomMetadata)) object.denomMetadata.map((e: any) => Metadata.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -164,7 +164,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.balances = object.balances?.map(e => Balance.fromPartial(e)) || []; message.supply = object.supply?.map(e => Coin.fromPartial(e)) || []; message.denomMetadata = object.denomMetadata?.map(e => Metadata.fromPartial(e)) || []; @@ -257,7 +259,7 @@ function createBaseBalance(): Balance { export const Balance = { typeUrl: "/cosmos.bank.v1beta1.Balance", aminoType: "cosmos-sdk/Balance", - encode(message: Balance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Balance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -266,8 +268,8 @@ export const Balance = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Balance { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Balance { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBalance(); while (reader.pos < end) { @@ -287,10 +289,10 @@ export const Balance = { return message; }, fromJSON(object: any): Balance { - return { - address: isSet(object.address) ? String(object.address) : "", - coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseBalance(); + if (isSet(object.address)) obj.address = String(object.address); + if (Array.isArray(object?.coins)) object.coins.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Balance): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts index 86355f61e8..2a92d39688 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Params, ParamsAmino, ParamsSDKType, Metadata, MetadataAmino, MetadataSDKType } from "./bank"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.bank.v1beta1"; /** QueryBalanceRequest is the request type for the Query/Balance RPC method. */ @@ -572,7 +572,7 @@ function createBaseQueryBalanceRequest(): QueryBalanceRequest { export const QueryBalanceRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryBalanceRequest", aminoType: "cosmos-sdk/QueryBalanceRequest", - encode(message: QueryBalanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBalanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -581,8 +581,8 @@ export const QueryBalanceRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalanceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBalanceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBalanceRequest(); while (reader.pos < end) { @@ -602,10 +602,10 @@ export const QueryBalanceRequest = { return message; }, fromJSON(object: any): QueryBalanceRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - denom: isSet(object.denom) ? String(object.denom) : "" - }; + const obj = createBaseQueryBalanceRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.denom)) obj.denom = String(object.denom); + return obj; }, toJSON(message: QueryBalanceRequest): unknown { const obj: any = {}; @@ -673,14 +673,14 @@ function createBaseQueryBalanceResponse(): QueryBalanceResponse { export const QueryBalanceResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryBalanceResponse", aminoType: "cosmos-sdk/QueryBalanceResponse", - encode(message: QueryBalanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBalanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.balance !== undefined) { Coin.encode(message.balance, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalanceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBalanceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBalanceResponse(); while (reader.pos < end) { @@ -697,9 +697,9 @@ export const QueryBalanceResponse = { return message; }, fromJSON(object: any): QueryBalanceResponse { - return { - balance: isSet(object.balance) ? Coin.fromJSON(object.balance) : undefined - }; + const obj = createBaseQueryBalanceResponse(); + if (isSet(object.balance)) obj.balance = Coin.fromJSON(object.balance); + return obj; }, toJSON(message: QueryBalanceResponse): unknown { const obj: any = {}; @@ -708,7 +708,9 @@ export const QueryBalanceResponse = { }, fromPartial(object: DeepPartial): QueryBalanceResponse { const message = createBaseQueryBalanceResponse(); - message.balance = object.balance !== undefined && object.balance !== null ? Coin.fromPartial(object.balance) : undefined; + if (object.balance !== undefined && object.balance !== null) { + message.balance = Coin.fromPartial(object.balance); + } return message; }, fromSDK(object: QueryBalanceResponseSDKType): QueryBalanceResponse { @@ -762,7 +764,7 @@ function createBaseQueryAllBalancesRequest(): QueryAllBalancesRequest { export const QueryAllBalancesRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesRequest", aminoType: "cosmos-sdk/QueryAllBalancesRequest", - encode(message: QueryAllBalancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllBalancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -771,8 +773,8 @@ export const QueryAllBalancesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllBalancesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllBalancesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllBalancesRequest(); while (reader.pos < end) { @@ -792,10 +794,10 @@ export const QueryAllBalancesRequest = { return message; }, fromJSON(object: any): QueryAllBalancesRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllBalancesRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllBalancesRequest): unknown { const obj: any = {}; @@ -806,7 +808,9 @@ export const QueryAllBalancesRequest = { fromPartial(object: DeepPartial): QueryAllBalancesRequest { const message = createBaseQueryAllBalancesRequest(); message.address = object.address ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllBalancesRequestSDKType): QueryAllBalancesRequest { @@ -864,7 +868,7 @@ function createBaseQueryAllBalancesResponse(): QueryAllBalancesResponse { export const QueryAllBalancesResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryAllBalancesResponse", aminoType: "cosmos-sdk/QueryAllBalancesResponse", - encode(message: QueryAllBalancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllBalancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.balances) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -873,8 +877,8 @@ export const QueryAllBalancesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllBalancesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllBalancesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllBalancesResponse(); while (reader.pos < end) { @@ -894,10 +898,10 @@ export const QueryAllBalancesResponse = { return message; }, fromJSON(object: any): QueryAllBalancesResponse { - return { - balances: Array.isArray(object?.balances) ? object.balances.map((e: any) => Coin.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllBalancesResponse(); + if (Array.isArray(object?.balances)) object.balances.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllBalancesResponse): unknown { const obj: any = {}; @@ -912,7 +916,9 @@ export const QueryAllBalancesResponse = { fromPartial(object: DeepPartial): QueryAllBalancesResponse { const message = createBaseQueryAllBalancesResponse(); message.balances = object.balances?.map(e => Coin.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllBalancesResponseSDKType): QueryAllBalancesResponse { @@ -978,7 +984,7 @@ function createBaseQuerySpendableBalancesRequest(): QuerySpendableBalancesReques export const QuerySpendableBalancesRequest = { typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesRequest", aminoType: "cosmos-sdk/QuerySpendableBalancesRequest", - encode(message: QuerySpendableBalancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySpendableBalancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -987,8 +993,8 @@ export const QuerySpendableBalancesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySpendableBalancesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySpendableBalancesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySpendableBalancesRequest(); while (reader.pos < end) { @@ -1008,10 +1014,10 @@ export const QuerySpendableBalancesRequest = { return message; }, fromJSON(object: any): QuerySpendableBalancesRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQuerySpendableBalancesRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QuerySpendableBalancesRequest): unknown { const obj: any = {}; @@ -1022,7 +1028,9 @@ export const QuerySpendableBalancesRequest = { fromPartial(object: DeepPartial): QuerySpendableBalancesRequest { const message = createBaseQuerySpendableBalancesRequest(); message.address = object.address ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QuerySpendableBalancesRequestSDKType): QuerySpendableBalancesRequest { @@ -1080,7 +1088,7 @@ function createBaseQuerySpendableBalancesResponse(): QuerySpendableBalancesRespo export const QuerySpendableBalancesResponse = { typeUrl: "/cosmos.bank.v1beta1.QuerySpendableBalancesResponse", aminoType: "cosmos-sdk/QuerySpendableBalancesResponse", - encode(message: QuerySpendableBalancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySpendableBalancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.balances) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1089,8 +1097,8 @@ export const QuerySpendableBalancesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySpendableBalancesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySpendableBalancesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySpendableBalancesResponse(); while (reader.pos < end) { @@ -1110,10 +1118,10 @@ export const QuerySpendableBalancesResponse = { return message; }, fromJSON(object: any): QuerySpendableBalancesResponse { - return { - balances: Array.isArray(object?.balances) ? object.balances.map((e: any) => Coin.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQuerySpendableBalancesResponse(); + if (Array.isArray(object?.balances)) object.balances.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QuerySpendableBalancesResponse): unknown { const obj: any = {}; @@ -1128,7 +1136,9 @@ export const QuerySpendableBalancesResponse = { fromPartial(object: DeepPartial): QuerySpendableBalancesResponse { const message = createBaseQuerySpendableBalancesResponse(); message.balances = object.balances?.map(e => Coin.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QuerySpendableBalancesResponseSDKType): QuerySpendableBalancesResponse { @@ -1193,14 +1203,14 @@ function createBaseQueryTotalSupplyRequest(): QueryTotalSupplyRequest { export const QueryTotalSupplyRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyRequest", aminoType: "cosmos-sdk/QueryTotalSupplyRequest", - encode(message: QueryTotalSupplyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTotalSupplyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTotalSupplyRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTotalSupplyRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTotalSupplyRequest(); while (reader.pos < end) { @@ -1217,9 +1227,9 @@ export const QueryTotalSupplyRequest = { return message; }, fromJSON(object: any): QueryTotalSupplyRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryTotalSupplyRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryTotalSupplyRequest): unknown { const obj: any = {}; @@ -1228,7 +1238,9 @@ export const QueryTotalSupplyRequest = { }, fromPartial(object: DeepPartial): QueryTotalSupplyRequest { const message = createBaseQueryTotalSupplyRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryTotalSupplyRequestSDKType): QueryTotalSupplyRequest { @@ -1282,7 +1294,7 @@ function createBaseQueryTotalSupplyResponse(): QueryTotalSupplyResponse { export const QueryTotalSupplyResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryTotalSupplyResponse", aminoType: "cosmos-sdk/QueryTotalSupplyResponse", - encode(message: QueryTotalSupplyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTotalSupplyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.supply) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1291,8 +1303,8 @@ export const QueryTotalSupplyResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTotalSupplyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTotalSupplyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTotalSupplyResponse(); while (reader.pos < end) { @@ -1312,10 +1324,10 @@ export const QueryTotalSupplyResponse = { return message; }, fromJSON(object: any): QueryTotalSupplyResponse { - return { - supply: Array.isArray(object?.supply) ? object.supply.map((e: any) => Coin.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryTotalSupplyResponse(); + if (Array.isArray(object?.supply)) object.supply.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryTotalSupplyResponse): unknown { const obj: any = {}; @@ -1330,7 +1342,9 @@ export const QueryTotalSupplyResponse = { fromPartial(object: DeepPartial): QueryTotalSupplyResponse { const message = createBaseQueryTotalSupplyResponse(); message.supply = object.supply?.map(e => Coin.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryTotalSupplyResponseSDKType): QueryTotalSupplyResponse { @@ -1395,14 +1409,14 @@ function createBaseQuerySupplyOfRequest(): QuerySupplyOfRequest { export const QuerySupplyOfRequest = { typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfRequest", aminoType: "cosmos-sdk/QuerySupplyOfRequest", - encode(message: QuerySupplyOfRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySupplyOfRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySupplyOfRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySupplyOfRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySupplyOfRequest(); while (reader.pos < end) { @@ -1419,9 +1433,9 @@ export const QuerySupplyOfRequest = { return message; }, fromJSON(object: any): QuerySupplyOfRequest { - return { - denom: isSet(object.denom) ? String(object.denom) : "" - }; + const obj = createBaseQuerySupplyOfRequest(); + if (isSet(object.denom)) obj.denom = String(object.denom); + return obj; }, toJSON(message: QuerySupplyOfRequest): unknown { const obj: any = {}; @@ -1483,14 +1497,14 @@ function createBaseQuerySupplyOfResponse(): QuerySupplyOfResponse { export const QuerySupplyOfResponse = { typeUrl: "/cosmos.bank.v1beta1.QuerySupplyOfResponse", aminoType: "cosmos-sdk/QuerySupplyOfResponse", - encode(message: QuerySupplyOfResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySupplyOfResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.amount !== undefined) { Coin.encode(message.amount, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySupplyOfResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySupplyOfResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySupplyOfResponse(); while (reader.pos < end) { @@ -1507,9 +1521,9 @@ export const QuerySupplyOfResponse = { return message; }, fromJSON(object: any): QuerySupplyOfResponse { - return { - amount: isSet(object.amount) ? Coin.fromJSON(object.amount) : undefined - }; + const obj = createBaseQuerySupplyOfResponse(); + if (isSet(object.amount)) obj.amount = Coin.fromJSON(object.amount); + return obj; }, toJSON(message: QuerySupplyOfResponse): unknown { const obj: any = {}; @@ -1518,7 +1532,9 @@ export const QuerySupplyOfResponse = { }, fromPartial(object: DeepPartial): QuerySupplyOfResponse { const message = createBaseQuerySupplyOfResponse(); - message.amount = object.amount !== undefined && object.amount !== null ? Coin.fromPartial(object.amount) : undefined; + if (object.amount !== undefined && object.amount !== null) { + message.amount = Coin.fromPartial(object.amount); + } return message; }, fromSDK(object: QuerySupplyOfResponseSDKType): QuerySupplyOfResponse { @@ -1569,11 +1585,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -1587,7 +1603,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -1641,14 +1658,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -1665,9 +1682,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -1676,7 +1693,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -1729,14 +1748,14 @@ function createBaseQueryDenomsMetadataRequest(): QueryDenomsMetadataRequest { export const QueryDenomsMetadataRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataRequest", aminoType: "cosmos-sdk/QueryDenomsMetadataRequest", - encode(message: QueryDenomsMetadataRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDenomsMetadataRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomsMetadataRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDenomsMetadataRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDenomsMetadataRequest(); while (reader.pos < end) { @@ -1753,9 +1772,9 @@ export const QueryDenomsMetadataRequest = { return message; }, fromJSON(object: any): QueryDenomsMetadataRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDenomsMetadataRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDenomsMetadataRequest): unknown { const obj: any = {}; @@ -1764,7 +1783,9 @@ export const QueryDenomsMetadataRequest = { }, fromPartial(object: DeepPartial): QueryDenomsMetadataRequest { const message = createBaseQueryDenomsMetadataRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDenomsMetadataRequestSDKType): QueryDenomsMetadataRequest { @@ -1818,7 +1839,7 @@ function createBaseQueryDenomsMetadataResponse(): QueryDenomsMetadataResponse { export const QueryDenomsMetadataResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryDenomsMetadataResponse", aminoType: "cosmos-sdk/QueryDenomsMetadataResponse", - encode(message: QueryDenomsMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDenomsMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.metadatas) { Metadata.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1827,8 +1848,8 @@ export const QueryDenomsMetadataResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomsMetadataResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDenomsMetadataResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDenomsMetadataResponse(); while (reader.pos < end) { @@ -1848,10 +1869,10 @@ export const QueryDenomsMetadataResponse = { return message; }, fromJSON(object: any): QueryDenomsMetadataResponse { - return { - metadatas: Array.isArray(object?.metadatas) ? object.metadatas.map((e: any) => Metadata.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDenomsMetadataResponse(); + if (Array.isArray(object?.metadatas)) object.metadatas.map((e: any) => Metadata.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDenomsMetadataResponse): unknown { const obj: any = {}; @@ -1866,7 +1887,9 @@ export const QueryDenomsMetadataResponse = { fromPartial(object: DeepPartial): QueryDenomsMetadataResponse { const message = createBaseQueryDenomsMetadataResponse(); message.metadatas = object.metadatas?.map(e => Metadata.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDenomsMetadataResponseSDKType): QueryDenomsMetadataResponse { @@ -1931,14 +1954,14 @@ function createBaseQueryDenomMetadataRequest(): QueryDenomMetadataRequest { export const QueryDenomMetadataRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataRequest", aminoType: "cosmos-sdk/QueryDenomMetadataRequest", - encode(message: QueryDenomMetadataRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDenomMetadataRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomMetadataRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDenomMetadataRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDenomMetadataRequest(); while (reader.pos < end) { @@ -1955,9 +1978,9 @@ export const QueryDenomMetadataRequest = { return message; }, fromJSON(object: any): QueryDenomMetadataRequest { - return { - denom: isSet(object.denom) ? String(object.denom) : "" - }; + const obj = createBaseQueryDenomMetadataRequest(); + if (isSet(object.denom)) obj.denom = String(object.denom); + return obj; }, toJSON(message: QueryDenomMetadataRequest): unknown { const obj: any = {}; @@ -2019,14 +2042,14 @@ function createBaseQueryDenomMetadataResponse(): QueryDenomMetadataResponse { export const QueryDenomMetadataResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryDenomMetadataResponse", aminoType: "cosmos-sdk/QueryDenomMetadataResponse", - encode(message: QueryDenomMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDenomMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metadata !== undefined) { Metadata.encode(message.metadata, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomMetadataResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDenomMetadataResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDenomMetadataResponse(); while (reader.pos < end) { @@ -2043,9 +2066,9 @@ export const QueryDenomMetadataResponse = { return message; }, fromJSON(object: any): QueryDenomMetadataResponse { - return { - metadata: isSet(object.metadata) ? Metadata.fromJSON(object.metadata) : undefined - }; + const obj = createBaseQueryDenomMetadataResponse(); + if (isSet(object.metadata)) obj.metadata = Metadata.fromJSON(object.metadata); + return obj; }, toJSON(message: QueryDenomMetadataResponse): unknown { const obj: any = {}; @@ -2054,7 +2077,9 @@ export const QueryDenomMetadataResponse = { }, fromPartial(object: DeepPartial): QueryDenomMetadataResponse { const message = createBaseQueryDenomMetadataResponse(); - message.metadata = object.metadata !== undefined && object.metadata !== null ? Metadata.fromPartial(object.metadata) : undefined; + if (object.metadata !== undefined && object.metadata !== null) { + message.metadata = Metadata.fromPartial(object.metadata); + } return message; }, fromSDK(object: QueryDenomMetadataResponseSDKType): QueryDenomMetadataResponse { @@ -2108,7 +2133,7 @@ function createBaseQueryDenomOwnersRequest(): QueryDenomOwnersRequest { export const QueryDenomOwnersRequest = { typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersRequest", aminoType: "cosmos-sdk/QueryDenomOwnersRequest", - encode(message: QueryDenomOwnersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDenomOwnersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } @@ -2117,8 +2142,8 @@ export const QueryDenomOwnersRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomOwnersRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDenomOwnersRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDenomOwnersRequest(); while (reader.pos < end) { @@ -2138,10 +2163,10 @@ export const QueryDenomOwnersRequest = { return message; }, fromJSON(object: any): QueryDenomOwnersRequest { - return { - denom: isSet(object.denom) ? String(object.denom) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDenomOwnersRequest(); + if (isSet(object.denom)) obj.denom = String(object.denom); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDenomOwnersRequest): unknown { const obj: any = {}; @@ -2152,7 +2177,9 @@ export const QueryDenomOwnersRequest = { fromPartial(object: DeepPartial): QueryDenomOwnersRequest { const message = createBaseQueryDenomOwnersRequest(); message.denom = object.denom ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDenomOwnersRequestSDKType): QueryDenomOwnersRequest { @@ -2210,7 +2237,7 @@ function createBaseDenomOwner(): DenomOwner { export const DenomOwner = { typeUrl: "/cosmos.bank.v1beta1.DenomOwner", aminoType: "cosmos-sdk/DenomOwner", - encode(message: DenomOwner, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DenomOwner, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -2219,8 +2246,8 @@ export const DenomOwner = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DenomOwner { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DenomOwner { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDenomOwner(); while (reader.pos < end) { @@ -2240,10 +2267,10 @@ export const DenomOwner = { return message; }, fromJSON(object: any): DenomOwner { - return { - address: isSet(object.address) ? String(object.address) : "", - balance: isSet(object.balance) ? Coin.fromJSON(object.balance) : undefined - }; + const obj = createBaseDenomOwner(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.balance)) obj.balance = Coin.fromJSON(object.balance); + return obj; }, toJSON(message: DenomOwner): unknown { const obj: any = {}; @@ -2254,7 +2281,9 @@ export const DenomOwner = { fromPartial(object: DeepPartial): DenomOwner { const message = createBaseDenomOwner(); message.address = object.address ?? ""; - message.balance = object.balance !== undefined && object.balance !== null ? Coin.fromPartial(object.balance) : undefined; + if (object.balance !== undefined && object.balance !== null) { + message.balance = Coin.fromPartial(object.balance); + } return message; }, fromSDK(object: DenomOwnerSDKType): DenomOwner { @@ -2312,7 +2341,7 @@ function createBaseQueryDenomOwnersResponse(): QueryDenomOwnersResponse { export const QueryDenomOwnersResponse = { typeUrl: "/cosmos.bank.v1beta1.QueryDenomOwnersResponse", aminoType: "cosmos-sdk/QueryDenomOwnersResponse", - encode(message: QueryDenomOwnersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDenomOwnersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.denomOwners) { DenomOwner.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2321,8 +2350,8 @@ export const QueryDenomOwnersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDenomOwnersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDenomOwnersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDenomOwnersResponse(); while (reader.pos < end) { @@ -2342,10 +2371,10 @@ export const QueryDenomOwnersResponse = { return message; }, fromJSON(object: any): QueryDenomOwnersResponse { - return { - denomOwners: Array.isArray(object?.denomOwners) ? object.denomOwners.map((e: any) => DenomOwner.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDenomOwnersResponse(); + if (Array.isArray(object?.denomOwners)) object.denomOwners.map((e: any) => DenomOwner.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDenomOwnersResponse): unknown { const obj: any = {}; @@ -2360,7 +2389,9 @@ export const QueryDenomOwnersResponse = { fromPartial(object: DeepPartial): QueryDenomOwnersResponse { const message = createBaseQueryDenomOwnersResponse(); message.denomOwners = object.denomOwners?.map(e => DenomOwner.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDenomOwnersResponseSDKType): QueryDenomOwnersResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts index bdbe211620..5973b45190 100644 --- a/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/bank/v1beta1/tx.ts @@ -1,6 +1,6 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Input, InputAmino, InputSDKType, Output, OutputAmino, OutputSDKType } from "./bank"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.bank.v1beta1"; /** MsgSend represents a message to send coins from one account to another. */ @@ -90,7 +90,7 @@ function createBaseMsgSend(): MsgSend { export const MsgSend = { typeUrl: "/cosmos.bank.v1beta1.MsgSend", aminoType: "cosmos-sdk/MsgSend", - encode(message: MsgSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); } @@ -102,8 +102,8 @@ export const MsgSend = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSend { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSend { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSend(); while (reader.pos < end) { @@ -126,11 +126,11 @@ export const MsgSend = { return message; }, fromJSON(object: any): MsgSend { - return { - fromAddress: isSet(object.fromAddress) ? String(object.fromAddress) : "", - toAddress: isSet(object.toAddress) ? String(object.toAddress) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgSend(); + if (isSet(object.fromAddress)) obj.fromAddress = String(object.fromAddress); + if (isSet(object.toAddress)) obj.toAddress = String(object.toAddress); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgSend): unknown { const obj: any = {}; @@ -214,11 +214,11 @@ function createBaseMsgSendResponse(): MsgSendResponse { export const MsgSendResponse = { typeUrl: "/cosmos.bank.v1beta1.MsgSendResponse", aminoType: "cosmos-sdk/MsgSendResponse", - encode(_: MsgSendResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgSendResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSendResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSendResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSendResponse(); while (reader.pos < end) { @@ -232,7 +232,8 @@ export const MsgSendResponse = { return message; }, fromJSON(_: any): MsgSendResponse { - return {}; + const obj = createBaseMsgSendResponse(); + return obj; }, toJSON(_: MsgSendResponse): unknown { const obj: any = {}; @@ -287,7 +288,7 @@ function createBaseMsgMultiSend(): MsgMultiSend { export const MsgMultiSend = { typeUrl: "/cosmos.bank.v1beta1.MsgMultiSend", aminoType: "cosmos-sdk/MsgMultiSend", - encode(message: MsgMultiSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgMultiSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.inputs) { Input.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -296,8 +297,8 @@ export const MsgMultiSend = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgMultiSend { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgMultiSend { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgMultiSend(); while (reader.pos < end) { @@ -317,10 +318,10 @@ export const MsgMultiSend = { return message; }, fromJSON(object: any): MsgMultiSend { - return { - inputs: Array.isArray(object?.inputs) ? object.inputs.map((e: any) => Input.fromJSON(e)) : [], - outputs: Array.isArray(object?.outputs) ? object.outputs.map((e: any) => Output.fromJSON(e)) : [] - }; + const obj = createBaseMsgMultiSend(); + if (Array.isArray(object?.inputs)) object.inputs.map((e: any) => Input.fromJSON(e)); + if (Array.isArray(object?.outputs)) object.outputs.map((e: any) => Output.fromJSON(e)); + return obj; }, toJSON(message: MsgMultiSend): unknown { const obj: any = {}; @@ -410,11 +411,11 @@ function createBaseMsgMultiSendResponse(): MsgMultiSendResponse { export const MsgMultiSendResponse = { typeUrl: "/cosmos.bank.v1beta1.MsgMultiSendResponse", aminoType: "cosmos-sdk/MsgMultiSendResponse", - encode(_: MsgMultiSendResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgMultiSendResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgMultiSendResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgMultiSendResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgMultiSendResponse(); while (reader.pos < end) { @@ -428,7 +429,8 @@ export const MsgMultiSendResponse = { return message; }, fromJSON(_: any): MsgMultiSendResponse { - return {}; + const obj = createBaseMsgMultiSendResponse(); + return obj; }, toJSON(_: MsgMultiSendResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/abci/v1beta1/abci.ts b/__fixtures__/v-next/outputv2/cosmos/base/abci/v1beta1/abci.ts index 24cd84e0b0..1147c25a2a 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/abci/v1beta1/abci.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/abci/v1beta1/abci.ts @@ -1,7 +1,7 @@ import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { Event, EventAmino, EventSDKType } from "../../../../tendermint/abci/types"; -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "cosmos.base.abci.v1beta1"; /** * TxResponse defines a structure containing relevant tx data and metadata. The @@ -9,7 +9,7 @@ export const protobufPackage = "cosmos.base.abci.v1beta1"; */ export interface TxResponse { /** The block height */ - height: Long; + height: bigint; /** The transaction hash. */ txhash: string; /** Namespace for the Code */ @@ -28,9 +28,9 @@ export interface TxResponse { /** Additional information. May be non-deterministic. */ info: string; /** Amount of gas requested for transaction. */ - gasWanted: Long; + gasWanted: bigint; /** Amount of gas consumed by transaction. */ - gasUsed: Long; + gasUsed: bigint; /** The request transaction bytes. */ tx: Any; /** @@ -108,7 +108,7 @@ export interface TxResponseAminoMsg { * tags are stringified and the log is JSON decoded. */ export interface TxResponseSDKType { - height: Long; + height: bigint; txhash: string; codespace: string; code: number; @@ -116,8 +116,8 @@ export interface TxResponseSDKType { raw_log: string; logs: ABCIMessageLogSDKType[]; info: string; - gas_wanted: Long; - gas_used: Long; + gas_wanted: bigint; + gas_used: bigint; tx: AnySDKType; timestamp: string; events: EventSDKType[]; @@ -223,9 +223,9 @@ export interface AttributeSDKType { /** GasInfo defines tx execution gas context. */ export interface GasInfo { /** GasWanted is the maximum units of work we allow this tx to perform. */ - gasWanted: Long; + gasWanted: bigint; /** GasUsed is the amount of gas actually consumed. */ - gasUsed: Long; + gasUsed: bigint; } export interface GasInfoProtoMsg { typeUrl: "/cosmos.base.abci.v1beta1.GasInfo"; @@ -244,8 +244,8 @@ export interface GasInfoAminoMsg { } /** GasInfo defines tx execution gas context. */ export interface GasInfoSDKType { - gas_wanted: Long; - gas_used: Long; + gas_wanted: bigint; + gas_used: bigint; } /** Result is the union of ResponseFormat and ResponseCheckTx. */ export interface Result { @@ -428,15 +428,15 @@ export interface TxMsgDataSDKType { /** SearchTxsResult defines a structure for querying txs pageable */ export interface SearchTxsResult { /** Count of all txs */ - totalCount: Long; + totalCount: bigint; /** Count of txs in current page */ - count: Long; + count: bigint; /** Index of current page, start from 1 */ - pageNumber: Long; + pageNumber: bigint; /** Count of total pages */ - pageTotal: Long; + pageTotal: bigint; /** Max count txs per page */ - limit: Long; + limit: bigint; /** List of txs in current page */ txs: TxResponse[]; } @@ -465,16 +465,16 @@ export interface SearchTxsResultAminoMsg { } /** SearchTxsResult defines a structure for querying txs pageable */ export interface SearchTxsResultSDKType { - total_count: Long; - count: Long; - page_number: Long; - page_total: Long; - limit: Long; + total_count: bigint; + count: bigint; + page_number: bigint; + page_total: bigint; + limit: bigint; txs: TxResponseSDKType[]; } function createBaseTxResponse(): TxResponse { return { - height: Long.ZERO, + height: BigInt(0), txhash: "", codespace: "", code: 0, @@ -482,8 +482,8 @@ function createBaseTxResponse(): TxResponse { rawLog: "", logs: [], info: "", - gasWanted: Long.ZERO, - gasUsed: Long.ZERO, + gasWanted: BigInt(0), + gasUsed: BigInt(0), tx: Any.fromPartial({}), timestamp: "", events: [] @@ -492,8 +492,8 @@ function createBaseTxResponse(): TxResponse { export const TxResponse = { typeUrl: "/cosmos.base.abci.v1beta1.TxResponse", aminoType: "cosmos-sdk/TxResponse", - encode(message: TxResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: TxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } if (message.txhash !== "") { @@ -517,10 +517,10 @@ export const TxResponse = { if (message.info !== "") { writer.uint32(66).string(message.info); } - if (!message.gasWanted.isZero()) { + if (message.gasWanted !== BigInt(0)) { writer.uint32(72).int64(message.gasWanted); } - if (!message.gasUsed.isZero()) { + if (message.gasUsed !== BigInt(0)) { writer.uint32(80).int64(message.gasUsed); } if (message.tx !== undefined) { @@ -534,15 +534,15 @@ export const TxResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TxResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TxResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTxResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; case 2: message.txhash = reader.string(); @@ -566,10 +566,10 @@ export const TxResponse = { message.info = reader.string(); break; case 9: - message.gasWanted = (reader.int64() as Long); + message.gasWanted = reader.int64(); break; case 10: - message.gasUsed = (reader.int64() as Long); + message.gasUsed = reader.int64(); break; case 11: message.tx = Any.decode(reader, reader.uint32()); @@ -588,25 +588,25 @@ export const TxResponse = { return message; }, fromJSON(object: any): TxResponse { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO, - txhash: isSet(object.txhash) ? String(object.txhash) : "", - codespace: isSet(object.codespace) ? String(object.codespace) : "", - code: isSet(object.code) ? Number(object.code) : 0, - data: isSet(object.data) ? String(object.data) : "", - rawLog: isSet(object.rawLog) ? String(object.rawLog) : "", - logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => ABCIMessageLog.fromJSON(e)) : [], - info: isSet(object.info) ? String(object.info) : "", - gasWanted: isSet(object.gasWanted) ? Long.fromValue(object.gasWanted) : Long.ZERO, - gasUsed: isSet(object.gasUsed) ? Long.fromValue(object.gasUsed) : Long.ZERO, - tx: isSet(object.tx) ? Any.fromJSON(object.tx) : undefined, - timestamp: isSet(object.timestamp) ? String(object.timestamp) : "", - events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [] - }; + const obj = createBaseTxResponse(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.txhash)) obj.txhash = String(object.txhash); + if (isSet(object.codespace)) obj.codespace = String(object.codespace); + if (isSet(object.code)) obj.code = Number(object.code); + if (isSet(object.data)) obj.data = String(object.data); + if (isSet(object.rawLog)) obj.rawLog = String(object.rawLog); + if (Array.isArray(object?.logs)) object.logs.map((e: any) => ABCIMessageLog.fromJSON(e)); + if (isSet(object.info)) obj.info = String(object.info); + if (isSet(object.gasWanted)) obj.gasWanted = BigInt(object.gasWanted.toString()); + if (isSet(object.gasUsed)) obj.gasUsed = BigInt(object.gasUsed.toString()); + if (isSet(object.tx)) obj.tx = Any.fromJSON(object.tx); + if (isSet(object.timestamp)) obj.timestamp = String(object.timestamp); + if (Array.isArray(object?.events)) object.events.map((e: any) => Event.fromJSON(e)); + return obj; }, toJSON(message: TxResponse): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); message.txhash !== undefined && (obj.txhash = message.txhash); message.codespace !== undefined && (obj.codespace = message.codespace); message.code !== undefined && (obj.code = Math.round(message.code)); @@ -618,8 +618,8 @@ export const TxResponse = { obj.logs = []; } message.info !== undefined && (obj.info = message.info); - message.gasWanted !== undefined && (obj.gasWanted = (message.gasWanted || Long.ZERO).toString()); - message.gasUsed !== undefined && (obj.gasUsed = (message.gasUsed || Long.ZERO).toString()); + message.gasWanted !== undefined && (obj.gasWanted = (message.gasWanted || BigInt(0)).toString()); + message.gasUsed !== undefined && (obj.gasUsed = (message.gasUsed || BigInt(0)).toString()); message.tx !== undefined && (obj.tx = message.tx ? Any.toJSON(message.tx) : undefined); message.timestamp !== undefined && (obj.timestamp = message.timestamp); if (message.events) { @@ -631,7 +631,9 @@ export const TxResponse = { }, fromPartial(object: DeepPartial): TxResponse { const message = createBaseTxResponse(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } message.txhash = object.txhash ?? ""; message.codespace = object.codespace ?? ""; message.code = object.code ?? 0; @@ -639,9 +641,15 @@ export const TxResponse = { message.rawLog = object.rawLog ?? ""; message.logs = object.logs?.map(e => ABCIMessageLog.fromPartial(e)) || []; message.info = object.info ?? ""; - message.gasWanted = object.gasWanted !== undefined && object.gasWanted !== null ? Long.fromValue(object.gasWanted) : Long.ZERO; - message.gasUsed = object.gasUsed !== undefined && object.gasUsed !== null ? Long.fromValue(object.gasUsed) : Long.ZERO; - message.tx = object.tx !== undefined && object.tx !== null ? Any.fromPartial(object.tx) : undefined; + if (object.gasWanted !== undefined && object.gasWanted !== null) { + message.gasWanted = BigInt(object.gasWanted.toString()); + } + if (object.gasUsed !== undefined && object.gasUsed !== null) { + message.gasUsed = BigInt(object.gasUsed.toString()); + } + if (object.tx !== undefined && object.tx !== null) { + message.tx = Any.fromPartial(object.tx); + } message.timestamp = object.timestamp ?? ""; message.events = object.events?.map(e => Event.fromPartial(e)) || []; return message; @@ -690,7 +698,7 @@ export const TxResponse = { }, fromAmino(object: TxResponseAmino): TxResponse { return { - height: Long.fromString(object.height), + height: BigInt(object.height), txhash: object.txhash, codespace: object.codespace, code: object.code, @@ -698,8 +706,8 @@ export const TxResponse = { rawLog: object.raw_log, logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => ABCIMessageLog.fromAmino(e)) : [], info: object.info, - gasWanted: Long.fromString(object.gas_wanted), - gasUsed: Long.fromString(object.gas_used), + gasWanted: BigInt(object.gas_wanted), + gasUsed: BigInt(object.gas_used), tx: object?.tx ? Any.fromAmino(object.tx) : undefined, timestamp: object.timestamp, events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromAmino(e)) : [] @@ -762,7 +770,7 @@ function createBaseABCIMessageLog(): ABCIMessageLog { export const ABCIMessageLog = { typeUrl: "/cosmos.base.abci.v1beta1.ABCIMessageLog", aminoType: "cosmos-sdk/ABCIMessageLog", - encode(message: ABCIMessageLog, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ABCIMessageLog, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msgIndex !== 0) { writer.uint32(8).uint32(message.msgIndex); } @@ -774,8 +782,8 @@ export const ABCIMessageLog = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ABCIMessageLog { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ABCIMessageLog { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseABCIMessageLog(); while (reader.pos < end) { @@ -798,11 +806,11 @@ export const ABCIMessageLog = { return message; }, fromJSON(object: any): ABCIMessageLog { - return { - msgIndex: isSet(object.msgIndex) ? Number(object.msgIndex) : 0, - log: isSet(object.log) ? String(object.log) : "", - events: Array.isArray(object?.events) ? object.events.map((e: any) => StringEvent.fromJSON(e)) : [] - }; + const obj = createBaseABCIMessageLog(); + if (isSet(object.msgIndex)) obj.msgIndex = Number(object.msgIndex); + if (isSet(object.log)) obj.log = String(object.log); + if (Array.isArray(object?.events)) object.events.map((e: any) => StringEvent.fromJSON(e)); + return obj; }, toJSON(message: ABCIMessageLog): unknown { const obj: any = {}; @@ -889,7 +897,7 @@ function createBaseStringEvent(): StringEvent { export const StringEvent = { typeUrl: "/cosmos.base.abci.v1beta1.StringEvent", aminoType: "cosmos-sdk/StringEvent", - encode(message: StringEvent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: StringEvent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -898,8 +906,8 @@ export const StringEvent = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): StringEvent { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): StringEvent { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStringEvent(); while (reader.pos < end) { @@ -919,10 +927,10 @@ export const StringEvent = { return message; }, fromJSON(object: any): StringEvent { - return { - type: isSet(object.type) ? String(object.type) : "", - attributes: Array.isArray(object?.attributes) ? object.attributes.map((e: any) => Attribute.fromJSON(e)) : [] - }; + const obj = createBaseStringEvent(); + if (isSet(object.type)) obj.type = String(object.type); + if (Array.isArray(object?.attributes)) object.attributes.map((e: any) => Attribute.fromJSON(e)); + return obj; }, toJSON(message: StringEvent): unknown { const obj: any = {}; @@ -1003,7 +1011,7 @@ function createBaseAttribute(): Attribute { export const Attribute = { typeUrl: "/cosmos.base.abci.v1beta1.Attribute", aminoType: "cosmos-sdk/Attribute", - encode(message: Attribute, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Attribute, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -1012,8 +1020,8 @@ export const Attribute = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Attribute { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Attribute { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAttribute(); while (reader.pos < end) { @@ -1033,10 +1041,10 @@ export const Attribute = { return message; }, fromJSON(object: any): Attribute { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseAttribute(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: Attribute): unknown { const obj: any = {}; @@ -1098,34 +1106,34 @@ export const Attribute = { }; function createBaseGasInfo(): GasInfo { return { - gasWanted: Long.UZERO, - gasUsed: Long.UZERO + gasWanted: BigInt(0), + gasUsed: BigInt(0) }; } export const GasInfo = { typeUrl: "/cosmos.base.abci.v1beta1.GasInfo", aminoType: "cosmos-sdk/GasInfo", - encode(message: GasInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.gasWanted.isZero()) { + encode(message: GasInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.gasWanted !== BigInt(0)) { writer.uint32(8).uint64(message.gasWanted); } - if (!message.gasUsed.isZero()) { + if (message.gasUsed !== BigInt(0)) { writer.uint32(16).uint64(message.gasUsed); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GasInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GasInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGasInfo(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.gasWanted = (reader.uint64() as Long); + message.gasWanted = reader.uint64(); break; case 2: - message.gasUsed = (reader.uint64() as Long); + message.gasUsed = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1135,21 +1143,25 @@ export const GasInfo = { return message; }, fromJSON(object: any): GasInfo { - return { - gasWanted: isSet(object.gasWanted) ? Long.fromValue(object.gasWanted) : Long.UZERO, - gasUsed: isSet(object.gasUsed) ? Long.fromValue(object.gasUsed) : Long.UZERO - }; + const obj = createBaseGasInfo(); + if (isSet(object.gasWanted)) obj.gasWanted = BigInt(object.gasWanted.toString()); + if (isSet(object.gasUsed)) obj.gasUsed = BigInt(object.gasUsed.toString()); + return obj; }, toJSON(message: GasInfo): unknown { const obj: any = {}; - message.gasWanted !== undefined && (obj.gasWanted = (message.gasWanted || Long.UZERO).toString()); - message.gasUsed !== undefined && (obj.gasUsed = (message.gasUsed || Long.UZERO).toString()); + message.gasWanted !== undefined && (obj.gasWanted = (message.gasWanted || BigInt(0)).toString()); + message.gasUsed !== undefined && (obj.gasUsed = (message.gasUsed || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): GasInfo { const message = createBaseGasInfo(); - message.gasWanted = object.gasWanted !== undefined && object.gasWanted !== null ? Long.fromValue(object.gasWanted) : Long.UZERO; - message.gasUsed = object.gasUsed !== undefined && object.gasUsed !== null ? Long.fromValue(object.gasUsed) : Long.UZERO; + if (object.gasWanted !== undefined && object.gasWanted !== null) { + message.gasWanted = BigInt(object.gasWanted.toString()); + } + if (object.gasUsed !== undefined && object.gasUsed !== null) { + message.gasUsed = BigInt(object.gasUsed.toString()); + } return message; }, fromSDK(object: GasInfoSDKType): GasInfo { @@ -1166,8 +1178,8 @@ export const GasInfo = { }, fromAmino(object: GasInfoAmino): GasInfo { return { - gasWanted: Long.fromString(object.gas_wanted), - gasUsed: Long.fromString(object.gas_used) + gasWanted: BigInt(object.gas_wanted), + gasUsed: BigInt(object.gas_used) }; }, toAmino(message: GasInfo): GasInfoAmino { @@ -1209,7 +1221,7 @@ function createBaseResult(): Result { export const Result = { typeUrl: "/cosmos.base.abci.v1beta1.Result", aminoType: "cosmos-sdk/Result", - encode(message: Result, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Result, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); } @@ -1224,8 +1236,8 @@ export const Result = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Result { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Result { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResult(); while (reader.pos < end) { @@ -1251,12 +1263,12 @@ export const Result = { return message; }, fromJSON(object: any): Result { - return { - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array(), - log: isSet(object.log) ? String(object.log) : "", - events: Array.isArray(object?.events) ? object.events.map((e: any) => Event.fromJSON(e)) : [], - msgResponses: Array.isArray(object?.msgResponses) ? object.msgResponses.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseResult(); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + if (isSet(object.log)) obj.log = String(object.log); + if (Array.isArray(object?.events)) object.events.map((e: any) => Event.fromJSON(e)); + if (Array.isArray(object?.msgResponses)) object.msgResponses.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: Result): unknown { const obj: any = {}; @@ -1361,7 +1373,7 @@ function createBaseSimulationResponse(): SimulationResponse { export const SimulationResponse = { typeUrl: "/cosmos.base.abci.v1beta1.SimulationResponse", aminoType: "cosmos-sdk/SimulationResponse", - encode(message: SimulationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SimulationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gasInfo !== undefined) { GasInfo.encode(message.gasInfo, writer.uint32(10).fork()).ldelim(); } @@ -1370,8 +1382,8 @@ export const SimulationResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SimulationResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SimulationResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSimulationResponse(); while (reader.pos < end) { @@ -1391,10 +1403,10 @@ export const SimulationResponse = { return message; }, fromJSON(object: any): SimulationResponse { - return { - gasInfo: isSet(object.gasInfo) ? GasInfo.fromJSON(object.gasInfo) : undefined, - result: isSet(object.result) ? Result.fromJSON(object.result) : undefined - }; + const obj = createBaseSimulationResponse(); + if (isSet(object.gasInfo)) obj.gasInfo = GasInfo.fromJSON(object.gasInfo); + if (isSet(object.result)) obj.result = Result.fromJSON(object.result); + return obj; }, toJSON(message: SimulationResponse): unknown { const obj: any = {}; @@ -1404,8 +1416,12 @@ export const SimulationResponse = { }, fromPartial(object: DeepPartial): SimulationResponse { const message = createBaseSimulationResponse(); - message.gasInfo = object.gasInfo !== undefined && object.gasInfo !== null ? GasInfo.fromPartial(object.gasInfo) : undefined; - message.result = object.result !== undefined && object.result !== null ? Result.fromPartial(object.result) : undefined; + if (object.gasInfo !== undefined && object.gasInfo !== null) { + message.gasInfo = GasInfo.fromPartial(object.gasInfo); + } + if (object.result !== undefined && object.result !== null) { + message.result = Result.fromPartial(object.result); + } return message; }, fromSDK(object: SimulationResponseSDKType): SimulationResponse { @@ -1463,7 +1479,7 @@ function createBaseMsgData(): MsgData { export const MsgData = { typeUrl: "/cosmos.base.abci.v1beta1.MsgData", aminoType: "cosmos-sdk/MsgData", - encode(message: MsgData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msgType !== "") { writer.uint32(10).string(message.msgType); } @@ -1472,8 +1488,8 @@ export const MsgData = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgData { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgData { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgData(); while (reader.pos < end) { @@ -1493,10 +1509,10 @@ export const MsgData = { return message; }, fromJSON(object: any): MsgData { - return { - msgType: isSet(object.msgType) ? String(object.msgType) : "", - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseMsgData(); + if (isSet(object.msgType)) obj.msgType = String(object.msgType); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: MsgData): unknown { const obj: any = {}; @@ -1565,7 +1581,7 @@ function createBaseTxMsgData(): TxMsgData { export const TxMsgData = { typeUrl: "/cosmos.base.abci.v1beta1.TxMsgData", aminoType: "cosmos-sdk/TxMsgData", - encode(message: TxMsgData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TxMsgData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.data) { MsgData.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1574,8 +1590,8 @@ export const TxMsgData = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TxMsgData { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TxMsgData { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTxMsgData(); while (reader.pos < end) { @@ -1595,10 +1611,10 @@ export const TxMsgData = { return message; }, fromJSON(object: any): TxMsgData { - return { - data: Array.isArray(object?.data) ? object.data.map((e: any) => MsgData.fromJSON(e)) : [], - msgResponses: Array.isArray(object?.msgResponses) ? object.msgResponses.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseTxMsgData(); + if (Array.isArray(object?.data)) object.data.map((e: any) => MsgData.fromJSON(e)); + if (Array.isArray(object?.msgResponses)) object.msgResponses.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: TxMsgData): unknown { const obj: any = {}; @@ -1684,31 +1700,31 @@ export const TxMsgData = { }; function createBaseSearchTxsResult(): SearchTxsResult { return { - totalCount: Long.UZERO, - count: Long.UZERO, - pageNumber: Long.UZERO, - pageTotal: Long.UZERO, - limit: Long.UZERO, + totalCount: BigInt(0), + count: BigInt(0), + pageNumber: BigInt(0), + pageTotal: BigInt(0), + limit: BigInt(0), txs: [] }; } export const SearchTxsResult = { typeUrl: "/cosmos.base.abci.v1beta1.SearchTxsResult", aminoType: "cosmos-sdk/SearchTxsResult", - encode(message: SearchTxsResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.totalCount.isZero()) { + encode(message: SearchTxsResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.totalCount !== BigInt(0)) { writer.uint32(8).uint64(message.totalCount); } - if (!message.count.isZero()) { + if (message.count !== BigInt(0)) { writer.uint32(16).uint64(message.count); } - if (!message.pageNumber.isZero()) { + if (message.pageNumber !== BigInt(0)) { writer.uint32(24).uint64(message.pageNumber); } - if (!message.pageTotal.isZero()) { + if (message.pageTotal !== BigInt(0)) { writer.uint32(32).uint64(message.pageTotal); } - if (!message.limit.isZero()) { + if (message.limit !== BigInt(0)) { writer.uint32(40).uint64(message.limit); } for (const v of message.txs) { @@ -1716,27 +1732,27 @@ export const SearchTxsResult = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SearchTxsResult { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SearchTxsResult { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSearchTxsResult(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.totalCount = (reader.uint64() as Long); + message.totalCount = reader.uint64(); break; case 2: - message.count = (reader.uint64() as Long); + message.count = reader.uint64(); break; case 3: - message.pageNumber = (reader.uint64() as Long); + message.pageNumber = reader.uint64(); break; case 4: - message.pageTotal = (reader.uint64() as Long); + message.pageTotal = reader.uint64(); break; case 5: - message.limit = (reader.uint64() as Long); + message.limit = reader.uint64(); break; case 6: message.txs.push(TxResponse.decode(reader, reader.uint32())); @@ -1749,22 +1765,22 @@ export const SearchTxsResult = { return message; }, fromJSON(object: any): SearchTxsResult { - return { - totalCount: isSet(object.totalCount) ? Long.fromValue(object.totalCount) : Long.UZERO, - count: isSet(object.count) ? Long.fromValue(object.count) : Long.UZERO, - pageNumber: isSet(object.pageNumber) ? Long.fromValue(object.pageNumber) : Long.UZERO, - pageTotal: isSet(object.pageTotal) ? Long.fromValue(object.pageTotal) : Long.UZERO, - limit: isSet(object.limit) ? Long.fromValue(object.limit) : Long.UZERO, - txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => TxResponse.fromJSON(e)) : [] - }; + const obj = createBaseSearchTxsResult(); + if (isSet(object.totalCount)) obj.totalCount = BigInt(object.totalCount.toString()); + if (isSet(object.count)) obj.count = BigInt(object.count.toString()); + if (isSet(object.pageNumber)) obj.pageNumber = BigInt(object.pageNumber.toString()); + if (isSet(object.pageTotal)) obj.pageTotal = BigInt(object.pageTotal.toString()); + if (isSet(object.limit)) obj.limit = BigInt(object.limit.toString()); + if (Array.isArray(object?.txs)) object.txs.map((e: any) => TxResponse.fromJSON(e)); + return obj; }, toJSON(message: SearchTxsResult): unknown { const obj: any = {}; - message.totalCount !== undefined && (obj.totalCount = (message.totalCount || Long.UZERO).toString()); - message.count !== undefined && (obj.count = (message.count || Long.UZERO).toString()); - message.pageNumber !== undefined && (obj.pageNumber = (message.pageNumber || Long.UZERO).toString()); - message.pageTotal !== undefined && (obj.pageTotal = (message.pageTotal || Long.UZERO).toString()); - message.limit !== undefined && (obj.limit = (message.limit || Long.UZERO).toString()); + message.totalCount !== undefined && (obj.totalCount = (message.totalCount || BigInt(0)).toString()); + message.count !== undefined && (obj.count = (message.count || BigInt(0)).toString()); + message.pageNumber !== undefined && (obj.pageNumber = (message.pageNumber || BigInt(0)).toString()); + message.pageTotal !== undefined && (obj.pageTotal = (message.pageTotal || BigInt(0)).toString()); + message.limit !== undefined && (obj.limit = (message.limit || BigInt(0)).toString()); if (message.txs) { obj.txs = message.txs.map(e => e ? TxResponse.toJSON(e) : undefined); } else { @@ -1774,11 +1790,21 @@ export const SearchTxsResult = { }, fromPartial(object: DeepPartial): SearchTxsResult { const message = createBaseSearchTxsResult(); - message.totalCount = object.totalCount !== undefined && object.totalCount !== null ? Long.fromValue(object.totalCount) : Long.UZERO; - message.count = object.count !== undefined && object.count !== null ? Long.fromValue(object.count) : Long.UZERO; - message.pageNumber = object.pageNumber !== undefined && object.pageNumber !== null ? Long.fromValue(object.pageNumber) : Long.UZERO; - message.pageTotal = object.pageTotal !== undefined && object.pageTotal !== null ? Long.fromValue(object.pageTotal) : Long.UZERO; - message.limit = object.limit !== undefined && object.limit !== null ? Long.fromValue(object.limit) : Long.UZERO; + if (object.totalCount !== undefined && object.totalCount !== null) { + message.totalCount = BigInt(object.totalCount.toString()); + } + if (object.count !== undefined && object.count !== null) { + message.count = BigInt(object.count.toString()); + } + if (object.pageNumber !== undefined && object.pageNumber !== null) { + message.pageNumber = BigInt(object.pageNumber.toString()); + } + if (object.pageTotal !== undefined && object.pageTotal !== null) { + message.pageTotal = BigInt(object.pageTotal.toString()); + } + if (object.limit !== undefined && object.limit !== null) { + message.limit = BigInt(object.limit.toString()); + } message.txs = object.txs?.map(e => TxResponse.fromPartial(e)) || []; return message; }, @@ -1808,11 +1834,11 @@ export const SearchTxsResult = { }, fromAmino(object: SearchTxsResultAmino): SearchTxsResult { return { - totalCount: Long.fromString(object.total_count), - count: Long.fromString(object.count), - pageNumber: Long.fromString(object.page_number), - pageTotal: Long.fromString(object.page_total), - limit: Long.fromString(object.limit), + totalCount: BigInt(object.total_count), + count: BigInt(object.count), + pageNumber: BigInt(object.page_number), + pageTotal: BigInt(object.page_total), + limit: BigInt(object.limit), txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => TxResponse.fromAmino(e)) : [] }; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/base/kv/v1beta1/kv.ts b/__fixtures__/v-next/outputv2/cosmos/base/kv/v1beta1/kv.ts index aef2f04423..22a52bce33 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/kv/v1beta1/kv.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/kv/v1beta1/kv.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "cosmos.base.kv.v1beta1"; /** Pairs defines a repeated slice of Pair objects. */ @@ -52,14 +52,14 @@ function createBasePairs(): Pairs { export const Pairs = { typeUrl: "/cosmos.base.kv.v1beta1.Pairs", aminoType: "cosmos-sdk/Pairs", - encode(message: Pairs, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Pairs, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pairs) { Pair.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Pairs { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Pairs { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePairs(); while (reader.pos < end) { @@ -76,9 +76,9 @@ export const Pairs = { return message; }, fromJSON(object: any): Pairs { - return { - pairs: Array.isArray(object?.pairs) ? object.pairs.map((e: any) => Pair.fromJSON(e)) : [] - }; + const obj = createBasePairs(); + if (Array.isArray(object?.pairs)) object.pairs.map((e: any) => Pair.fromJSON(e)); + return obj; }, toJSON(message: Pairs): unknown { const obj: any = {}; @@ -153,7 +153,7 @@ function createBasePair(): Pair { export const Pair = { typeUrl: "/cosmos.base.kv.v1beta1.Pair", aminoType: "cosmos-sdk/Pair", - encode(message: Pair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Pair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -162,8 +162,8 @@ export const Pair = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Pair { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Pair { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePair(); while (reader.pos < end) { @@ -183,10 +183,10 @@ export const Pair = { return message; }, fromJSON(object: any): Pair { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array() - }; + const obj = createBasePair(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + return obj; }, toJSON(message: Pair): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/query/v1beta1/pagination.ts b/__fixtures__/v-next/outputv2/cosmos/base/query/v1beta1/pagination.ts index 093420ea20..df0bcd01b3 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/query/v1beta1/pagination.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/query/v1beta1/pagination.ts @@ -1,5 +1,5 @@ -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.base.query.v1beta1"; /** * PageRequest is to be embedded in gRPC request messages for efficient @@ -22,12 +22,12 @@ export interface PageRequest { * It is less efficient than using key. Only one of offset or key should * be set. */ - offset: Long; + offset: bigint; /** * limit is the total number of results to be returned in the result page. * If left empty it will default to a value to be set by each app. */ - limit: Long; + limit: bigint; /** * count_total is set to true to indicate that the result set should include * a count of the total number of items available for pagination in UIs. @@ -102,8 +102,8 @@ export interface PageRequestAminoMsg { */ export interface PageRequestSDKType { key: Uint8Array; - offset: Long; - limit: Long; + offset: bigint; + limit: bigint; count_total: boolean; reverse: boolean; } @@ -127,7 +127,7 @@ export interface PageResponse { * total is total number of results available if PageRequest.count_total * was set, its value is undefined otherwise */ - total: Long; + total: bigint; } export interface PageResponseProtoMsg { typeUrl: "/cosmos.base.query.v1beta1.PageResponse"; @@ -170,13 +170,13 @@ export interface PageResponseAminoMsg { */ export interface PageResponseSDKType { next_key: Uint8Array; - total: Long; + total: bigint; } function createBasePageRequest(): PageRequest { return { key: new Uint8Array(), - offset: Long.UZERO, - limit: Long.UZERO, + offset: BigInt(0), + limit: BigInt(0), countTotal: false, reverse: false }; @@ -184,14 +184,14 @@ function createBasePageRequest(): PageRequest { export const PageRequest = { typeUrl: "/cosmos.base.query.v1beta1.PageRequest", aminoType: "cosmos-sdk/PageRequest", - encode(message: PageRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PageRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } - if (!message.offset.isZero()) { + if (message.offset !== BigInt(0)) { writer.uint32(16).uint64(message.offset); } - if (!message.limit.isZero()) { + if (message.limit !== BigInt(0)) { writer.uint32(24).uint64(message.limit); } if (message.countTotal === true) { @@ -202,8 +202,8 @@ export const PageRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PageRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PageRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePageRequest(); while (reader.pos < end) { @@ -213,10 +213,10 @@ export const PageRequest = { message.key = reader.bytes(); break; case 2: - message.offset = (reader.uint64() as Long); + message.offset = reader.uint64(); break; case 3: - message.limit = (reader.uint64() as Long); + message.limit = reader.uint64(); break; case 4: message.countTotal = reader.bool(); @@ -232,19 +232,19 @@ export const PageRequest = { return message; }, fromJSON(object: any): PageRequest { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - offset: isSet(object.offset) ? Long.fromValue(object.offset) : Long.UZERO, - limit: isSet(object.limit) ? Long.fromValue(object.limit) : Long.UZERO, - countTotal: isSet(object.countTotal) ? Boolean(object.countTotal) : false, - reverse: isSet(object.reverse) ? Boolean(object.reverse) : false - }; + const obj = createBasePageRequest(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.offset)) obj.offset = BigInt(object.offset.toString()); + if (isSet(object.limit)) obj.limit = BigInt(object.limit.toString()); + if (isSet(object.countTotal)) obj.countTotal = Boolean(object.countTotal); + if (isSet(object.reverse)) obj.reverse = Boolean(object.reverse); + return obj; }, toJSON(message: PageRequest): unknown { const obj: any = {}; message.key !== undefined && (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array())); - message.offset !== undefined && (obj.offset = (message.offset || Long.UZERO).toString()); - message.limit !== undefined && (obj.limit = (message.limit || Long.UZERO).toString()); + message.offset !== undefined && (obj.offset = (message.offset || BigInt(0)).toString()); + message.limit !== undefined && (obj.limit = (message.limit || BigInt(0)).toString()); message.countTotal !== undefined && (obj.countTotal = message.countTotal); message.reverse !== undefined && (obj.reverse = message.reverse); return obj; @@ -252,8 +252,12 @@ export const PageRequest = { fromPartial(object: DeepPartial): PageRequest { const message = createBasePageRequest(); message.key = object.key ?? new Uint8Array(); - message.offset = object.offset !== undefined && object.offset !== null ? Long.fromValue(object.offset) : Long.UZERO; - message.limit = object.limit !== undefined && object.limit !== null ? Long.fromValue(object.limit) : Long.UZERO; + if (object.offset !== undefined && object.offset !== null) { + message.offset = BigInt(object.offset.toString()); + } + if (object.limit !== undefined && object.limit !== null) { + message.limit = BigInt(object.limit.toString()); + } message.countTotal = object.countTotal ?? false; message.reverse = object.reverse ?? false; return message; @@ -279,8 +283,8 @@ export const PageRequest = { fromAmino(object: PageRequestAmino): PageRequest { return { key: object.key, - offset: Long.fromString(object.offset), - limit: Long.fromString(object.limit), + offset: BigInt(object.offset), + limit: BigInt(object.limit), countTotal: object.count_total, reverse: object.reverse }; @@ -319,23 +323,23 @@ export const PageRequest = { function createBasePageResponse(): PageResponse { return { nextKey: new Uint8Array(), - total: Long.UZERO + total: BigInt(0) }; } export const PageResponse = { typeUrl: "/cosmos.base.query.v1beta1.PageResponse", aminoType: "cosmos-sdk/PageResponse", - encode(message: PageResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PageResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nextKey.length !== 0) { writer.uint32(10).bytes(message.nextKey); } - if (!message.total.isZero()) { + if (message.total !== BigInt(0)) { writer.uint32(16).uint64(message.total); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PageResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PageResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePageResponse(); while (reader.pos < end) { @@ -345,7 +349,7 @@ export const PageResponse = { message.nextKey = reader.bytes(); break; case 2: - message.total = (reader.uint64() as Long); + message.total = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -355,21 +359,23 @@ export const PageResponse = { return message; }, fromJSON(object: any): PageResponse { - return { - nextKey: isSet(object.nextKey) ? bytesFromBase64(object.nextKey) : new Uint8Array(), - total: isSet(object.total) ? Long.fromValue(object.total) : Long.UZERO - }; + const obj = createBasePageResponse(); + if (isSet(object.nextKey)) obj.nextKey = bytesFromBase64(object.nextKey); + if (isSet(object.total)) obj.total = BigInt(object.total.toString()); + return obj; }, toJSON(message: PageResponse): unknown { const obj: any = {}; message.nextKey !== undefined && (obj.nextKey = base64FromBytes(message.nextKey !== undefined ? message.nextKey : new Uint8Array())); - message.total !== undefined && (obj.total = (message.total || Long.UZERO).toString()); + message.total !== undefined && (obj.total = (message.total || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): PageResponse { const message = createBasePageResponse(); message.nextKey = object.nextKey ?? new Uint8Array(); - message.total = object.total !== undefined && object.total !== null ? Long.fromValue(object.total) : Long.UZERO; + if (object.total !== undefined && object.total !== null) { + message.total = BigInt(object.total.toString()); + } return message; }, fromSDK(object: PageResponseSDKType): PageResponse { @@ -387,7 +393,7 @@ export const PageResponse = { fromAmino(object: PageResponseAmino): PageResponse { return { nextKey: object.next_key, - total: Long.fromString(object.total) + total: BigInt(object.total) }; }, toAmino(message: PageResponse): PageResponseAmino { diff --git a/__fixtures__/v-next/outputv2/cosmos/base/reflection/v1beta1/reflection.ts b/__fixtures__/v-next/outputv2/cosmos/base/reflection/v1beta1/reflection.ts index 10173e14a3..03a036a35b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/reflection/v1beta1/reflection.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/reflection/v1beta1/reflection.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial, isSet } from "../../../../helpers"; export const protobufPackage = "cosmos.base.reflection.v1beta1"; /** ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. */ @@ -103,11 +103,11 @@ function createBaseListAllInterfacesRequest(): ListAllInterfacesRequest { export const ListAllInterfacesRequest = { typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesRequest", aminoType: "cosmos-sdk/ListAllInterfacesRequest", - encode(_: ListAllInterfacesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: ListAllInterfacesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListAllInterfacesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListAllInterfacesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListAllInterfacesRequest(); while (reader.pos < end) { @@ -121,7 +121,8 @@ export const ListAllInterfacesRequest = { return message; }, fromJSON(_: any): ListAllInterfacesRequest { - return {}; + const obj = createBaseListAllInterfacesRequest(); + return obj; }, toJSON(_: ListAllInterfacesRequest): unknown { const obj: any = {}; @@ -175,14 +176,14 @@ function createBaseListAllInterfacesResponse(): ListAllInterfacesResponse { export const ListAllInterfacesResponse = { typeUrl: "/cosmos.base.reflection.v1beta1.ListAllInterfacesResponse", aminoType: "cosmos-sdk/ListAllInterfacesResponse", - encode(message: ListAllInterfacesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListAllInterfacesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.interfaceNames) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListAllInterfacesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListAllInterfacesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListAllInterfacesResponse(); while (reader.pos < end) { @@ -199,9 +200,9 @@ export const ListAllInterfacesResponse = { return message; }, fromJSON(object: any): ListAllInterfacesResponse { - return { - interfaceNames: Array.isArray(object?.interfaceNames) ? object.interfaceNames.map((e: any) => String(e)) : [] - }; + const obj = createBaseListAllInterfacesResponse(); + if (Array.isArray(object?.interfaceNames)) object.interfaceNames.map((e: any) => String(e)); + return obj; }, toJSON(message: ListAllInterfacesResponse): unknown { const obj: any = {}; @@ -275,14 +276,14 @@ function createBaseListImplementationsRequest(): ListImplementationsRequest { export const ListImplementationsRequest = { typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsRequest", aminoType: "cosmos-sdk/ListImplementationsRequest", - encode(message: ListImplementationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListImplementationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.interfaceName !== "") { writer.uint32(10).string(message.interfaceName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListImplementationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListImplementationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListImplementationsRequest(); while (reader.pos < end) { @@ -299,9 +300,9 @@ export const ListImplementationsRequest = { return message; }, fromJSON(object: any): ListImplementationsRequest { - return { - interfaceName: isSet(object.interfaceName) ? String(object.interfaceName) : "" - }; + const obj = createBaseListImplementationsRequest(); + if (isSet(object.interfaceName)) obj.interfaceName = String(object.interfaceName); + return obj; }, toJSON(message: ListImplementationsRequest): unknown { const obj: any = {}; @@ -363,14 +364,14 @@ function createBaseListImplementationsResponse(): ListImplementationsResponse { export const ListImplementationsResponse = { typeUrl: "/cosmos.base.reflection.v1beta1.ListImplementationsResponse", aminoType: "cosmos-sdk/ListImplementationsResponse", - encode(message: ListImplementationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListImplementationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.implementationMessageNames) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListImplementationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListImplementationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListImplementationsResponse(); while (reader.pos < end) { @@ -387,9 +388,9 @@ export const ListImplementationsResponse = { return message; }, fromJSON(object: any): ListImplementationsResponse { - return { - implementationMessageNames: Array.isArray(object?.implementationMessageNames) ? object.implementationMessageNames.map((e: any) => String(e)) : [] - }; + const obj = createBaseListImplementationsResponse(); + if (Array.isArray(object?.implementationMessageNames)) object.implementationMessageNames.map((e: any) => String(e)); + return obj; }, toJSON(message: ListImplementationsResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts b/__fixtures__/v-next/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts index b0db5361f4..4f3e4ab0ea 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/reflection/v2alpha1/reflection.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.base.reflection.v2alpha1"; /** AppDescriptor describes a cosmos-sdk based application */ @@ -714,7 +714,7 @@ function createBaseAppDescriptor(): AppDescriptor { export const AppDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.AppDescriptor", aminoType: "cosmos-sdk/AppDescriptor", - encode(message: AppDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AppDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authn !== undefined) { AuthnDescriptor.encode(message.authn, writer.uint32(10).fork()).ldelim(); } @@ -735,8 +735,8 @@ export const AppDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AppDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AppDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAppDescriptor(); while (reader.pos < end) { @@ -768,14 +768,14 @@ export const AppDescriptor = { return message; }, fromJSON(object: any): AppDescriptor { - return { - authn: isSet(object.authn) ? AuthnDescriptor.fromJSON(object.authn) : undefined, - chain: isSet(object.chain) ? ChainDescriptor.fromJSON(object.chain) : undefined, - codec: isSet(object.codec) ? CodecDescriptor.fromJSON(object.codec) : undefined, - configuration: isSet(object.configuration) ? ConfigurationDescriptor.fromJSON(object.configuration) : undefined, - queryServices: isSet(object.queryServices) ? QueryServicesDescriptor.fromJSON(object.queryServices) : undefined, - tx: isSet(object.tx) ? TxDescriptor.fromJSON(object.tx) : undefined - }; + const obj = createBaseAppDescriptor(); + if (isSet(object.authn)) obj.authn = AuthnDescriptor.fromJSON(object.authn); + if (isSet(object.chain)) obj.chain = ChainDescriptor.fromJSON(object.chain); + if (isSet(object.codec)) obj.codec = CodecDescriptor.fromJSON(object.codec); + if (isSet(object.configuration)) obj.configuration = ConfigurationDescriptor.fromJSON(object.configuration); + if (isSet(object.queryServices)) obj.queryServices = QueryServicesDescriptor.fromJSON(object.queryServices); + if (isSet(object.tx)) obj.tx = TxDescriptor.fromJSON(object.tx); + return obj; }, toJSON(message: AppDescriptor): unknown { const obj: any = {}; @@ -789,12 +789,24 @@ export const AppDescriptor = { }, fromPartial(object: DeepPartial): AppDescriptor { const message = createBaseAppDescriptor(); - message.authn = object.authn !== undefined && object.authn !== null ? AuthnDescriptor.fromPartial(object.authn) : undefined; - message.chain = object.chain !== undefined && object.chain !== null ? ChainDescriptor.fromPartial(object.chain) : undefined; - message.codec = object.codec !== undefined && object.codec !== null ? CodecDescriptor.fromPartial(object.codec) : undefined; - message.configuration = object.configuration !== undefined && object.configuration !== null ? ConfigurationDescriptor.fromPartial(object.configuration) : undefined; - message.queryServices = object.queryServices !== undefined && object.queryServices !== null ? QueryServicesDescriptor.fromPartial(object.queryServices) : undefined; - message.tx = object.tx !== undefined && object.tx !== null ? TxDescriptor.fromPartial(object.tx) : undefined; + if (object.authn !== undefined && object.authn !== null) { + message.authn = AuthnDescriptor.fromPartial(object.authn); + } + if (object.chain !== undefined && object.chain !== null) { + message.chain = ChainDescriptor.fromPartial(object.chain); + } + if (object.codec !== undefined && object.codec !== null) { + message.codec = CodecDescriptor.fromPartial(object.codec); + } + if (object.configuration !== undefined && object.configuration !== null) { + message.configuration = ConfigurationDescriptor.fromPartial(object.configuration); + } + if (object.queryServices !== undefined && object.queryServices !== null) { + message.queryServices = QueryServicesDescriptor.fromPartial(object.queryServices); + } + if (object.tx !== undefined && object.tx !== null) { + message.tx = TxDescriptor.fromPartial(object.tx); + } return message; }, fromSDK(object: AppDescriptorSDKType): AppDescriptor { @@ -868,7 +880,7 @@ function createBaseTxDescriptor(): TxDescriptor { export const TxDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.TxDescriptor", aminoType: "cosmos-sdk/TxDescriptor", - encode(message: TxDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TxDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); } @@ -877,8 +889,8 @@ export const TxDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TxDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TxDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTxDescriptor(); while (reader.pos < end) { @@ -898,10 +910,10 @@ export const TxDescriptor = { return message; }, fromJSON(object: any): TxDescriptor { - return { - fullname: isSet(object.fullname) ? String(object.fullname) : "", - msgs: Array.isArray(object?.msgs) ? object.msgs.map((e: any) => MsgDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseTxDescriptor(); + if (isSet(object.fullname)) obj.fullname = String(object.fullname); + if (Array.isArray(object?.msgs)) object.msgs.map((e: any) => MsgDescriptor.fromJSON(e)); + return obj; }, toJSON(message: TxDescriptor): unknown { const obj: any = {}; @@ -981,14 +993,14 @@ function createBaseAuthnDescriptor(): AuthnDescriptor { export const AuthnDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.AuthnDescriptor", aminoType: "cosmos-sdk/AuthnDescriptor", - encode(message: AuthnDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuthnDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signModes) { SigningModeDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuthnDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuthnDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuthnDescriptor(); while (reader.pos < end) { @@ -1005,9 +1017,9 @@ export const AuthnDescriptor = { return message; }, fromJSON(object: any): AuthnDescriptor { - return { - signModes: Array.isArray(object?.signModes) ? object.signModes.map((e: any) => SigningModeDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseAuthnDescriptor(); + if (Array.isArray(object?.signModes)) object.signModes.map((e: any) => SigningModeDescriptor.fromJSON(e)); + return obj; }, toJSON(message: AuthnDescriptor): unknown { const obj: any = {}; @@ -1083,7 +1095,7 @@ function createBaseSigningModeDescriptor(): SigningModeDescriptor { export const SigningModeDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.SigningModeDescriptor", aminoType: "cosmos-sdk/SigningModeDescriptor", - encode(message: SigningModeDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SigningModeDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1095,8 +1107,8 @@ export const SigningModeDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SigningModeDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SigningModeDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSigningModeDescriptor(); while (reader.pos < end) { @@ -1119,11 +1131,11 @@ export const SigningModeDescriptor = { return message; }, fromJSON(object: any): SigningModeDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - number: isSet(object.number) ? Number(object.number) : 0, - authnInfoProviderMethodFullname: isSet(object.authnInfoProviderMethodFullname) ? String(object.authnInfoProviderMethodFullname) : "" - }; + const obj = createBaseSigningModeDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.number)) obj.number = Number(object.number); + if (isSet(object.authnInfoProviderMethodFullname)) obj.authnInfoProviderMethodFullname = String(object.authnInfoProviderMethodFullname); + return obj; }, toJSON(message: SigningModeDescriptor): unknown { const obj: any = {}; @@ -1197,14 +1209,14 @@ function createBaseChainDescriptor(): ChainDescriptor { export const ChainDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.ChainDescriptor", aminoType: "cosmos-sdk/ChainDescriptor", - encode(message: ChainDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ChainDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ChainDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ChainDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseChainDescriptor(); while (reader.pos < end) { @@ -1221,9 +1233,9 @@ export const ChainDescriptor = { return message; }, fromJSON(object: any): ChainDescriptor { - return { - id: isSet(object.id) ? String(object.id) : "" - }; + const obj = createBaseChainDescriptor(); + if (isSet(object.id)) obj.id = String(object.id); + return obj; }, toJSON(message: ChainDescriptor): unknown { const obj: any = {}; @@ -1285,14 +1297,14 @@ function createBaseCodecDescriptor(): CodecDescriptor { export const CodecDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.CodecDescriptor", aminoType: "cosmos-sdk/CodecDescriptor", - encode(message: CodecDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CodecDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.interfaces) { InterfaceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CodecDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CodecDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCodecDescriptor(); while (reader.pos < end) { @@ -1309,9 +1321,9 @@ export const CodecDescriptor = { return message; }, fromJSON(object: any): CodecDescriptor { - return { - interfaces: Array.isArray(object?.interfaces) ? object.interfaces.map((e: any) => InterfaceDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseCodecDescriptor(); + if (Array.isArray(object?.interfaces)) object.interfaces.map((e: any) => InterfaceDescriptor.fromJSON(e)); + return obj; }, toJSON(message: CodecDescriptor): unknown { const obj: any = {}; @@ -1387,7 +1399,7 @@ function createBaseInterfaceDescriptor(): InterfaceDescriptor { export const InterfaceDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceDescriptor", aminoType: "cosmos-sdk/InterfaceDescriptor", - encode(message: InterfaceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InterfaceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); } @@ -1399,8 +1411,8 @@ export const InterfaceDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InterfaceDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InterfaceDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInterfaceDescriptor(); while (reader.pos < end) { @@ -1423,11 +1435,11 @@ export const InterfaceDescriptor = { return message; }, fromJSON(object: any): InterfaceDescriptor { - return { - fullname: isSet(object.fullname) ? String(object.fullname) : "", - interfaceAcceptingMessages: Array.isArray(object?.interfaceAcceptingMessages) ? object.interfaceAcceptingMessages.map((e: any) => InterfaceAcceptingMessageDescriptor.fromJSON(e)) : [], - interfaceImplementers: Array.isArray(object?.interfaceImplementers) ? object.interfaceImplementers.map((e: any) => InterfaceImplementerDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseInterfaceDescriptor(); + if (isSet(object.fullname)) obj.fullname = String(object.fullname); + if (Array.isArray(object?.interfaceAcceptingMessages)) object.interfaceAcceptingMessages.map((e: any) => InterfaceAcceptingMessageDescriptor.fromJSON(e)); + if (Array.isArray(object?.interfaceImplementers)) object.interfaceImplementers.map((e: any) => InterfaceImplementerDescriptor.fromJSON(e)); + return obj; }, toJSON(message: InterfaceDescriptor): unknown { const obj: any = {}; @@ -1526,7 +1538,7 @@ function createBaseInterfaceImplementerDescriptor(): InterfaceImplementerDescrip export const InterfaceImplementerDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceImplementerDescriptor", aminoType: "cosmos-sdk/InterfaceImplementerDescriptor", - encode(message: InterfaceImplementerDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InterfaceImplementerDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); } @@ -1535,8 +1547,8 @@ export const InterfaceImplementerDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InterfaceImplementerDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InterfaceImplementerDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInterfaceImplementerDescriptor(); while (reader.pos < end) { @@ -1556,10 +1568,10 @@ export const InterfaceImplementerDescriptor = { return message; }, fromJSON(object: any): InterfaceImplementerDescriptor { - return { - fullname: isSet(object.fullname) ? String(object.fullname) : "", - typeUrl: isSet(object.typeUrl) ? String(object.typeUrl) : "" - }; + const obj = createBaseInterfaceImplementerDescriptor(); + if (isSet(object.fullname)) obj.fullname = String(object.fullname); + if (isSet(object.typeUrl)) obj.typeUrl = String(object.typeUrl); + return obj; }, toJSON(message: InterfaceImplementerDescriptor): unknown { const obj: any = {}; @@ -1628,7 +1640,7 @@ function createBaseInterfaceAcceptingMessageDescriptor(): InterfaceAcceptingMess export const InterfaceAcceptingMessageDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor", aminoType: "cosmos-sdk/InterfaceAcceptingMessageDescriptor", - encode(message: InterfaceAcceptingMessageDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InterfaceAcceptingMessageDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); } @@ -1637,8 +1649,8 @@ export const InterfaceAcceptingMessageDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InterfaceAcceptingMessageDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InterfaceAcceptingMessageDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInterfaceAcceptingMessageDescriptor(); while (reader.pos < end) { @@ -1658,10 +1670,10 @@ export const InterfaceAcceptingMessageDescriptor = { return message; }, fromJSON(object: any): InterfaceAcceptingMessageDescriptor { - return { - fullname: isSet(object.fullname) ? String(object.fullname) : "", - fieldDescriptorNames: Array.isArray(object?.fieldDescriptorNames) ? object.fieldDescriptorNames.map((e: any) => String(e)) : [] - }; + const obj = createBaseInterfaceAcceptingMessageDescriptor(); + if (isSet(object.fullname)) obj.fullname = String(object.fullname); + if (Array.isArray(object?.fieldDescriptorNames)) object.fieldDescriptorNames.map((e: any) => String(e)); + return obj; }, toJSON(message: InterfaceAcceptingMessageDescriptor): unknown { const obj: any = {}; @@ -1741,14 +1753,14 @@ function createBaseConfigurationDescriptor(): ConfigurationDescriptor { export const ConfigurationDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.ConfigurationDescriptor", aminoType: "cosmos-sdk/ConfigurationDescriptor", - encode(message: ConfigurationDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConfigurationDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bech32AccountAddressPrefix !== "") { writer.uint32(10).string(message.bech32AccountAddressPrefix); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConfigurationDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConfigurationDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConfigurationDescriptor(); while (reader.pos < end) { @@ -1765,9 +1777,9 @@ export const ConfigurationDescriptor = { return message; }, fromJSON(object: any): ConfigurationDescriptor { - return { - bech32AccountAddressPrefix: isSet(object.bech32AccountAddressPrefix) ? String(object.bech32AccountAddressPrefix) : "" - }; + const obj = createBaseConfigurationDescriptor(); + if (isSet(object.bech32AccountAddressPrefix)) obj.bech32AccountAddressPrefix = String(object.bech32AccountAddressPrefix); + return obj; }, toJSON(message: ConfigurationDescriptor): unknown { const obj: any = {}; @@ -1829,14 +1841,14 @@ function createBaseMsgDescriptor(): MsgDescriptor { export const MsgDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.MsgDescriptor", aminoType: "cosmos-sdk/MsgDescriptor", - encode(message: MsgDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.msgTypeUrl !== "") { writer.uint32(10).string(message.msgTypeUrl); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDescriptor(); while (reader.pos < end) { @@ -1853,9 +1865,9 @@ export const MsgDescriptor = { return message; }, fromJSON(object: any): MsgDescriptor { - return { - msgTypeUrl: isSet(object.msgTypeUrl) ? String(object.msgTypeUrl) : "" - }; + const obj = createBaseMsgDescriptor(); + if (isSet(object.msgTypeUrl)) obj.msgTypeUrl = String(object.msgTypeUrl); + return obj; }, toJSON(message: MsgDescriptor): unknown { const obj: any = {}; @@ -1915,11 +1927,11 @@ function createBaseGetAuthnDescriptorRequest(): GetAuthnDescriptorRequest { export const GetAuthnDescriptorRequest = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest", aminoType: "cosmos-sdk/GetAuthnDescriptorRequest", - encode(_: GetAuthnDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetAuthnDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetAuthnDescriptorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetAuthnDescriptorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetAuthnDescriptorRequest(); while (reader.pos < end) { @@ -1933,7 +1945,8 @@ export const GetAuthnDescriptorRequest = { return message; }, fromJSON(_: any): GetAuthnDescriptorRequest { - return {}; + const obj = createBaseGetAuthnDescriptorRequest(); + return obj; }, toJSON(_: GetAuthnDescriptorRequest): unknown { const obj: any = {}; @@ -1987,14 +2000,14 @@ function createBaseGetAuthnDescriptorResponse(): GetAuthnDescriptorResponse { export const GetAuthnDescriptorResponse = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse", aminoType: "cosmos-sdk/GetAuthnDescriptorResponse", - encode(message: GetAuthnDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetAuthnDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authn !== undefined) { AuthnDescriptor.encode(message.authn, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetAuthnDescriptorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetAuthnDescriptorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetAuthnDescriptorResponse(); while (reader.pos < end) { @@ -2011,9 +2024,9 @@ export const GetAuthnDescriptorResponse = { return message; }, fromJSON(object: any): GetAuthnDescriptorResponse { - return { - authn: isSet(object.authn) ? AuthnDescriptor.fromJSON(object.authn) : undefined - }; + const obj = createBaseGetAuthnDescriptorResponse(); + if (isSet(object.authn)) obj.authn = AuthnDescriptor.fromJSON(object.authn); + return obj; }, toJSON(message: GetAuthnDescriptorResponse): unknown { const obj: any = {}; @@ -2022,7 +2035,9 @@ export const GetAuthnDescriptorResponse = { }, fromPartial(object: DeepPartial): GetAuthnDescriptorResponse { const message = createBaseGetAuthnDescriptorResponse(); - message.authn = object.authn !== undefined && object.authn !== null ? AuthnDescriptor.fromPartial(object.authn) : undefined; + if (object.authn !== undefined && object.authn !== null) { + message.authn = AuthnDescriptor.fromPartial(object.authn); + } return message; }, fromSDK(object: GetAuthnDescriptorResponseSDKType): GetAuthnDescriptorResponse { @@ -2073,11 +2088,11 @@ function createBaseGetChainDescriptorRequest(): GetChainDescriptorRequest { export const GetChainDescriptorRequest = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest", aminoType: "cosmos-sdk/GetChainDescriptorRequest", - encode(_: GetChainDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetChainDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetChainDescriptorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetChainDescriptorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetChainDescriptorRequest(); while (reader.pos < end) { @@ -2091,7 +2106,8 @@ export const GetChainDescriptorRequest = { return message; }, fromJSON(_: any): GetChainDescriptorRequest { - return {}; + const obj = createBaseGetChainDescriptorRequest(); + return obj; }, toJSON(_: GetChainDescriptorRequest): unknown { const obj: any = {}; @@ -2145,14 +2161,14 @@ function createBaseGetChainDescriptorResponse(): GetChainDescriptorResponse { export const GetChainDescriptorResponse = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetChainDescriptorResponse", aminoType: "cosmos-sdk/GetChainDescriptorResponse", - encode(message: GetChainDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetChainDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.chain !== undefined) { ChainDescriptor.encode(message.chain, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetChainDescriptorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetChainDescriptorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetChainDescriptorResponse(); while (reader.pos < end) { @@ -2169,9 +2185,9 @@ export const GetChainDescriptorResponse = { return message; }, fromJSON(object: any): GetChainDescriptorResponse { - return { - chain: isSet(object.chain) ? ChainDescriptor.fromJSON(object.chain) : undefined - }; + const obj = createBaseGetChainDescriptorResponse(); + if (isSet(object.chain)) obj.chain = ChainDescriptor.fromJSON(object.chain); + return obj; }, toJSON(message: GetChainDescriptorResponse): unknown { const obj: any = {}; @@ -2180,7 +2196,9 @@ export const GetChainDescriptorResponse = { }, fromPartial(object: DeepPartial): GetChainDescriptorResponse { const message = createBaseGetChainDescriptorResponse(); - message.chain = object.chain !== undefined && object.chain !== null ? ChainDescriptor.fromPartial(object.chain) : undefined; + if (object.chain !== undefined && object.chain !== null) { + message.chain = ChainDescriptor.fromPartial(object.chain); + } return message; }, fromSDK(object: GetChainDescriptorResponseSDKType): GetChainDescriptorResponse { @@ -2231,11 +2249,11 @@ function createBaseGetCodecDescriptorRequest(): GetCodecDescriptorRequest { export const GetCodecDescriptorRequest = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorRequest", aminoType: "cosmos-sdk/GetCodecDescriptorRequest", - encode(_: GetCodecDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetCodecDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetCodecDescriptorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetCodecDescriptorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetCodecDescriptorRequest(); while (reader.pos < end) { @@ -2249,7 +2267,8 @@ export const GetCodecDescriptorRequest = { return message; }, fromJSON(_: any): GetCodecDescriptorRequest { - return {}; + const obj = createBaseGetCodecDescriptorRequest(); + return obj; }, toJSON(_: GetCodecDescriptorRequest): unknown { const obj: any = {}; @@ -2303,14 +2322,14 @@ function createBaseGetCodecDescriptorResponse(): GetCodecDescriptorResponse { export const GetCodecDescriptorResponse = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetCodecDescriptorResponse", aminoType: "cosmos-sdk/GetCodecDescriptorResponse", - encode(message: GetCodecDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetCodecDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codec !== undefined) { CodecDescriptor.encode(message.codec, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetCodecDescriptorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetCodecDescriptorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetCodecDescriptorResponse(); while (reader.pos < end) { @@ -2327,9 +2346,9 @@ export const GetCodecDescriptorResponse = { return message; }, fromJSON(object: any): GetCodecDescriptorResponse { - return { - codec: isSet(object.codec) ? CodecDescriptor.fromJSON(object.codec) : undefined - }; + const obj = createBaseGetCodecDescriptorResponse(); + if (isSet(object.codec)) obj.codec = CodecDescriptor.fromJSON(object.codec); + return obj; }, toJSON(message: GetCodecDescriptorResponse): unknown { const obj: any = {}; @@ -2338,7 +2357,9 @@ export const GetCodecDescriptorResponse = { }, fromPartial(object: DeepPartial): GetCodecDescriptorResponse { const message = createBaseGetCodecDescriptorResponse(); - message.codec = object.codec !== undefined && object.codec !== null ? CodecDescriptor.fromPartial(object.codec) : undefined; + if (object.codec !== undefined && object.codec !== null) { + message.codec = CodecDescriptor.fromPartial(object.codec); + } return message; }, fromSDK(object: GetCodecDescriptorResponseSDKType): GetCodecDescriptorResponse { @@ -2389,11 +2410,11 @@ function createBaseGetConfigurationDescriptorRequest(): GetConfigurationDescript export const GetConfigurationDescriptorRequest = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorRequest", aminoType: "cosmos-sdk/GetConfigurationDescriptorRequest", - encode(_: GetConfigurationDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetConfigurationDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetConfigurationDescriptorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetConfigurationDescriptorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetConfigurationDescriptorRequest(); while (reader.pos < end) { @@ -2407,7 +2428,8 @@ export const GetConfigurationDescriptorRequest = { return message; }, fromJSON(_: any): GetConfigurationDescriptorRequest { - return {}; + const obj = createBaseGetConfigurationDescriptorRequest(); + return obj; }, toJSON(_: GetConfigurationDescriptorRequest): unknown { const obj: any = {}; @@ -2461,14 +2483,14 @@ function createBaseGetConfigurationDescriptorResponse(): GetConfigurationDescrip export const GetConfigurationDescriptorResponse = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetConfigurationDescriptorResponse", aminoType: "cosmos-sdk/GetConfigurationDescriptorResponse", - encode(message: GetConfigurationDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetConfigurationDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.config !== undefined) { ConfigurationDescriptor.encode(message.config, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetConfigurationDescriptorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetConfigurationDescriptorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetConfigurationDescriptorResponse(); while (reader.pos < end) { @@ -2485,9 +2507,9 @@ export const GetConfigurationDescriptorResponse = { return message; }, fromJSON(object: any): GetConfigurationDescriptorResponse { - return { - config: isSet(object.config) ? ConfigurationDescriptor.fromJSON(object.config) : undefined - }; + const obj = createBaseGetConfigurationDescriptorResponse(); + if (isSet(object.config)) obj.config = ConfigurationDescriptor.fromJSON(object.config); + return obj; }, toJSON(message: GetConfigurationDescriptorResponse): unknown { const obj: any = {}; @@ -2496,7 +2518,9 @@ export const GetConfigurationDescriptorResponse = { }, fromPartial(object: DeepPartial): GetConfigurationDescriptorResponse { const message = createBaseGetConfigurationDescriptorResponse(); - message.config = object.config !== undefined && object.config !== null ? ConfigurationDescriptor.fromPartial(object.config) : undefined; + if (object.config !== undefined && object.config !== null) { + message.config = ConfigurationDescriptor.fromPartial(object.config); + } return message; }, fromSDK(object: GetConfigurationDescriptorResponseSDKType): GetConfigurationDescriptorResponse { @@ -2547,11 +2571,11 @@ function createBaseGetQueryServicesDescriptorRequest(): GetQueryServicesDescript export const GetQueryServicesDescriptorRequest = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorRequest", aminoType: "cosmos-sdk/GetQueryServicesDescriptorRequest", - encode(_: GetQueryServicesDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetQueryServicesDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetQueryServicesDescriptorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetQueryServicesDescriptorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetQueryServicesDescriptorRequest(); while (reader.pos < end) { @@ -2565,7 +2589,8 @@ export const GetQueryServicesDescriptorRequest = { return message; }, fromJSON(_: any): GetQueryServicesDescriptorRequest { - return {}; + const obj = createBaseGetQueryServicesDescriptorRequest(); + return obj; }, toJSON(_: GetQueryServicesDescriptorRequest): unknown { const obj: any = {}; @@ -2619,14 +2644,14 @@ function createBaseGetQueryServicesDescriptorResponse(): GetQueryServicesDescrip export const GetQueryServicesDescriptorResponse = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetQueryServicesDescriptorResponse", aminoType: "cosmos-sdk/GetQueryServicesDescriptorResponse", - encode(message: GetQueryServicesDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetQueryServicesDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.queries !== undefined) { QueryServicesDescriptor.encode(message.queries, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetQueryServicesDescriptorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetQueryServicesDescriptorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetQueryServicesDescriptorResponse(); while (reader.pos < end) { @@ -2643,9 +2668,9 @@ export const GetQueryServicesDescriptorResponse = { return message; }, fromJSON(object: any): GetQueryServicesDescriptorResponse { - return { - queries: isSet(object.queries) ? QueryServicesDescriptor.fromJSON(object.queries) : undefined - }; + const obj = createBaseGetQueryServicesDescriptorResponse(); + if (isSet(object.queries)) obj.queries = QueryServicesDescriptor.fromJSON(object.queries); + return obj; }, toJSON(message: GetQueryServicesDescriptorResponse): unknown { const obj: any = {}; @@ -2654,7 +2679,9 @@ export const GetQueryServicesDescriptorResponse = { }, fromPartial(object: DeepPartial): GetQueryServicesDescriptorResponse { const message = createBaseGetQueryServicesDescriptorResponse(); - message.queries = object.queries !== undefined && object.queries !== null ? QueryServicesDescriptor.fromPartial(object.queries) : undefined; + if (object.queries !== undefined && object.queries !== null) { + message.queries = QueryServicesDescriptor.fromPartial(object.queries); + } return message; }, fromSDK(object: GetQueryServicesDescriptorResponseSDKType): GetQueryServicesDescriptorResponse { @@ -2705,11 +2732,11 @@ function createBaseGetTxDescriptorRequest(): GetTxDescriptorRequest { export const GetTxDescriptorRequest = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorRequest", aminoType: "cosmos-sdk/GetTxDescriptorRequest", - encode(_: GetTxDescriptorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetTxDescriptorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetTxDescriptorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetTxDescriptorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetTxDescriptorRequest(); while (reader.pos < end) { @@ -2723,7 +2750,8 @@ export const GetTxDescriptorRequest = { return message; }, fromJSON(_: any): GetTxDescriptorRequest { - return {}; + const obj = createBaseGetTxDescriptorRequest(); + return obj; }, toJSON(_: GetTxDescriptorRequest): unknown { const obj: any = {}; @@ -2777,14 +2805,14 @@ function createBaseGetTxDescriptorResponse(): GetTxDescriptorResponse { export const GetTxDescriptorResponse = { typeUrl: "/cosmos.base.reflection.v2alpha1.GetTxDescriptorResponse", aminoType: "cosmos-sdk/GetTxDescriptorResponse", - encode(message: GetTxDescriptorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetTxDescriptorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx !== undefined) { TxDescriptor.encode(message.tx, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetTxDescriptorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetTxDescriptorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetTxDescriptorResponse(); while (reader.pos < end) { @@ -2801,9 +2829,9 @@ export const GetTxDescriptorResponse = { return message; }, fromJSON(object: any): GetTxDescriptorResponse { - return { - tx: isSet(object.tx) ? TxDescriptor.fromJSON(object.tx) : undefined - }; + const obj = createBaseGetTxDescriptorResponse(); + if (isSet(object.tx)) obj.tx = TxDescriptor.fromJSON(object.tx); + return obj; }, toJSON(message: GetTxDescriptorResponse): unknown { const obj: any = {}; @@ -2812,7 +2840,9 @@ export const GetTxDescriptorResponse = { }, fromPartial(object: DeepPartial): GetTxDescriptorResponse { const message = createBaseGetTxDescriptorResponse(); - message.tx = object.tx !== undefined && object.tx !== null ? TxDescriptor.fromPartial(object.tx) : undefined; + if (object.tx !== undefined && object.tx !== null) { + message.tx = TxDescriptor.fromPartial(object.tx); + } return message; }, fromSDK(object: GetTxDescriptorResponseSDKType): GetTxDescriptorResponse { @@ -2865,14 +2895,14 @@ function createBaseQueryServicesDescriptor(): QueryServicesDescriptor { export const QueryServicesDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServicesDescriptor", aminoType: "cosmos-sdk/QueryServicesDescriptor", - encode(message: QueryServicesDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryServicesDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.queryServices) { QueryServiceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryServicesDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryServicesDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryServicesDescriptor(); while (reader.pos < end) { @@ -2889,9 +2919,9 @@ export const QueryServicesDescriptor = { return message; }, fromJSON(object: any): QueryServicesDescriptor { - return { - queryServices: Array.isArray(object?.queryServices) ? object.queryServices.map((e: any) => QueryServiceDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseQueryServicesDescriptor(); + if (Array.isArray(object?.queryServices)) object.queryServices.map((e: any) => QueryServiceDescriptor.fromJSON(e)); + return obj; }, toJSON(message: QueryServicesDescriptor): unknown { const obj: any = {}; @@ -2967,7 +2997,7 @@ function createBaseQueryServiceDescriptor(): QueryServiceDescriptor { export const QueryServiceDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.QueryServiceDescriptor", aminoType: "cosmos-sdk/QueryServiceDescriptor", - encode(message: QueryServiceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryServiceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fullname !== "") { writer.uint32(10).string(message.fullname); } @@ -2979,8 +3009,8 @@ export const QueryServiceDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryServiceDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryServiceDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryServiceDescriptor(); while (reader.pos < end) { @@ -3003,11 +3033,11 @@ export const QueryServiceDescriptor = { return message; }, fromJSON(object: any): QueryServiceDescriptor { - return { - fullname: isSet(object.fullname) ? String(object.fullname) : "", - isModule: isSet(object.isModule) ? Boolean(object.isModule) : false, - methods: Array.isArray(object?.methods) ? object.methods.map((e: any) => QueryMethodDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseQueryServiceDescriptor(); + if (isSet(object.fullname)) obj.fullname = String(object.fullname); + if (isSet(object.isModule)) obj.isModule = Boolean(object.isModule); + if (Array.isArray(object?.methods)) object.methods.map((e: any) => QueryMethodDescriptor.fromJSON(e)); + return obj; }, toJSON(message: QueryServiceDescriptor): unknown { const obj: any = {}; @@ -3094,7 +3124,7 @@ function createBaseQueryMethodDescriptor(): QueryMethodDescriptor { export const QueryMethodDescriptor = { typeUrl: "/cosmos.base.reflection.v2alpha1.QueryMethodDescriptor", aminoType: "cosmos-sdk/QueryMethodDescriptor", - encode(message: QueryMethodDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryMethodDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3103,8 +3133,8 @@ export const QueryMethodDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryMethodDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryMethodDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryMethodDescriptor(); while (reader.pos < end) { @@ -3124,10 +3154,10 @@ export const QueryMethodDescriptor = { return message; }, fromJSON(object: any): QueryMethodDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - fullQueryPath: isSet(object.fullQueryPath) ? String(object.fullQueryPath) : "" - }; + const obj = createBaseQueryMethodDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.fullQueryPath)) obj.fullQueryPath = String(object.fullQueryPath); + return obj; }, toJSON(message: QueryMethodDescriptor): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts b/__fixtures__/v-next/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts index d9d9afaa84..20df745619 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/snapshots/v1beta1/snapshot.ts @@ -1,9 +1,9 @@ -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.base.snapshots.v1beta1"; /** Snapshot contains Tendermint state sync snapshot info. */ export interface Snapshot { - height: Long; + height: bigint; format: number; chunks: number; hash: Uint8Array; @@ -27,7 +27,7 @@ export interface SnapshotAminoMsg { } /** Snapshot contains Tendermint state sync snapshot info. */ export interface SnapshotSDKType { - height: Long; + height: bigint; format: number; chunks: number; hash: Uint8Array; @@ -115,7 +115,7 @@ export interface SnapshotIAVLItem { key: Uint8Array; value: Uint8Array; /** version is block height */ - version: Long; + version: bigint; /** height is depth of the tree. */ height: number; } @@ -140,7 +140,7 @@ export interface SnapshotIAVLItemAminoMsg { export interface SnapshotIAVLItemSDKType { key: Uint8Array; value: Uint8Array; - version: Long; + version: bigint; height: number; } /** SnapshotExtensionMeta contains metadata about an external snapshotter. */ @@ -231,7 +231,7 @@ export interface SnapshotSchemaSDKType { } function createBaseSnapshot(): Snapshot { return { - height: Long.UZERO, + height: BigInt(0), format: 0, chunks: 0, hash: new Uint8Array(), @@ -241,8 +241,8 @@ function createBaseSnapshot(): Snapshot { export const Snapshot = { typeUrl: "/cosmos.base.snapshots.v1beta1.Snapshot", aminoType: "cosmos-sdk/Snapshot", - encode(message: Snapshot, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: Snapshot, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).uint64(message.height); } if (message.format !== 0) { @@ -259,15 +259,15 @@ export const Snapshot = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Snapshot { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Snapshot { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshot(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.uint64() as Long); + message.height = reader.uint64(); break; case 2: message.format = reader.uint32(); @@ -289,17 +289,17 @@ export const Snapshot = { return message; }, fromJSON(object: any): Snapshot { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.UZERO, - format: isSet(object.format) ? Number(object.format) : 0, - chunks: isSet(object.chunks) ? Number(object.chunks) : 0, - hash: isSet(object.hash) ? bytesFromBase64(object.hash) : new Uint8Array(), - metadata: isSet(object.metadata) ? Metadata.fromJSON(object.metadata) : undefined - }; + const obj = createBaseSnapshot(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.format)) obj.format = Number(object.format); + if (isSet(object.chunks)) obj.chunks = Number(object.chunks); + if (isSet(object.hash)) obj.hash = bytesFromBase64(object.hash); + if (isSet(object.metadata)) obj.metadata = Metadata.fromJSON(object.metadata); + return obj; }, toJSON(message: Snapshot): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.UZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); message.format !== undefined && (obj.format = Math.round(message.format)); message.chunks !== undefined && (obj.chunks = Math.round(message.chunks)); message.hash !== undefined && (obj.hash = base64FromBytes(message.hash !== undefined ? message.hash : new Uint8Array())); @@ -308,11 +308,15 @@ export const Snapshot = { }, fromPartial(object: DeepPartial): Snapshot { const message = createBaseSnapshot(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.UZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } message.format = object.format ?? 0; message.chunks = object.chunks ?? 0; message.hash = object.hash ?? new Uint8Array(); - message.metadata = object.metadata !== undefined && object.metadata !== null ? Metadata.fromPartial(object.metadata) : undefined; + if (object.metadata !== undefined && object.metadata !== null) { + message.metadata = Metadata.fromPartial(object.metadata); + } return message; }, fromSDK(object: SnapshotSDKType): Snapshot { @@ -335,7 +339,7 @@ export const Snapshot = { }, fromAmino(object: SnapshotAmino): Snapshot { return { - height: Long.fromString(object.height), + height: BigInt(object.height), format: object.format, chunks: object.chunks, hash: object.hash, @@ -381,14 +385,14 @@ function createBaseMetadata(): Metadata { export const Metadata = { typeUrl: "/cosmos.base.snapshots.v1beta1.Metadata", aminoType: "cosmos-sdk/Metadata", - encode(message: Metadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Metadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.chunkHashes) { writer.uint32(10).bytes(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Metadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Metadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetadata(); while (reader.pos < end) { @@ -405,9 +409,9 @@ export const Metadata = { return message; }, fromJSON(object: any): Metadata { - return { - chunkHashes: Array.isArray(object?.chunkHashes) ? object.chunkHashes.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseMetadata(); + if (Array.isArray(object?.chunkHashes)) object.chunkHashes.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: Metadata): unknown { const obj: any = {}; @@ -486,7 +490,7 @@ function createBaseSnapshotItem(): SnapshotItem { export const SnapshotItem = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotItem", aminoType: "cosmos-sdk/SnapshotItem", - encode(message: SnapshotItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.store !== undefined) { SnapshotStoreItem.encode(message.store, writer.uint32(10).fork()).ldelim(); } @@ -507,8 +511,8 @@ export const SnapshotItem = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotItem { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotItem { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotItem(); while (reader.pos < end) { @@ -540,14 +544,14 @@ export const SnapshotItem = { return message; }, fromJSON(object: any): SnapshotItem { - return { - store: isSet(object.store) ? SnapshotStoreItem.fromJSON(object.store) : undefined, - iavl: isSet(object.iavl) ? SnapshotIAVLItem.fromJSON(object.iavl) : undefined, - extension: isSet(object.extension) ? SnapshotExtensionMeta.fromJSON(object.extension) : undefined, - extensionPayload: isSet(object.extensionPayload) ? SnapshotExtensionPayload.fromJSON(object.extensionPayload) : undefined, - kv: isSet(object.kv) ? SnapshotKVItem.fromJSON(object.kv) : undefined, - schema: isSet(object.schema) ? SnapshotSchema.fromJSON(object.schema) : undefined - }; + const obj = createBaseSnapshotItem(); + if (isSet(object.store)) obj.store = SnapshotStoreItem.fromJSON(object.store); + if (isSet(object.iavl)) obj.iavl = SnapshotIAVLItem.fromJSON(object.iavl); + if (isSet(object.extension)) obj.extension = SnapshotExtensionMeta.fromJSON(object.extension); + if (isSet(object.extensionPayload)) obj.extensionPayload = SnapshotExtensionPayload.fromJSON(object.extensionPayload); + if (isSet(object.kv)) obj.kv = SnapshotKVItem.fromJSON(object.kv); + if (isSet(object.schema)) obj.schema = SnapshotSchema.fromJSON(object.schema); + return obj; }, toJSON(message: SnapshotItem): unknown { const obj: any = {}; @@ -561,12 +565,24 @@ export const SnapshotItem = { }, fromPartial(object: DeepPartial): SnapshotItem { const message = createBaseSnapshotItem(); - message.store = object.store !== undefined && object.store !== null ? SnapshotStoreItem.fromPartial(object.store) : undefined; - message.iavl = object.iavl !== undefined && object.iavl !== null ? SnapshotIAVLItem.fromPartial(object.iavl) : undefined; - message.extension = object.extension !== undefined && object.extension !== null ? SnapshotExtensionMeta.fromPartial(object.extension) : undefined; - message.extensionPayload = object.extensionPayload !== undefined && object.extensionPayload !== null ? SnapshotExtensionPayload.fromPartial(object.extensionPayload) : undefined; - message.kv = object.kv !== undefined && object.kv !== null ? SnapshotKVItem.fromPartial(object.kv) : undefined; - message.schema = object.schema !== undefined && object.schema !== null ? SnapshotSchema.fromPartial(object.schema) : undefined; + if (object.store !== undefined && object.store !== null) { + message.store = SnapshotStoreItem.fromPartial(object.store); + } + if (object.iavl !== undefined && object.iavl !== null) { + message.iavl = SnapshotIAVLItem.fromPartial(object.iavl); + } + if (object.extension !== undefined && object.extension !== null) { + message.extension = SnapshotExtensionMeta.fromPartial(object.extension); + } + if (object.extensionPayload !== undefined && object.extensionPayload !== null) { + message.extensionPayload = SnapshotExtensionPayload.fromPartial(object.extensionPayload); + } + if (object.kv !== undefined && object.kv !== null) { + message.kv = SnapshotKVItem.fromPartial(object.kv); + } + if (object.schema !== undefined && object.schema !== null) { + message.schema = SnapshotSchema.fromPartial(object.schema); + } return message; }, fromSDK(object: SnapshotItemSDKType): SnapshotItem { @@ -639,14 +655,14 @@ function createBaseSnapshotStoreItem(): SnapshotStoreItem { export const SnapshotStoreItem = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotStoreItem", aminoType: "cosmos-sdk/SnapshotStoreItem", - encode(message: SnapshotStoreItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotStoreItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotStoreItem { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotStoreItem { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotStoreItem(); while (reader.pos < end) { @@ -663,9 +679,9 @@ export const SnapshotStoreItem = { return message; }, fromJSON(object: any): SnapshotStoreItem { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseSnapshotStoreItem(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: SnapshotStoreItem): unknown { const obj: any = {}; @@ -723,21 +739,21 @@ function createBaseSnapshotIAVLItem(): SnapshotIAVLItem { return { key: new Uint8Array(), value: new Uint8Array(), - version: Long.ZERO, + version: BigInt(0), height: 0 }; } export const SnapshotIAVLItem = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotIAVLItem", aminoType: "cosmos-sdk/SnapshotIAVLItem", - encode(message: SnapshotIAVLItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotIAVLItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } if (message.value.length !== 0) { writer.uint32(18).bytes(message.value); } - if (!message.version.isZero()) { + if (message.version !== BigInt(0)) { writer.uint32(24).int64(message.version); } if (message.height !== 0) { @@ -745,8 +761,8 @@ export const SnapshotIAVLItem = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotIAVLItem { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotIAVLItem { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotIAVLItem(); while (reader.pos < end) { @@ -759,7 +775,7 @@ export const SnapshotIAVLItem = { message.value = reader.bytes(); break; case 3: - message.version = (reader.int64() as Long); + message.version = reader.int64(); break; case 4: message.height = reader.int32(); @@ -772,18 +788,18 @@ export const SnapshotIAVLItem = { return message; }, fromJSON(object: any): SnapshotIAVLItem { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array(), - version: isSet(object.version) ? Long.fromValue(object.version) : Long.ZERO, - height: isSet(object.height) ? Number(object.height) : 0 - }; + const obj = createBaseSnapshotIAVLItem(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + if (isSet(object.version)) obj.version = BigInt(object.version.toString()); + if (isSet(object.height)) obj.height = Number(object.height); + return obj; }, toJSON(message: SnapshotIAVLItem): unknown { const obj: any = {}; message.key !== undefined && (obj.key = base64FromBytes(message.key !== undefined ? message.key : new Uint8Array())); message.value !== undefined && (obj.value = base64FromBytes(message.value !== undefined ? message.value : new Uint8Array())); - message.version !== undefined && (obj.version = (message.version || Long.ZERO).toString()); + message.version !== undefined && (obj.version = (message.version || BigInt(0)).toString()); message.height !== undefined && (obj.height = Math.round(message.height)); return obj; }, @@ -791,7 +807,9 @@ export const SnapshotIAVLItem = { const message = createBaseSnapshotIAVLItem(); message.key = object.key ?? new Uint8Array(); message.value = object.value ?? new Uint8Array(); - message.version = object.version !== undefined && object.version !== null ? Long.fromValue(object.version) : Long.ZERO; + if (object.version !== undefined && object.version !== null) { + message.version = BigInt(object.version.toString()); + } message.height = object.height ?? 0; return message; }, @@ -815,7 +833,7 @@ export const SnapshotIAVLItem = { return { key: object.key, value: object.value, - version: Long.fromString(object.version), + version: BigInt(object.version), height: object.height }; }, @@ -858,7 +876,7 @@ function createBaseSnapshotExtensionMeta(): SnapshotExtensionMeta { export const SnapshotExtensionMeta = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionMeta", aminoType: "cosmos-sdk/SnapshotExtensionMeta", - encode(message: SnapshotExtensionMeta, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotExtensionMeta, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -867,8 +885,8 @@ export const SnapshotExtensionMeta = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotExtensionMeta { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotExtensionMeta { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotExtensionMeta(); while (reader.pos < end) { @@ -888,10 +906,10 @@ export const SnapshotExtensionMeta = { return message; }, fromJSON(object: any): SnapshotExtensionMeta { - return { - name: isSet(object.name) ? String(object.name) : "", - format: isSet(object.format) ? Number(object.format) : 0 - }; + const obj = createBaseSnapshotExtensionMeta(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.format)) obj.format = Number(object.format); + return obj; }, toJSON(message: SnapshotExtensionMeta): unknown { const obj: any = {}; @@ -959,14 +977,14 @@ function createBaseSnapshotExtensionPayload(): SnapshotExtensionPayload { export const SnapshotExtensionPayload = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotExtensionPayload", aminoType: "cosmos-sdk/SnapshotExtensionPayload", - encode(message: SnapshotExtensionPayload, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotExtensionPayload, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.payload.length !== 0) { writer.uint32(10).bytes(message.payload); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotExtensionPayload { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotExtensionPayload { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotExtensionPayload(); while (reader.pos < end) { @@ -983,9 +1001,9 @@ export const SnapshotExtensionPayload = { return message; }, fromJSON(object: any): SnapshotExtensionPayload { - return { - payload: isSet(object.payload) ? bytesFromBase64(object.payload) : new Uint8Array() - }; + const obj = createBaseSnapshotExtensionPayload(); + if (isSet(object.payload)) obj.payload = bytesFromBase64(object.payload); + return obj; }, toJSON(message: SnapshotExtensionPayload): unknown { const obj: any = {}; @@ -1048,7 +1066,7 @@ function createBaseSnapshotKVItem(): SnapshotKVItem { export const SnapshotKVItem = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotKVItem", aminoType: "cosmos-sdk/SnapshotKVItem", - encode(message: SnapshotKVItem, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotKVItem, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -1057,8 +1075,8 @@ export const SnapshotKVItem = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotKVItem { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotKVItem { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotKVItem(); while (reader.pos < end) { @@ -1078,10 +1096,10 @@ export const SnapshotKVItem = { return message; }, fromJSON(object: any): SnapshotKVItem { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array() - }; + const obj = createBaseSnapshotKVItem(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + return obj; }, toJSON(message: SnapshotKVItem): unknown { const obj: any = {}; @@ -1149,14 +1167,14 @@ function createBaseSnapshotSchema(): SnapshotSchema { export const SnapshotSchema = { typeUrl: "/cosmos.base.snapshots.v1beta1.SnapshotSchema", aminoType: "cosmos-sdk/SnapshotSchema", - encode(message: SnapshotSchema, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SnapshotSchema, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.keys) { writer.uint32(10).bytes(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SnapshotSchema { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SnapshotSchema { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSnapshotSchema(); while (reader.pos < end) { @@ -1173,9 +1191,9 @@ export const SnapshotSchema = { return message; }, fromJSON(object: any): SnapshotSchema { - return { - keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseSnapshotSchema(); + if (Array.isArray(object?.keys)) object.keys.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: SnapshotSchema): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/commit_info.ts b/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/commit_info.ts index f9660425e2..923aee7bdb 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/commit_info.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/commit_info.ts @@ -1,12 +1,12 @@ -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "cosmos.base.store.v1beta1"; /** * CommitInfo defines commit information used by the multi-store when committing * a version/height. */ export interface CommitInfo { - version: Long; + version: bigint; storeInfos: StoreInfo[]; } export interface CommitInfoProtoMsg { @@ -30,7 +30,7 @@ export interface CommitInfoAminoMsg { * a version/height. */ export interface CommitInfoSDKType { - version: Long; + version: bigint; store_infos: StoreInfoSDKType[]; } /** @@ -70,7 +70,7 @@ export interface StoreInfoSDKType { * committed. */ export interface CommitID { - version: Long; + version: bigint; hash: Uint8Array; } export interface CommitIDProtoMsg { @@ -94,20 +94,20 @@ export interface CommitIDAminoMsg { * committed. */ export interface CommitIDSDKType { - version: Long; + version: bigint; hash: Uint8Array; } function createBaseCommitInfo(): CommitInfo { return { - version: Long.ZERO, + version: BigInt(0), storeInfos: [] }; } export const CommitInfo = { typeUrl: "/cosmos.base.store.v1beta1.CommitInfo", aminoType: "cosmos-sdk/CommitInfo", - encode(message: CommitInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.version.isZero()) { + encode(message: CommitInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.version !== BigInt(0)) { writer.uint32(8).int64(message.version); } for (const v of message.storeInfos) { @@ -115,15 +115,15 @@ export const CommitInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CommitInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CommitInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommitInfo(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.version = (reader.int64() as Long); + message.version = reader.int64(); break; case 2: message.storeInfos.push(StoreInfo.decode(reader, reader.uint32())); @@ -136,14 +136,14 @@ export const CommitInfo = { return message; }, fromJSON(object: any): CommitInfo { - return { - version: isSet(object.version) ? Long.fromValue(object.version) : Long.ZERO, - storeInfos: Array.isArray(object?.storeInfos) ? object.storeInfos.map((e: any) => StoreInfo.fromJSON(e)) : [] - }; + const obj = createBaseCommitInfo(); + if (isSet(object.version)) obj.version = BigInt(object.version.toString()); + if (Array.isArray(object?.storeInfos)) object.storeInfos.map((e: any) => StoreInfo.fromJSON(e)); + return obj; }, toJSON(message: CommitInfo): unknown { const obj: any = {}; - message.version !== undefined && (obj.version = (message.version || Long.ZERO).toString()); + message.version !== undefined && (obj.version = (message.version || BigInt(0)).toString()); if (message.storeInfos) { obj.storeInfos = message.storeInfos.map(e => e ? StoreInfo.toJSON(e) : undefined); } else { @@ -153,7 +153,9 @@ export const CommitInfo = { }, fromPartial(object: DeepPartial): CommitInfo { const message = createBaseCommitInfo(); - message.version = object.version !== undefined && object.version !== null ? Long.fromValue(object.version) : Long.ZERO; + if (object.version !== undefined && object.version !== null) { + message.version = BigInt(object.version.toString()); + } message.storeInfos = object.storeInfos?.map(e => StoreInfo.fromPartial(e)) || []; return message; }, @@ -175,7 +177,7 @@ export const CommitInfo = { }, fromAmino(object: CommitInfoAmino): CommitInfo { return { - version: Long.fromString(object.version), + version: BigInt(object.version), storeInfos: Array.isArray(object?.store_infos) ? object.store_infos.map((e: any) => StoreInfo.fromAmino(e)) : [] }; }, @@ -220,7 +222,7 @@ function createBaseStoreInfo(): StoreInfo { export const StoreInfo = { typeUrl: "/cosmos.base.store.v1beta1.StoreInfo", aminoType: "cosmos-sdk/StoreInfo", - encode(message: StoreInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: StoreInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -229,8 +231,8 @@ export const StoreInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): StoreInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): StoreInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStoreInfo(); while (reader.pos < end) { @@ -250,10 +252,10 @@ export const StoreInfo = { return message; }, fromJSON(object: any): StoreInfo { - return { - name: isSet(object.name) ? String(object.name) : "", - commitId: isSet(object.commitId) ? CommitID.fromJSON(object.commitId) : undefined - }; + const obj = createBaseStoreInfo(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.commitId)) obj.commitId = CommitID.fromJSON(object.commitId); + return obj; }, toJSON(message: StoreInfo): unknown { const obj: any = {}; @@ -264,7 +266,9 @@ export const StoreInfo = { fromPartial(object: DeepPartial): StoreInfo { const message = createBaseStoreInfo(); message.name = object.name ?? ""; - message.commitId = object.commitId !== undefined && object.commitId !== null ? CommitID.fromPartial(object.commitId) : undefined; + if (object.commitId !== undefined && object.commitId !== null) { + message.commitId = CommitID.fromPartial(object.commitId); + } return message; }, fromSDK(object: StoreInfoSDKType): StoreInfo { @@ -315,15 +319,15 @@ export const StoreInfo = { }; function createBaseCommitID(): CommitID { return { - version: Long.ZERO, + version: BigInt(0), hash: new Uint8Array() }; } export const CommitID = { typeUrl: "/cosmos.base.store.v1beta1.CommitID", aminoType: "cosmos-sdk/CommitID", - encode(message: CommitID, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.version.isZero()) { + encode(message: CommitID, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.version !== BigInt(0)) { writer.uint32(8).int64(message.version); } if (message.hash.length !== 0) { @@ -331,15 +335,15 @@ export const CommitID = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CommitID { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CommitID { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommitID(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.version = (reader.int64() as Long); + message.version = reader.int64(); break; case 2: message.hash = reader.bytes(); @@ -352,20 +356,22 @@ export const CommitID = { return message; }, fromJSON(object: any): CommitID { - return { - version: isSet(object.version) ? Long.fromValue(object.version) : Long.ZERO, - hash: isSet(object.hash) ? bytesFromBase64(object.hash) : new Uint8Array() - }; + const obj = createBaseCommitID(); + if (isSet(object.version)) obj.version = BigInt(object.version.toString()); + if (isSet(object.hash)) obj.hash = bytesFromBase64(object.hash); + return obj; }, toJSON(message: CommitID): unknown { const obj: any = {}; - message.version !== undefined && (obj.version = (message.version || Long.ZERO).toString()); + message.version !== undefined && (obj.version = (message.version || BigInt(0)).toString()); message.hash !== undefined && (obj.hash = base64FromBytes(message.hash !== undefined ? message.hash : new Uint8Array())); return obj; }, fromPartial(object: DeepPartial): CommitID { const message = createBaseCommitID(); - message.version = object.version !== undefined && object.version !== null ? Long.fromValue(object.version) : Long.ZERO; + if (object.version !== undefined && object.version !== null) { + message.version = BigInt(object.version.toString()); + } message.hash = object.hash ?? new Uint8Array(); return message; }, @@ -383,7 +389,7 @@ export const CommitID = { }, fromAmino(object: CommitIDAmino): CommitID { return { - version: Long.fromString(object.version), + version: BigInt(object.version), hash: object.hash }; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/listening.ts b/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/listening.ts index 7320e54cb3..13e21425eb 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/listening.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/store/v1beta1/listening.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.base.store.v1beta1"; /** @@ -63,7 +63,7 @@ function createBaseStoreKVPair(): StoreKVPair { export const StoreKVPair = { typeUrl: "/cosmos.base.store.v1beta1.StoreKVPair", aminoType: "cosmos-sdk/StoreKVPair", - encode(message: StoreKVPair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: StoreKVPair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.storeKey !== "") { writer.uint32(10).string(message.storeKey); } @@ -78,8 +78,8 @@ export const StoreKVPair = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): StoreKVPair { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): StoreKVPair { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStoreKVPair(); while (reader.pos < end) { @@ -105,12 +105,12 @@ export const StoreKVPair = { return message; }, fromJSON(object: any): StoreKVPair { - return { - storeKey: isSet(object.storeKey) ? String(object.storeKey) : "", - delete: isSet(object.delete) ? Boolean(object.delete) : false, - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array() - }; + const obj = createBaseStoreKVPair(); + if (isSet(object.storeKey)) obj.storeKey = String(object.storeKey); + if (isSet(object.delete)) obj.delete = Boolean(object.delete); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + return obj; }, toJSON(message: StoreKVPair): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/tendermint/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/base/tendermint/v1beta1/query.ts index c147dc1688..9bcd871b29 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/tendermint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/tendermint/v1beta1/query.ts @@ -3,12 +3,12 @@ import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../../tendermint/types/types"; import { Block, BlockAmino, BlockSDKType } from "../../../../tendermint/types/block"; import { NodeInfo, NodeInfoAmino, NodeInfoSDKType } from "../../../../tendermint/p2p/types"; -import { Long, isSet, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.base.tendermint.v1beta1"; /** GetValidatorSetByHeightRequest is the request type for the Query/GetValidatorSetByHeight RPC method. */ export interface GetValidatorSetByHeightRequest { - height: Long; + height: bigint; /** pagination defines an pagination for the request. */ pagination: PageRequest; } @@ -28,12 +28,12 @@ export interface GetValidatorSetByHeightRequestAminoMsg { } /** GetValidatorSetByHeightRequest is the request type for the Query/GetValidatorSetByHeight RPC method. */ export interface GetValidatorSetByHeightRequestSDKType { - height: Long; + height: bigint; pagination: PageRequestSDKType; } /** GetValidatorSetByHeightResponse is the response type for the Query/GetValidatorSetByHeight RPC method. */ export interface GetValidatorSetByHeightResponse { - blockHeight: Long; + blockHeight: bigint; validators: Validator[]; /** pagination defines an pagination for the response. */ pagination: PageResponse; @@ -55,7 +55,7 @@ export interface GetValidatorSetByHeightResponseAminoMsg { } /** GetValidatorSetByHeightResponse is the response type for the Query/GetValidatorSetByHeight RPC method. */ export interface GetValidatorSetByHeightResponseSDKType { - block_height: Long; + block_height: bigint; validators: ValidatorSDKType[]; pagination: PageResponseSDKType; } @@ -83,7 +83,7 @@ export interface GetLatestValidatorSetRequestSDKType { } /** GetLatestValidatorSetResponse is the response type for the Query/GetValidatorSetByHeight RPC method. */ export interface GetLatestValidatorSetResponse { - blockHeight: Long; + blockHeight: bigint; validators: Validator[]; /** pagination defines an pagination for the response. */ pagination: PageResponse; @@ -105,7 +105,7 @@ export interface GetLatestValidatorSetResponseAminoMsg { } /** GetLatestValidatorSetResponse is the response type for the Query/GetValidatorSetByHeight RPC method. */ export interface GetLatestValidatorSetResponseSDKType { - block_height: Long; + block_height: bigint; validators: ValidatorSDKType[]; pagination: PageResponseSDKType; } @@ -113,8 +113,8 @@ export interface GetLatestValidatorSetResponseSDKType { export interface Validator { address: string; pubKey: Any; - votingPower: Long; - proposerPriority: Long; + votingPower: bigint; + proposerPriority: bigint; } export interface ValidatorProtoMsg { typeUrl: "/cosmos.base.tendermint.v1beta1.Validator"; @@ -135,12 +135,12 @@ export interface ValidatorAminoMsg { export interface ValidatorSDKType { address: string; pub_key: AnySDKType; - voting_power: Long; - proposer_priority: Long; + voting_power: bigint; + proposer_priority: bigint; } /** GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method. */ export interface GetBlockByHeightRequest { - height: Long; + height: bigint; } export interface GetBlockByHeightRequestProtoMsg { typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest"; @@ -156,7 +156,7 @@ export interface GetBlockByHeightRequestAminoMsg { } /** GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method. */ export interface GetBlockByHeightRequestSDKType { - height: Long; + height: bigint; } /** GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. */ export interface GetBlockByHeightResponse { @@ -366,15 +366,15 @@ export interface ModuleSDKType { } function createBaseGetValidatorSetByHeightRequest(): GetValidatorSetByHeightRequest { return { - height: Long.ZERO, + height: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const GetValidatorSetByHeightRequest = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest", aminoType: "cosmos-sdk/GetValidatorSetByHeightRequest", - encode(message: GetValidatorSetByHeightRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: GetValidatorSetByHeightRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } if (message.pagination !== undefined) { @@ -382,15 +382,15 @@ export const GetValidatorSetByHeightRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetValidatorSetByHeightRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetValidatorSetByHeightRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetValidatorSetByHeightRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -403,21 +403,25 @@ export const GetValidatorSetByHeightRequest = { return message; }, fromJSON(object: any): GetValidatorSetByHeightRequest { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetValidatorSetByHeightRequest(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: GetValidatorSetByHeightRequest): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): GetValidatorSetByHeightRequest { const message = createBaseGetValidatorSetByHeightRequest(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetValidatorSetByHeightRequestSDKType): GetValidatorSetByHeightRequest { @@ -434,7 +438,7 @@ export const GetValidatorSetByHeightRequest = { }, fromAmino(object: GetValidatorSetByHeightRequestAmino): GetValidatorSetByHeightRequest { return { - height: Long.fromString(object.height), + height: BigInt(object.height), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -468,7 +472,7 @@ export const GetValidatorSetByHeightRequest = { }; function createBaseGetValidatorSetByHeightResponse(): GetValidatorSetByHeightResponse { return { - blockHeight: Long.ZERO, + blockHeight: BigInt(0), validators: [], pagination: PageResponse.fromPartial({}) }; @@ -476,8 +480,8 @@ function createBaseGetValidatorSetByHeightResponse(): GetValidatorSetByHeightRes export const GetValidatorSetByHeightResponse = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse", aminoType: "cosmos-sdk/GetValidatorSetByHeightResponse", - encode(message: GetValidatorSetByHeightResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.blockHeight.isZero()) { + encode(message: GetValidatorSetByHeightResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.blockHeight !== BigInt(0)) { writer.uint32(8).int64(message.blockHeight); } for (const v of message.validators) { @@ -488,15 +492,15 @@ export const GetValidatorSetByHeightResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetValidatorSetByHeightResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetValidatorSetByHeightResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetValidatorSetByHeightResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.blockHeight = (reader.int64() as Long); + message.blockHeight = reader.int64(); break; case 2: message.validators.push(Validator.decode(reader, reader.uint32())); @@ -512,15 +516,15 @@ export const GetValidatorSetByHeightResponse = { return message; }, fromJSON(object: any): GetValidatorSetByHeightResponse { - return { - blockHeight: isSet(object.blockHeight) ? Long.fromValue(object.blockHeight) : Long.ZERO, - validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetValidatorSetByHeightResponse(); + if (isSet(object.blockHeight)) obj.blockHeight = BigInt(object.blockHeight.toString()); + if (Array.isArray(object?.validators)) object.validators.map((e: any) => Validator.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: GetValidatorSetByHeightResponse): unknown { const obj: any = {}; - message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || Long.ZERO).toString()); + message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || BigInt(0)).toString()); if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toJSON(e) : undefined); } else { @@ -531,9 +535,13 @@ export const GetValidatorSetByHeightResponse = { }, fromPartial(object: DeepPartial): GetValidatorSetByHeightResponse { const message = createBaseGetValidatorSetByHeightResponse(); - message.blockHeight = object.blockHeight !== undefined && object.blockHeight !== null ? Long.fromValue(object.blockHeight) : Long.ZERO; + if (object.blockHeight !== undefined && object.blockHeight !== null) { + message.blockHeight = BigInt(object.blockHeight.toString()); + } message.validators = object.validators?.map(e => Validator.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetValidatorSetByHeightResponseSDKType): GetValidatorSetByHeightResponse { @@ -556,7 +564,7 @@ export const GetValidatorSetByHeightResponse = { }, fromAmino(object: GetValidatorSetByHeightResponseAmino): GetValidatorSetByHeightResponse { return { - blockHeight: Long.fromString(object.block_height), + blockHeight: BigInt(object.block_height), validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined }; @@ -602,14 +610,14 @@ function createBaseGetLatestValidatorSetRequest(): GetLatestValidatorSetRequest export const GetLatestValidatorSetRequest = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest", aminoType: "cosmos-sdk/GetLatestValidatorSetRequest", - encode(message: GetLatestValidatorSetRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetLatestValidatorSetRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetLatestValidatorSetRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetLatestValidatorSetRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetLatestValidatorSetRequest(); while (reader.pos < end) { @@ -626,9 +634,9 @@ export const GetLatestValidatorSetRequest = { return message; }, fromJSON(object: any): GetLatestValidatorSetRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetLatestValidatorSetRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: GetLatestValidatorSetRequest): unknown { const obj: any = {}; @@ -637,7 +645,9 @@ export const GetLatestValidatorSetRequest = { }, fromPartial(object: DeepPartial): GetLatestValidatorSetRequest { const message = createBaseGetLatestValidatorSetRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetLatestValidatorSetRequestSDKType): GetLatestValidatorSetRequest { @@ -684,7 +694,7 @@ export const GetLatestValidatorSetRequest = { }; function createBaseGetLatestValidatorSetResponse(): GetLatestValidatorSetResponse { return { - blockHeight: Long.ZERO, + blockHeight: BigInt(0), validators: [], pagination: PageResponse.fromPartial({}) }; @@ -692,8 +702,8 @@ function createBaseGetLatestValidatorSetResponse(): GetLatestValidatorSetRespons export const GetLatestValidatorSetResponse = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse", aminoType: "cosmos-sdk/GetLatestValidatorSetResponse", - encode(message: GetLatestValidatorSetResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.blockHeight.isZero()) { + encode(message: GetLatestValidatorSetResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.blockHeight !== BigInt(0)) { writer.uint32(8).int64(message.blockHeight); } for (const v of message.validators) { @@ -704,15 +714,15 @@ export const GetLatestValidatorSetResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetLatestValidatorSetResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetLatestValidatorSetResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetLatestValidatorSetResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.blockHeight = (reader.int64() as Long); + message.blockHeight = reader.int64(); break; case 2: message.validators.push(Validator.decode(reader, reader.uint32())); @@ -728,15 +738,15 @@ export const GetLatestValidatorSetResponse = { return message; }, fromJSON(object: any): GetLatestValidatorSetResponse { - return { - blockHeight: isSet(object.blockHeight) ? Long.fromValue(object.blockHeight) : Long.ZERO, - validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetLatestValidatorSetResponse(); + if (isSet(object.blockHeight)) obj.blockHeight = BigInt(object.blockHeight.toString()); + if (Array.isArray(object?.validators)) object.validators.map((e: any) => Validator.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: GetLatestValidatorSetResponse): unknown { const obj: any = {}; - message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || Long.ZERO).toString()); + message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || BigInt(0)).toString()); if (message.validators) { obj.validators = message.validators.map(e => e ? Validator.toJSON(e) : undefined); } else { @@ -747,9 +757,13 @@ export const GetLatestValidatorSetResponse = { }, fromPartial(object: DeepPartial): GetLatestValidatorSetResponse { const message = createBaseGetLatestValidatorSetResponse(); - message.blockHeight = object.blockHeight !== undefined && object.blockHeight !== null ? Long.fromValue(object.blockHeight) : Long.ZERO; + if (object.blockHeight !== undefined && object.blockHeight !== null) { + message.blockHeight = BigInt(object.blockHeight.toString()); + } message.validators = object.validators?.map(e => Validator.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetLatestValidatorSetResponseSDKType): GetLatestValidatorSetResponse { @@ -772,7 +786,7 @@ export const GetLatestValidatorSetResponse = { }, fromAmino(object: GetLatestValidatorSetResponseAmino): GetLatestValidatorSetResponse { return { - blockHeight: Long.fromString(object.block_height), + blockHeight: BigInt(object.block_height), validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromAmino(e)) : [], pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined }; @@ -814,30 +828,30 @@ function createBaseValidator(): Validator { return { address: "", pubKey: Any.fromPartial({}), - votingPower: Long.ZERO, - proposerPriority: Long.ZERO + votingPower: BigInt(0), + proposerPriority: BigInt(0) }; } export const Validator = { typeUrl: "/cosmos.base.tendermint.v1beta1.Validator", aminoType: "cosmos-sdk/Validator", - encode(message: Validator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Validator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } if (message.pubKey !== undefined) { Any.encode(message.pubKey, writer.uint32(18).fork()).ldelim(); } - if (!message.votingPower.isZero()) { + if (message.votingPower !== BigInt(0)) { writer.uint32(24).int64(message.votingPower); } - if (!message.proposerPriority.isZero()) { + if (message.proposerPriority !== BigInt(0)) { writer.uint32(32).int64(message.proposerPriority); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Validator { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Validator { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidator(); while (reader.pos < end) { @@ -850,10 +864,10 @@ export const Validator = { message.pubKey = Any.decode(reader, reader.uint32()); break; case 3: - message.votingPower = (reader.int64() as Long); + message.votingPower = reader.int64(); break; case 4: - message.proposerPriority = (reader.int64() as Long); + message.proposerPriority = reader.int64(); break; default: reader.skipType(tag & 7); @@ -863,27 +877,33 @@ export const Validator = { return message; }, fromJSON(object: any): Validator { - return { - address: isSet(object.address) ? String(object.address) : "", - pubKey: isSet(object.pubKey) ? Any.fromJSON(object.pubKey) : undefined, - votingPower: isSet(object.votingPower) ? Long.fromValue(object.votingPower) : Long.ZERO, - proposerPriority: isSet(object.proposerPriority) ? Long.fromValue(object.proposerPriority) : Long.ZERO - }; + const obj = createBaseValidator(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pubKey)) obj.pubKey = Any.fromJSON(object.pubKey); + if (isSet(object.votingPower)) obj.votingPower = BigInt(object.votingPower.toString()); + if (isSet(object.proposerPriority)) obj.proposerPriority = BigInt(object.proposerPriority.toString()); + return obj; }, toJSON(message: Validator): unknown { const obj: any = {}; message.address !== undefined && (obj.address = message.address); message.pubKey !== undefined && (obj.pubKey = message.pubKey ? Any.toJSON(message.pubKey) : undefined); - message.votingPower !== undefined && (obj.votingPower = (message.votingPower || Long.ZERO).toString()); - message.proposerPriority !== undefined && (obj.proposerPriority = (message.proposerPriority || Long.ZERO).toString()); + message.votingPower !== undefined && (obj.votingPower = (message.votingPower || BigInt(0)).toString()); + message.proposerPriority !== undefined && (obj.proposerPriority = (message.proposerPriority || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Validator { const message = createBaseValidator(); message.address = object.address ?? ""; - message.pubKey = object.pubKey !== undefined && object.pubKey !== null ? Any.fromPartial(object.pubKey) : undefined; - message.votingPower = object.votingPower !== undefined && object.votingPower !== null ? Long.fromValue(object.votingPower) : Long.ZERO; - message.proposerPriority = object.proposerPriority !== undefined && object.proposerPriority !== null ? Long.fromValue(object.proposerPriority) : Long.ZERO; + if (object.pubKey !== undefined && object.pubKey !== null) { + message.pubKey = Any.fromPartial(object.pubKey); + } + if (object.votingPower !== undefined && object.votingPower !== null) { + message.votingPower = BigInt(object.votingPower.toString()); + } + if (object.proposerPriority !== undefined && object.proposerPriority !== null) { + message.proposerPriority = BigInt(object.proposerPriority.toString()); + } return message; }, fromSDK(object: ValidatorSDKType): Validator { @@ -906,8 +926,8 @@ export const Validator = { return { address: object.address, pubKey: object?.pub_key ? Any.fromAmino(object.pub_key) : undefined, - votingPower: Long.fromString(object.voting_power), - proposerPriority: Long.fromString(object.proposer_priority) + votingPower: BigInt(object.voting_power), + proposerPriority: BigInt(object.proposer_priority) }; }, toAmino(message: Validator): ValidatorAmino { @@ -942,27 +962,27 @@ export const Validator = { }; function createBaseGetBlockByHeightRequest(): GetBlockByHeightRequest { return { - height: Long.ZERO + height: BigInt(0) }; } export const GetBlockByHeightRequest = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest", aminoType: "cosmos-sdk/GetBlockByHeightRequest", - encode(message: GetBlockByHeightRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: GetBlockByHeightRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetBlockByHeightRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetBlockByHeightRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetBlockByHeightRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; default: reader.skipType(tag & 7); @@ -972,18 +992,20 @@ export const GetBlockByHeightRequest = { return message; }, fromJSON(object: any): GetBlockByHeightRequest { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO - }; + const obj = createBaseGetBlockByHeightRequest(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + return obj; }, toJSON(message: GetBlockByHeightRequest): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): GetBlockByHeightRequest { const message = createBaseGetBlockByHeightRequest(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } return message; }, fromSDK(object: GetBlockByHeightRequestSDKType): GetBlockByHeightRequest { @@ -998,7 +1020,7 @@ export const GetBlockByHeightRequest = { }, fromAmino(object: GetBlockByHeightRequestAmino): GetBlockByHeightRequest { return { - height: Long.fromString(object.height) + height: BigInt(object.height) }; }, toAmino(message: GetBlockByHeightRequest): GetBlockByHeightRequestAmino { @@ -1037,7 +1059,7 @@ function createBaseGetBlockByHeightResponse(): GetBlockByHeightResponse { export const GetBlockByHeightResponse = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse", aminoType: "cosmos-sdk/GetBlockByHeightResponse", - encode(message: GetBlockByHeightResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetBlockByHeightResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockId !== undefined) { BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim(); } @@ -1046,8 +1068,8 @@ export const GetBlockByHeightResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetBlockByHeightResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetBlockByHeightResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetBlockByHeightResponse(); while (reader.pos < end) { @@ -1067,10 +1089,10 @@ export const GetBlockByHeightResponse = { return message; }, fromJSON(object: any): GetBlockByHeightResponse { - return { - blockId: isSet(object.blockId) ? BlockID.fromJSON(object.blockId) : undefined, - block: isSet(object.block) ? Block.fromJSON(object.block) : undefined - }; + const obj = createBaseGetBlockByHeightResponse(); + if (isSet(object.blockId)) obj.blockId = BlockID.fromJSON(object.blockId); + if (isSet(object.block)) obj.block = Block.fromJSON(object.block); + return obj; }, toJSON(message: GetBlockByHeightResponse): unknown { const obj: any = {}; @@ -1080,8 +1102,12 @@ export const GetBlockByHeightResponse = { }, fromPartial(object: DeepPartial): GetBlockByHeightResponse { const message = createBaseGetBlockByHeightResponse(); - message.blockId = object.blockId !== undefined && object.blockId !== null ? BlockID.fromPartial(object.blockId) : undefined; - message.block = object.block !== undefined && object.block !== null ? Block.fromPartial(object.block) : undefined; + if (object.blockId !== undefined && object.blockId !== null) { + message.blockId = BlockID.fromPartial(object.blockId); + } + if (object.block !== undefined && object.block !== null) { + message.block = Block.fromPartial(object.block); + } return message; }, fromSDK(object: GetBlockByHeightResponseSDKType): GetBlockByHeightResponse { @@ -1136,11 +1162,11 @@ function createBaseGetLatestBlockRequest(): GetLatestBlockRequest { export const GetLatestBlockRequest = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockRequest", aminoType: "cosmos-sdk/GetLatestBlockRequest", - encode(_: GetLatestBlockRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetLatestBlockRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetLatestBlockRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetLatestBlockRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetLatestBlockRequest(); while (reader.pos < end) { @@ -1154,7 +1180,8 @@ export const GetLatestBlockRequest = { return message; }, fromJSON(_: any): GetLatestBlockRequest { - return {}; + const obj = createBaseGetLatestBlockRequest(); + return obj; }, toJSON(_: GetLatestBlockRequest): unknown { const obj: any = {}; @@ -1209,7 +1236,7 @@ function createBaseGetLatestBlockResponse(): GetLatestBlockResponse { export const GetLatestBlockResponse = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetLatestBlockResponse", aminoType: "cosmos-sdk/GetLatestBlockResponse", - encode(message: GetLatestBlockResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetLatestBlockResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.blockId !== undefined) { BlockID.encode(message.blockId, writer.uint32(10).fork()).ldelim(); } @@ -1218,8 +1245,8 @@ export const GetLatestBlockResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetLatestBlockResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetLatestBlockResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetLatestBlockResponse(); while (reader.pos < end) { @@ -1239,10 +1266,10 @@ export const GetLatestBlockResponse = { return message; }, fromJSON(object: any): GetLatestBlockResponse { - return { - blockId: isSet(object.blockId) ? BlockID.fromJSON(object.blockId) : undefined, - block: isSet(object.block) ? Block.fromJSON(object.block) : undefined - }; + const obj = createBaseGetLatestBlockResponse(); + if (isSet(object.blockId)) obj.blockId = BlockID.fromJSON(object.blockId); + if (isSet(object.block)) obj.block = Block.fromJSON(object.block); + return obj; }, toJSON(message: GetLatestBlockResponse): unknown { const obj: any = {}; @@ -1252,8 +1279,12 @@ export const GetLatestBlockResponse = { }, fromPartial(object: DeepPartial): GetLatestBlockResponse { const message = createBaseGetLatestBlockResponse(); - message.blockId = object.blockId !== undefined && object.blockId !== null ? BlockID.fromPartial(object.blockId) : undefined; - message.block = object.block !== undefined && object.block !== null ? Block.fromPartial(object.block) : undefined; + if (object.blockId !== undefined && object.blockId !== null) { + message.blockId = BlockID.fromPartial(object.blockId); + } + if (object.block !== undefined && object.block !== null) { + message.block = Block.fromPartial(object.block); + } return message; }, fromSDK(object: GetLatestBlockResponseSDKType): GetLatestBlockResponse { @@ -1308,11 +1339,11 @@ function createBaseGetSyncingRequest(): GetSyncingRequest { export const GetSyncingRequest = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingRequest", aminoType: "cosmos-sdk/GetSyncingRequest", - encode(_: GetSyncingRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetSyncingRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetSyncingRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetSyncingRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetSyncingRequest(); while (reader.pos < end) { @@ -1326,7 +1357,8 @@ export const GetSyncingRequest = { return message; }, fromJSON(_: any): GetSyncingRequest { - return {}; + const obj = createBaseGetSyncingRequest(); + return obj; }, toJSON(_: GetSyncingRequest): unknown { const obj: any = {}; @@ -1380,14 +1412,14 @@ function createBaseGetSyncingResponse(): GetSyncingResponse { export const GetSyncingResponse = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetSyncingResponse", aminoType: "cosmos-sdk/GetSyncingResponse", - encode(message: GetSyncingResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetSyncingResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.syncing === true) { writer.uint32(8).bool(message.syncing); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetSyncingResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetSyncingResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetSyncingResponse(); while (reader.pos < end) { @@ -1404,9 +1436,9 @@ export const GetSyncingResponse = { return message; }, fromJSON(object: any): GetSyncingResponse { - return { - syncing: isSet(object.syncing) ? Boolean(object.syncing) : false - }; + const obj = createBaseGetSyncingResponse(); + if (isSet(object.syncing)) obj.syncing = Boolean(object.syncing); + return obj; }, toJSON(message: GetSyncingResponse): unknown { const obj: any = {}; @@ -1466,11 +1498,11 @@ function createBaseGetNodeInfoRequest(): GetNodeInfoRequest { export const GetNodeInfoRequest = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoRequest", aminoType: "cosmos-sdk/GetNodeInfoRequest", - encode(_: GetNodeInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetNodeInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetNodeInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetNodeInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetNodeInfoRequest(); while (reader.pos < end) { @@ -1484,7 +1516,8 @@ export const GetNodeInfoRequest = { return message; }, fromJSON(_: any): GetNodeInfoRequest { - return {}; + const obj = createBaseGetNodeInfoRequest(); + return obj; }, toJSON(_: GetNodeInfoRequest): unknown { const obj: any = {}; @@ -1539,7 +1572,7 @@ function createBaseGetNodeInfoResponse(): GetNodeInfoResponse { export const GetNodeInfoResponse = { typeUrl: "/cosmos.base.tendermint.v1beta1.GetNodeInfoResponse", aminoType: "cosmos-sdk/GetNodeInfoResponse", - encode(message: GetNodeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetNodeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nodeInfo !== undefined) { NodeInfo.encode(message.nodeInfo, writer.uint32(10).fork()).ldelim(); } @@ -1548,8 +1581,8 @@ export const GetNodeInfoResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetNodeInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetNodeInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetNodeInfoResponse(); while (reader.pos < end) { @@ -1569,10 +1602,10 @@ export const GetNodeInfoResponse = { return message; }, fromJSON(object: any): GetNodeInfoResponse { - return { - nodeInfo: isSet(object.nodeInfo) ? NodeInfo.fromJSON(object.nodeInfo) : undefined, - applicationVersion: isSet(object.applicationVersion) ? VersionInfo.fromJSON(object.applicationVersion) : undefined - }; + const obj = createBaseGetNodeInfoResponse(); + if (isSet(object.nodeInfo)) obj.nodeInfo = NodeInfo.fromJSON(object.nodeInfo); + if (isSet(object.applicationVersion)) obj.applicationVersion = VersionInfo.fromJSON(object.applicationVersion); + return obj; }, toJSON(message: GetNodeInfoResponse): unknown { const obj: any = {}; @@ -1582,8 +1615,12 @@ export const GetNodeInfoResponse = { }, fromPartial(object: DeepPartial): GetNodeInfoResponse { const message = createBaseGetNodeInfoResponse(); - message.nodeInfo = object.nodeInfo !== undefined && object.nodeInfo !== null ? NodeInfo.fromPartial(object.nodeInfo) : undefined; - message.applicationVersion = object.applicationVersion !== undefined && object.applicationVersion !== null ? VersionInfo.fromPartial(object.applicationVersion) : undefined; + if (object.nodeInfo !== undefined && object.nodeInfo !== null) { + message.nodeInfo = NodeInfo.fromPartial(object.nodeInfo); + } + if (object.applicationVersion !== undefined && object.applicationVersion !== null) { + message.applicationVersion = VersionInfo.fromPartial(object.applicationVersion); + } return message; }, fromSDK(object: GetNodeInfoResponseSDKType): GetNodeInfoResponse { @@ -1647,7 +1684,7 @@ function createBaseVersionInfo(): VersionInfo { export const VersionInfo = { typeUrl: "/cosmos.base.tendermint.v1beta1.VersionInfo", aminoType: "cosmos-sdk/VersionInfo", - encode(message: VersionInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: VersionInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1674,8 +1711,8 @@ export const VersionInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): VersionInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): VersionInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVersionInfo(); while (reader.pos < end) { @@ -1713,16 +1750,16 @@ export const VersionInfo = { return message; }, fromJSON(object: any): VersionInfo { - return { - name: isSet(object.name) ? String(object.name) : "", - appName: isSet(object.appName) ? String(object.appName) : "", - version: isSet(object.version) ? String(object.version) : "", - gitCommit: isSet(object.gitCommit) ? String(object.gitCommit) : "", - buildTags: isSet(object.buildTags) ? String(object.buildTags) : "", - goVersion: isSet(object.goVersion) ? String(object.goVersion) : "", - buildDeps: Array.isArray(object?.buildDeps) ? object.buildDeps.map((e: any) => Module.fromJSON(e)) : [], - cosmosSdkVersion: isSet(object.cosmosSdkVersion) ? String(object.cosmosSdkVersion) : "" - }; + const obj = createBaseVersionInfo(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.appName)) obj.appName = String(object.appName); + if (isSet(object.version)) obj.version = String(object.version); + if (isSet(object.gitCommit)) obj.gitCommit = String(object.gitCommit); + if (isSet(object.buildTags)) obj.buildTags = String(object.buildTags); + if (isSet(object.goVersion)) obj.goVersion = String(object.goVersion); + if (Array.isArray(object?.buildDeps)) object.buildDeps.map((e: any) => Module.fromJSON(e)); + if (isSet(object.cosmosSdkVersion)) obj.cosmosSdkVersion = String(object.cosmosSdkVersion); + return obj; }, toJSON(message: VersionInfo): unknown { const obj: any = {}; @@ -1840,7 +1877,7 @@ function createBaseModule(): Module { export const Module = { typeUrl: "/cosmos.base.tendermint.v1beta1.Module", aminoType: "cosmos-sdk/Module", - encode(message: Module, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Module, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path !== "") { writer.uint32(10).string(message.path); } @@ -1852,8 +1889,8 @@ export const Module = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Module { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Module { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModule(); while (reader.pos < end) { @@ -1876,11 +1913,11 @@ export const Module = { return message; }, fromJSON(object: any): Module { - return { - path: isSet(object.path) ? String(object.path) : "", - version: isSet(object.version) ? String(object.version) : "", - sum: isSet(object.sum) ? String(object.sum) : "" - }; + const obj = createBaseModule(); + if (isSet(object.path)) obj.path = String(object.path); + if (isSet(object.version)) obj.version = String(object.version); + if (isSet(object.sum)) obj.sum = String(object.sum); + return obj; }, toJSON(message: Module): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts b/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts index 145da105a6..e5cec5299d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts +++ b/__fixtures__/v-next/outputv2/cosmos/base/v1beta1/coin.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.base.v1beta1"; /** @@ -126,7 +126,7 @@ function createBaseCoin(): Coin { export const Coin = { typeUrl: "/cosmos.base.v1beta1.Coin", aminoType: "cosmos-sdk/Coin", - encode(message: Coin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Coin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } @@ -135,8 +135,8 @@ export const Coin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Coin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Coin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCoin(); while (reader.pos < end) { @@ -156,10 +156,10 @@ export const Coin = { return message; }, fromJSON(object: any): Coin { - return { - denom: isSet(object.denom) ? String(object.denom) : "", - amount: isSet(object.amount) ? String(object.amount) : "" - }; + const obj = createBaseCoin(); + if (isSet(object.denom)) obj.denom = String(object.denom); + if (isSet(object.amount)) obj.amount = String(object.amount); + return obj; }, toJSON(message: Coin): unknown { const obj: any = {}; @@ -228,7 +228,7 @@ function createBaseDecCoin(): DecCoin { export const DecCoin = { typeUrl: "/cosmos.base.v1beta1.DecCoin", aminoType: "cosmos-sdk/DecCoin", - encode(message: DecCoin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DecCoin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } @@ -237,8 +237,8 @@ export const DecCoin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DecCoin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DecCoin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecCoin(); while (reader.pos < end) { @@ -258,10 +258,10 @@ export const DecCoin = { return message; }, fromJSON(object: any): DecCoin { - return { - denom: isSet(object.denom) ? String(object.denom) : "", - amount: isSet(object.amount) ? String(object.amount) : "" - }; + const obj = createBaseDecCoin(); + if (isSet(object.denom)) obj.denom = String(object.denom); + if (isSet(object.amount)) obj.amount = String(object.amount); + return obj; }, toJSON(message: DecCoin): unknown { const obj: any = {}; @@ -329,14 +329,14 @@ function createBaseIntProto(): IntProto { export const IntProto = { typeUrl: "/cosmos.base.v1beta1.IntProto", aminoType: "cosmos-sdk/IntProto", - encode(message: IntProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: IntProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.int !== "") { writer.uint32(10).string(message.int); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): IntProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): IntProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseIntProto(); while (reader.pos < end) { @@ -353,9 +353,9 @@ export const IntProto = { return message; }, fromJSON(object: any): IntProto { - return { - int: isSet(object.int) ? String(object.int) : "" - }; + const obj = createBaseIntProto(); + if (isSet(object.int)) obj.int = String(object.int); + return obj; }, toJSON(message: IntProto): unknown { const obj: any = {}; @@ -417,14 +417,14 @@ function createBaseDecProto(): DecProto { export const DecProto = { typeUrl: "/cosmos.base.v1beta1.DecProto", aminoType: "cosmos-sdk/DecProto", - encode(message: DecProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DecProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.dec !== "") { writer.uint32(10).string(message.dec); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DecProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DecProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecProto(); while (reader.pos < end) { @@ -441,9 +441,9 @@ export const DecProto = { return message; }, fromJSON(object: any): DecProto { - return { - dec: isSet(object.dec) ? String(object.dec) : "" - }; + const obj = createBaseDecProto(); + if (isSet(object.dec)) obj.dec = String(object.dec); + return obj; }, toJSON(message: DecProto): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts index 458007c78b..4585bd7edb 100644 --- a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts +++ b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/capability.ts @@ -1,12 +1,12 @@ -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.capability.v1beta1"; /** * Capability defines an implementation of an object capability. The index * provided to a Capability must be globally unique. */ export interface Capability { - index: Long; + index: bigint; } export interface CapabilityProtoMsg { typeUrl: "/cosmos.capability.v1beta1.Capability"; @@ -28,7 +28,7 @@ export interface CapabilityAminoMsg { * provided to a Capability must be globally unique. */ export interface CapabilitySDKType { - index: Long; + index: bigint; } /** * Owner defines a single capability owner. An owner is defined by the name of @@ -93,27 +93,27 @@ export interface CapabilityOwnersSDKType { } function createBaseCapability(): Capability { return { - index: Long.UZERO + index: BigInt(0) }; } export const Capability = { typeUrl: "/cosmos.capability.v1beta1.Capability", aminoType: "cosmos-sdk/Capability", - encode(message: Capability, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.index.isZero()) { + encode(message: Capability, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Capability { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Capability { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCapability(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.index = (reader.uint64() as Long); + message.index = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -123,18 +123,20 @@ export const Capability = { return message; }, fromJSON(object: any): Capability { - return { - index: isSet(object.index) ? Long.fromValue(object.index) : Long.UZERO - }; + const obj = createBaseCapability(); + if (isSet(object.index)) obj.index = BigInt(object.index.toString()); + return obj; }, toJSON(message: Capability): unknown { const obj: any = {}; - message.index !== undefined && (obj.index = (message.index || Long.UZERO).toString()); + message.index !== undefined && (obj.index = (message.index || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Capability { const message = createBaseCapability(); - message.index = object.index !== undefined && object.index !== null ? Long.fromValue(object.index) : Long.UZERO; + if (object.index !== undefined && object.index !== null) { + message.index = BigInt(object.index.toString()); + } return message; }, fromSDK(object: CapabilitySDKType): Capability { @@ -149,7 +151,7 @@ export const Capability = { }, fromAmino(object: CapabilityAmino): Capability { return { - index: Long.fromString(object.index) + index: BigInt(object.index) }; }, toAmino(message: Capability): CapabilityAmino { @@ -188,7 +190,7 @@ function createBaseOwner(): Owner { export const Owner = { typeUrl: "/cosmos.capability.v1beta1.Owner", aminoType: "cosmos-sdk/Owner", - encode(message: Owner, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Owner, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.module !== "") { writer.uint32(10).string(message.module); } @@ -197,8 +199,8 @@ export const Owner = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Owner { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Owner { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOwner(); while (reader.pos < end) { @@ -218,10 +220,10 @@ export const Owner = { return message; }, fromJSON(object: any): Owner { - return { - module: isSet(object.module) ? String(object.module) : "", - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseOwner(); + if (isSet(object.module)) obj.module = String(object.module); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: Owner): unknown { const obj: any = {}; @@ -289,14 +291,14 @@ function createBaseCapabilityOwners(): CapabilityOwners { export const CapabilityOwners = { typeUrl: "/cosmos.capability.v1beta1.CapabilityOwners", aminoType: "cosmos-sdk/CapabilityOwners", - encode(message: CapabilityOwners, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CapabilityOwners, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.owners) { Owner.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CapabilityOwners { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CapabilityOwners { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCapabilityOwners(); while (reader.pos < end) { @@ -313,9 +315,9 @@ export const CapabilityOwners = { return message; }, fromJSON(object: any): CapabilityOwners { - return { - owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => Owner.fromJSON(e)) : [] - }; + const obj = createBaseCapabilityOwners(); + if (Array.isArray(object?.owners)) object.owners.map((e: any) => Owner.fromJSON(e)); + return obj; }, toJSON(message: CapabilityOwners): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts index df40fd678c..487258cbca 100644 --- a/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/capability/v1beta1/genesis.ts @@ -1,11 +1,11 @@ import { CapabilityOwners, CapabilityOwnersAmino, CapabilityOwnersSDKType } from "./capability"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.capability.v1beta1"; /** GenesisOwners defines the capability owners with their corresponding index. */ export interface GenesisOwners { /** index is the index of the capability owner. */ - index: Long; + index: bigint; /** index_owners are the owners at the given index. */ indexOwners: CapabilityOwners; } @@ -26,13 +26,13 @@ export interface GenesisOwnersAminoMsg { } /** GenesisOwners defines the capability owners with their corresponding index. */ export interface GenesisOwnersSDKType { - index: Long; + index: bigint; index_owners: CapabilityOwnersSDKType; } /** GenesisState defines the capability module's genesis state. */ export interface GenesisState { /** index is the capability global index. */ - index: Long; + index: bigint; /** * owners represents a map from index to owners of the capability index * index key is string to allow amino marshalling. @@ -59,20 +59,20 @@ export interface GenesisStateAminoMsg { } /** GenesisState defines the capability module's genesis state. */ export interface GenesisStateSDKType { - index: Long; + index: bigint; owners: GenesisOwnersSDKType[]; } function createBaseGenesisOwners(): GenesisOwners { return { - index: Long.UZERO, + index: BigInt(0), indexOwners: CapabilityOwners.fromPartial({}) }; } export const GenesisOwners = { typeUrl: "/cosmos.capability.v1beta1.GenesisOwners", aminoType: "cosmos-sdk/GenesisOwners", - encode(message: GenesisOwners, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.index.isZero()) { + encode(message: GenesisOwners, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); } if (message.indexOwners !== undefined) { @@ -80,15 +80,15 @@ export const GenesisOwners = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisOwners { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisOwners { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisOwners(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.index = (reader.uint64() as Long); + message.index = reader.uint64(); break; case 2: message.indexOwners = CapabilityOwners.decode(reader, reader.uint32()); @@ -101,21 +101,25 @@ export const GenesisOwners = { return message; }, fromJSON(object: any): GenesisOwners { - return { - index: isSet(object.index) ? Long.fromValue(object.index) : Long.UZERO, - indexOwners: isSet(object.indexOwners) ? CapabilityOwners.fromJSON(object.indexOwners) : undefined - }; + const obj = createBaseGenesisOwners(); + if (isSet(object.index)) obj.index = BigInt(object.index.toString()); + if (isSet(object.indexOwners)) obj.indexOwners = CapabilityOwners.fromJSON(object.indexOwners); + return obj; }, toJSON(message: GenesisOwners): unknown { const obj: any = {}; - message.index !== undefined && (obj.index = (message.index || Long.UZERO).toString()); + message.index !== undefined && (obj.index = (message.index || BigInt(0)).toString()); message.indexOwners !== undefined && (obj.indexOwners = message.indexOwners ? CapabilityOwners.toJSON(message.indexOwners) : undefined); return obj; }, fromPartial(object: DeepPartial): GenesisOwners { const message = createBaseGenesisOwners(); - message.index = object.index !== undefined && object.index !== null ? Long.fromValue(object.index) : Long.UZERO; - message.indexOwners = object.indexOwners !== undefined && object.indexOwners !== null ? CapabilityOwners.fromPartial(object.indexOwners) : undefined; + if (object.index !== undefined && object.index !== null) { + message.index = BigInt(object.index.toString()); + } + if (object.indexOwners !== undefined && object.indexOwners !== null) { + message.indexOwners = CapabilityOwners.fromPartial(object.indexOwners); + } return message; }, fromSDK(object: GenesisOwnersSDKType): GenesisOwners { @@ -132,7 +136,7 @@ export const GenesisOwners = { }, fromAmino(object: GenesisOwnersAmino): GenesisOwners { return { - index: Long.fromString(object.index), + index: BigInt(object.index), indexOwners: object?.index_owners ? CapabilityOwners.fromAmino(object.index_owners) : undefined }; }, @@ -166,15 +170,15 @@ export const GenesisOwners = { }; function createBaseGenesisState(): GenesisState { return { - index: Long.UZERO, + index: BigInt(0), owners: [] }; } export const GenesisState = { typeUrl: "/cosmos.capability.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.index.isZero()) { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.index !== BigInt(0)) { writer.uint32(8).uint64(message.index); } for (const v of message.owners) { @@ -182,15 +186,15 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.index = (reader.uint64() as Long); + message.index = reader.uint64(); break; case 2: message.owners.push(GenesisOwners.decode(reader, reader.uint32())); @@ -203,14 +207,14 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - index: isSet(object.index) ? Long.fromValue(object.index) : Long.UZERO, - owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => GenesisOwners.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.index)) obj.index = BigInt(object.index.toString()); + if (Array.isArray(object?.owners)) object.owners.map((e: any) => GenesisOwners.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; - message.index !== undefined && (obj.index = (message.index || Long.UZERO).toString()); + message.index !== undefined && (obj.index = (message.index || BigInt(0)).toString()); if (message.owners) { obj.owners = message.owners.map(e => e ? GenesisOwners.toJSON(e) : undefined); } else { @@ -220,7 +224,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.index = object.index !== undefined && object.index !== null ? Long.fromValue(object.index) : Long.UZERO; + if (object.index !== undefined && object.index !== null) { + message.index = BigInt(object.index.toString()); + } message.owners = object.owners?.map(e => GenesisOwners.fromPartial(e)) || []; return message; }, @@ -242,7 +248,7 @@ export const GenesisState = { }, fromAmino(object: GenesisStateAmino): GenesisState { return { - index: Long.fromString(object.index), + index: BigInt(object.index), owners: Array.isArray(object?.owners) ? object.owners.map((e: any) => GenesisOwners.fromAmino(e)) : [] }; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/genesis.ts index 6680021e65..1e2c3a1bd9 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crisis.v1beta1"; /** GenesisState defines the crisis module's genesis state. */ @@ -38,14 +38,14 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.crisis.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.constantFee !== undefined) { Coin.encode(message.constantFee, writer.uint32(26).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -62,9 +62,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - constantFee: isSet(object.constantFee) ? Coin.fromJSON(object.constantFee) : undefined - }; + const obj = createBaseGenesisState(); + if (isSet(object.constantFee)) obj.constantFee = Coin.fromJSON(object.constantFee); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -73,7 +73,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.constantFee = object.constantFee !== undefined && object.constantFee !== null ? Coin.fromPartial(object.constantFee) : undefined; + if (object.constantFee !== undefined && object.constantFee !== null) { + message.constantFee = Coin.fromPartial(object.constantFee); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { diff --git a/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts index f7d4fc355d..192224e402 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crisis/v1beta1/tx.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crisis.v1beta1"; /** MsgVerifyInvariant represents a message to verify a particular invariance. */ @@ -51,7 +51,7 @@ function createBaseMsgVerifyInvariant(): MsgVerifyInvariant { export const MsgVerifyInvariant = { typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariant", aminoType: "cosmos-sdk/MsgVerifyInvariant", - encode(message: MsgVerifyInvariant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgVerifyInvariant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } @@ -63,8 +63,8 @@ export const MsgVerifyInvariant = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVerifyInvariant { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVerifyInvariant { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVerifyInvariant(); while (reader.pos < end) { @@ -87,11 +87,11 @@ export const MsgVerifyInvariant = { return message; }, fromJSON(object: any): MsgVerifyInvariant { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - invariantModuleName: isSet(object.invariantModuleName) ? String(object.invariantModuleName) : "", - invariantRoute: isSet(object.invariantRoute) ? String(object.invariantRoute) : "" - }; + const obj = createBaseMsgVerifyInvariant(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.invariantModuleName)) obj.invariantModuleName = String(object.invariantModuleName); + if (isSet(object.invariantRoute)) obj.invariantRoute = String(object.invariantRoute); + return obj; }, toJSON(message: MsgVerifyInvariant): unknown { const obj: any = {}; @@ -163,11 +163,11 @@ function createBaseMsgVerifyInvariantResponse(): MsgVerifyInvariantResponse { export const MsgVerifyInvariantResponse = { typeUrl: "/cosmos.crisis.v1beta1.MsgVerifyInvariantResponse", aminoType: "cosmos-sdk/MsgVerifyInvariantResponse", - encode(_: MsgVerifyInvariantResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgVerifyInvariantResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVerifyInvariantResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVerifyInvariantResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVerifyInvariantResponse(); while (reader.pos < end) { @@ -181,7 +181,8 @@ export const MsgVerifyInvariantResponse = { return message; }, fromJSON(_: any): MsgVerifyInvariantResponse { - return {}; + const obj = createBaseMsgVerifyInvariantResponse(); + return obj; }, toJSON(_: MsgVerifyInvariantResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/ed25519/keys.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/ed25519/keys.ts index 0d54cf3d51..889438f25c 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/ed25519/keys.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/ed25519/keys.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crypto.ed25519"; /** @@ -76,14 +76,14 @@ function createBasePubKey(): PubKey { export const PubKey = { typeUrl: "/cosmos.crypto.ed25519.PubKey", aminoType: "cosmos-sdk/PubKey", - encode(message: PubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PubKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PubKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePubKey(); while (reader.pos < end) { @@ -100,9 +100,9 @@ export const PubKey = { return message; }, fromJSON(object: any): PubKey { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array() - }; + const obj = createBasePubKey(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + return obj; }, toJSON(message: PubKey): unknown { const obj: any = {}; @@ -164,14 +164,14 @@ function createBasePrivKey(): PrivKey { export const PrivKey = { typeUrl: "/cosmos.crypto.ed25519.PrivKey", aminoType: "cosmos-sdk/PrivKey", - encode(message: PrivKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PrivKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PrivKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PrivKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePrivKey(); while (reader.pos < end) { @@ -188,9 +188,9 @@ export const PrivKey = { return message; }, fromJSON(object: any): PrivKey { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array() - }; + const obj = createBasePrivKey(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + return obj; }, toJSON(message: PrivKey): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/hd/v1/hd.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/hd/v1/hd.ts index 0dc59c5173..8656f13028 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/hd/v1/hd.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/hd/v1/hd.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.crypto.hd.v1"; /** BIP44Params is used as path field in ledger item in Record. */ @@ -61,7 +61,7 @@ function createBaseBIP44Params(): BIP44Params { export const BIP44Params = { typeUrl: "/cosmos.crypto.hd.v1.BIP44Params", aminoType: "cosmos-sdk/BIP44Params", - encode(message: BIP44Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BIP44Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.purpose !== 0) { writer.uint32(8).uint32(message.purpose); } @@ -79,8 +79,8 @@ export const BIP44Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BIP44Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BIP44Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBIP44Params(); while (reader.pos < end) { @@ -109,13 +109,13 @@ export const BIP44Params = { return message; }, fromJSON(object: any): BIP44Params { - return { - purpose: isSet(object.purpose) ? Number(object.purpose) : 0, - coinType: isSet(object.coinType) ? Number(object.coinType) : 0, - account: isSet(object.account) ? Number(object.account) : 0, - change: isSet(object.change) ? Boolean(object.change) : false, - addressIndex: isSet(object.addressIndex) ? Number(object.addressIndex) : 0 - }; + const obj = createBaseBIP44Params(); + if (isSet(object.purpose)) obj.purpose = Number(object.purpose); + if (isSet(object.coinType)) obj.coinType = Number(object.coinType); + if (isSet(object.account)) obj.account = Number(object.account); + if (isSet(object.change)) obj.change = Boolean(object.change); + if (isSet(object.addressIndex)) obj.addressIndex = Number(object.addressIndex); + return obj; }, toJSON(message: BIP44Params): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/keyring/v1/record.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/keyring/v1/record.ts index 1947c2caa6..23c0d499df 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/keyring/v1/record.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/keyring/v1/record.ts @@ -1,6 +1,6 @@ import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; import { BIP44Params, BIP44ParamsAmino, BIP44ParamsSDKType } from "../../hd/v1/hd"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.crypto.keyring.v1"; /** Record is used for representing a key in the keyring. */ @@ -143,7 +143,7 @@ function createBaseRecord(): Record { export const Record = { typeUrl: "/cosmos.crypto.keyring.v1.Record", aminoType: "cosmos-sdk/Record", - encode(message: Record, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Record, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -164,8 +164,8 @@ export const Record = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Record { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Record { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRecord(); while (reader.pos < end) { @@ -197,14 +197,14 @@ export const Record = { return message; }, fromJSON(object: any): Record { - return { - name: isSet(object.name) ? String(object.name) : "", - pubKey: isSet(object.pubKey) ? Any.fromJSON(object.pubKey) : undefined, - local: isSet(object.local) ? Record_Local.fromJSON(object.local) : undefined, - ledger: isSet(object.ledger) ? Record_Ledger.fromJSON(object.ledger) : undefined, - multi: isSet(object.multi) ? Record_Multi.fromJSON(object.multi) : undefined, - offline: isSet(object.offline) ? Record_Offline.fromJSON(object.offline) : undefined - }; + const obj = createBaseRecord(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.pubKey)) obj.pubKey = Any.fromJSON(object.pubKey); + if (isSet(object.local)) obj.local = Record_Local.fromJSON(object.local); + if (isSet(object.ledger)) obj.ledger = Record_Ledger.fromJSON(object.ledger); + if (isSet(object.multi)) obj.multi = Record_Multi.fromJSON(object.multi); + if (isSet(object.offline)) obj.offline = Record_Offline.fromJSON(object.offline); + return obj; }, toJSON(message: Record): unknown { const obj: any = {}; @@ -219,11 +219,21 @@ export const Record = { fromPartial(object: DeepPartial): Record { const message = createBaseRecord(); message.name = object.name ?? ""; - message.pubKey = object.pubKey !== undefined && object.pubKey !== null ? Any.fromPartial(object.pubKey) : undefined; - message.local = object.local !== undefined && object.local !== null ? Record_Local.fromPartial(object.local) : undefined; - message.ledger = object.ledger !== undefined && object.ledger !== null ? Record_Ledger.fromPartial(object.ledger) : undefined; - message.multi = object.multi !== undefined && object.multi !== null ? Record_Multi.fromPartial(object.multi) : undefined; - message.offline = object.offline !== undefined && object.offline !== null ? Record_Offline.fromPartial(object.offline) : undefined; + if (object.pubKey !== undefined && object.pubKey !== null) { + message.pubKey = Any.fromPartial(object.pubKey); + } + if (object.local !== undefined && object.local !== null) { + message.local = Record_Local.fromPartial(object.local); + } + if (object.ledger !== undefined && object.ledger !== null) { + message.ledger = Record_Ledger.fromPartial(object.ledger); + } + if (object.multi !== undefined && object.multi !== null) { + message.multi = Record_Multi.fromPartial(object.multi); + } + if (object.offline !== undefined && object.offline !== null) { + message.offline = Record_Offline.fromPartial(object.offline); + } return message; }, fromSDK(object: RecordSDKType): Record { @@ -297,7 +307,7 @@ function createBaseRecord_Local(): Record_Local { export const Record_Local = { typeUrl: "/cosmos.crypto.keyring.v1.Local", aminoType: "cosmos-sdk/Local", - encode(message: Record_Local, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Record_Local, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.privKey !== undefined) { Any.encode(message.privKey, writer.uint32(10).fork()).ldelim(); } @@ -306,8 +316,8 @@ export const Record_Local = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Record_Local { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Record_Local { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRecord_Local(); while (reader.pos < end) { @@ -327,10 +337,10 @@ export const Record_Local = { return message; }, fromJSON(object: any): Record_Local { - return { - privKey: isSet(object.privKey) ? Any.fromJSON(object.privKey) : undefined, - privKeyType: isSet(object.privKeyType) ? String(object.privKeyType) : "" - }; + const obj = createBaseRecord_Local(); + if (isSet(object.privKey)) obj.privKey = Any.fromJSON(object.privKey); + if (isSet(object.privKeyType)) obj.privKeyType = String(object.privKeyType); + return obj; }, toJSON(message: Record_Local): unknown { const obj: any = {}; @@ -340,7 +350,9 @@ export const Record_Local = { }, fromPartial(object: DeepPartial): Record_Local { const message = createBaseRecord_Local(); - message.privKey = object.privKey !== undefined && object.privKey !== null ? Any.fromPartial(object.privKey) : undefined; + if (object.privKey !== undefined && object.privKey !== null) { + message.privKey = Any.fromPartial(object.privKey); + } message.privKeyType = object.privKeyType ?? ""; return message; }, @@ -398,14 +410,14 @@ function createBaseRecord_Ledger(): Record_Ledger { export const Record_Ledger = { typeUrl: "/cosmos.crypto.keyring.v1.Ledger", aminoType: "cosmos-sdk/Ledger", - encode(message: Record_Ledger, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Record_Ledger, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.path !== undefined) { BIP44Params.encode(message.path, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Record_Ledger { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Record_Ledger { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRecord_Ledger(); while (reader.pos < end) { @@ -422,9 +434,9 @@ export const Record_Ledger = { return message; }, fromJSON(object: any): Record_Ledger { - return { - path: isSet(object.path) ? BIP44Params.fromJSON(object.path) : undefined - }; + const obj = createBaseRecord_Ledger(); + if (isSet(object.path)) obj.path = BIP44Params.fromJSON(object.path); + return obj; }, toJSON(message: Record_Ledger): unknown { const obj: any = {}; @@ -433,7 +445,9 @@ export const Record_Ledger = { }, fromPartial(object: DeepPartial): Record_Ledger { const message = createBaseRecord_Ledger(); - message.path = object.path !== undefined && object.path !== null ? BIP44Params.fromPartial(object.path) : undefined; + if (object.path !== undefined && object.path !== null) { + message.path = BIP44Params.fromPartial(object.path); + } return message; }, fromSDK(object: Record_LedgerSDKType): Record_Ledger { @@ -484,11 +498,11 @@ function createBaseRecord_Multi(): Record_Multi { export const Record_Multi = { typeUrl: "/cosmos.crypto.keyring.v1.Multi", aminoType: "cosmos-sdk/Multi", - encode(_: Record_Multi, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: Record_Multi, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Record_Multi { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Record_Multi { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRecord_Multi(); while (reader.pos < end) { @@ -502,7 +516,8 @@ export const Record_Multi = { return message; }, fromJSON(_: any): Record_Multi { - return {}; + const obj = createBaseRecord_Multi(); + return obj; }, toJSON(_: Record_Multi): unknown { const obj: any = {}; @@ -554,11 +569,11 @@ function createBaseRecord_Offline(): Record_Offline { export const Record_Offline = { typeUrl: "/cosmos.crypto.keyring.v1.Offline", aminoType: "cosmos-sdk/Offline", - encode(_: Record_Offline, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: Record_Offline, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Record_Offline { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Record_Offline { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRecord_Offline(); while (reader.pos < end) { @@ -572,7 +587,8 @@ export const Record_Offline = { return message; }, fromJSON(_: any): Record_Offline { - return {}; + const obj = createBaseRecord_Offline(); + return obj; }, toJSON(_: Record_Offline): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts index 6c8d6c778e..2a0a194c3b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/keys.ts @@ -1,5 +1,5 @@ import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crypto.multisig"; /** @@ -46,7 +46,7 @@ function createBaseLegacyAminoPubKey(): LegacyAminoPubKey { export const LegacyAminoPubKey = { typeUrl: "/cosmos.crypto.multisig.LegacyAminoPubKey", aminoType: "cosmos-sdk/LegacyAminoPubKey", - encode(message: LegacyAminoPubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LegacyAminoPubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.threshold !== 0) { writer.uint32(8).uint32(message.threshold); } @@ -55,8 +55,8 @@ export const LegacyAminoPubKey = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LegacyAminoPubKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LegacyAminoPubKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLegacyAminoPubKey(); while (reader.pos < end) { @@ -76,10 +76,10 @@ export const LegacyAminoPubKey = { return message; }, fromJSON(object: any): LegacyAminoPubKey { - return { - threshold: isSet(object.threshold) ? Number(object.threshold) : 0, - publicKeys: Array.isArray(object?.publicKeys) ? object.publicKeys.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseLegacyAminoPubKey(); + if (isSet(object.threshold)) obj.threshold = Number(object.threshold); + if (Array.isArray(object?.publicKeys)) object.publicKeys.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: LegacyAminoPubKey): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts index 2e943c8bfd..0294f0a269 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/multisig/v1beta1/multisig.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { bytesFromBase64, base64FromBytes, DeepPartial, isSet } from "../../../../helpers"; export const protobufPackage = "cosmos.crypto.multisig.v1beta1"; /** @@ -79,14 +79,14 @@ function createBaseMultiSignature(): MultiSignature { export const MultiSignature = { typeUrl: "/cosmos.crypto.multisig.v1beta1.MultiSignature", aminoType: "cosmos-sdk/MultiSignature", - encode(message: MultiSignature, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MultiSignature, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signatures) { writer.uint32(10).bytes(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MultiSignature { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MultiSignature { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMultiSignature(); while (reader.pos < end) { @@ -103,9 +103,9 @@ export const MultiSignature = { return message; }, fromJSON(object: any): MultiSignature { - return { - signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseMultiSignature(); + if (Array.isArray(object?.signatures)) object.signatures.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: MultiSignature): unknown { const obj: any = {}; @@ -180,7 +180,7 @@ function createBaseCompactBitArray(): CompactBitArray { export const CompactBitArray = { typeUrl: "/cosmos.crypto.multisig.v1beta1.CompactBitArray", aminoType: "cosmos-sdk/CompactBitArray", - encode(message: CompactBitArray, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CompactBitArray, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.extraBitsStored !== 0) { writer.uint32(8).uint32(message.extraBitsStored); } @@ -189,8 +189,8 @@ export const CompactBitArray = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CompactBitArray { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CompactBitArray { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCompactBitArray(); while (reader.pos < end) { @@ -210,10 +210,10 @@ export const CompactBitArray = { return message; }, fromJSON(object: any): CompactBitArray { - return { - extraBitsStored: isSet(object.extraBitsStored) ? Number(object.extraBitsStored) : 0, - elems: isSet(object.elems) ? bytesFromBase64(object.elems) : new Uint8Array() - }; + const obj = createBaseCompactBitArray(); + if (isSet(object.extraBitsStored)) obj.extraBitsStored = Number(object.extraBitsStored); + if (isSet(object.elems)) obj.elems = bytesFromBase64(object.elems); + return obj; }, toJSON(message: CompactBitArray): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/secp256k1/keys.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/secp256k1/keys.ts index c0a6057d9a..a9bace0f7c 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/secp256k1/keys.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/secp256k1/keys.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crypto.secp256k1"; /** @@ -67,14 +67,14 @@ function createBasePubKey(): PubKey { export const PubKey = { typeUrl: "/cosmos.crypto.secp256k1.PubKey", aminoType: "cosmos-sdk/PubKey", - encode(message: PubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PubKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PubKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePubKey(); while (reader.pos < end) { @@ -91,9 +91,9 @@ export const PubKey = { return message; }, fromJSON(object: any): PubKey { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array() - }; + const obj = createBasePubKey(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + return obj; }, toJSON(message: PubKey): unknown { const obj: any = {}; @@ -155,14 +155,14 @@ function createBasePrivKey(): PrivKey { export const PrivKey = { typeUrl: "/cosmos.crypto.secp256k1.PrivKey", aminoType: "cosmos-sdk/PrivKey", - encode(message: PrivKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PrivKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PrivKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PrivKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePrivKey(); while (reader.pos < end) { @@ -179,9 +179,9 @@ export const PrivKey = { return message; }, fromJSON(object: any): PrivKey { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array() - }; + const obj = createBasePrivKey(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + return obj; }, toJSON(message: PrivKey): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/crypto/secp256r1/keys.ts b/__fixtures__/v-next/outputv2/cosmos/crypto/secp256r1/keys.ts index 1dfe2a886a..3fbc304db0 100644 --- a/__fixtures__/v-next/outputv2/cosmos/crypto/secp256r1/keys.ts +++ b/__fixtures__/v-next/outputv2/cosmos/crypto/secp256r1/keys.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.crypto.secp256r1"; /** PubKey defines a secp256r1 ECDSA public key. */ @@ -59,14 +59,14 @@ function createBasePubKey(): PubKey { export const PubKey = { typeUrl: "/cosmos.crypto.secp256r1.PubKey", aminoType: "cosmos-sdk/PubKey", - encode(message: PubKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PubKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PubKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PubKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePubKey(); while (reader.pos < end) { @@ -83,9 +83,9 @@ export const PubKey = { return message; }, fromJSON(object: any): PubKey { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array() - }; + const obj = createBasePubKey(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + return obj; }, toJSON(message: PubKey): unknown { const obj: any = {}; @@ -147,14 +147,14 @@ function createBasePrivKey(): PrivKey { export const PrivKey = { typeUrl: "/cosmos.crypto.secp256r1.PrivKey", aminoType: "cosmos-sdk/PrivKey", - encode(message: PrivKey, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PrivKey, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.secret.length !== 0) { writer.uint32(10).bytes(message.secret); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PrivKey { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PrivKey { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePrivKey(); while (reader.pos < end) { @@ -171,9 +171,9 @@ export const PrivKey = { return message; }, fromJSON(object: any): PrivKey { - return { - secret: isSet(object.secret) ? bytesFromBase64(object.secret) : new Uint8Array() - }; + const obj = createBasePrivKey(); + if (isSet(object.secret)) obj.secret = bytesFromBase64(object.secret); + return obj; }, toJSON(message: PrivKey): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts index f67d43adf8..6f4f586ded 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/distribution.ts @@ -1,6 +1,7 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType, Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { Decimal } from "@cosmjs/math"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.distribution.v1beta1"; /** Params defines the set of params for the distribution module. */ export interface Params { @@ -100,7 +101,7 @@ export interface ValidatorHistoricalRewardsSDKType { */ export interface ValidatorCurrentRewards { rewards: DecCoin[]; - period: Long; + period: bigint; } export interface ValidatorCurrentRewardsProtoMsg { typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards"; @@ -126,7 +127,7 @@ export interface ValidatorCurrentRewardsAminoMsg { */ export interface ValidatorCurrentRewardsSDKType { rewards: DecCoinSDKType[]; - period: Long; + period: bigint; } /** * ValidatorAccumulatedCommission represents accumulated commission @@ -193,7 +194,7 @@ export interface ValidatorOutstandingRewardsSDKType { * for delegations which are withdrawn after a slash has occurred. */ export interface ValidatorSlashEvent { - validatorPeriod: Long; + validatorPeriod: bigint; fraction: string; } export interface ValidatorSlashEventProtoMsg { @@ -221,7 +222,7 @@ export interface ValidatorSlashEventAminoMsg { * for delegations which are withdrawn after a slash has occurred. */ export interface ValidatorSlashEventSDKType { - validator_period: Long; + validator_period: bigint; fraction: string; } /** ValidatorSlashEvents is a collection of ValidatorSlashEvent messages. */ @@ -314,9 +315,9 @@ export interface CommunityPoolSpendProposalSDKType { * thus sdk.Dec is used. */ export interface DelegatorStartingInfo { - previousPeriod: Long; + previousPeriod: bigint; stake: string; - height: Long; + height: bigint; } export interface DelegatorStartingInfoProtoMsg { typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo"; @@ -348,9 +349,9 @@ export interface DelegatorStartingInfoAminoMsg { * thus sdk.Dec is used. */ export interface DelegatorStartingInfoSDKType { - previous_period: Long; + previous_period: bigint; stake: string; - height: Long; + height: bigint; } /** * DelegationDelegatorReward represents the properties @@ -436,36 +437,36 @@ function createBaseParams(): Params { export const Params = { typeUrl: "/cosmos.distribution.v1beta1.Params", aminoType: "cosmos-sdk/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.communityTax !== "") { - writer.uint32(10).string(message.communityTax); + writer.uint32(10).string(Decimal.fromUserInput(message.communityTax, 18).atomics); } if (message.baseProposerReward !== "") { - writer.uint32(18).string(message.baseProposerReward); + writer.uint32(18).string(Decimal.fromUserInput(message.baseProposerReward, 18).atomics); } if (message.bonusProposerReward !== "") { - writer.uint32(26).string(message.bonusProposerReward); + writer.uint32(26).string(Decimal.fromUserInput(message.bonusProposerReward, 18).atomics); } if (message.withdrawAddrEnabled === true) { writer.uint32(32).bool(message.withdrawAddrEnabled); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.communityTax = reader.string(); + message.communityTax = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 2: - message.baseProposerReward = reader.string(); + message.baseProposerReward = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.bonusProposerReward = reader.string(); + message.bonusProposerReward = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 4: message.withdrawAddrEnabled = reader.bool(); @@ -478,12 +479,12 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - communityTax: isSet(object.communityTax) ? String(object.communityTax) : "", - baseProposerReward: isSet(object.baseProposerReward) ? String(object.baseProposerReward) : "", - bonusProposerReward: isSet(object.bonusProposerReward) ? String(object.bonusProposerReward) : "", - withdrawAddrEnabled: isSet(object.withdrawAddrEnabled) ? Boolean(object.withdrawAddrEnabled) : false - }; + const obj = createBaseParams(); + if (isSet(object.communityTax)) obj.communityTax = String(object.communityTax); + if (isSet(object.baseProposerReward)) obj.baseProposerReward = String(object.baseProposerReward); + if (isSet(object.bonusProposerReward)) obj.bonusProposerReward = String(object.bonusProposerReward); + if (isSet(object.withdrawAddrEnabled)) obj.withdrawAddrEnabled = Boolean(object.withdrawAddrEnabled); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -564,7 +565,7 @@ function createBaseValidatorHistoricalRewards(): ValidatorHistoricalRewards { export const ValidatorHistoricalRewards = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewards", aminoType: "cosmos-sdk/ValidatorHistoricalRewards", - encode(message: ValidatorHistoricalRewards, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorHistoricalRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.cumulativeRewardRatio) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -573,8 +574,8 @@ export const ValidatorHistoricalRewards = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorHistoricalRewards { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorHistoricalRewards { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorHistoricalRewards(); while (reader.pos < end) { @@ -594,10 +595,10 @@ export const ValidatorHistoricalRewards = { return message; }, fromJSON(object: any): ValidatorHistoricalRewards { - return { - cumulativeRewardRatio: Array.isArray(object?.cumulativeRewardRatio) ? object.cumulativeRewardRatio.map((e: any) => DecCoin.fromJSON(e)) : [], - referenceCount: isSet(object.referenceCount) ? Number(object.referenceCount) : 0 - }; + const obj = createBaseValidatorHistoricalRewards(); + if (Array.isArray(object?.cumulativeRewardRatio)) object.cumulativeRewardRatio.map((e: any) => DecCoin.fromJSON(e)); + if (isSet(object.referenceCount)) obj.referenceCount = Number(object.referenceCount); + return obj; }, toJSON(message: ValidatorHistoricalRewards): unknown { const obj: any = {}; @@ -672,23 +673,23 @@ export const ValidatorHistoricalRewards = { function createBaseValidatorCurrentRewards(): ValidatorCurrentRewards { return { rewards: [], - period: Long.UZERO + period: BigInt(0) }; } export const ValidatorCurrentRewards = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewards", aminoType: "cosmos-sdk/ValidatorCurrentRewards", - encode(message: ValidatorCurrentRewards, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorCurrentRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } - if (!message.period.isZero()) { + if (message.period !== BigInt(0)) { writer.uint32(16).uint64(message.period); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorCurrentRewards { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorCurrentRewards { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorCurrentRewards(); while (reader.pos < end) { @@ -698,7 +699,7 @@ export const ValidatorCurrentRewards = { message.rewards.push(DecCoin.decode(reader, reader.uint32())); break; case 2: - message.period = (reader.uint64() as Long); + message.period = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -708,10 +709,10 @@ export const ValidatorCurrentRewards = { return message; }, fromJSON(object: any): ValidatorCurrentRewards { - return { - rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromJSON(e)) : [], - period: isSet(object.period) ? Long.fromValue(object.period) : Long.UZERO - }; + const obj = createBaseValidatorCurrentRewards(); + if (Array.isArray(object?.rewards)) object.rewards.map((e: any) => DecCoin.fromJSON(e)); + if (isSet(object.period)) obj.period = BigInt(object.period.toString()); + return obj; }, toJSON(message: ValidatorCurrentRewards): unknown { const obj: any = {}; @@ -720,13 +721,15 @@ export const ValidatorCurrentRewards = { } else { obj.rewards = []; } - message.period !== undefined && (obj.period = (message.period || Long.UZERO).toString()); + message.period !== undefined && (obj.period = (message.period || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): ValidatorCurrentRewards { const message = createBaseValidatorCurrentRewards(); message.rewards = object.rewards?.map(e => DecCoin.fromPartial(e)) || []; - message.period = object.period !== undefined && object.period !== null ? Long.fromValue(object.period) : Long.UZERO; + if (object.period !== undefined && object.period !== null) { + message.period = BigInt(object.period.toString()); + } return message; }, fromSDK(object: ValidatorCurrentRewardsSDKType): ValidatorCurrentRewards { @@ -748,7 +751,7 @@ export const ValidatorCurrentRewards = { fromAmino(object: ValidatorCurrentRewardsAmino): ValidatorCurrentRewards { return { rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromAmino(e)) : [], - period: Long.fromString(object.period) + period: BigInt(object.period) }; }, toAmino(message: ValidatorCurrentRewards): ValidatorCurrentRewardsAmino { @@ -791,14 +794,14 @@ function createBaseValidatorAccumulatedCommission(): ValidatorAccumulatedCommiss export const ValidatorAccumulatedCommission = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommission", aminoType: "cosmos-sdk/ValidatorAccumulatedCommission", - encode(message: ValidatorAccumulatedCommission, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorAccumulatedCommission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.commission) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorAccumulatedCommission { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorAccumulatedCommission { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorAccumulatedCommission(); while (reader.pos < end) { @@ -815,9 +818,9 @@ export const ValidatorAccumulatedCommission = { return message; }, fromJSON(object: any): ValidatorAccumulatedCommission { - return { - commission: Array.isArray(object?.commission) ? object.commission.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseValidatorAccumulatedCommission(); + if (Array.isArray(object?.commission)) object.commission.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: ValidatorAccumulatedCommission): unknown { const obj: any = {}; @@ -891,14 +894,14 @@ function createBaseValidatorOutstandingRewards(): ValidatorOutstandingRewards { export const ValidatorOutstandingRewards = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewards", aminoType: "cosmos-sdk/ValidatorOutstandingRewards", - encode(message: ValidatorOutstandingRewards, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorOutstandingRewards, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorOutstandingRewards { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorOutstandingRewards { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorOutstandingRewards(); while (reader.pos < end) { @@ -915,9 +918,9 @@ export const ValidatorOutstandingRewards = { return message; }, fromJSON(object: any): ValidatorOutstandingRewards { - return { - rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseValidatorOutstandingRewards(); + if (Array.isArray(object?.rewards)) object.rewards.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: ValidatorOutstandingRewards): unknown { const obj: any = {}; @@ -985,34 +988,34 @@ export const ValidatorOutstandingRewards = { }; function createBaseValidatorSlashEvent(): ValidatorSlashEvent { return { - validatorPeriod: Long.UZERO, + validatorPeriod: BigInt(0), fraction: "" }; } export const ValidatorSlashEvent = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvent", aminoType: "cosmos-sdk/ValidatorSlashEvent", - encode(message: ValidatorSlashEvent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.validatorPeriod.isZero()) { + encode(message: ValidatorSlashEvent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.validatorPeriod !== BigInt(0)) { writer.uint32(8).uint64(message.validatorPeriod); } if (message.fraction !== "") { - writer.uint32(18).string(message.fraction); + writer.uint32(18).string(Decimal.fromUserInput(message.fraction, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSlashEvent { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorSlashEvent { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorSlashEvent(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.validatorPeriod = (reader.uint64() as Long); + message.validatorPeriod = reader.uint64(); break; case 2: - message.fraction = reader.string(); + message.fraction = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -1022,20 +1025,22 @@ export const ValidatorSlashEvent = { return message; }, fromJSON(object: any): ValidatorSlashEvent { - return { - validatorPeriod: isSet(object.validatorPeriod) ? Long.fromValue(object.validatorPeriod) : Long.UZERO, - fraction: isSet(object.fraction) ? String(object.fraction) : "" - }; + const obj = createBaseValidatorSlashEvent(); + if (isSet(object.validatorPeriod)) obj.validatorPeriod = BigInt(object.validatorPeriod.toString()); + if (isSet(object.fraction)) obj.fraction = String(object.fraction); + return obj; }, toJSON(message: ValidatorSlashEvent): unknown { const obj: any = {}; - message.validatorPeriod !== undefined && (obj.validatorPeriod = (message.validatorPeriod || Long.UZERO).toString()); + message.validatorPeriod !== undefined && (obj.validatorPeriod = (message.validatorPeriod || BigInt(0)).toString()); message.fraction !== undefined && (obj.fraction = message.fraction); return obj; }, fromPartial(object: DeepPartial): ValidatorSlashEvent { const message = createBaseValidatorSlashEvent(); - message.validatorPeriod = object.validatorPeriod !== undefined && object.validatorPeriod !== null ? Long.fromValue(object.validatorPeriod) : Long.UZERO; + if (object.validatorPeriod !== undefined && object.validatorPeriod !== null) { + message.validatorPeriod = BigInt(object.validatorPeriod.toString()); + } message.fraction = object.fraction ?? ""; return message; }, @@ -1053,7 +1058,7 @@ export const ValidatorSlashEvent = { }, fromAmino(object: ValidatorSlashEventAmino): ValidatorSlashEvent { return { - validatorPeriod: Long.fromString(object.validator_period), + validatorPeriod: BigInt(object.validator_period), fraction: object.fraction }; }, @@ -1093,14 +1098,14 @@ function createBaseValidatorSlashEvents(): ValidatorSlashEvents { export const ValidatorSlashEvents = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEvents", aminoType: "cosmos-sdk/ValidatorSlashEvents", - encode(message: ValidatorSlashEvents, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorSlashEvents, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validatorSlashEvents) { ValidatorSlashEvent.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSlashEvents { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorSlashEvents { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorSlashEvents(); while (reader.pos < end) { @@ -1117,9 +1122,9 @@ export const ValidatorSlashEvents = { return message; }, fromJSON(object: any): ValidatorSlashEvents { - return { - validatorSlashEvents: Array.isArray(object?.validatorSlashEvents) ? object.validatorSlashEvents.map((e: any) => ValidatorSlashEvent.fromJSON(e)) : [] - }; + const obj = createBaseValidatorSlashEvents(); + if (Array.isArray(object?.validatorSlashEvents)) object.validatorSlashEvents.map((e: any) => ValidatorSlashEvent.fromJSON(e)); + return obj; }, toJSON(message: ValidatorSlashEvents): unknown { const obj: any = {}; @@ -1193,14 +1198,14 @@ function createBaseFeePool(): FeePool { export const FeePool = { typeUrl: "/cosmos.distribution.v1beta1.FeePool", aminoType: "cosmos-sdk/FeePool", - encode(message: FeePool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FeePool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.communityPool) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FeePool { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FeePool { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFeePool(); while (reader.pos < end) { @@ -1217,9 +1222,9 @@ export const FeePool = { return message; }, fromJSON(object: any): FeePool { - return { - communityPool: Array.isArray(object?.communityPool) ? object.communityPool.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseFeePool(); + if (Array.isArray(object?.communityPool)) object.communityPool.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: FeePool): unknown { const obj: any = {}; @@ -1296,7 +1301,7 @@ function createBaseCommunityPoolSpendProposal(): CommunityPoolSpendProposal { export const CommunityPoolSpendProposal = { typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposal", aminoType: "cosmos-sdk/CommunityPoolSpendProposal", - encode(message: CommunityPoolSpendProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CommunityPoolSpendProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1311,8 +1316,8 @@ export const CommunityPoolSpendProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CommunityPoolSpendProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CommunityPoolSpendProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommunityPoolSpendProposal(); while (reader.pos < end) { @@ -1338,12 +1343,12 @@ export const CommunityPoolSpendProposal = { return message; }, fromJSON(object: any): CommunityPoolSpendProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - recipient: isSet(object.recipient) ? String(object.recipient) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseCommunityPoolSpendProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.recipient)) obj.recipient = String(object.recipient); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: CommunityPoolSpendProposal): unknown { const obj: any = {}; @@ -1429,41 +1434,41 @@ export const CommunityPoolSpendProposal = { }; function createBaseDelegatorStartingInfo(): DelegatorStartingInfo { return { - previousPeriod: Long.UZERO, + previousPeriod: BigInt(0), stake: "", - height: Long.UZERO + height: BigInt(0) }; } export const DelegatorStartingInfo = { typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfo", aminoType: "cosmos-sdk/DelegatorStartingInfo", - encode(message: DelegatorStartingInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.previousPeriod.isZero()) { + encode(message: DelegatorStartingInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.previousPeriod !== BigInt(0)) { writer.uint32(8).uint64(message.previousPeriod); } if (message.stake !== "") { - writer.uint32(18).string(message.stake); + writer.uint32(18).string(Decimal.fromUserInput(message.stake, 18).atomics); } - if (!message.height.isZero()) { + if (message.height !== BigInt(0)) { writer.uint32(24).uint64(message.height); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DelegatorStartingInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DelegatorStartingInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelegatorStartingInfo(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.previousPeriod = (reader.uint64() as Long); + message.previousPeriod = reader.uint64(); break; case 2: - message.stake = reader.string(); + message.stake = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.height = (reader.uint64() as Long); + message.height = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1473,24 +1478,28 @@ export const DelegatorStartingInfo = { return message; }, fromJSON(object: any): DelegatorStartingInfo { - return { - previousPeriod: isSet(object.previousPeriod) ? Long.fromValue(object.previousPeriod) : Long.UZERO, - stake: isSet(object.stake) ? String(object.stake) : "", - height: isSet(object.height) ? Long.fromValue(object.height) : Long.UZERO - }; + const obj = createBaseDelegatorStartingInfo(); + if (isSet(object.previousPeriod)) obj.previousPeriod = BigInt(object.previousPeriod.toString()); + if (isSet(object.stake)) obj.stake = String(object.stake); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + return obj; }, toJSON(message: DelegatorStartingInfo): unknown { const obj: any = {}; - message.previousPeriod !== undefined && (obj.previousPeriod = (message.previousPeriod || Long.UZERO).toString()); + message.previousPeriod !== undefined && (obj.previousPeriod = (message.previousPeriod || BigInt(0)).toString()); message.stake !== undefined && (obj.stake = message.stake); - message.height !== undefined && (obj.height = (message.height || Long.UZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): DelegatorStartingInfo { const message = createBaseDelegatorStartingInfo(); - message.previousPeriod = object.previousPeriod !== undefined && object.previousPeriod !== null ? Long.fromValue(object.previousPeriod) : Long.UZERO; + if (object.previousPeriod !== undefined && object.previousPeriod !== null) { + message.previousPeriod = BigInt(object.previousPeriod.toString()); + } message.stake = object.stake ?? ""; - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.UZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } return message; }, fromSDK(object: DelegatorStartingInfoSDKType): DelegatorStartingInfo { @@ -1509,9 +1518,9 @@ export const DelegatorStartingInfo = { }, fromAmino(object: DelegatorStartingInfoAmino): DelegatorStartingInfo { return { - previousPeriod: Long.fromString(object.previous_period), + previousPeriod: BigInt(object.previous_period), stake: object.stake, - height: Long.fromString(object.height) + height: BigInt(object.height) }; }, toAmino(message: DelegatorStartingInfo): DelegatorStartingInfoAmino { @@ -1552,7 +1561,7 @@ function createBaseDelegationDelegatorReward(): DelegationDelegatorReward { export const DelegationDelegatorReward = { typeUrl: "/cosmos.distribution.v1beta1.DelegationDelegatorReward", aminoType: "cosmos-sdk/DelegationDelegatorReward", - encode(message: DelegationDelegatorReward, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DelegationDelegatorReward, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } @@ -1561,8 +1570,8 @@ export const DelegationDelegatorReward = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DelegationDelegatorReward { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DelegationDelegatorReward { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelegationDelegatorReward(); while (reader.pos < end) { @@ -1582,10 +1591,10 @@ export const DelegationDelegatorReward = { return message; }, fromJSON(object: any): DelegationDelegatorReward { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - reward: Array.isArray(object?.reward) ? object.reward.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseDelegationDelegatorReward(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (Array.isArray(object?.reward)) object.reward.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: DelegationDelegatorReward): unknown { const obj: any = {}; @@ -1669,7 +1678,7 @@ function createBaseCommunityPoolSpendProposalWithDeposit(): CommunityPoolSpendPr export const CommunityPoolSpendProposalWithDeposit = { typeUrl: "/cosmos.distribution.v1beta1.CommunityPoolSpendProposalWithDeposit", aminoType: "cosmos-sdk/CommunityPoolSpendProposalWithDeposit", - encode(message: CommunityPoolSpendProposalWithDeposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CommunityPoolSpendProposalWithDeposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1687,8 +1696,8 @@ export const CommunityPoolSpendProposalWithDeposit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CommunityPoolSpendProposalWithDeposit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CommunityPoolSpendProposalWithDeposit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommunityPoolSpendProposalWithDeposit(); while (reader.pos < end) { @@ -1717,13 +1726,13 @@ export const CommunityPoolSpendProposalWithDeposit = { return message; }, fromJSON(object: any): CommunityPoolSpendProposalWithDeposit { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - recipient: isSet(object.recipient) ? String(object.recipient) : "", - amount: isSet(object.amount) ? String(object.amount) : "", - deposit: isSet(object.deposit) ? String(object.deposit) : "" - }; + const obj = createBaseCommunityPoolSpendProposalWithDeposit(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.recipient)) obj.recipient = String(object.recipient); + if (isSet(object.amount)) obj.amount = String(object.amount); + if (isSet(object.deposit)) obj.deposit = String(object.deposit); + return obj; }, toJSON(message: CommunityPoolSpendProposalWithDeposit): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts index 794294949c..6b48299f6a 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/genesis.ts @@ -1,7 +1,7 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../base/v1beta1/coin"; import { ValidatorAccumulatedCommission, ValidatorAccumulatedCommissionAmino, ValidatorAccumulatedCommissionSDKType, ValidatorHistoricalRewards, ValidatorHistoricalRewardsAmino, ValidatorHistoricalRewardsSDKType, ValidatorCurrentRewards, ValidatorCurrentRewardsAmino, ValidatorCurrentRewardsSDKType, DelegatorStartingInfo, DelegatorStartingInfoAmino, DelegatorStartingInfoSDKType, ValidatorSlashEvent, ValidatorSlashEventAmino, ValidatorSlashEventSDKType, Params, ParamsAmino, ParamsSDKType, FeePool, FeePoolAmino, FeePoolSDKType } from "./distribution"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.distribution.v1beta1"; /** * DelegatorWithdrawInfo is the address for where distributions rewards are @@ -113,7 +113,7 @@ export interface ValidatorHistoricalRewardsRecord { /** validator_address is the address of the validator. */ validatorAddress: string; /** period defines the period the historical rewards apply to. */ - period: Long; + period: bigint; /** rewards defines the historical rewards of a validator. */ rewards: ValidatorHistoricalRewards; } @@ -143,7 +143,7 @@ export interface ValidatorHistoricalRewardsRecordAminoMsg { */ export interface ValidatorHistoricalRewardsRecordSDKType { validator_address: string; - period: Long; + period: bigint; rewards: ValidatorHistoricalRewardsSDKType; } /** ValidatorCurrentRewardsRecord is used for import / export via genesis json. */ @@ -210,9 +210,9 @@ export interface ValidatorSlashEventRecord { /** validator_address is the address of the validator. */ validatorAddress: string; /** height defines the block height at which the slash event occured. */ - height: Long; + height: bigint; /** period is the period of the slash event. */ - period: Long; + period: bigint; /** validator_slash_event describes the slash event. */ validatorSlashEvent: ValidatorSlashEvent; } @@ -238,8 +238,8 @@ export interface ValidatorSlashEventRecordAminoMsg { /** ValidatorSlashEventRecord is used for import / export via genesis json. */ export interface ValidatorSlashEventRecordSDKType { validator_address: string; - height: Long; - period: Long; + height: bigint; + period: bigint; validator_slash_event: ValidatorSlashEventSDKType; } /** GenesisState defines the distribution module's genesis state. */ @@ -318,7 +318,7 @@ function createBaseDelegatorWithdrawInfo(): DelegatorWithdrawInfo { export const DelegatorWithdrawInfo = { typeUrl: "/cosmos.distribution.v1beta1.DelegatorWithdrawInfo", aminoType: "cosmos-sdk/DelegatorWithdrawInfo", - encode(message: DelegatorWithdrawInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DelegatorWithdrawInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -327,8 +327,8 @@ export const DelegatorWithdrawInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DelegatorWithdrawInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DelegatorWithdrawInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelegatorWithdrawInfo(); while (reader.pos < end) { @@ -348,10 +348,10 @@ export const DelegatorWithdrawInfo = { return message; }, fromJSON(object: any): DelegatorWithdrawInfo { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - withdrawAddress: isSet(object.withdrawAddress) ? String(object.withdrawAddress) : "" - }; + const obj = createBaseDelegatorWithdrawInfo(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.withdrawAddress)) obj.withdrawAddress = String(object.withdrawAddress); + return obj; }, toJSON(message: DelegatorWithdrawInfo): unknown { const obj: any = {}; @@ -420,7 +420,7 @@ function createBaseValidatorOutstandingRewardsRecord(): ValidatorOutstandingRewa export const ValidatorOutstandingRewardsRecord = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorOutstandingRewardsRecord", aminoType: "cosmos-sdk/ValidatorOutstandingRewardsRecord", - encode(message: ValidatorOutstandingRewardsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorOutstandingRewardsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } @@ -429,8 +429,8 @@ export const ValidatorOutstandingRewardsRecord = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorOutstandingRewardsRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorOutstandingRewardsRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorOutstandingRewardsRecord(); while (reader.pos < end) { @@ -450,10 +450,10 @@ export const ValidatorOutstandingRewardsRecord = { return message; }, fromJSON(object: any): ValidatorOutstandingRewardsRecord { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - outstandingRewards: Array.isArray(object?.outstandingRewards) ? object.outstandingRewards.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseValidatorOutstandingRewardsRecord(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (Array.isArray(object?.outstandingRewards)) object.outstandingRewards.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: ValidatorOutstandingRewardsRecord): unknown { const obj: any = {}; @@ -534,7 +534,7 @@ function createBaseValidatorAccumulatedCommissionRecord(): ValidatorAccumulatedC export const ValidatorAccumulatedCommissionRecord = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorAccumulatedCommissionRecord", aminoType: "cosmos-sdk/ValidatorAccumulatedCommissionRecord", - encode(message: ValidatorAccumulatedCommissionRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorAccumulatedCommissionRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } @@ -543,8 +543,8 @@ export const ValidatorAccumulatedCommissionRecord = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorAccumulatedCommissionRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorAccumulatedCommissionRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorAccumulatedCommissionRecord(); while (reader.pos < end) { @@ -564,10 +564,10 @@ export const ValidatorAccumulatedCommissionRecord = { return message; }, fromJSON(object: any): ValidatorAccumulatedCommissionRecord { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - accumulated: isSet(object.accumulated) ? ValidatorAccumulatedCommission.fromJSON(object.accumulated) : undefined - }; + const obj = createBaseValidatorAccumulatedCommissionRecord(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.accumulated)) obj.accumulated = ValidatorAccumulatedCommission.fromJSON(object.accumulated); + return obj; }, toJSON(message: ValidatorAccumulatedCommissionRecord): unknown { const obj: any = {}; @@ -578,7 +578,9 @@ export const ValidatorAccumulatedCommissionRecord = { fromPartial(object: DeepPartial): ValidatorAccumulatedCommissionRecord { const message = createBaseValidatorAccumulatedCommissionRecord(); message.validatorAddress = object.validatorAddress ?? ""; - message.accumulated = object.accumulated !== undefined && object.accumulated !== null ? ValidatorAccumulatedCommission.fromPartial(object.accumulated) : undefined; + if (object.accumulated !== undefined && object.accumulated !== null) { + message.accumulated = ValidatorAccumulatedCommission.fromPartial(object.accumulated); + } return message; }, fromSDK(object: ValidatorAccumulatedCommissionRecordSDKType): ValidatorAccumulatedCommissionRecord { @@ -630,18 +632,18 @@ export const ValidatorAccumulatedCommissionRecord = { function createBaseValidatorHistoricalRewardsRecord(): ValidatorHistoricalRewardsRecord { return { validatorAddress: "", - period: Long.UZERO, + period: BigInt(0), rewards: ValidatorHistoricalRewards.fromPartial({}) }; } export const ValidatorHistoricalRewardsRecord = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorHistoricalRewardsRecord", aminoType: "cosmos-sdk/ValidatorHistoricalRewardsRecord", - encode(message: ValidatorHistoricalRewardsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorHistoricalRewardsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } - if (!message.period.isZero()) { + if (message.period !== BigInt(0)) { writer.uint32(16).uint64(message.period); } if (message.rewards !== undefined) { @@ -649,8 +651,8 @@ export const ValidatorHistoricalRewardsRecord = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorHistoricalRewardsRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorHistoricalRewardsRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorHistoricalRewardsRecord(); while (reader.pos < end) { @@ -660,7 +662,7 @@ export const ValidatorHistoricalRewardsRecord = { message.validatorAddress = reader.string(); break; case 2: - message.period = (reader.uint64() as Long); + message.period = reader.uint64(); break; case 3: message.rewards = ValidatorHistoricalRewards.decode(reader, reader.uint32()); @@ -673,24 +675,28 @@ export const ValidatorHistoricalRewardsRecord = { return message; }, fromJSON(object: any): ValidatorHistoricalRewardsRecord { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - period: isSet(object.period) ? Long.fromValue(object.period) : Long.UZERO, - rewards: isSet(object.rewards) ? ValidatorHistoricalRewards.fromJSON(object.rewards) : undefined - }; + const obj = createBaseValidatorHistoricalRewardsRecord(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.period)) obj.period = BigInt(object.period.toString()); + if (isSet(object.rewards)) obj.rewards = ValidatorHistoricalRewards.fromJSON(object.rewards); + return obj; }, toJSON(message: ValidatorHistoricalRewardsRecord): unknown { const obj: any = {}; message.validatorAddress !== undefined && (obj.validatorAddress = message.validatorAddress); - message.period !== undefined && (obj.period = (message.period || Long.UZERO).toString()); + message.period !== undefined && (obj.period = (message.period || BigInt(0)).toString()); message.rewards !== undefined && (obj.rewards = message.rewards ? ValidatorHistoricalRewards.toJSON(message.rewards) : undefined); return obj; }, fromPartial(object: DeepPartial): ValidatorHistoricalRewardsRecord { const message = createBaseValidatorHistoricalRewardsRecord(); message.validatorAddress = object.validatorAddress ?? ""; - message.period = object.period !== undefined && object.period !== null ? Long.fromValue(object.period) : Long.UZERO; - message.rewards = object.rewards !== undefined && object.rewards !== null ? ValidatorHistoricalRewards.fromPartial(object.rewards) : undefined; + if (object.period !== undefined && object.period !== null) { + message.period = BigInt(object.period.toString()); + } + if (object.rewards !== undefined && object.rewards !== null) { + message.rewards = ValidatorHistoricalRewards.fromPartial(object.rewards); + } return message; }, fromSDK(object: ValidatorHistoricalRewardsRecordSDKType): ValidatorHistoricalRewardsRecord { @@ -710,7 +716,7 @@ export const ValidatorHistoricalRewardsRecord = { fromAmino(object: ValidatorHistoricalRewardsRecordAmino): ValidatorHistoricalRewardsRecord { return { validatorAddress: object.validator_address, - period: Long.fromString(object.period), + period: BigInt(object.period), rewards: object?.rewards ? ValidatorHistoricalRewards.fromAmino(object.rewards) : undefined }; }, @@ -752,7 +758,7 @@ function createBaseValidatorCurrentRewardsRecord(): ValidatorCurrentRewardsRecor export const ValidatorCurrentRewardsRecord = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorCurrentRewardsRecord", aminoType: "cosmos-sdk/ValidatorCurrentRewardsRecord", - encode(message: ValidatorCurrentRewardsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorCurrentRewardsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } @@ -761,8 +767,8 @@ export const ValidatorCurrentRewardsRecord = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorCurrentRewardsRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorCurrentRewardsRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorCurrentRewardsRecord(); while (reader.pos < end) { @@ -782,10 +788,10 @@ export const ValidatorCurrentRewardsRecord = { return message; }, fromJSON(object: any): ValidatorCurrentRewardsRecord { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - rewards: isSet(object.rewards) ? ValidatorCurrentRewards.fromJSON(object.rewards) : undefined - }; + const obj = createBaseValidatorCurrentRewardsRecord(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.rewards)) obj.rewards = ValidatorCurrentRewards.fromJSON(object.rewards); + return obj; }, toJSON(message: ValidatorCurrentRewardsRecord): unknown { const obj: any = {}; @@ -796,7 +802,9 @@ export const ValidatorCurrentRewardsRecord = { fromPartial(object: DeepPartial): ValidatorCurrentRewardsRecord { const message = createBaseValidatorCurrentRewardsRecord(); message.validatorAddress = object.validatorAddress ?? ""; - message.rewards = object.rewards !== undefined && object.rewards !== null ? ValidatorCurrentRewards.fromPartial(object.rewards) : undefined; + if (object.rewards !== undefined && object.rewards !== null) { + message.rewards = ValidatorCurrentRewards.fromPartial(object.rewards); + } return message; }, fromSDK(object: ValidatorCurrentRewardsRecordSDKType): ValidatorCurrentRewardsRecord { @@ -855,7 +863,7 @@ function createBaseDelegatorStartingInfoRecord(): DelegatorStartingInfoRecord { export const DelegatorStartingInfoRecord = { typeUrl: "/cosmos.distribution.v1beta1.DelegatorStartingInfoRecord", aminoType: "cosmos-sdk/DelegatorStartingInfoRecord", - encode(message: DelegatorStartingInfoRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DelegatorStartingInfoRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -867,8 +875,8 @@ export const DelegatorStartingInfoRecord = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DelegatorStartingInfoRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DelegatorStartingInfoRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelegatorStartingInfoRecord(); while (reader.pos < end) { @@ -891,11 +899,11 @@ export const DelegatorStartingInfoRecord = { return message; }, fromJSON(object: any): DelegatorStartingInfoRecord { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - startingInfo: isSet(object.startingInfo) ? DelegatorStartingInfo.fromJSON(object.startingInfo) : undefined - }; + const obj = createBaseDelegatorStartingInfoRecord(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.startingInfo)) obj.startingInfo = DelegatorStartingInfo.fromJSON(object.startingInfo); + return obj; }, toJSON(message: DelegatorStartingInfoRecord): unknown { const obj: any = {}; @@ -908,7 +916,9 @@ export const DelegatorStartingInfoRecord = { const message = createBaseDelegatorStartingInfoRecord(); message.delegatorAddress = object.delegatorAddress ?? ""; message.validatorAddress = object.validatorAddress ?? ""; - message.startingInfo = object.startingInfo !== undefined && object.startingInfo !== null ? DelegatorStartingInfo.fromPartial(object.startingInfo) : undefined; + if (object.startingInfo !== undefined && object.startingInfo !== null) { + message.startingInfo = DelegatorStartingInfo.fromPartial(object.startingInfo); + } return message; }, fromSDK(object: DelegatorStartingInfoRecordSDKType): DelegatorStartingInfoRecord { @@ -964,22 +974,22 @@ export const DelegatorStartingInfoRecord = { function createBaseValidatorSlashEventRecord(): ValidatorSlashEventRecord { return { validatorAddress: "", - height: Long.UZERO, - period: Long.UZERO, + height: BigInt(0), + period: BigInt(0), validatorSlashEvent: ValidatorSlashEvent.fromPartial({}) }; } export const ValidatorSlashEventRecord = { typeUrl: "/cosmos.distribution.v1beta1.ValidatorSlashEventRecord", aminoType: "cosmos-sdk/ValidatorSlashEventRecord", - encode(message: ValidatorSlashEventRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorSlashEventRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } - if (!message.height.isZero()) { + if (message.height !== BigInt(0)) { writer.uint32(16).uint64(message.height); } - if (!message.period.isZero()) { + if (message.period !== BigInt(0)) { writer.uint32(24).uint64(message.period); } if (message.validatorSlashEvent !== undefined) { @@ -987,8 +997,8 @@ export const ValidatorSlashEventRecord = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSlashEventRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorSlashEventRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorSlashEventRecord(); while (reader.pos < end) { @@ -998,10 +1008,10 @@ export const ValidatorSlashEventRecord = { message.validatorAddress = reader.string(); break; case 2: - message.height = (reader.uint64() as Long); + message.height = reader.uint64(); break; case 3: - message.period = (reader.uint64() as Long); + message.period = reader.uint64(); break; case 4: message.validatorSlashEvent = ValidatorSlashEvent.decode(reader, reader.uint32()); @@ -1014,27 +1024,33 @@ export const ValidatorSlashEventRecord = { return message; }, fromJSON(object: any): ValidatorSlashEventRecord { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - height: isSet(object.height) ? Long.fromValue(object.height) : Long.UZERO, - period: isSet(object.period) ? Long.fromValue(object.period) : Long.UZERO, - validatorSlashEvent: isSet(object.validatorSlashEvent) ? ValidatorSlashEvent.fromJSON(object.validatorSlashEvent) : undefined - }; + const obj = createBaseValidatorSlashEventRecord(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.period)) obj.period = BigInt(object.period.toString()); + if (isSet(object.validatorSlashEvent)) obj.validatorSlashEvent = ValidatorSlashEvent.fromJSON(object.validatorSlashEvent); + return obj; }, toJSON(message: ValidatorSlashEventRecord): unknown { const obj: any = {}; message.validatorAddress !== undefined && (obj.validatorAddress = message.validatorAddress); - message.height !== undefined && (obj.height = (message.height || Long.UZERO).toString()); - message.period !== undefined && (obj.period = (message.period || Long.UZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); + message.period !== undefined && (obj.period = (message.period || BigInt(0)).toString()); message.validatorSlashEvent !== undefined && (obj.validatorSlashEvent = message.validatorSlashEvent ? ValidatorSlashEvent.toJSON(message.validatorSlashEvent) : undefined); return obj; }, fromPartial(object: DeepPartial): ValidatorSlashEventRecord { const message = createBaseValidatorSlashEventRecord(); message.validatorAddress = object.validatorAddress ?? ""; - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.UZERO; - message.period = object.period !== undefined && object.period !== null ? Long.fromValue(object.period) : Long.UZERO; - message.validatorSlashEvent = object.validatorSlashEvent !== undefined && object.validatorSlashEvent !== null ? ValidatorSlashEvent.fromPartial(object.validatorSlashEvent) : undefined; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } + if (object.period !== undefined && object.period !== null) { + message.period = BigInt(object.period.toString()); + } + if (object.validatorSlashEvent !== undefined && object.validatorSlashEvent !== null) { + message.validatorSlashEvent = ValidatorSlashEvent.fromPartial(object.validatorSlashEvent); + } return message; }, fromSDK(object: ValidatorSlashEventRecordSDKType): ValidatorSlashEventRecord { @@ -1056,8 +1072,8 @@ export const ValidatorSlashEventRecord = { fromAmino(object: ValidatorSlashEventRecordAmino): ValidatorSlashEventRecord { return { validatorAddress: object.validator_address, - height: Long.fromString(object.height), - period: Long.fromString(object.period), + height: BigInt(object.height), + period: BigInt(object.period), validatorSlashEvent: object?.validator_slash_event ? ValidatorSlashEvent.fromAmino(object.validator_slash_event) : undefined }; }, @@ -1108,7 +1124,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.distribution.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -1141,8 +1157,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -1186,18 +1202,18 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - feePool: isSet(object.feePool) ? FeePool.fromJSON(object.feePool) : undefined, - delegatorWithdrawInfos: Array.isArray(object?.delegatorWithdrawInfos) ? object.delegatorWithdrawInfos.map((e: any) => DelegatorWithdrawInfo.fromJSON(e)) : [], - previousProposer: isSet(object.previousProposer) ? String(object.previousProposer) : "", - outstandingRewards: Array.isArray(object?.outstandingRewards) ? object.outstandingRewards.map((e: any) => ValidatorOutstandingRewardsRecord.fromJSON(e)) : [], - validatorAccumulatedCommissions: Array.isArray(object?.validatorAccumulatedCommissions) ? object.validatorAccumulatedCommissions.map((e: any) => ValidatorAccumulatedCommissionRecord.fromJSON(e)) : [], - validatorHistoricalRewards: Array.isArray(object?.validatorHistoricalRewards) ? object.validatorHistoricalRewards.map((e: any) => ValidatorHistoricalRewardsRecord.fromJSON(e)) : [], - validatorCurrentRewards: Array.isArray(object?.validatorCurrentRewards) ? object.validatorCurrentRewards.map((e: any) => ValidatorCurrentRewardsRecord.fromJSON(e)) : [], - delegatorStartingInfos: Array.isArray(object?.delegatorStartingInfos) ? object.delegatorStartingInfos.map((e: any) => DelegatorStartingInfoRecord.fromJSON(e)) : [], - validatorSlashEvents: Array.isArray(object?.validatorSlashEvents) ? object.validatorSlashEvents.map((e: any) => ValidatorSlashEventRecord.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (isSet(object.feePool)) obj.feePool = FeePool.fromJSON(object.feePool); + if (Array.isArray(object?.delegatorWithdrawInfos)) object.delegatorWithdrawInfos.map((e: any) => DelegatorWithdrawInfo.fromJSON(e)); + if (isSet(object.previousProposer)) obj.previousProposer = String(object.previousProposer); + if (Array.isArray(object?.outstandingRewards)) object.outstandingRewards.map((e: any) => ValidatorOutstandingRewardsRecord.fromJSON(e)); + if (Array.isArray(object?.validatorAccumulatedCommissions)) object.validatorAccumulatedCommissions.map((e: any) => ValidatorAccumulatedCommissionRecord.fromJSON(e)); + if (Array.isArray(object?.validatorHistoricalRewards)) object.validatorHistoricalRewards.map((e: any) => ValidatorHistoricalRewardsRecord.fromJSON(e)); + if (Array.isArray(object?.validatorCurrentRewards)) object.validatorCurrentRewards.map((e: any) => ValidatorCurrentRewardsRecord.fromJSON(e)); + if (Array.isArray(object?.delegatorStartingInfos)) object.delegatorStartingInfos.map((e: any) => DelegatorStartingInfoRecord.fromJSON(e)); + if (Array.isArray(object?.validatorSlashEvents)) object.validatorSlashEvents.map((e: any) => ValidatorSlashEventRecord.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -1243,8 +1259,12 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; - message.feePool = object.feePool !== undefined && object.feePool !== null ? FeePool.fromPartial(object.feePool) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } + if (object.feePool !== undefined && object.feePool !== null) { + message.feePool = FeePool.fromPartial(object.feePool); + } message.delegatorWithdrawInfos = object.delegatorWithdrawInfos?.map(e => DelegatorWithdrawInfo.fromPartial(e)) || []; message.previousProposer = object.previousProposer ?? ""; message.outstandingRewards = object.outstandingRewards?.map(e => ValidatorOutstandingRewardsRecord.fromPartial(e)) || []; diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts index ecc48ebb31..ad5f704003 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/query.ts @@ -1,8 +1,8 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Params, ParamsAmino, ParamsSDKType, ValidatorOutstandingRewards, ValidatorOutstandingRewardsAmino, ValidatorOutstandingRewardsSDKType, ValidatorAccumulatedCommission, ValidatorAccumulatedCommissionAmino, ValidatorAccumulatedCommissionSDKType, ValidatorSlashEvent, ValidatorSlashEventAmino, ValidatorSlashEventSDKType, DelegationDelegatorReward, DelegationDelegatorRewardAmino, DelegationDelegatorRewardSDKType } from "./distribution"; import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../base/v1beta1/coin"; -import { Long, DeepPartial, isSet } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "cosmos.distribution.v1beta1"; /** QueryParamsRequest is the request type for the Query/Params RPC method. */ export interface QueryParamsRequest {} @@ -170,9 +170,9 @@ export interface QueryValidatorSlashesRequest { /** validator_address defines the validator address to query for. */ validatorAddress: string; /** starting_height defines the optional starting height to query the slashes. */ - startingHeight: Long; + startingHeight: bigint; /** starting_height defines the optional ending height to query the slashes. */ - endingHeight: Long; + endingHeight: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -204,8 +204,8 @@ export interface QueryValidatorSlashesRequestAminoMsg { */ export interface QueryValidatorSlashesRequestSDKType { validator_address: string; - starting_height: Long; - ending_height: Long; + starting_height: bigint; + ending_height: bigint; pagination: PageRequestSDKType; } /** @@ -562,11 +562,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -580,7 +580,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -634,14 +635,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -658,9 +659,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -669,7 +670,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -722,14 +725,14 @@ function createBaseQueryValidatorOutstandingRewardsRequest(): QueryValidatorOuts export const QueryValidatorOutstandingRewardsRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsRequest", aminoType: "cosmos-sdk/QueryValidatorOutstandingRewardsRequest", - encode(message: QueryValidatorOutstandingRewardsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorOutstandingRewardsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorOutstandingRewardsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorOutstandingRewardsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorOutstandingRewardsRequest(); while (reader.pos < end) { @@ -746,9 +749,9 @@ export const QueryValidatorOutstandingRewardsRequest = { return message; }, fromJSON(object: any): QueryValidatorOutstandingRewardsRequest { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "" - }; + const obj = createBaseQueryValidatorOutstandingRewardsRequest(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + return obj; }, toJSON(message: QueryValidatorOutstandingRewardsRequest): unknown { const obj: any = {}; @@ -810,14 +813,14 @@ function createBaseQueryValidatorOutstandingRewardsResponse(): QueryValidatorOut export const QueryValidatorOutstandingRewardsResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorOutstandingRewardsResponse", aminoType: "cosmos-sdk/QueryValidatorOutstandingRewardsResponse", - encode(message: QueryValidatorOutstandingRewardsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorOutstandingRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rewards !== undefined) { ValidatorOutstandingRewards.encode(message.rewards, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorOutstandingRewardsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorOutstandingRewardsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorOutstandingRewardsResponse(); while (reader.pos < end) { @@ -834,9 +837,9 @@ export const QueryValidatorOutstandingRewardsResponse = { return message; }, fromJSON(object: any): QueryValidatorOutstandingRewardsResponse { - return { - rewards: isSet(object.rewards) ? ValidatorOutstandingRewards.fromJSON(object.rewards) : undefined - }; + const obj = createBaseQueryValidatorOutstandingRewardsResponse(); + if (isSet(object.rewards)) obj.rewards = ValidatorOutstandingRewards.fromJSON(object.rewards); + return obj; }, toJSON(message: QueryValidatorOutstandingRewardsResponse): unknown { const obj: any = {}; @@ -845,7 +848,9 @@ export const QueryValidatorOutstandingRewardsResponse = { }, fromPartial(object: DeepPartial): QueryValidatorOutstandingRewardsResponse { const message = createBaseQueryValidatorOutstandingRewardsResponse(); - message.rewards = object.rewards !== undefined && object.rewards !== null ? ValidatorOutstandingRewards.fromPartial(object.rewards) : undefined; + if (object.rewards !== undefined && object.rewards !== null) { + message.rewards = ValidatorOutstandingRewards.fromPartial(object.rewards); + } return message; }, fromSDK(object: QueryValidatorOutstandingRewardsResponseSDKType): QueryValidatorOutstandingRewardsResponse { @@ -898,14 +903,14 @@ function createBaseQueryValidatorCommissionRequest(): QueryValidatorCommissionRe export const QueryValidatorCommissionRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionRequest", aminoType: "cosmos-sdk/QueryValidatorCommissionRequest", - encode(message: QueryValidatorCommissionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorCommissionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorCommissionRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorCommissionRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorCommissionRequest(); while (reader.pos < end) { @@ -922,9 +927,9 @@ export const QueryValidatorCommissionRequest = { return message; }, fromJSON(object: any): QueryValidatorCommissionRequest { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "" - }; + const obj = createBaseQueryValidatorCommissionRequest(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + return obj; }, toJSON(message: QueryValidatorCommissionRequest): unknown { const obj: any = {}; @@ -986,14 +991,14 @@ function createBaseQueryValidatorCommissionResponse(): QueryValidatorCommissionR export const QueryValidatorCommissionResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorCommissionResponse", aminoType: "cosmos-sdk/QueryValidatorCommissionResponse", - encode(message: QueryValidatorCommissionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorCommissionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.commission !== undefined) { ValidatorAccumulatedCommission.encode(message.commission, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorCommissionResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorCommissionResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorCommissionResponse(); while (reader.pos < end) { @@ -1010,9 +1015,9 @@ export const QueryValidatorCommissionResponse = { return message; }, fromJSON(object: any): QueryValidatorCommissionResponse { - return { - commission: isSet(object.commission) ? ValidatorAccumulatedCommission.fromJSON(object.commission) : undefined - }; + const obj = createBaseQueryValidatorCommissionResponse(); + if (isSet(object.commission)) obj.commission = ValidatorAccumulatedCommission.fromJSON(object.commission); + return obj; }, toJSON(message: QueryValidatorCommissionResponse): unknown { const obj: any = {}; @@ -1021,7 +1026,9 @@ export const QueryValidatorCommissionResponse = { }, fromPartial(object: DeepPartial): QueryValidatorCommissionResponse { const message = createBaseQueryValidatorCommissionResponse(); - message.commission = object.commission !== undefined && object.commission !== null ? ValidatorAccumulatedCommission.fromPartial(object.commission) : undefined; + if (object.commission !== undefined && object.commission !== null) { + message.commission = ValidatorAccumulatedCommission.fromPartial(object.commission); + } return message; }, fromSDK(object: QueryValidatorCommissionResponseSDKType): QueryValidatorCommissionResponse { @@ -1069,22 +1076,22 @@ export const QueryValidatorCommissionResponse = { function createBaseQueryValidatorSlashesRequest(): QueryValidatorSlashesRequest { return { validatorAddress: "", - startingHeight: Long.UZERO, - endingHeight: Long.UZERO, + startingHeight: BigInt(0), + endingHeight: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryValidatorSlashesRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesRequest", aminoType: "cosmos-sdk/QueryValidatorSlashesRequest", - encode(message: QueryValidatorSlashesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorSlashesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } - if (!message.startingHeight.isZero()) { + if (message.startingHeight !== BigInt(0)) { writer.uint32(16).uint64(message.startingHeight); } - if (!message.endingHeight.isZero()) { + if (message.endingHeight !== BigInt(0)) { writer.uint32(24).uint64(message.endingHeight); } if (message.pagination !== undefined) { @@ -1092,8 +1099,8 @@ export const QueryValidatorSlashesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorSlashesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorSlashesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorSlashesRequest(); while (reader.pos < end) { @@ -1103,10 +1110,10 @@ export const QueryValidatorSlashesRequest = { message.validatorAddress = reader.string(); break; case 2: - message.startingHeight = (reader.uint64() as Long); + message.startingHeight = reader.uint64(); break; case 3: - message.endingHeight = (reader.uint64() as Long); + message.endingHeight = reader.uint64(); break; case 4: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1119,27 +1126,33 @@ export const QueryValidatorSlashesRequest = { return message; }, fromJSON(object: any): QueryValidatorSlashesRequest { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - startingHeight: isSet(object.startingHeight) ? Long.fromValue(object.startingHeight) : Long.UZERO, - endingHeight: isSet(object.endingHeight) ? Long.fromValue(object.endingHeight) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorSlashesRequest(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.startingHeight)) obj.startingHeight = BigInt(object.startingHeight.toString()); + if (isSet(object.endingHeight)) obj.endingHeight = BigInt(object.endingHeight.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorSlashesRequest): unknown { const obj: any = {}; message.validatorAddress !== undefined && (obj.validatorAddress = message.validatorAddress); - message.startingHeight !== undefined && (obj.startingHeight = (message.startingHeight || Long.UZERO).toString()); - message.endingHeight !== undefined && (obj.endingHeight = (message.endingHeight || Long.UZERO).toString()); + message.startingHeight !== undefined && (obj.startingHeight = (message.startingHeight || BigInt(0)).toString()); + message.endingHeight !== undefined && (obj.endingHeight = (message.endingHeight || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryValidatorSlashesRequest { const message = createBaseQueryValidatorSlashesRequest(); message.validatorAddress = object.validatorAddress ?? ""; - message.startingHeight = object.startingHeight !== undefined && object.startingHeight !== null ? Long.fromValue(object.startingHeight) : Long.UZERO; - message.endingHeight = object.endingHeight !== undefined && object.endingHeight !== null ? Long.fromValue(object.endingHeight) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.startingHeight !== undefined && object.startingHeight !== null) { + message.startingHeight = BigInt(object.startingHeight.toString()); + } + if (object.endingHeight !== undefined && object.endingHeight !== null) { + message.endingHeight = BigInt(object.endingHeight.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorSlashesRequestSDKType): QueryValidatorSlashesRequest { @@ -1161,8 +1174,8 @@ export const QueryValidatorSlashesRequest = { fromAmino(object: QueryValidatorSlashesRequestAmino): QueryValidatorSlashesRequest { return { validatorAddress: object.validator_address, - startingHeight: Long.fromString(object.starting_height), - endingHeight: Long.fromString(object.ending_height), + startingHeight: BigInt(object.starting_height), + endingHeight: BigInt(object.ending_height), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1205,7 +1218,7 @@ function createBaseQueryValidatorSlashesResponse(): QueryValidatorSlashesRespons export const QueryValidatorSlashesResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryValidatorSlashesResponse", aminoType: "cosmos-sdk/QueryValidatorSlashesResponse", - encode(message: QueryValidatorSlashesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorSlashesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.slashes) { ValidatorSlashEvent.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1214,8 +1227,8 @@ export const QueryValidatorSlashesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorSlashesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorSlashesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorSlashesResponse(); while (reader.pos < end) { @@ -1235,10 +1248,10 @@ export const QueryValidatorSlashesResponse = { return message; }, fromJSON(object: any): QueryValidatorSlashesResponse { - return { - slashes: Array.isArray(object?.slashes) ? object.slashes.map((e: any) => ValidatorSlashEvent.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorSlashesResponse(); + if (Array.isArray(object?.slashes)) object.slashes.map((e: any) => ValidatorSlashEvent.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorSlashesResponse): unknown { const obj: any = {}; @@ -1253,7 +1266,9 @@ export const QueryValidatorSlashesResponse = { fromPartial(object: DeepPartial): QueryValidatorSlashesResponse { const message = createBaseQueryValidatorSlashesResponse(); message.slashes = object.slashes?.map(e => ValidatorSlashEvent.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorSlashesResponseSDKType): QueryValidatorSlashesResponse { @@ -1319,7 +1334,7 @@ function createBaseQueryDelegationRewardsRequest(): QueryDelegationRewardsReques export const QueryDelegationRewardsRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsRequest", aminoType: "cosmos-sdk/QueryDelegationRewardsRequest", - encode(message: QueryDelegationRewardsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegationRewardsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -1328,8 +1343,8 @@ export const QueryDelegationRewardsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationRewardsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegationRewardsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegationRewardsRequest(); while (reader.pos < end) { @@ -1349,10 +1364,10 @@ export const QueryDelegationRewardsRequest = { return message; }, fromJSON(object: any): QueryDelegationRewardsRequest { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "" - }; + const obj = createBaseQueryDelegationRewardsRequest(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + return obj; }, toJSON(message: QueryDelegationRewardsRequest): unknown { const obj: any = {}; @@ -1420,14 +1435,14 @@ function createBaseQueryDelegationRewardsResponse(): QueryDelegationRewardsRespo export const QueryDelegationRewardsResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationRewardsResponse", aminoType: "cosmos-sdk/QueryDelegationRewardsResponse", - encode(message: QueryDelegationRewardsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegationRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationRewardsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegationRewardsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegationRewardsResponse(); while (reader.pos < end) { @@ -1444,9 +1459,9 @@ export const QueryDelegationRewardsResponse = { return message; }, fromJSON(object: any): QueryDelegationRewardsResponse { - return { - rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseQueryDelegationRewardsResponse(); + if (Array.isArray(object?.rewards)) object.rewards.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: QueryDelegationRewardsResponse): unknown { const obj: any = {}; @@ -1520,14 +1535,14 @@ function createBaseQueryDelegationTotalRewardsRequest(): QueryDelegationTotalRew export const QueryDelegationTotalRewardsRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsRequest", aminoType: "cosmos-sdk/QueryDelegationTotalRewardsRequest", - encode(message: QueryDelegationTotalRewardsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegationTotalRewardsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationTotalRewardsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegationTotalRewardsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegationTotalRewardsRequest(); while (reader.pos < end) { @@ -1544,9 +1559,9 @@ export const QueryDelegationTotalRewardsRequest = { return message; }, fromJSON(object: any): QueryDelegationTotalRewardsRequest { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "" - }; + const obj = createBaseQueryDelegationTotalRewardsRequest(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + return obj; }, toJSON(message: QueryDelegationTotalRewardsRequest): unknown { const obj: any = {}; @@ -1609,7 +1624,7 @@ function createBaseQueryDelegationTotalRewardsResponse(): QueryDelegationTotalRe export const QueryDelegationTotalRewardsResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegationTotalRewardsResponse", aminoType: "cosmos-sdk/QueryDelegationTotalRewardsResponse", - encode(message: QueryDelegationTotalRewardsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegationTotalRewardsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rewards) { DelegationDelegatorReward.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1618,8 +1633,8 @@ export const QueryDelegationTotalRewardsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationTotalRewardsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegationTotalRewardsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegationTotalRewardsResponse(); while (reader.pos < end) { @@ -1639,10 +1654,10 @@ export const QueryDelegationTotalRewardsResponse = { return message; }, fromJSON(object: any): QueryDelegationTotalRewardsResponse { - return { - rewards: Array.isArray(object?.rewards) ? object.rewards.map((e: any) => DelegationDelegatorReward.fromJSON(e)) : [], - total: Array.isArray(object?.total) ? object.total.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseQueryDelegationTotalRewardsResponse(); + if (Array.isArray(object?.rewards)) object.rewards.map((e: any) => DelegationDelegatorReward.fromJSON(e)); + if (Array.isArray(object?.total)) object.total.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: QueryDelegationTotalRewardsResponse): unknown { const obj: any = {}; @@ -1734,14 +1749,14 @@ function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRe export const QueryDelegatorValidatorsRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsRequest", aminoType: "cosmos-sdk/QueryDelegatorValidatorsRequest", - encode(message: QueryDelegatorValidatorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorValidatorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorValidatorsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorValidatorsRequest(); while (reader.pos < end) { @@ -1758,9 +1773,9 @@ export const QueryDelegatorValidatorsRequest = { return message; }, fromJSON(object: any): QueryDelegatorValidatorsRequest { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "" - }; + const obj = createBaseQueryDelegatorValidatorsRequest(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + return obj; }, toJSON(message: QueryDelegatorValidatorsRequest): unknown { const obj: any = {}; @@ -1822,14 +1837,14 @@ function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsR export const QueryDelegatorValidatorsResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorValidatorsResponse", aminoType: "cosmos-sdk/QueryDelegatorValidatorsResponse", - encode(message: QueryDelegatorValidatorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorValidatorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorValidatorsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorValidatorsResponse(); while (reader.pos < end) { @@ -1846,9 +1861,9 @@ export const QueryDelegatorValidatorsResponse = { return message; }, fromJSON(object: any): QueryDelegatorValidatorsResponse { - return { - validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => String(e)) : [] - }; + const obj = createBaseQueryDelegatorValidatorsResponse(); + if (Array.isArray(object?.validators)) object.validators.map((e: any) => String(e)); + return obj; }, toJSON(message: QueryDelegatorValidatorsResponse): unknown { const obj: any = {}; @@ -1922,14 +1937,14 @@ function createBaseQueryDelegatorWithdrawAddressRequest(): QueryDelegatorWithdra export const QueryDelegatorWithdrawAddressRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressRequest", aminoType: "cosmos-sdk/QueryDelegatorWithdrawAddressRequest", - encode(message: QueryDelegatorWithdrawAddressRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorWithdrawAddressRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorWithdrawAddressRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorWithdrawAddressRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorWithdrawAddressRequest(); while (reader.pos < end) { @@ -1946,9 +1961,9 @@ export const QueryDelegatorWithdrawAddressRequest = { return message; }, fromJSON(object: any): QueryDelegatorWithdrawAddressRequest { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "" - }; + const obj = createBaseQueryDelegatorWithdrawAddressRequest(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + return obj; }, toJSON(message: QueryDelegatorWithdrawAddressRequest): unknown { const obj: any = {}; @@ -2010,14 +2025,14 @@ function createBaseQueryDelegatorWithdrawAddressResponse(): QueryDelegatorWithdr export const QueryDelegatorWithdrawAddressResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryDelegatorWithdrawAddressResponse", aminoType: "cosmos-sdk/QueryDelegatorWithdrawAddressResponse", - encode(message: QueryDelegatorWithdrawAddressResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorWithdrawAddressResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.withdrawAddress !== "") { writer.uint32(10).string(message.withdrawAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorWithdrawAddressResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorWithdrawAddressResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorWithdrawAddressResponse(); while (reader.pos < end) { @@ -2034,9 +2049,9 @@ export const QueryDelegatorWithdrawAddressResponse = { return message; }, fromJSON(object: any): QueryDelegatorWithdrawAddressResponse { - return { - withdrawAddress: isSet(object.withdrawAddress) ? String(object.withdrawAddress) : "" - }; + const obj = createBaseQueryDelegatorWithdrawAddressResponse(); + if (isSet(object.withdrawAddress)) obj.withdrawAddress = String(object.withdrawAddress); + return obj; }, toJSON(message: QueryDelegatorWithdrawAddressResponse): unknown { const obj: any = {}; @@ -2096,11 +2111,11 @@ function createBaseQueryCommunityPoolRequest(): QueryCommunityPoolRequest { export const QueryCommunityPoolRequest = { typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolRequest", aminoType: "cosmos-sdk/QueryCommunityPoolRequest", - encode(_: QueryCommunityPoolRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryCommunityPoolRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCommunityPoolRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCommunityPoolRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCommunityPoolRequest(); while (reader.pos < end) { @@ -2114,7 +2129,8 @@ export const QueryCommunityPoolRequest = { return message; }, fromJSON(_: any): QueryCommunityPoolRequest { - return {}; + const obj = createBaseQueryCommunityPoolRequest(); + return obj; }, toJSON(_: QueryCommunityPoolRequest): unknown { const obj: any = {}; @@ -2168,14 +2184,14 @@ function createBaseQueryCommunityPoolResponse(): QueryCommunityPoolResponse { export const QueryCommunityPoolResponse = { typeUrl: "/cosmos.distribution.v1beta1.QueryCommunityPoolResponse", aminoType: "cosmos-sdk/QueryCommunityPoolResponse", - encode(message: QueryCommunityPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCommunityPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pool) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCommunityPoolResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCommunityPoolResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCommunityPoolResponse(); while (reader.pos < end) { @@ -2192,9 +2208,9 @@ export const QueryCommunityPoolResponse = { return message; }, fromJSON(object: any): QueryCommunityPoolResponse { - return { - pool: Array.isArray(object?.pool) ? object.pool.map((e: any) => DecCoin.fromJSON(e)) : [] - }; + const obj = createBaseQueryCommunityPoolResponse(); + if (Array.isArray(object?.pool)) object.pool.map((e: any) => DecCoin.fromJSON(e)); + return obj; }, toJSON(message: QueryCommunityPoolResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts index 58b187df3f..11e2d13b02 100644 --- a/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/distribution/v1beta1/tx.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.distribution.v1beta1"; /** @@ -204,7 +204,7 @@ function createBaseMsgSetWithdrawAddress(): MsgSetWithdrawAddress { export const MsgSetWithdrawAddress = { typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddress", aminoType: "cosmos-sdk/MsgModifyWithdrawAddress", - encode(message: MsgSetWithdrawAddress, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSetWithdrawAddress, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -213,8 +213,8 @@ export const MsgSetWithdrawAddress = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSetWithdrawAddress { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetWithdrawAddress { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSetWithdrawAddress(); while (reader.pos < end) { @@ -234,10 +234,10 @@ export const MsgSetWithdrawAddress = { return message; }, fromJSON(object: any): MsgSetWithdrawAddress { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - withdrawAddress: isSet(object.withdrawAddress) ? String(object.withdrawAddress) : "" - }; + const obj = createBaseMsgSetWithdrawAddress(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.withdrawAddress)) obj.withdrawAddress = String(object.withdrawAddress); + return obj; }, toJSON(message: MsgSetWithdrawAddress): unknown { const obj: any = {}; @@ -303,11 +303,11 @@ function createBaseMsgSetWithdrawAddressResponse(): MsgSetWithdrawAddressRespons export const MsgSetWithdrawAddressResponse = { typeUrl: "/cosmos.distribution.v1beta1.MsgSetWithdrawAddressResponse", aminoType: "cosmos-sdk/MsgSetWithdrawAddressResponse", - encode(_: MsgSetWithdrawAddressResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgSetWithdrawAddressResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSetWithdrawAddressResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSetWithdrawAddressResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSetWithdrawAddressResponse(); while (reader.pos < end) { @@ -321,7 +321,8 @@ export const MsgSetWithdrawAddressResponse = { return message; }, fromJSON(_: any): MsgSetWithdrawAddressResponse { - return {}; + const obj = createBaseMsgSetWithdrawAddressResponse(); + return obj; }, toJSON(_: MsgSetWithdrawAddressResponse): unknown { const obj: any = {}; @@ -376,7 +377,7 @@ function createBaseMsgWithdrawDelegatorReward(): MsgWithdrawDelegatorReward { export const MsgWithdrawDelegatorReward = { typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward", aminoType: "cosmos-sdk/MsgWithdrawDelegationReward", - encode(message: MsgWithdrawDelegatorReward, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgWithdrawDelegatorReward, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -385,8 +386,8 @@ export const MsgWithdrawDelegatorReward = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawDelegatorReward { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawDelegatorReward { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawDelegatorReward(); while (reader.pos < end) { @@ -406,10 +407,10 @@ export const MsgWithdrawDelegatorReward = { return message; }, fromJSON(object: any): MsgWithdrawDelegatorReward { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "" - }; + const obj = createBaseMsgWithdrawDelegatorReward(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + return obj; }, toJSON(message: MsgWithdrawDelegatorReward): unknown { const obj: any = {}; @@ -477,14 +478,14 @@ function createBaseMsgWithdrawDelegatorRewardResponse(): MsgWithdrawDelegatorRew export const MsgWithdrawDelegatorRewardResponse = { typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawDelegatorRewardResponse", aminoType: "cosmos-sdk/MsgWithdrawDelegatorRewardResponse", - encode(message: MsgWithdrawDelegatorRewardResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgWithdrawDelegatorRewardResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawDelegatorRewardResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawDelegatorRewardResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawDelegatorRewardResponse(); while (reader.pos < end) { @@ -501,9 +502,9 @@ export const MsgWithdrawDelegatorRewardResponse = { return message; }, fromJSON(object: any): MsgWithdrawDelegatorRewardResponse { - return { - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgWithdrawDelegatorRewardResponse(); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgWithdrawDelegatorRewardResponse): unknown { const obj: any = {}; @@ -577,14 +578,14 @@ function createBaseMsgWithdrawValidatorCommission(): MsgWithdrawValidatorCommiss export const MsgWithdrawValidatorCommission = { typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommission", aminoType: "cosmos-sdk/MsgWithdrawValidatorCommission", - encode(message: MsgWithdrawValidatorCommission, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgWithdrawValidatorCommission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddress !== "") { writer.uint32(10).string(message.validatorAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawValidatorCommission { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawValidatorCommission { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawValidatorCommission(); while (reader.pos < end) { @@ -601,9 +602,9 @@ export const MsgWithdrawValidatorCommission = { return message; }, fromJSON(object: any): MsgWithdrawValidatorCommission { - return { - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "" - }; + const obj = createBaseMsgWithdrawValidatorCommission(); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + return obj; }, toJSON(message: MsgWithdrawValidatorCommission): unknown { const obj: any = {}; @@ -665,14 +666,14 @@ function createBaseMsgWithdrawValidatorCommissionResponse(): MsgWithdrawValidato export const MsgWithdrawValidatorCommissionResponse = { typeUrl: "/cosmos.distribution.v1beta1.MsgWithdrawValidatorCommissionResponse", aminoType: "cosmos-sdk/MsgWithdrawValidatorCommissionResponse", - encode(message: MsgWithdrawValidatorCommissionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgWithdrawValidatorCommissionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawValidatorCommissionResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawValidatorCommissionResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawValidatorCommissionResponse(); while (reader.pos < end) { @@ -689,9 +690,9 @@ export const MsgWithdrawValidatorCommissionResponse = { return message; }, fromJSON(object: any): MsgWithdrawValidatorCommissionResponse { - return { - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgWithdrawValidatorCommissionResponse(); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgWithdrawValidatorCommissionResponse): unknown { const obj: any = {}; @@ -766,7 +767,7 @@ function createBaseMsgFundCommunityPool(): MsgFundCommunityPool { export const MsgFundCommunityPool = { typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPool", aminoType: "cosmos-sdk/MsgFundCommunityPool", - encode(message: MsgFundCommunityPool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgFundCommunityPool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -775,8 +776,8 @@ export const MsgFundCommunityPool = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgFundCommunityPool { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgFundCommunityPool { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgFundCommunityPool(); while (reader.pos < end) { @@ -796,10 +797,10 @@ export const MsgFundCommunityPool = { return message; }, fromJSON(object: any): MsgFundCommunityPool { - return { - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [], - depositor: isSet(object.depositor) ? String(object.depositor) : "" - }; + const obj = createBaseMsgFundCommunityPool(); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + return obj; }, toJSON(message: MsgFundCommunityPool): unknown { const obj: any = {}; @@ -877,11 +878,11 @@ function createBaseMsgFundCommunityPoolResponse(): MsgFundCommunityPoolResponse export const MsgFundCommunityPoolResponse = { typeUrl: "/cosmos.distribution.v1beta1.MsgFundCommunityPoolResponse", aminoType: "cosmos-sdk/MsgFundCommunityPoolResponse", - encode(_: MsgFundCommunityPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgFundCommunityPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgFundCommunityPoolResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgFundCommunityPoolResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgFundCommunityPoolResponse(); while (reader.pos < end) { @@ -895,7 +896,8 @@ export const MsgFundCommunityPoolResponse = { return message; }, fromJSON(_: any): MsgFundCommunityPoolResponse { - return {}; + const obj = createBaseMsgFundCommunityPoolResponse(); + return obj; }, toJSON(_: MsgFundCommunityPoolResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts index 94bd5a2308..4613d801ed 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/evidence.ts @@ -1,15 +1,15 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; /** * Equivocation implements the Evidence interface and defines evidence of double * signing misbehavior. */ export interface Equivocation { - height: Long; + height: bigint; time: Date; - power: Long; + power: bigint; consensusAddress: string; } export interface EquivocationProtoMsg { @@ -35,30 +35,30 @@ export interface EquivocationAminoMsg { * signing misbehavior. */ export interface EquivocationSDKType { - height: Long; + height: bigint; time: Date; - power: Long; + power: bigint; consensus_address: string; } function createBaseEquivocation(): Equivocation { return { - height: Long.ZERO, + height: BigInt(0), time: new Date(), - power: Long.ZERO, + power: BigInt(0), consensusAddress: "" }; } export const Equivocation = { typeUrl: "/cosmos.evidence.v1beta1.Equivocation", aminoType: "cosmos-sdk/Equivocation", - encode(message: Equivocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: Equivocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } if (message.time !== undefined) { Timestamp.encode(toTimestamp(message.time), writer.uint32(18).fork()).ldelim(); } - if (!message.power.isZero()) { + if (message.power !== BigInt(0)) { writer.uint32(24).int64(message.power); } if (message.consensusAddress !== "") { @@ -66,21 +66,21 @@ export const Equivocation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Equivocation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Equivocation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEquivocation(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; case 2: message.time = fromTimestamp(Timestamp.decode(reader, reader.uint32())); break; case 3: - message.power = (reader.int64() as Long); + message.power = reader.int64(); break; case 4: message.consensusAddress = reader.string(); @@ -93,26 +93,30 @@ export const Equivocation = { return message; }, fromJSON(object: any): Equivocation { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO, - time: isSet(object.time) ? new Date(object.time) : undefined, - power: isSet(object.power) ? Long.fromValue(object.power) : Long.ZERO, - consensusAddress: isSet(object.consensusAddress) ? String(object.consensusAddress) : "" - }; + const obj = createBaseEquivocation(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.time)) obj.time = new Date(object.time); + if (isSet(object.power)) obj.power = BigInt(object.power.toString()); + if (isSet(object.consensusAddress)) obj.consensusAddress = String(object.consensusAddress); + return obj; }, toJSON(message: Equivocation): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); message.time !== undefined && (obj.time = message.time.toISOString()); - message.power !== undefined && (obj.power = (message.power || Long.ZERO).toString()); + message.power !== undefined && (obj.power = (message.power || BigInt(0)).toString()); message.consensusAddress !== undefined && (obj.consensusAddress = message.consensusAddress); return obj; }, fromPartial(object: DeepPartial): Equivocation { const message = createBaseEquivocation(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } message.time = object.time ?? undefined; - message.power = object.power !== undefined && object.power !== null ? Long.fromValue(object.power) : Long.ZERO; + if (object.power !== undefined && object.power !== null) { + message.power = BigInt(object.power.toString()); + } message.consensusAddress = object.consensusAddress ?? ""; return message; }, @@ -134,9 +138,9 @@ export const Equivocation = { }, fromAmino(object: EquivocationAmino): Equivocation { return { - height: Long.fromString(object.height), + height: BigInt(object.height), time: object.time, - power: Long.fromString(object.power), + power: BigInt(object.power), consensusAddress: object.consensus_address }; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts index ad45852e85..02a98cdf1a 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; /** GenesisState defines the evidence module's genesis state. */ @@ -32,14 +32,14 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.evidence.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.evidence) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -56,9 +56,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - evidence: Array.isArray(object?.evidence) ? object.evidence.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.evidence)) object.evidence.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts index 882c51ec55..2dbb05bc28 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; /** QueryEvidenceRequest is the request type for the Query/Evidence RPC method. */ @@ -122,14 +122,14 @@ function createBaseQueryEvidenceRequest(): QueryEvidenceRequest { export const QueryEvidenceRequest = { typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceRequest", aminoType: "cosmos-sdk/QueryEvidenceRequest", - encode(message: QueryEvidenceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryEvidenceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.evidenceHash.length !== 0) { writer.uint32(10).bytes(message.evidenceHash); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryEvidenceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryEvidenceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryEvidenceRequest(); while (reader.pos < end) { @@ -146,9 +146,9 @@ export const QueryEvidenceRequest = { return message; }, fromJSON(object: any): QueryEvidenceRequest { - return { - evidenceHash: isSet(object.evidenceHash) ? bytesFromBase64(object.evidenceHash) : new Uint8Array() - }; + const obj = createBaseQueryEvidenceRequest(); + if (isSet(object.evidenceHash)) obj.evidenceHash = bytesFromBase64(object.evidenceHash); + return obj; }, toJSON(message: QueryEvidenceRequest): unknown { const obj: any = {}; @@ -210,14 +210,14 @@ function createBaseQueryEvidenceResponse(): QueryEvidenceResponse { export const QueryEvidenceResponse = { typeUrl: "/cosmos.evidence.v1beta1.QueryEvidenceResponse", aminoType: "cosmos-sdk/QueryEvidenceResponse", - encode(message: QueryEvidenceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryEvidenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.evidence !== undefined) { Any.encode(message.evidence, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryEvidenceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryEvidenceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryEvidenceResponse(); while (reader.pos < end) { @@ -234,9 +234,9 @@ export const QueryEvidenceResponse = { return message; }, fromJSON(object: any): QueryEvidenceResponse { - return { - evidence: isSet(object.evidence) ? Any.fromJSON(object.evidence) : undefined - }; + const obj = createBaseQueryEvidenceResponse(); + if (isSet(object.evidence)) obj.evidence = Any.fromJSON(object.evidence); + return obj; }, toJSON(message: QueryEvidenceResponse): unknown { const obj: any = {}; @@ -245,7 +245,9 @@ export const QueryEvidenceResponse = { }, fromPartial(object: DeepPartial): QueryEvidenceResponse { const message = createBaseQueryEvidenceResponse(); - message.evidence = object.evidence !== undefined && object.evidence !== null ? Any.fromPartial(object.evidence) : undefined; + if (object.evidence !== undefined && object.evidence !== null) { + message.evidence = Any.fromPartial(object.evidence); + } return message; }, fromSDK(object: QueryEvidenceResponseSDKType): QueryEvidenceResponse { @@ -298,14 +300,14 @@ function createBaseQueryAllEvidenceRequest(): QueryAllEvidenceRequest { export const QueryAllEvidenceRequest = { typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceRequest", aminoType: "cosmos-sdk/QueryAllEvidenceRequest", - encode(message: QueryAllEvidenceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllEvidenceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllEvidenceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllEvidenceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllEvidenceRequest(); while (reader.pos < end) { @@ -322,9 +324,9 @@ export const QueryAllEvidenceRequest = { return message; }, fromJSON(object: any): QueryAllEvidenceRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllEvidenceRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllEvidenceRequest): unknown { const obj: any = {}; @@ -333,7 +335,9 @@ export const QueryAllEvidenceRequest = { }, fromPartial(object: DeepPartial): QueryAllEvidenceRequest { const message = createBaseQueryAllEvidenceRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllEvidenceRequestSDKType): QueryAllEvidenceRequest { @@ -387,7 +391,7 @@ function createBaseQueryAllEvidenceResponse(): QueryAllEvidenceResponse { export const QueryAllEvidenceResponse = { typeUrl: "/cosmos.evidence.v1beta1.QueryAllEvidenceResponse", aminoType: "cosmos-sdk/QueryAllEvidenceResponse", - encode(message: QueryAllEvidenceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllEvidenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.evidence) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -396,8 +400,8 @@ export const QueryAllEvidenceResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllEvidenceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllEvidenceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllEvidenceResponse(); while (reader.pos < end) { @@ -417,10 +421,10 @@ export const QueryAllEvidenceResponse = { return message; }, fromJSON(object: any): QueryAllEvidenceResponse { - return { - evidence: Array.isArray(object?.evidence) ? object.evidence.map((e: any) => Any.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllEvidenceResponse(); + if (Array.isArray(object?.evidence)) object.evidence.map((e: any) => Any.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllEvidenceResponse): unknown { const obj: any = {}; @@ -435,7 +439,9 @@ export const QueryAllEvidenceResponse = { fromPartial(object: DeepPartial): QueryAllEvidenceResponse { const message = createBaseQueryAllEvidenceResponse(); message.evidence = object.evidence?.map(e => Any.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllEvidenceResponseSDKType): QueryAllEvidenceResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts index 4b651bb9b8..6b28f25a17 100644 --- a/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/evidence/v1beta1/tx.ts @@ -1,5 +1,5 @@ import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.evidence.v1beta1"; /** @@ -68,7 +68,7 @@ function createBaseMsgSubmitEvidence(): MsgSubmitEvidence { export const MsgSubmitEvidence = { typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidence", aminoType: "cosmos-sdk/MsgSubmitEvidence", - encode(message: MsgSubmitEvidence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSubmitEvidence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.submitter !== "") { writer.uint32(10).string(message.submitter); } @@ -77,8 +77,8 @@ export const MsgSubmitEvidence = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitEvidence { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitEvidence { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitEvidence(); while (reader.pos < end) { @@ -98,10 +98,10 @@ export const MsgSubmitEvidence = { return message; }, fromJSON(object: any): MsgSubmitEvidence { - return { - submitter: isSet(object.submitter) ? String(object.submitter) : "", - evidence: isSet(object.evidence) ? Any.fromJSON(object.evidence) : undefined - }; + const obj = createBaseMsgSubmitEvidence(); + if (isSet(object.submitter)) obj.submitter = String(object.submitter); + if (isSet(object.evidence)) obj.evidence = Any.fromJSON(object.evidence); + return obj; }, toJSON(message: MsgSubmitEvidence): unknown { const obj: any = {}; @@ -112,7 +112,9 @@ export const MsgSubmitEvidence = { fromPartial(object: DeepPartial): MsgSubmitEvidence { const message = createBaseMsgSubmitEvidence(); message.submitter = object.submitter ?? ""; - message.evidence = object.evidence !== undefined && object.evidence !== null ? Any.fromPartial(object.evidence) : undefined; + if (object.evidence !== undefined && object.evidence !== null) { + message.evidence = Any.fromPartial(object.evidence); + } return message; }, fromSDK(object: MsgSubmitEvidenceSDKType): MsgSubmitEvidence { @@ -169,14 +171,14 @@ function createBaseMsgSubmitEvidenceResponse(): MsgSubmitEvidenceResponse { export const MsgSubmitEvidenceResponse = { typeUrl: "/cosmos.evidence.v1beta1.MsgSubmitEvidenceResponse", aminoType: "cosmos-sdk/MsgSubmitEvidenceResponse", - encode(message: MsgSubmitEvidenceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSubmitEvidenceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash.length !== 0) { writer.uint32(34).bytes(message.hash); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitEvidenceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitEvidenceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitEvidenceResponse(); while (reader.pos < end) { @@ -193,9 +195,9 @@ export const MsgSubmitEvidenceResponse = { return message; }, fromJSON(object: any): MsgSubmitEvidenceResponse { - return { - hash: isSet(object.hash) ? bytesFromBase64(object.hash) : new Uint8Array() - }; + const obj = createBaseMsgSubmitEvidenceResponse(); + if (isSet(object.hash)) obj.hash = bytesFromBase64(object.hash); + return obj; }, toJSON(message: MsgSubmitEvidenceResponse): unknown { const obj: any = {}; @@ -249,8 +251,8 @@ export const MsgSubmitEvidenceResponse = { }; } }; -export const Evidence_InterfaceDecoder = (input: _m0.Reader | Uint8Array): Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const Evidence_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { default: diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts index 55bcb611e1..2e04e76247 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/feegrant.ts @@ -2,7 +2,7 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Timestamp } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.feegrant.v1beta1"; /** @@ -10,6 +10,7 @@ export const protobufPackage = "cosmos.feegrant.v1beta1"; * that optionally expires. The grantee can use up to SpendLimit to cover fees. */ export interface BasicAllowance { + $typeUrl?: string; /** * spend_limit specifies the maximum amount of tokens that can be spent * by this allowance and will be updated as tokens are spent. If it is @@ -46,6 +47,7 @@ export interface BasicAllowanceAminoMsg { * that optionally expires. The grantee can use up to SpendLimit to cover fees. */ export interface BasicAllowanceSDKType { + $typeUrl?: string; spend_limit: CoinSDKType[]; expiration: Date; } @@ -54,6 +56,7 @@ export interface BasicAllowanceSDKType { * as well as a limit per time period. */ export interface PeriodicAllowance { + $typeUrl?: string; /** basic specifies a struct of `BasicAllowance` */ basic: BasicAllowance; /** @@ -114,6 +117,7 @@ export interface PeriodicAllowanceAminoMsg { * as well as a limit per time period. */ export interface PeriodicAllowanceSDKType { + $typeUrl?: string; basic: BasicAllowanceSDKType; period: DurationSDKType; period_spend_limit: CoinSDKType[]; @@ -122,6 +126,7 @@ export interface PeriodicAllowanceSDKType { } /** AllowedMsgAllowance creates allowance only for specified message types. */ export interface AllowedMsgAllowance { + $typeUrl?: string; /** allowance can be any of basic and periodic fee allowance. */ allowance: BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any | undefined; /** allowed_messages are the messages for which the grantee has the access. */ @@ -147,6 +152,7 @@ export interface AllowedMsgAllowanceAminoMsg { } /** AllowedMsgAllowance creates allowance only for specified message types. */ export interface AllowedMsgAllowanceSDKType { + $typeUrl?: string; allowance: BasicAllowanceSDKType | PeriodicAllowanceSDKType | AllowedMsgAllowanceSDKType | AnySDKType | undefined; allowed_messages: string[]; } @@ -187,6 +193,7 @@ export interface GrantSDKType { } function createBaseBasicAllowance(): BasicAllowance { return { + $typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance", spendLimit: [], expiration: new Date() }; @@ -194,7 +201,7 @@ function createBaseBasicAllowance(): BasicAllowance { export const BasicAllowance = { typeUrl: "/cosmos.feegrant.v1beta1.BasicAllowance", aminoType: "cosmos-sdk/BasicAllowance", - encode(message: BasicAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BasicAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.spendLimit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -203,8 +210,8 @@ export const BasicAllowance = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BasicAllowance { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BasicAllowance { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBasicAllowance(); while (reader.pos < end) { @@ -224,10 +231,10 @@ export const BasicAllowance = { return message; }, fromJSON(object: any): BasicAllowance { - return { - spendLimit: Array.isArray(object?.spendLimit) ? object.spendLimit.map((e: any) => Coin.fromJSON(e)) : [], - expiration: isSet(object.expiration) ? new Date(object.expiration) : undefined - }; + const obj = createBaseBasicAllowance(); + if (Array.isArray(object?.spendLimit)) object.spendLimit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.expiration)) obj.expiration = new Date(object.expiration); + return obj; }, toJSON(message: BasicAllowance): unknown { const obj: any = {}; @@ -301,6 +308,7 @@ export const BasicAllowance = { }; function createBasePeriodicAllowance(): PeriodicAllowance { return { + $typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance", basic: BasicAllowance.fromPartial({}), period: Duration.fromPartial({}), periodSpendLimit: [], @@ -311,7 +319,7 @@ function createBasePeriodicAllowance(): PeriodicAllowance { export const PeriodicAllowance = { typeUrl: "/cosmos.feegrant.v1beta1.PeriodicAllowance", aminoType: "cosmos-sdk/PeriodicAllowance", - encode(message: PeriodicAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PeriodicAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.basic !== undefined) { BasicAllowance.encode(message.basic, writer.uint32(10).fork()).ldelim(); } @@ -329,8 +337,8 @@ export const PeriodicAllowance = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PeriodicAllowance { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PeriodicAllowance { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePeriodicAllowance(); while (reader.pos < end) { @@ -359,13 +367,13 @@ export const PeriodicAllowance = { return message; }, fromJSON(object: any): PeriodicAllowance { - return { - basic: isSet(object.basic) ? BasicAllowance.fromJSON(object.basic) : undefined, - period: isSet(object.period) ? Duration.fromJSON(object.period) : undefined, - periodSpendLimit: Array.isArray(object?.periodSpendLimit) ? object.periodSpendLimit.map((e: any) => Coin.fromJSON(e)) : [], - periodCanSpend: Array.isArray(object?.periodCanSpend) ? object.periodCanSpend.map((e: any) => Coin.fromJSON(e)) : [], - periodReset: isSet(object.periodReset) ? new Date(object.periodReset) : undefined - }; + const obj = createBasePeriodicAllowance(); + if (isSet(object.basic)) obj.basic = BasicAllowance.fromJSON(object.basic); + if (isSet(object.period)) obj.period = Duration.fromJSON(object.period); + if (Array.isArray(object?.periodSpendLimit)) object.periodSpendLimit.map((e: any) => Coin.fromJSON(e)); + if (Array.isArray(object?.periodCanSpend)) object.periodCanSpend.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.periodReset)) obj.periodReset = new Date(object.periodReset); + return obj; }, toJSON(message: PeriodicAllowance): unknown { const obj: any = {}; @@ -386,8 +394,12 @@ export const PeriodicAllowance = { }, fromPartial(object: DeepPartial): PeriodicAllowance { const message = createBasePeriodicAllowance(); - message.basic = object.basic !== undefined && object.basic !== null ? BasicAllowance.fromPartial(object.basic) : undefined; - message.period = object.period !== undefined && object.period !== null ? Duration.fromPartial(object.period) : undefined; + if (object.basic !== undefined && object.basic !== null) { + message.basic = BasicAllowance.fromPartial(object.basic); + } + if (object.period !== undefined && object.period !== null) { + message.period = Duration.fromPartial(object.period); + } message.periodSpendLimit = object.periodSpendLimit?.map(e => Coin.fromPartial(e)) || []; message.periodCanSpend = object.periodCanSpend?.map(e => Coin.fromPartial(e)) || []; message.periodReset = object.periodReset ?? undefined; @@ -469,6 +481,7 @@ export const PeriodicAllowance = { }; function createBaseAllowedMsgAllowance(): AllowedMsgAllowance { return { + $typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance", allowance: Any.fromPartial({}), allowedMessages: [] }; @@ -476,7 +489,7 @@ function createBaseAllowedMsgAllowance(): AllowedMsgAllowance { export const AllowedMsgAllowance = { typeUrl: "/cosmos.feegrant.v1beta1.AllowedMsgAllowance", aminoType: "cosmos-sdk/AllowedMsgAllowance", - encode(message: AllowedMsgAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AllowedMsgAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allowance !== undefined) { Any.encode((message.allowance as Any), writer.uint32(10).fork()).ldelim(); } @@ -485,8 +498,8 @@ export const AllowedMsgAllowance = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AllowedMsgAllowance { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AllowedMsgAllowance { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAllowedMsgAllowance(); while (reader.pos < end) { @@ -506,10 +519,10 @@ export const AllowedMsgAllowance = { return message; }, fromJSON(object: any): AllowedMsgAllowance { - return { - allowance: isSet(object.allowance) ? Any.fromJSON(object.allowance) : undefined, - allowedMessages: Array.isArray(object?.allowedMessages) ? object.allowedMessages.map((e: any) => String(e)) : [] - }; + const obj = createBaseAllowedMsgAllowance(); + if (isSet(object.allowance)) obj.allowance = Any.fromJSON(object.allowance); + if (Array.isArray(object?.allowedMessages)) object.allowedMessages.map((e: any) => String(e)); + return obj; }, toJSON(message: AllowedMsgAllowance): unknown { const obj: any = {}; @@ -523,7 +536,9 @@ export const AllowedMsgAllowance = { }, fromPartial(object: DeepPartial): AllowedMsgAllowance { const message = createBaseAllowedMsgAllowance(); - message.allowance = object.allowance !== undefined && object.allowance !== null ? Any.fromPartial(object.allowance) : undefined; + if (object.allowance !== undefined && object.allowance !== null) { + message.allowance = Any.fromPartial(object.allowance); + } message.allowedMessages = object.allowedMessages?.map(e => e) || []; return message; }, @@ -591,7 +606,7 @@ function createBaseGrant(): Grant { export const Grant = { typeUrl: "/cosmos.feegrant.v1beta1.Grant", aminoType: "cosmos-sdk/Grant", - encode(message: Grant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Grant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -603,8 +618,8 @@ export const Grant = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Grant { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Grant { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGrant(); while (reader.pos < end) { @@ -627,11 +642,11 @@ export const Grant = { return message; }, fromJSON(object: any): Grant { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "", - allowance: isSet(object.allowance) ? Any.fromJSON(object.allowance) : undefined - }; + const obj = createBaseGrant(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.allowance)) obj.allowance = Any.fromJSON(object.allowance); + return obj; }, toJSON(message: Grant): unknown { const obj: any = {}; @@ -644,7 +659,9 @@ export const Grant = { const message = createBaseGrant(); message.granter = object.granter ?? ""; message.grantee = object.grantee ?? ""; - message.allowance = object.allowance !== undefined && object.allowance !== null ? Any.fromPartial(object.allowance) : undefined; + if (object.allowance !== undefined && object.allowance !== null) { + message.allowance = Any.fromPartial(object.allowance); + } return message; }, fromSDK(object: GrantSDKType): Grant { @@ -697,8 +714,8 @@ export const Grant = { }; } }; -export const FeeAllowanceI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const FeeAllowanceI_InterfaceDecoder = (input: BinaryReader | Uint8Array): BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.feegrant.v1beta1.BasicAllowance": diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts index 9f787bbe61..4175f887ad 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Grant, GrantAmino, GrantSDKType } from "./feegrant"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.feegrant.v1beta1"; /** GenesisState contains a set of fee allowances, persisted from the store */ @@ -30,14 +30,14 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.feegrant.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowances) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -54,9 +54,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - allowances: Array.isArray(object?.allowances) ? object.allowances.map((e: any) => Grant.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.allowances)) object.allowances.map((e: any) => Grant.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts index c7c3a64bb5..e231ba8aaa 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Grant, GrantAmino, GrantSDKType } from "./feegrant"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.feegrant.v1beta1"; /** QueryAllowanceRequest is the request type for the Query/Allowance RPC method. */ @@ -165,7 +165,7 @@ function createBaseQueryAllowanceRequest(): QueryAllowanceRequest { export const QueryAllowanceRequest = { typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceRequest", aminoType: "cosmos-sdk/QueryAllowanceRequest", - encode(message: QueryAllowanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllowanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -174,8 +174,8 @@ export const QueryAllowanceRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllowanceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllowanceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllowanceRequest(); while (reader.pos < end) { @@ -195,10 +195,10 @@ export const QueryAllowanceRequest = { return message; }, fromJSON(object: any): QueryAllowanceRequest { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "" - }; + const obj = createBaseQueryAllowanceRequest(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + return obj; }, toJSON(message: QueryAllowanceRequest): unknown { const obj: any = {}; @@ -266,14 +266,14 @@ function createBaseQueryAllowanceResponse(): QueryAllowanceResponse { export const QueryAllowanceResponse = { typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowanceResponse", aminoType: "cosmos-sdk/QueryAllowanceResponse", - encode(message: QueryAllowanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllowanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allowance !== undefined) { Grant.encode(message.allowance, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllowanceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllowanceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllowanceResponse(); while (reader.pos < end) { @@ -290,9 +290,9 @@ export const QueryAllowanceResponse = { return message; }, fromJSON(object: any): QueryAllowanceResponse { - return { - allowance: isSet(object.allowance) ? Grant.fromJSON(object.allowance) : undefined - }; + const obj = createBaseQueryAllowanceResponse(); + if (isSet(object.allowance)) obj.allowance = Grant.fromJSON(object.allowance); + return obj; }, toJSON(message: QueryAllowanceResponse): unknown { const obj: any = {}; @@ -301,7 +301,9 @@ export const QueryAllowanceResponse = { }, fromPartial(object: DeepPartial): QueryAllowanceResponse { const message = createBaseQueryAllowanceResponse(); - message.allowance = object.allowance !== undefined && object.allowance !== null ? Grant.fromPartial(object.allowance) : undefined; + if (object.allowance !== undefined && object.allowance !== null) { + message.allowance = Grant.fromPartial(object.allowance); + } return message; }, fromSDK(object: QueryAllowanceResponseSDKType): QueryAllowanceResponse { @@ -355,7 +357,7 @@ function createBaseQueryAllowancesRequest(): QueryAllowancesRequest { export const QueryAllowancesRequest = { typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesRequest", aminoType: "cosmos-sdk/QueryAllowancesRequest", - encode(message: QueryAllowancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllowancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.grantee !== "") { writer.uint32(10).string(message.grantee); } @@ -364,8 +366,8 @@ export const QueryAllowancesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllowancesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllowancesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllowancesRequest(); while (reader.pos < end) { @@ -385,10 +387,10 @@ export const QueryAllowancesRequest = { return message; }, fromJSON(object: any): QueryAllowancesRequest { - return { - grantee: isSet(object.grantee) ? String(object.grantee) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllowancesRequest(); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllowancesRequest): unknown { const obj: any = {}; @@ -399,7 +401,9 @@ export const QueryAllowancesRequest = { fromPartial(object: DeepPartial): QueryAllowancesRequest { const message = createBaseQueryAllowancesRequest(); message.grantee = object.grantee ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllowancesRequestSDKType): QueryAllowancesRequest { @@ -457,7 +461,7 @@ function createBaseQueryAllowancesResponse(): QueryAllowancesResponse { export const QueryAllowancesResponse = { typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesResponse", aminoType: "cosmos-sdk/QueryAllowancesResponse", - encode(message: QueryAllowancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllowancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowances) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -466,8 +470,8 @@ export const QueryAllowancesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllowancesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllowancesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllowancesResponse(); while (reader.pos < end) { @@ -487,10 +491,10 @@ export const QueryAllowancesResponse = { return message; }, fromJSON(object: any): QueryAllowancesResponse { - return { - allowances: Array.isArray(object?.allowances) ? object.allowances.map((e: any) => Grant.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllowancesResponse(); + if (Array.isArray(object?.allowances)) object.allowances.map((e: any) => Grant.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllowancesResponse): unknown { const obj: any = {}; @@ -505,7 +509,9 @@ export const QueryAllowancesResponse = { fromPartial(object: DeepPartial): QueryAllowancesResponse { const message = createBaseQueryAllowancesResponse(); message.allowances = object.allowances?.map(e => Grant.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllowancesResponseSDKType): QueryAllowancesResponse { @@ -571,7 +577,7 @@ function createBaseQueryAllowancesByGranterRequest(): QueryAllowancesByGranterRe export const QueryAllowancesByGranterRequest = { typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterRequest", aminoType: "cosmos-sdk/QueryAllowancesByGranterRequest", - encode(message: QueryAllowancesByGranterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllowancesByGranterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -580,8 +586,8 @@ export const QueryAllowancesByGranterRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllowancesByGranterRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllowancesByGranterRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllowancesByGranterRequest(); while (reader.pos < end) { @@ -601,10 +607,10 @@ export const QueryAllowancesByGranterRequest = { return message; }, fromJSON(object: any): QueryAllowancesByGranterRequest { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllowancesByGranterRequest(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllowancesByGranterRequest): unknown { const obj: any = {}; @@ -615,7 +621,9 @@ export const QueryAllowancesByGranterRequest = { fromPartial(object: DeepPartial): QueryAllowancesByGranterRequest { const message = createBaseQueryAllowancesByGranterRequest(); message.granter = object.granter ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllowancesByGranterRequestSDKType): QueryAllowancesByGranterRequest { @@ -673,7 +681,7 @@ function createBaseQueryAllowancesByGranterResponse(): QueryAllowancesByGranterR export const QueryAllowancesByGranterResponse = { typeUrl: "/cosmos.feegrant.v1beta1.QueryAllowancesByGranterResponse", aminoType: "cosmos-sdk/QueryAllowancesByGranterResponse", - encode(message: QueryAllowancesByGranterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllowancesByGranterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allowances) { Grant.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -682,8 +690,8 @@ export const QueryAllowancesByGranterResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllowancesByGranterResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllowancesByGranterResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllowancesByGranterResponse(); while (reader.pos < end) { @@ -703,10 +711,10 @@ export const QueryAllowancesByGranterResponse = { return message; }, fromJSON(object: any): QueryAllowancesByGranterResponse { - return { - allowances: Array.isArray(object?.allowances) ? object.allowances.map((e: any) => Grant.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllowancesByGranterResponse(); + if (Array.isArray(object?.allowances)) object.allowances.map((e: any) => Grant.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllowancesByGranterResponse): unknown { const obj: any = {}; @@ -721,7 +729,9 @@ export const QueryAllowancesByGranterResponse = { fromPartial(object: DeepPartial): QueryAllowancesByGranterResponse { const message = createBaseQueryAllowancesByGranterResponse(); message.allowances = object.allowances?.map(e => Grant.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllowancesByGranterResponseSDKType): QueryAllowancesByGranterResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts index ffb815db88..7e8481c36f 100644 --- a/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/feegrant/v1beta1/tx.ts @@ -1,6 +1,6 @@ import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { BasicAllowance, BasicAllowanceProtoMsg, BasicAllowanceSDKType, PeriodicAllowance, PeriodicAllowanceProtoMsg, PeriodicAllowanceSDKType, AllowedMsgAllowance, AllowedMsgAllowanceProtoMsg, AllowedMsgAllowanceSDKType } from "./feegrant"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.feegrant.v1beta1"; /** @@ -112,7 +112,7 @@ function createBaseMsgGrantAllowance(): MsgGrantAllowance { export const MsgGrantAllowance = { typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowance", aminoType: "cosmos-sdk/MsgGrantAllowance", - encode(message: MsgGrantAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgGrantAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -124,8 +124,8 @@ export const MsgGrantAllowance = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgGrantAllowance { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgGrantAllowance { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgGrantAllowance(); while (reader.pos < end) { @@ -148,11 +148,11 @@ export const MsgGrantAllowance = { return message; }, fromJSON(object: any): MsgGrantAllowance { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "", - allowance: isSet(object.allowance) ? Any.fromJSON(object.allowance) : undefined - }; + const obj = createBaseMsgGrantAllowance(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + if (isSet(object.allowance)) obj.allowance = Any.fromJSON(object.allowance); + return obj; }, toJSON(message: MsgGrantAllowance): unknown { const obj: any = {}; @@ -165,7 +165,9 @@ export const MsgGrantAllowance = { const message = createBaseMsgGrantAllowance(); message.granter = object.granter ?? ""; message.grantee = object.grantee ?? ""; - message.allowance = object.allowance !== undefined && object.allowance !== null ? Any.fromPartial(object.allowance) : undefined; + if (object.allowance !== undefined && object.allowance !== null) { + message.allowance = Any.fromPartial(object.allowance); + } return message; }, fromSDK(object: MsgGrantAllowanceSDKType): MsgGrantAllowance { @@ -224,11 +226,11 @@ function createBaseMsgGrantAllowanceResponse(): MsgGrantAllowanceResponse { export const MsgGrantAllowanceResponse = { typeUrl: "/cosmos.feegrant.v1beta1.MsgGrantAllowanceResponse", aminoType: "cosmos-sdk/MsgGrantAllowanceResponse", - encode(_: MsgGrantAllowanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgGrantAllowanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgGrantAllowanceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgGrantAllowanceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgGrantAllowanceResponse(); while (reader.pos < end) { @@ -242,7 +244,8 @@ export const MsgGrantAllowanceResponse = { return message; }, fromJSON(_: any): MsgGrantAllowanceResponse { - return {}; + const obj = createBaseMsgGrantAllowanceResponse(); + return obj; }, toJSON(_: MsgGrantAllowanceResponse): unknown { const obj: any = {}; @@ -297,7 +300,7 @@ function createBaseMsgRevokeAllowance(): MsgRevokeAllowance { export const MsgRevokeAllowance = { typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowance", aminoType: "cosmos-sdk/MsgRevokeAllowance", - encode(message: MsgRevokeAllowance, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgRevokeAllowance, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.granter !== "") { writer.uint32(10).string(message.granter); } @@ -306,8 +309,8 @@ export const MsgRevokeAllowance = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRevokeAllowance { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRevokeAllowance { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRevokeAllowance(); while (reader.pos < end) { @@ -327,10 +330,10 @@ export const MsgRevokeAllowance = { return message; }, fromJSON(object: any): MsgRevokeAllowance { - return { - granter: isSet(object.granter) ? String(object.granter) : "", - grantee: isSet(object.grantee) ? String(object.grantee) : "" - }; + const obj = createBaseMsgRevokeAllowance(); + if (isSet(object.granter)) obj.granter = String(object.granter); + if (isSet(object.grantee)) obj.grantee = String(object.grantee); + return obj; }, toJSON(message: MsgRevokeAllowance): unknown { const obj: any = {}; @@ -396,11 +399,11 @@ function createBaseMsgRevokeAllowanceResponse(): MsgRevokeAllowanceResponse { export const MsgRevokeAllowanceResponse = { typeUrl: "/cosmos.feegrant.v1beta1.MsgRevokeAllowanceResponse", aminoType: "cosmos-sdk/MsgRevokeAllowanceResponse", - encode(_: MsgRevokeAllowanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgRevokeAllowanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRevokeAllowanceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRevokeAllowanceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRevokeAllowanceResponse(); while (reader.pos < end) { @@ -414,7 +417,8 @@ export const MsgRevokeAllowanceResponse = { return message; }, fromJSON(_: any): MsgRevokeAllowanceResponse { - return {}; + const obj = createBaseMsgRevokeAllowanceResponse(); + return obj; }, toJSON(_: MsgRevokeAllowanceResponse): unknown { const obj: any = {}; @@ -460,8 +464,8 @@ export const MsgRevokeAllowanceResponse = { }; } }; -export const FeeAllowanceI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const FeeAllowanceI_InterfaceDecoder = (input: BinaryReader | Uint8Array): BasicAllowance | PeriodicAllowance | AllowedMsgAllowance | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.feegrant.v1beta1.BasicAllowance": diff --git a/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts index ed355a272c..87243d71c3 100644 --- a/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/genutil/v1beta1/genesis.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.genutil.v1beta1"; /** GenesisState defines the raw genesis transaction in JSON. */ @@ -31,14 +31,14 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.genutil.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.genTxs) { writer.uint32(10).bytes(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -55,9 +55,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - genTxs: Array.isArray(object?.genTxs) ? object.genTxs.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.genTxs)) object.genTxs.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts index af8d47c657..3efb1dde6b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/genesis.ts @@ -1,11 +1,11 @@ import { Deposit, DepositAmino, DepositSDKType, Vote, VoteAmino, VoteSDKType, Proposal, ProposalAmino, ProposalSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType } from "./gov"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1"; /** GenesisState defines the gov module's genesis state. */ export interface GenesisState { /** starting_proposal_id is the ID of the starting proposal. */ - startingProposalId: Long; + startingProposalId: bigint; /** deposits defines all the deposits present at genesis. */ deposits: Deposit[]; /** votes defines all the votes present at genesis. */ @@ -46,7 +46,7 @@ export interface GenesisStateAminoMsg { } /** GenesisState defines the gov module's genesis state. */ export interface GenesisStateSDKType { - starting_proposal_id: Long; + starting_proposal_id: bigint; deposits: DepositSDKType[]; votes: VoteSDKType[]; proposals: ProposalSDKType[]; @@ -56,7 +56,7 @@ export interface GenesisStateSDKType { } function createBaseGenesisState(): GenesisState { return { - startingProposalId: Long.UZERO, + startingProposalId: BigInt(0), deposits: [], votes: [], proposals: [], @@ -68,8 +68,8 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.gov.v1.GenesisState", aminoType: "cosmos-sdk/v1/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.startingProposalId.isZero()) { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.startingProposalId !== BigInt(0)) { writer.uint32(8).uint64(message.startingProposalId); } for (const v of message.deposits) { @@ -92,15 +92,15 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.startingProposalId = (reader.uint64() as Long); + message.startingProposalId = reader.uint64(); break; case 2: message.deposits.push(Deposit.decode(reader, reader.uint32())); @@ -128,19 +128,19 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - startingProposalId: isSet(object.startingProposalId) ? Long.fromValue(object.startingProposalId) : Long.UZERO, - deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromJSON(e)) : [], - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [], - proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromJSON(e)) : [], - depositParams: isSet(object.depositParams) ? DepositParams.fromJSON(object.depositParams) : undefined, - votingParams: isSet(object.votingParams) ? VotingParams.fromJSON(object.votingParams) : undefined, - tallyParams: isSet(object.tallyParams) ? TallyParams.fromJSON(object.tallyParams) : undefined - }; + const obj = createBaseGenesisState(); + if (isSet(object.startingProposalId)) obj.startingProposalId = BigInt(object.startingProposalId.toString()); + if (Array.isArray(object?.deposits)) object.deposits.map((e: any) => Deposit.fromJSON(e)); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + if (Array.isArray(object?.proposals)) object.proposals.map((e: any) => Proposal.fromJSON(e)); + if (isSet(object.depositParams)) obj.depositParams = DepositParams.fromJSON(object.depositParams); + if (isSet(object.votingParams)) obj.votingParams = VotingParams.fromJSON(object.votingParams); + if (isSet(object.tallyParams)) obj.tallyParams = TallyParams.fromJSON(object.tallyParams); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; - message.startingProposalId !== undefined && (obj.startingProposalId = (message.startingProposalId || Long.UZERO).toString()); + message.startingProposalId !== undefined && (obj.startingProposalId = (message.startingProposalId || BigInt(0)).toString()); if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toJSON(e) : undefined); } else { @@ -163,13 +163,21 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.startingProposalId = object.startingProposalId !== undefined && object.startingProposalId !== null ? Long.fromValue(object.startingProposalId) : Long.UZERO; + if (object.startingProposalId !== undefined && object.startingProposalId !== null) { + message.startingProposalId = BigInt(object.startingProposalId.toString()); + } message.deposits = object.deposits?.map(e => Deposit.fromPartial(e)) || []; message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; message.proposals = object.proposals?.map(e => Proposal.fromPartial(e)) || []; - message.depositParams = object.depositParams !== undefined && object.depositParams !== null ? DepositParams.fromPartial(object.depositParams) : undefined; - message.votingParams = object.votingParams !== undefined && object.votingParams !== null ? VotingParams.fromPartial(object.votingParams) : undefined; - message.tallyParams = object.tallyParams !== undefined && object.tallyParams !== null ? TallyParams.fromPartial(object.tallyParams) : undefined; + if (object.depositParams !== undefined && object.depositParams !== null) { + message.depositParams = DepositParams.fromPartial(object.depositParams); + } + if (object.votingParams !== undefined && object.votingParams !== null) { + message.votingParams = VotingParams.fromPartial(object.votingParams); + } + if (object.tallyParams !== undefined && object.tallyParams !== null) { + message.tallyParams = TallyParams.fromPartial(object.tallyParams); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { @@ -208,7 +216,7 @@ export const GenesisState = { }, fromAmino(object: GenesisStateAmino): GenesisState { return { - startingProposalId: Long.fromString(object.starting_proposal_id), + startingProposalId: BigInt(object.starting_proposal_id), deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromAmino(e)) : [], votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts index 86f2a870b0..27f94582e9 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/gov.ts @@ -2,8 +2,8 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Timestamp } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1"; /** VoteOption enumerates the valid vote options for a given governance proposal. */ export enum VoteOption { @@ -167,7 +167,7 @@ export interface WeightedVoteOptionSDKType { * proposal. */ export interface Deposit { - proposalId: Long; + proposalId: bigint; depositor: string; amount: Coin[]; } @@ -193,13 +193,13 @@ export interface DepositAminoMsg { * proposal. */ export interface DepositSDKType { - proposal_id: Long; + proposal_id: bigint; depositor: string; amount: CoinSDKType[]; } /** Proposal defines the core field members of a governance proposal. */ export interface Proposal { - id: Long; + id: bigint; messages: Any[]; status: ProposalStatus; /** @@ -245,7 +245,7 @@ export interface ProposalAminoMsg { } /** Proposal defines the core field members of a governance proposal. */ export interface ProposalSDKType { - id: Long; + id: bigint; messages: AnySDKType[]; status: ProposalStatus; final_tally_result: TallyResultSDKType; @@ -290,7 +290,7 @@ export interface TallyResultSDKType { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface Vote { - proposalId: Long; + proposalId: bigint; voter: string; options: WeightedVoteOption[]; /** metadata is any arbitrary metadata to attached to the vote. */ @@ -320,7 +320,7 @@ export interface VoteAminoMsg { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface VoteSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; options: WeightedVoteOptionSDKType[]; metadata: string; @@ -433,7 +433,7 @@ function createBaseWeightedVoteOption(): WeightedVoteOption { export const WeightedVoteOption = { typeUrl: "/cosmos.gov.v1.WeightedVoteOption", aminoType: "cosmos-sdk/v1/WeightedVoteOption", - encode(message: WeightedVoteOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WeightedVoteOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.option !== 0) { writer.uint32(8).int32(message.option); } @@ -442,8 +442,8 @@ export const WeightedVoteOption = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WeightedVoteOption { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WeightedVoteOption { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWeightedVoteOption(); while (reader.pos < end) { @@ -463,10 +463,10 @@ export const WeightedVoteOption = { return message; }, fromJSON(object: any): WeightedVoteOption { - return { - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, - weight: isSet(object.weight) ? String(object.weight) : "" - }; + const obj = createBaseWeightedVoteOption(); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + if (isSet(object.weight)) obj.weight = String(object.weight); + return obj; }, toJSON(message: WeightedVoteOption): unknown { const obj: any = {}; @@ -528,7 +528,7 @@ export const WeightedVoteOption = { }; function createBaseDeposit(): Deposit { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), depositor: "", amount: [] }; @@ -536,8 +536,8 @@ function createBaseDeposit(): Deposit { export const Deposit = { typeUrl: "/cosmos.gov.v1.Deposit", aminoType: "cosmos-sdk/v1/Deposit", - encode(message: Deposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: Deposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.depositor !== "") { @@ -548,15 +548,15 @@ export const Deposit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Deposit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Deposit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeposit(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.depositor = reader.string(); @@ -572,15 +572,15 @@ export const Deposit = { return message; }, fromJSON(object: any): Deposit { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseDeposit(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Deposit): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toJSON(e) : undefined); @@ -591,7 +591,9 @@ export const Deposit = { }, fromPartial(object: DeepPartial): Deposit { const message = createBaseDeposit(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.depositor = object.depositor ?? ""; message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; return message; @@ -616,7 +618,7 @@ export const Deposit = { }, fromAmino(object: DepositAmino): Deposit { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), depositor: object.depositor, amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] }; @@ -656,7 +658,7 @@ export const Deposit = { }; function createBaseProposal(): Proposal { return { - id: Long.UZERO, + id: BigInt(0), messages: [], status: 0, finalTallyResult: TallyResult.fromPartial({}), @@ -671,8 +673,8 @@ function createBaseProposal(): Proposal { export const Proposal = { typeUrl: "/cosmos.gov.v1.Proposal", aminoType: "cosmos-sdk/v1/Proposal", - encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.id.isZero()) { + encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); } for (const v of message.messages) { @@ -704,15 +706,15 @@ export const Proposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Proposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Proposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProposal(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.id = (reader.uint64() as Long); + message.id = reader.uint64(); break; case 2: message.messages.push(Any.decode(reader, reader.uint32())); @@ -749,22 +751,22 @@ export const Proposal = { return message; }, fromJSON(object: any): Proposal { - return { - id: isSet(object.id) ? Long.fromValue(object.id) : Long.UZERO, - messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromJSON(e)) : [], - status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, - finalTallyResult: isSet(object.finalTallyResult) ? TallyResult.fromJSON(object.finalTallyResult) : undefined, - submitTime: isSet(object.submitTime) ? new Date(object.submitTime) : undefined, - depositEndTime: isSet(object.depositEndTime) ? new Date(object.depositEndTime) : undefined, - totalDeposit: Array.isArray(object?.totalDeposit) ? object.totalDeposit.map((e: any) => Coin.fromJSON(e)) : [], - votingStartTime: isSet(object.votingStartTime) ? new Date(object.votingStartTime) : undefined, - votingEndTime: isSet(object.votingEndTime) ? new Date(object.votingEndTime) : undefined, - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseProposal(); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + if (Array.isArray(object?.messages)) object.messages.map((e: any) => Any.fromJSON(e)); + if (isSet(object.status)) obj.status = proposalStatusFromJSON(object.status); + if (isSet(object.finalTallyResult)) obj.finalTallyResult = TallyResult.fromJSON(object.finalTallyResult); + if (isSet(object.submitTime)) obj.submitTime = new Date(object.submitTime); + if (isSet(object.depositEndTime)) obj.depositEndTime = new Date(object.depositEndTime); + if (Array.isArray(object?.totalDeposit)) object.totalDeposit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.votingStartTime)) obj.votingStartTime = new Date(object.votingStartTime); + if (isSet(object.votingEndTime)) obj.votingEndTime = new Date(object.votingEndTime); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: Proposal): unknown { const obj: any = {}; - message.id !== undefined && (obj.id = (message.id || Long.UZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); if (message.messages) { obj.messages = message.messages.map(e => e ? Any.toJSON(e) : undefined); } else { @@ -786,10 +788,14 @@ export const Proposal = { }, fromPartial(object: DeepPartial): Proposal { const message = createBaseProposal(); - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.UZERO; + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } message.messages = object.messages?.map(e => Any.fromPartial(e)) || []; message.status = object.status ?? 0; - message.finalTallyResult = object.finalTallyResult !== undefined && object.finalTallyResult !== null ? TallyResult.fromPartial(object.finalTallyResult) : undefined; + if (object.finalTallyResult !== undefined && object.finalTallyResult !== null) { + message.finalTallyResult = TallyResult.fromPartial(object.finalTallyResult); + } message.submitTime = object.submitTime ?? undefined; message.depositEndTime = object.depositEndTime ?? undefined; message.totalDeposit = object.totalDeposit?.map(e => Coin.fromPartial(e)) || []; @@ -836,7 +842,7 @@ export const Proposal = { }, fromAmino(object: ProposalAmino): Proposal { return { - id: Long.fromString(object.id), + id: BigInt(object.id), messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [], status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined, @@ -903,7 +909,7 @@ function createBaseTallyResult(): TallyResult { export const TallyResult = { typeUrl: "/cosmos.gov.v1.TallyResult", aminoType: "cosmos-sdk/v1/TallyResult", - encode(message: TallyResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TallyResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.yesCount !== "") { writer.uint32(10).string(message.yesCount); } @@ -918,8 +924,8 @@ export const TallyResult = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TallyResult { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TallyResult { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTallyResult(); while (reader.pos < end) { @@ -945,12 +951,12 @@ export const TallyResult = { return message; }, fromJSON(object: any): TallyResult { - return { - yesCount: isSet(object.yesCount) ? String(object.yesCount) : "", - abstainCount: isSet(object.abstainCount) ? String(object.abstainCount) : "", - noCount: isSet(object.noCount) ? String(object.noCount) : "", - noWithVetoCount: isSet(object.noWithVetoCount) ? String(object.noWithVetoCount) : "" - }; + const obj = createBaseTallyResult(); + if (isSet(object.yesCount)) obj.yesCount = String(object.yesCount); + if (isSet(object.abstainCount)) obj.abstainCount = String(object.abstainCount); + if (isSet(object.noCount)) obj.noCount = String(object.noCount); + if (isSet(object.noWithVetoCount)) obj.noWithVetoCount = String(object.noWithVetoCount); + return obj; }, toJSON(message: TallyResult): unknown { const obj: any = {}; @@ -1024,7 +1030,7 @@ export const TallyResult = { }; function createBaseVote(): Vote { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", options: [], metadata: "" @@ -1033,8 +1039,8 @@ function createBaseVote(): Vote { export const Vote = { typeUrl: "/cosmos.gov.v1.Vote", aminoType: "cosmos-sdk/v1/Vote", - encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -1048,15 +1054,15 @@ export const Vote = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Vote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Vote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -1075,16 +1081,16 @@ export const Vote = { return message; }, fromJSON(object: any): Vote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromJSON(e)) : [], - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (Array.isArray(object?.options)) object.options.map((e: any) => WeightedVoteOption.fromJSON(e)); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: Vote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toJSON(e) : undefined); @@ -1096,7 +1102,9 @@ export const Vote = { }, fromPartial(object: DeepPartial): Vote { const message = createBaseVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.options = object.options?.map(e => WeightedVoteOption.fromPartial(e)) || []; message.metadata = object.metadata ?? ""; @@ -1124,7 +1132,7 @@ export const Vote = { }, fromAmino(object: VoteAmino): Vote { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [], metadata: object.metadata @@ -1173,7 +1181,7 @@ function createBaseDepositParams(): DepositParams { export const DepositParams = { typeUrl: "/cosmos.gov.v1.DepositParams", aminoType: "cosmos-sdk/v1/DepositParams", - encode(message: DepositParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DepositParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.minDeposit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1182,8 +1190,8 @@ export const DepositParams = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DepositParams { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DepositParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDepositParams(); while (reader.pos < end) { @@ -1203,10 +1211,10 @@ export const DepositParams = { return message; }, fromJSON(object: any): DepositParams { - return { - minDeposit: Array.isArray(object?.minDeposit) ? object.minDeposit.map((e: any) => Coin.fromJSON(e)) : [], - maxDepositPeriod: isSet(object.maxDepositPeriod) ? Duration.fromJSON(object.maxDepositPeriod) : undefined - }; + const obj = createBaseDepositParams(); + if (Array.isArray(object?.minDeposit)) object.minDeposit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.maxDepositPeriod)) obj.maxDepositPeriod = Duration.fromJSON(object.maxDepositPeriod); + return obj; }, toJSON(message: DepositParams): unknown { const obj: any = {}; @@ -1221,7 +1229,9 @@ export const DepositParams = { fromPartial(object: DeepPartial): DepositParams { const message = createBaseDepositParams(); message.minDeposit = object.minDeposit?.map(e => Coin.fromPartial(e)) || []; - message.maxDepositPeriod = object.maxDepositPeriod !== undefined && object.maxDepositPeriod !== null ? Duration.fromPartial(object.maxDepositPeriod) : undefined; + if (object.maxDepositPeriod !== undefined && object.maxDepositPeriod !== null) { + message.maxDepositPeriod = Duration.fromPartial(object.maxDepositPeriod); + } return message; }, fromSDK(object: DepositParamsSDKType): DepositParams { @@ -1286,14 +1296,14 @@ function createBaseVotingParams(): VotingParams { export const VotingParams = { typeUrl: "/cosmos.gov.v1.VotingParams", aminoType: "cosmos-sdk/v1/VotingParams", - encode(message: VotingParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: VotingParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingPeriod !== undefined) { Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): VotingParams { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): VotingParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVotingParams(); while (reader.pos < end) { @@ -1310,9 +1320,9 @@ export const VotingParams = { return message; }, fromJSON(object: any): VotingParams { - return { - votingPeriod: isSet(object.votingPeriod) ? Duration.fromJSON(object.votingPeriod) : undefined - }; + const obj = createBaseVotingParams(); + if (isSet(object.votingPeriod)) obj.votingPeriod = Duration.fromJSON(object.votingPeriod); + return obj; }, toJSON(message: VotingParams): unknown { const obj: any = {}; @@ -1321,7 +1331,9 @@ export const VotingParams = { }, fromPartial(object: DeepPartial): VotingParams { const message = createBaseVotingParams(); - message.votingPeriod = object.votingPeriod !== undefined && object.votingPeriod !== null ? Duration.fromPartial(object.votingPeriod) : undefined; + if (object.votingPeriod !== undefined && object.votingPeriod !== null) { + message.votingPeriod = Duration.fromPartial(object.votingPeriod); + } return message; }, fromSDK(object: VotingParamsSDKType): VotingParams { @@ -1376,7 +1388,7 @@ function createBaseTallyParams(): TallyParams { export const TallyParams = { typeUrl: "/cosmos.gov.v1.TallyParams", aminoType: "cosmos-sdk/v1/TallyParams", - encode(message: TallyParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TallyParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quorum !== "") { writer.uint32(10).string(message.quorum); } @@ -1388,8 +1400,8 @@ export const TallyParams = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TallyParams { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TallyParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTallyParams(); while (reader.pos < end) { @@ -1412,11 +1424,11 @@ export const TallyParams = { return message; }, fromJSON(object: any): TallyParams { - return { - quorum: isSet(object.quorum) ? String(object.quorum) : "", - threshold: isSet(object.threshold) ? String(object.threshold) : "", - vetoThreshold: isSet(object.vetoThreshold) ? String(object.vetoThreshold) : "" - }; + const obj = createBaseTallyParams(); + if (isSet(object.quorum)) obj.quorum = String(object.quorum); + if (isSet(object.threshold)) obj.threshold = String(object.threshold); + if (isSet(object.vetoThreshold)) obj.vetoThreshold = String(object.vetoThreshold); + return obj; }, toJSON(message: TallyParams): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts index 28ea92cc2f..2dc1f65ef9 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/query.ts @@ -1,12 +1,12 @@ import { ProposalStatus, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON, proposalStatusToJSON } from "./gov"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1"; /** QueryProposalRequest is the request type for the Query/Proposal RPC method. */ export interface QueryProposalRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface QueryProposalRequestProtoMsg { typeUrl: "/cosmos.gov.v1.QueryProposalRequest"; @@ -23,7 +23,7 @@ export interface QueryProposalRequestAminoMsg { } /** QueryProposalRequest is the request type for the Query/Proposal RPC method. */ export interface QueryProposalRequestSDKType { - proposal_id: Long; + proposal_id: bigint; } /** QueryProposalResponse is the response type for the Query/Proposal RPC method. */ export interface QueryProposalResponse { @@ -119,7 +119,7 @@ export interface QueryProposalsResponseSDKType { /** QueryVoteRequest is the request type for the Query/Vote RPC method. */ export interface QueryVoteRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** voter defines the oter address for the proposals. */ voter: string; } @@ -140,7 +140,7 @@ export interface QueryVoteRequestAminoMsg { } /** QueryVoteRequest is the request type for the Query/Vote RPC method. */ export interface QueryVoteRequestSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; } /** QueryVoteResponse is the response type for the Query/Vote RPC method. */ @@ -168,7 +168,7 @@ export interface QueryVoteResponseSDKType { /** QueryVotesRequest is the request type for the Query/Votes RPC method. */ export interface QueryVotesRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -189,7 +189,7 @@ export interface QueryVotesRequestAminoMsg { } /** QueryVotesRequest is the request type for the Query/Votes RPC method. */ export interface QueryVotesRequestSDKType { - proposal_id: Long; + proposal_id: bigint; pagination: PageRequestSDKType; } /** QueryVotesResponse is the response type for the Query/Votes RPC method. */ @@ -282,7 +282,7 @@ export interface QueryParamsResponseSDKType { /** QueryDepositRequest is the request type for the Query/Deposit RPC method. */ export interface QueryDepositRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** depositor defines the deposit addresses from the proposals. */ depositor: string; } @@ -303,7 +303,7 @@ export interface QueryDepositRequestAminoMsg { } /** QueryDepositRequest is the request type for the Query/Deposit RPC method. */ export interface QueryDepositRequestSDKType { - proposal_id: Long; + proposal_id: bigint; depositor: string; } /** QueryDepositResponse is the response type for the Query/Deposit RPC method. */ @@ -331,7 +331,7 @@ export interface QueryDepositResponseSDKType { /** QueryDepositsRequest is the request type for the Query/Deposits RPC method. */ export interface QueryDepositsRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -352,7 +352,7 @@ export interface QueryDepositsRequestAminoMsg { } /** QueryDepositsRequest is the request type for the Query/Deposits RPC method. */ export interface QueryDepositsRequestSDKType { - proposal_id: Long; + proposal_id: bigint; pagination: PageRequestSDKType; } /** QueryDepositsResponse is the response type for the Query/Deposits RPC method. */ @@ -383,7 +383,7 @@ export interface QueryDepositsResponseSDKType { /** QueryTallyResultRequest is the request type for the Query/Tally RPC method. */ export interface QueryTallyResultRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface QueryTallyResultRequestProtoMsg { typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest"; @@ -400,7 +400,7 @@ export interface QueryTallyResultRequestAminoMsg { } /** QueryTallyResultRequest is the request type for the Query/Tally RPC method. */ export interface QueryTallyResultRequestSDKType { - proposal_id: Long; + proposal_id: bigint; } /** QueryTallyResultResponse is the response type for the Query/Tally RPC method. */ export interface QueryTallyResultResponse { @@ -426,27 +426,27 @@ export interface QueryTallyResultResponseSDKType { } function createBaseQueryProposalRequest(): QueryProposalRequest { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const QueryProposalRequest = { typeUrl: "/cosmos.gov.v1.QueryProposalRequest", aminoType: "cosmos-sdk/v1/QueryProposalRequest", - encode(message: QueryProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -456,18 +456,20 @@ export const QueryProposalRequest = { return message; }, fromJSON(object: any): QueryProposalRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseQueryProposalRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: QueryProposalRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryProposalRequest { const message = createBaseQueryProposalRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: QueryProposalRequestSDKType): QueryProposalRequest { @@ -482,7 +484,7 @@ export const QueryProposalRequest = { }, fromAmino(object: QueryProposalRequestAmino): QueryProposalRequest { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { @@ -520,14 +522,14 @@ function createBaseQueryProposalResponse(): QueryProposalResponse { export const QueryProposalResponse = { typeUrl: "/cosmos.gov.v1.QueryProposalResponse", aminoType: "cosmos-sdk/v1/QueryProposalResponse", - encode(message: QueryProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposal !== undefined) { Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalResponse(); while (reader.pos < end) { @@ -544,9 +546,9 @@ export const QueryProposalResponse = { return message; }, fromJSON(object: any): QueryProposalResponse { - return { - proposal: isSet(object.proposal) ? Proposal.fromJSON(object.proposal) : undefined - }; + const obj = createBaseQueryProposalResponse(); + if (isSet(object.proposal)) obj.proposal = Proposal.fromJSON(object.proposal); + return obj; }, toJSON(message: QueryProposalResponse): unknown { const obj: any = {}; @@ -555,7 +557,9 @@ export const QueryProposalResponse = { }, fromPartial(object: DeepPartial): QueryProposalResponse { const message = createBaseQueryProposalResponse(); - message.proposal = object.proposal !== undefined && object.proposal !== null ? Proposal.fromPartial(object.proposal) : undefined; + if (object.proposal !== undefined && object.proposal !== null) { + message.proposal = Proposal.fromPartial(object.proposal); + } return message; }, fromSDK(object: QueryProposalResponseSDKType): QueryProposalResponse { @@ -611,7 +615,7 @@ function createBaseQueryProposalsRequest(): QueryProposalsRequest { export const QueryProposalsRequest = { typeUrl: "/cosmos.gov.v1.QueryProposalsRequest", aminoType: "cosmos-sdk/v1/QueryProposalsRequest", - encode(message: QueryProposalsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalStatus !== 0) { writer.uint32(8).int32(message.proposalStatus); } @@ -626,8 +630,8 @@ export const QueryProposalsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalsRequest(); while (reader.pos < end) { @@ -653,12 +657,12 @@ export const QueryProposalsRequest = { return message; }, fromJSON(object: any): QueryProposalsRequest { - return { - proposalStatus: isSet(object.proposalStatus) ? proposalStatusFromJSON(object.proposalStatus) : -1, - voter: isSet(object.voter) ? String(object.voter) : "", - depositor: isSet(object.depositor) ? String(object.depositor) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProposalsRequest(); + if (isSet(object.proposalStatus)) obj.proposalStatus = proposalStatusFromJSON(object.proposalStatus); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProposalsRequest): unknown { const obj: any = {}; @@ -673,7 +677,9 @@ export const QueryProposalsRequest = { message.proposalStatus = object.proposalStatus ?? 0; message.voter = object.voter ?? ""; message.depositor = object.depositor ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProposalsRequestSDKType): QueryProposalsRequest { @@ -739,7 +745,7 @@ function createBaseQueryProposalsResponse(): QueryProposalsResponse { export const QueryProposalsResponse = { typeUrl: "/cosmos.gov.v1.QueryProposalsResponse", aminoType: "cosmos-sdk/v1/QueryProposalsResponse", - encode(message: QueryProposalsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proposals) { Proposal.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -748,8 +754,8 @@ export const QueryProposalsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalsResponse(); while (reader.pos < end) { @@ -769,10 +775,10 @@ export const QueryProposalsResponse = { return message; }, fromJSON(object: any): QueryProposalsResponse { - return { - proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProposalsResponse(); + if (Array.isArray(object?.proposals)) object.proposals.map((e: any) => Proposal.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProposalsResponse): unknown { const obj: any = {}; @@ -787,7 +793,9 @@ export const QueryProposalsResponse = { fromPartial(object: DeepPartial): QueryProposalsResponse { const message = createBaseQueryProposalsResponse(); message.proposals = object.proposals?.map(e => Proposal.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProposalsResponseSDKType): QueryProposalsResponse { @@ -846,15 +854,15 @@ export const QueryProposalsResponse = { }; function createBaseQueryVoteRequest(): QueryVoteRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "" }; } export const QueryVoteRequest = { typeUrl: "/cosmos.gov.v1.QueryVoteRequest", aminoType: "cosmos-sdk/v1/QueryVoteRequest", - encode(message: QueryVoteRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryVoteRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -862,15 +870,15 @@ export const QueryVoteRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVoteRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVoteRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVoteRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -883,20 +891,22 @@ export const QueryVoteRequest = { return message; }, fromJSON(object: any): QueryVoteRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "" - }; + const obj = createBaseQueryVoteRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + return obj; }, toJSON(message: QueryVoteRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); return obj; }, fromPartial(object: DeepPartial): QueryVoteRequest { const message = createBaseQueryVoteRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; return message; }, @@ -914,7 +924,7 @@ export const QueryVoteRequest = { }, fromAmino(object: QueryVoteRequestAmino): QueryVoteRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter }; }, @@ -954,14 +964,14 @@ function createBaseQueryVoteResponse(): QueryVoteResponse { export const QueryVoteResponse = { typeUrl: "/cosmos.gov.v1.QueryVoteResponse", aminoType: "cosmos-sdk/v1/QueryVoteResponse", - encode(message: QueryVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.vote !== undefined) { Vote.encode(message.vote, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVoteResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVoteResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVoteResponse(); while (reader.pos < end) { @@ -978,9 +988,9 @@ export const QueryVoteResponse = { return message; }, fromJSON(object: any): QueryVoteResponse { - return { - vote: isSet(object.vote) ? Vote.fromJSON(object.vote) : undefined - }; + const obj = createBaseQueryVoteResponse(); + if (isSet(object.vote)) obj.vote = Vote.fromJSON(object.vote); + return obj; }, toJSON(message: QueryVoteResponse): unknown { const obj: any = {}; @@ -989,7 +999,9 @@ export const QueryVoteResponse = { }, fromPartial(object: DeepPartial): QueryVoteResponse { const message = createBaseQueryVoteResponse(); - message.vote = object.vote !== undefined && object.vote !== null ? Vote.fromPartial(object.vote) : undefined; + if (object.vote !== undefined && object.vote !== null) { + message.vote = Vote.fromPartial(object.vote); + } return message; }, fromSDK(object: QueryVoteResponseSDKType): QueryVoteResponse { @@ -1036,15 +1048,15 @@ export const QueryVoteResponse = { }; function createBaseQueryVotesRequest(): QueryVotesRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryVotesRequest = { typeUrl: "/cosmos.gov.v1.QueryVotesRequest", aminoType: "cosmos-sdk/v1/QueryVotesRequest", - encode(message: QueryVotesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryVotesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.pagination !== undefined) { @@ -1052,15 +1064,15 @@ export const QueryVotesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1073,21 +1085,25 @@ export const QueryVotesRequest = { return message; }, fromJSON(object: any): QueryVotesRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryVotesRequest { const message = createBaseQueryVotesRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesRequestSDKType): QueryVotesRequest { @@ -1104,7 +1120,7 @@ export const QueryVotesRequest = { }, fromAmino(object: QueryVotesRequestAmino): QueryVotesRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1145,7 +1161,7 @@ function createBaseQueryVotesResponse(): QueryVotesResponse { export const QueryVotesResponse = { typeUrl: "/cosmos.gov.v1.QueryVotesResponse", aminoType: "cosmos-sdk/v1/QueryVotesResponse", - encode(message: QueryVotesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVotesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1154,8 +1170,8 @@ export const QueryVotesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesResponse(); while (reader.pos < end) { @@ -1175,10 +1191,10 @@ export const QueryVotesResponse = { return message; }, fromJSON(object: any): QueryVotesResponse { - return { - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesResponse(); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesResponse): unknown { const obj: any = {}; @@ -1193,7 +1209,9 @@ export const QueryVotesResponse = { fromPartial(object: DeepPartial): QueryVotesResponse { const message = createBaseQueryVotesResponse(); message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesResponseSDKType): QueryVotesResponse { @@ -1258,14 +1276,14 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.gov.v1.QueryParamsRequest", aminoType: "cosmos-sdk/v1/QueryParamsRequest", - encode(message: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.paramsType !== "") { writer.uint32(10).string(message.paramsType); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -1282,9 +1300,9 @@ export const QueryParamsRequest = { return message; }, fromJSON(object: any): QueryParamsRequest { - return { - paramsType: isSet(object.paramsType) ? String(object.paramsType) : "" - }; + const obj = createBaseQueryParamsRequest(); + if (isSet(object.paramsType)) obj.paramsType = String(object.paramsType); + return obj; }, toJSON(message: QueryParamsRequest): unknown { const obj: any = {}; @@ -1348,7 +1366,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.gov.v1.QueryParamsResponse", aminoType: "cosmos-sdk/v1/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingParams !== undefined) { VotingParams.encode(message.votingParams, writer.uint32(10).fork()).ldelim(); } @@ -1360,8 +1378,8 @@ export const QueryParamsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -1384,11 +1402,11 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - votingParams: isSet(object.votingParams) ? VotingParams.fromJSON(object.votingParams) : undefined, - depositParams: isSet(object.depositParams) ? DepositParams.fromJSON(object.depositParams) : undefined, - tallyParams: isSet(object.tallyParams) ? TallyParams.fromJSON(object.tallyParams) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.votingParams)) obj.votingParams = VotingParams.fromJSON(object.votingParams); + if (isSet(object.depositParams)) obj.depositParams = DepositParams.fromJSON(object.depositParams); + if (isSet(object.tallyParams)) obj.tallyParams = TallyParams.fromJSON(object.tallyParams); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -1399,9 +1417,15 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.votingParams = object.votingParams !== undefined && object.votingParams !== null ? VotingParams.fromPartial(object.votingParams) : undefined; - message.depositParams = object.depositParams !== undefined && object.depositParams !== null ? DepositParams.fromPartial(object.depositParams) : undefined; - message.tallyParams = object.tallyParams !== undefined && object.tallyParams !== null ? TallyParams.fromPartial(object.tallyParams) : undefined; + if (object.votingParams !== undefined && object.votingParams !== null) { + message.votingParams = VotingParams.fromPartial(object.votingParams); + } + if (object.depositParams !== undefined && object.depositParams !== null) { + message.depositParams = DepositParams.fromPartial(object.depositParams); + } + if (object.tallyParams !== undefined && object.tallyParams !== null) { + message.tallyParams = TallyParams.fromPartial(object.tallyParams); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -1456,15 +1480,15 @@ export const QueryParamsResponse = { }; function createBaseQueryDepositRequest(): QueryDepositRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), depositor: "" }; } export const QueryDepositRequest = { typeUrl: "/cosmos.gov.v1.QueryDepositRequest", aminoType: "cosmos-sdk/v1/QueryDepositRequest", - encode(message: QueryDepositRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryDepositRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.depositor !== "") { @@ -1472,15 +1496,15 @@ export const QueryDepositRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.depositor = reader.string(); @@ -1493,20 +1517,22 @@ export const QueryDepositRequest = { return message; }, fromJSON(object: any): QueryDepositRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "" - }; + const obj = createBaseQueryDepositRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + return obj; }, toJSON(message: QueryDepositRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); return obj; }, fromPartial(object: DeepPartial): QueryDepositRequest { const message = createBaseQueryDepositRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.depositor = object.depositor ?? ""; return message; }, @@ -1524,7 +1550,7 @@ export const QueryDepositRequest = { }, fromAmino(object: QueryDepositRequestAmino): QueryDepositRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), depositor: object.depositor }; }, @@ -1564,14 +1590,14 @@ function createBaseQueryDepositResponse(): QueryDepositResponse { export const QueryDepositResponse = { typeUrl: "/cosmos.gov.v1.QueryDepositResponse", aminoType: "cosmos-sdk/v1/QueryDepositResponse", - encode(message: QueryDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deposit !== undefined) { Deposit.encode(message.deposit, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositResponse(); while (reader.pos < end) { @@ -1588,9 +1614,9 @@ export const QueryDepositResponse = { return message; }, fromJSON(object: any): QueryDepositResponse { - return { - deposit: isSet(object.deposit) ? Deposit.fromJSON(object.deposit) : undefined - }; + const obj = createBaseQueryDepositResponse(); + if (isSet(object.deposit)) obj.deposit = Deposit.fromJSON(object.deposit); + return obj; }, toJSON(message: QueryDepositResponse): unknown { const obj: any = {}; @@ -1599,7 +1625,9 @@ export const QueryDepositResponse = { }, fromPartial(object: DeepPartial): QueryDepositResponse { const message = createBaseQueryDepositResponse(); - message.deposit = object.deposit !== undefined && object.deposit !== null ? Deposit.fromPartial(object.deposit) : undefined; + if (object.deposit !== undefined && object.deposit !== null) { + message.deposit = Deposit.fromPartial(object.deposit); + } return message; }, fromSDK(object: QueryDepositResponseSDKType): QueryDepositResponse { @@ -1646,15 +1674,15 @@ export const QueryDepositResponse = { }; function createBaseQueryDepositsRequest(): QueryDepositsRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryDepositsRequest = { typeUrl: "/cosmos.gov.v1.QueryDepositsRequest", aminoType: "cosmos-sdk/v1/QueryDepositsRequest", - encode(message: QueryDepositsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryDepositsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.pagination !== undefined) { @@ -1662,15 +1690,15 @@ export const QueryDepositsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositsRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1683,21 +1711,25 @@ export const QueryDepositsRequest = { return message; }, fromJSON(object: any): QueryDepositsRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDepositsRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDepositsRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryDepositsRequest { const message = createBaseQueryDepositsRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDepositsRequestSDKType): QueryDepositsRequest { @@ -1714,7 +1746,7 @@ export const QueryDepositsRequest = { }, fromAmino(object: QueryDepositsRequestAmino): QueryDepositsRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1755,7 +1787,7 @@ function createBaseQueryDepositsResponse(): QueryDepositsResponse { export const QueryDepositsResponse = { typeUrl: "/cosmos.gov.v1.QueryDepositsResponse", aminoType: "cosmos-sdk/v1/QueryDepositsResponse", - encode(message: QueryDepositsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDepositsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deposits) { Deposit.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1764,8 +1796,8 @@ export const QueryDepositsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositsResponse(); while (reader.pos < end) { @@ -1785,10 +1817,10 @@ export const QueryDepositsResponse = { return message; }, fromJSON(object: any): QueryDepositsResponse { - return { - deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDepositsResponse(); + if (Array.isArray(object?.deposits)) object.deposits.map((e: any) => Deposit.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDepositsResponse): unknown { const obj: any = {}; @@ -1803,7 +1835,9 @@ export const QueryDepositsResponse = { fromPartial(object: DeepPartial): QueryDepositsResponse { const message = createBaseQueryDepositsResponse(); message.deposits = object.deposits?.map(e => Deposit.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDepositsResponseSDKType): QueryDepositsResponse { @@ -1862,27 +1896,27 @@ export const QueryDepositsResponse = { }; function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const QueryTallyResultRequest = { typeUrl: "/cosmos.gov.v1.QueryTallyResultRequest", aminoType: "cosmos-sdk/v1/QueryTallyResultRequest", - encode(message: QueryTallyResultRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryTallyResultRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTallyResultRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTallyResultRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTallyResultRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1892,18 +1926,20 @@ export const QueryTallyResultRequest = { return message; }, fromJSON(object: any): QueryTallyResultRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseQueryTallyResultRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: QueryTallyResultRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryTallyResultRequest { const message = createBaseQueryTallyResultRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: QueryTallyResultRequestSDKType): QueryTallyResultRequest { @@ -1918,7 +1954,7 @@ export const QueryTallyResultRequest = { }, fromAmino(object: QueryTallyResultRequestAmino): QueryTallyResultRequest { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { @@ -1956,14 +1992,14 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { export const QueryTallyResultResponse = { typeUrl: "/cosmos.gov.v1.QueryTallyResultResponse", aminoType: "cosmos-sdk/v1/QueryTallyResultResponse", - encode(message: QueryTallyResultResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTallyResultResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tally !== undefined) { TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTallyResultResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTallyResultResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTallyResultResponse(); while (reader.pos < end) { @@ -1980,9 +2016,9 @@ export const QueryTallyResultResponse = { return message; }, fromJSON(object: any): QueryTallyResultResponse { - return { - tally: isSet(object.tally) ? TallyResult.fromJSON(object.tally) : undefined - }; + const obj = createBaseQueryTallyResultResponse(); + if (isSet(object.tally)) obj.tally = TallyResult.fromJSON(object.tally); + return obj; }, toJSON(message: QueryTallyResultResponse): unknown { const obj: any = {}; @@ -1991,7 +2027,9 @@ export const QueryTallyResultResponse = { }, fromPartial(object: DeepPartial): QueryTallyResultResponse { const message = createBaseQueryTallyResultResponse(); - message.tally = object.tally !== undefined && object.tally !== null ? TallyResult.fromPartial(object.tally) : undefined; + if (object.tally !== undefined && object.tally !== null) { + message.tally = TallyResult.fromPartial(object.tally); + } return message; }, fromSDK(object: QueryTallyResultResponseSDKType): QueryTallyResultResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts index ccc0c45489..221b626799 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1/tx.ts @@ -7,8 +7,8 @@ import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposa import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; import { UpdateFeeTokenProposal, UpdateFeeTokenProposalProtoMsg, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1"; /** * MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary @@ -55,7 +55,7 @@ export interface MsgSubmitProposalSDKType { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponse { - proposalId: Long; + proposalId: bigint; } export interface MsgSubmitProposalResponseProtoMsg { typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse"; @@ -71,7 +71,7 @@ export interface MsgSubmitProposalResponseAminoMsg { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseSDKType { - proposal_id: Long; + proposal_id: bigint; } /** * MsgExecLegacyContent is used to wrap the legacy content field into a message. @@ -128,7 +128,7 @@ export interface MsgExecLegacyContentResponseAminoMsg { export interface MsgExecLegacyContentResponseSDKType {} /** MsgVote defines a message to cast a vote. */ export interface MsgVote { - proposalId: Long; + proposalId: bigint; voter: string; option: VoteOption; metadata: string; @@ -150,7 +150,7 @@ export interface MsgVoteAminoMsg { } /** MsgVote defines a message to cast a vote. */ export interface MsgVoteSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; option: VoteOption; metadata: string; @@ -171,7 +171,7 @@ export interface MsgVoteResponseAminoMsg { export interface MsgVoteResponseSDKType {} /** MsgVoteWeighted defines a message to cast a vote. */ export interface MsgVoteWeighted { - proposalId: Long; + proposalId: bigint; voter: string; options: WeightedVoteOption[]; metadata: string; @@ -193,7 +193,7 @@ export interface MsgVoteWeightedAminoMsg { } /** MsgVoteWeighted defines a message to cast a vote. */ export interface MsgVoteWeightedSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; options: WeightedVoteOptionSDKType[]; metadata: string; @@ -214,7 +214,7 @@ export interface MsgVoteWeightedResponseAminoMsg { export interface MsgVoteWeightedResponseSDKType {} /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDeposit { - proposalId: Long; + proposalId: bigint; depositor: string; amount: Coin[]; } @@ -234,7 +234,7 @@ export interface MsgDepositAminoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositSDKType { - proposal_id: Long; + proposal_id: bigint; depositor: string; amount: CoinSDKType[]; } @@ -263,7 +263,7 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal { export const MsgSubmitProposal = { typeUrl: "/cosmos.gov.v1.MsgSubmitProposal", aminoType: "cosmos-sdk/v1/MsgSubmitProposal", - encode(message: MsgSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.messages) { Any.encode((v! as Any), writer.uint32(10).fork()).ldelim(); } @@ -278,8 +278,8 @@ export const MsgSubmitProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitProposal(); while (reader.pos < end) { @@ -305,12 +305,12 @@ export const MsgSubmitProposal = { return message; }, fromJSON(object: any): MsgSubmitProposal { - return { - messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromJSON(e)) : [], - initialDeposit: Array.isArray(object?.initialDeposit) ? object.initialDeposit.map((e: any) => Coin.fromJSON(e)) : [], - proposer: isSet(object.proposer) ? String(object.proposer) : "", - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseMsgSubmitProposal(); + if (Array.isArray(object?.messages)) object.messages.map((e: any) => Any.fromJSON(e)); + if (Array.isArray(object?.initialDeposit)) object.initialDeposit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.proposer)) obj.proposer = String(object.proposer); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: MsgSubmitProposal): unknown { const obj: any = {}; @@ -408,27 +408,27 @@ export const MsgSubmitProposal = { }; function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const MsgSubmitProposalResponse = { typeUrl: "/cosmos.gov.v1.MsgSubmitProposalResponse", aminoType: "cosmos-sdk/v1/MsgSubmitProposalResponse", - encode(message: MsgSubmitProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgSubmitProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitProposalResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -438,18 +438,20 @@ export const MsgSubmitProposalResponse = { return message; }, fromJSON(object: any): MsgSubmitProposalResponse { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseMsgSubmitProposalResponse(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: MsgSubmitProposalResponse): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgSubmitProposalResponse { const message = createBaseMsgSubmitProposalResponse(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: MsgSubmitProposalResponseSDKType): MsgSubmitProposalResponse { @@ -464,7 +466,7 @@ export const MsgSubmitProposalResponse = { }, fromAmino(object: MsgSubmitProposalResponseAmino): MsgSubmitProposalResponse { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { @@ -503,7 +505,7 @@ function createBaseMsgExecLegacyContent(): MsgExecLegacyContent { export const MsgExecLegacyContent = { typeUrl: "/cosmos.gov.v1.MsgExecLegacyContent", aminoType: "cosmos-sdk/v1/MsgExecLegacyContent", - encode(message: MsgExecLegacyContent, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgExecLegacyContent, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.content !== undefined) { Any.encode((message.content as Any), writer.uint32(10).fork()).ldelim(); } @@ -512,8 +514,8 @@ export const MsgExecLegacyContent = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExecLegacyContent { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExecLegacyContent { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExecLegacyContent(); while (reader.pos < end) { @@ -533,10 +535,10 @@ export const MsgExecLegacyContent = { return message; }, fromJSON(object: any): MsgExecLegacyContent { - return { - content: isSet(object.content) ? Any.fromJSON(object.content) : undefined, - authority: isSet(object.authority) ? String(object.authority) : "" - }; + const obj = createBaseMsgExecLegacyContent(); + if (isSet(object.content)) obj.content = Any.fromJSON(object.content); + if (isSet(object.authority)) obj.authority = String(object.authority); + return obj; }, toJSON(message: MsgExecLegacyContent): unknown { const obj: any = {}; @@ -546,7 +548,9 @@ export const MsgExecLegacyContent = { }, fromPartial(object: DeepPartial): MsgExecLegacyContent { const message = createBaseMsgExecLegacyContent(); - message.content = object.content !== undefined && object.content !== null ? Any.fromPartial(object.content) : undefined; + if (object.content !== undefined && object.content !== null) { + message.content = Any.fromPartial(object.content); + } message.authority = object.authority ?? ""; return message; }, @@ -602,11 +606,11 @@ function createBaseMsgExecLegacyContentResponse(): MsgExecLegacyContentResponse export const MsgExecLegacyContentResponse = { typeUrl: "/cosmos.gov.v1.MsgExecLegacyContentResponse", aminoType: "cosmos-sdk/v1/MsgExecLegacyContentResponse", - encode(_: MsgExecLegacyContentResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgExecLegacyContentResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExecLegacyContentResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExecLegacyContentResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExecLegacyContentResponse(); while (reader.pos < end) { @@ -620,7 +624,8 @@ export const MsgExecLegacyContentResponse = { return message; }, fromJSON(_: any): MsgExecLegacyContentResponse { - return {}; + const obj = createBaseMsgExecLegacyContentResponse(); + return obj; }, toJSON(_: MsgExecLegacyContentResponse): unknown { const obj: any = {}; @@ -668,7 +673,7 @@ export const MsgExecLegacyContentResponse = { }; function createBaseMsgVote(): MsgVote { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", option: 0, metadata: "" @@ -677,8 +682,8 @@ function createBaseMsgVote(): MsgVote { export const MsgVote = { typeUrl: "/cosmos.gov.v1.MsgVote", aminoType: "cosmos-sdk/v1/MsgVote", - encode(message: MsgVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -692,15 +697,15 @@ export const MsgVote = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -719,16 +724,16 @@ export const MsgVote = { return message; }, fromJSON(object: any): MsgVote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseMsgVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: MsgVote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); message.metadata !== undefined && (obj.metadata = message.metadata); @@ -736,7 +741,9 @@ export const MsgVote = { }, fromPartial(object: DeepPartial): MsgVote { const message = createBaseMsgVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.option = object.option ?? 0; message.metadata = object.metadata ?? ""; @@ -760,7 +767,7 @@ export const MsgVote = { }, fromAmino(object: MsgVoteAmino): MsgVote { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, metadata: object.metadata @@ -802,11 +809,11 @@ function createBaseMsgVoteResponse(): MsgVoteResponse { export const MsgVoteResponse = { typeUrl: "/cosmos.gov.v1.MsgVoteResponse", aminoType: "cosmos-sdk/v1/MsgVoteResponse", - encode(_: MsgVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteResponse(); while (reader.pos < end) { @@ -820,7 +827,8 @@ export const MsgVoteResponse = { return message; }, fromJSON(_: any): MsgVoteResponse { - return {}; + const obj = createBaseMsgVoteResponse(); + return obj; }, toJSON(_: MsgVoteResponse): unknown { const obj: any = {}; @@ -868,7 +876,7 @@ export const MsgVoteResponse = { }; function createBaseMsgVoteWeighted(): MsgVoteWeighted { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", options: [], metadata: "" @@ -877,8 +885,8 @@ function createBaseMsgVoteWeighted(): MsgVoteWeighted { export const MsgVoteWeighted = { typeUrl: "/cosmos.gov.v1.MsgVoteWeighted", aminoType: "cosmos-sdk/v1/MsgVoteWeighted", - encode(message: MsgVoteWeighted, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgVoteWeighted, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -892,15 +900,15 @@ export const MsgVoteWeighted = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteWeighted { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteWeighted { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteWeighted(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -919,16 +927,16 @@ export const MsgVoteWeighted = { return message; }, fromJSON(object: any): MsgVoteWeighted { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromJSON(e)) : [], - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseMsgVoteWeighted(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (Array.isArray(object?.options)) object.options.map((e: any) => WeightedVoteOption.fromJSON(e)); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: MsgVoteWeighted): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toJSON(e) : undefined); @@ -940,7 +948,9 @@ export const MsgVoteWeighted = { }, fromPartial(object: DeepPartial): MsgVoteWeighted { const message = createBaseMsgVoteWeighted(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.options = object.options?.map(e => WeightedVoteOption.fromPartial(e)) || []; message.metadata = object.metadata ?? ""; @@ -968,7 +978,7 @@ export const MsgVoteWeighted = { }, fromAmino(object: MsgVoteWeightedAmino): MsgVoteWeighted { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [], metadata: object.metadata @@ -1014,11 +1024,11 @@ function createBaseMsgVoteWeightedResponse(): MsgVoteWeightedResponse { export const MsgVoteWeightedResponse = { typeUrl: "/cosmos.gov.v1.MsgVoteWeightedResponse", aminoType: "cosmos-sdk/v1/MsgVoteWeightedResponse", - encode(_: MsgVoteWeightedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgVoteWeightedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteWeightedResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteWeightedResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteWeightedResponse(); while (reader.pos < end) { @@ -1032,7 +1042,8 @@ export const MsgVoteWeightedResponse = { return message; }, fromJSON(_: any): MsgVoteWeightedResponse { - return {}; + const obj = createBaseMsgVoteWeightedResponse(); + return obj; }, toJSON(_: MsgVoteWeightedResponse): unknown { const obj: any = {}; @@ -1080,7 +1091,7 @@ export const MsgVoteWeightedResponse = { }; function createBaseMsgDeposit(): MsgDeposit { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), depositor: "", amount: [] }; @@ -1088,8 +1099,8 @@ function createBaseMsgDeposit(): MsgDeposit { export const MsgDeposit = { typeUrl: "/cosmos.gov.v1.MsgDeposit", aminoType: "cosmos-sdk/v1/MsgDeposit", - encode(message: MsgDeposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgDeposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.depositor !== "") { @@ -1100,15 +1111,15 @@ export const MsgDeposit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeposit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeposit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeposit(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.depositor = reader.string(); @@ -1124,15 +1135,15 @@ export const MsgDeposit = { return message; }, fromJSON(object: any): MsgDeposit { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgDeposit(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgDeposit): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toJSON(e) : undefined); @@ -1143,7 +1154,9 @@ export const MsgDeposit = { }, fromPartial(object: DeepPartial): MsgDeposit { const message = createBaseMsgDeposit(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.depositor = object.depositor ?? ""; message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; return message; @@ -1168,7 +1181,7 @@ export const MsgDeposit = { }, fromAmino(object: MsgDepositAmino): MsgDeposit { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), depositor: object.depositor, amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] }; @@ -1212,11 +1225,11 @@ function createBaseMsgDepositResponse(): MsgDepositResponse { export const MsgDepositResponse = { typeUrl: "/cosmos.gov.v1.MsgDepositResponse", aminoType: "cosmos-sdk/v1/MsgDepositResponse", - encode(_: MsgDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDepositResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDepositResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDepositResponse(); while (reader.pos < end) { @@ -1230,7 +1243,8 @@ export const MsgDepositResponse = { return message; }, fromJSON(_: any): MsgDepositResponse { - return {}; + const obj = createBaseMsgDepositResponse(); + return obj; }, toJSON(_: MsgDepositResponse): unknown { const obj: any = {}; @@ -1276,8 +1290,8 @@ export const MsgDepositResponse = { }; } }; -export const ProposalContentI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Array): TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.gov.v1beta1.TextProposal": diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts index 04d3976432..b34c4e9d9d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/genesis.ts @@ -1,11 +1,11 @@ import { Deposit, DepositAmino, DepositSDKType, Vote, VoteAmino, VoteSDKType, Proposal, ProposalAmino, ProposalSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType } from "./gov"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; /** GenesisState defines the gov module's genesis state. */ export interface GenesisState { /** starting_proposal_id is the ID of the starting proposal. */ - startingProposalId: Long; + startingProposalId: bigint; /** deposits defines all the deposits present at genesis. */ deposits: Deposit[]; /** votes defines all the votes present at genesis. */ @@ -46,7 +46,7 @@ export interface GenesisStateAminoMsg { } /** GenesisState defines the gov module's genesis state. */ export interface GenesisStateSDKType { - starting_proposal_id: Long; + starting_proposal_id: bigint; deposits: DepositSDKType[]; votes: VoteSDKType[]; proposals: ProposalSDKType[]; @@ -56,7 +56,7 @@ export interface GenesisStateSDKType { } function createBaseGenesisState(): GenesisState { return { - startingProposalId: Long.UZERO, + startingProposalId: BigInt(0), deposits: [], votes: [], proposals: [], @@ -68,8 +68,8 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.gov.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.startingProposalId.isZero()) { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.startingProposalId !== BigInt(0)) { writer.uint32(8).uint64(message.startingProposalId); } for (const v of message.deposits) { @@ -92,15 +92,15 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.startingProposalId = (reader.uint64() as Long); + message.startingProposalId = reader.uint64(); break; case 2: message.deposits.push(Deposit.decode(reader, reader.uint32())); @@ -128,19 +128,19 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - startingProposalId: isSet(object.startingProposalId) ? Long.fromValue(object.startingProposalId) : Long.UZERO, - deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromJSON(e)) : [], - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [], - proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromJSON(e)) : [], - depositParams: isSet(object.depositParams) ? DepositParams.fromJSON(object.depositParams) : undefined, - votingParams: isSet(object.votingParams) ? VotingParams.fromJSON(object.votingParams) : undefined, - tallyParams: isSet(object.tallyParams) ? TallyParams.fromJSON(object.tallyParams) : undefined - }; + const obj = createBaseGenesisState(); + if (isSet(object.startingProposalId)) obj.startingProposalId = BigInt(object.startingProposalId.toString()); + if (Array.isArray(object?.deposits)) object.deposits.map((e: any) => Deposit.fromJSON(e)); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + if (Array.isArray(object?.proposals)) object.proposals.map((e: any) => Proposal.fromJSON(e)); + if (isSet(object.depositParams)) obj.depositParams = DepositParams.fromJSON(object.depositParams); + if (isSet(object.votingParams)) obj.votingParams = VotingParams.fromJSON(object.votingParams); + if (isSet(object.tallyParams)) obj.tallyParams = TallyParams.fromJSON(object.tallyParams); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; - message.startingProposalId !== undefined && (obj.startingProposalId = (message.startingProposalId || Long.UZERO).toString()); + message.startingProposalId !== undefined && (obj.startingProposalId = (message.startingProposalId || BigInt(0)).toString()); if (message.deposits) { obj.deposits = message.deposits.map(e => e ? Deposit.toJSON(e) : undefined); } else { @@ -163,13 +163,21 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.startingProposalId = object.startingProposalId !== undefined && object.startingProposalId !== null ? Long.fromValue(object.startingProposalId) : Long.UZERO; + if (object.startingProposalId !== undefined && object.startingProposalId !== null) { + message.startingProposalId = BigInt(object.startingProposalId.toString()); + } message.deposits = object.deposits?.map(e => Deposit.fromPartial(e)) || []; message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; message.proposals = object.proposals?.map(e => Proposal.fromPartial(e)) || []; - message.depositParams = object.depositParams !== undefined && object.depositParams !== null ? DepositParams.fromPartial(object.depositParams) : undefined; - message.votingParams = object.votingParams !== undefined && object.votingParams !== null ? VotingParams.fromPartial(object.votingParams) : undefined; - message.tallyParams = object.tallyParams !== undefined && object.tallyParams !== null ? TallyParams.fromPartial(object.tallyParams) : undefined; + if (object.depositParams !== undefined && object.depositParams !== null) { + message.depositParams = DepositParams.fromPartial(object.depositParams); + } + if (object.votingParams !== undefined && object.votingParams !== null) { + message.votingParams = VotingParams.fromPartial(object.votingParams); + } + if (object.tallyParams !== undefined && object.tallyParams !== null) { + message.tallyParams = TallyParams.fromPartial(object.tallyParams); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { @@ -208,7 +216,7 @@ export const GenesisState = { }, fromAmino(object: GenesisStateAmino): GenesisState { return { - startingProposalId: Long.fromString(object.starting_proposal_id), + startingProposalId: BigInt(object.starting_proposal_id), deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromAmino(e)) : [], votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [], proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts index e7cfde2120..b4d4d97340 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/gov.ts @@ -7,8 +7,9 @@ import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposa import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; import { UpdateFeeTokenProposal, UpdateFeeTokenProposalProtoMsg, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { Decimal } from "@cosmjs/math"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; /** VoteOption enumerates the valid vote options for a given governance proposal. */ export enum VoteOption { @@ -184,6 +185,7 @@ export interface WeightedVoteOptionSDKType { * manually updated in case of approval. */ export interface TextProposal { + $typeUrl?: string; title: string; description: string; } @@ -208,6 +210,7 @@ export interface TextProposalAminoMsg { * manually updated in case of approval. */ export interface TextProposalSDKType { + $typeUrl?: string; title: string; description: string; } @@ -216,7 +219,7 @@ export interface TextProposalSDKType { * proposal. */ export interface Deposit { - proposalId: Long; + proposalId: bigint; depositor: string; amount: Coin[]; } @@ -242,13 +245,13 @@ export interface DepositAminoMsg { * proposal. */ export interface DepositSDKType { - proposal_id: Long; + proposal_id: bigint; depositor: string; amount: CoinSDKType[]; } /** Proposal defines the core field members of a governance proposal. */ export interface Proposal { - proposalId: Long; + proposalId: bigint; content: TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any | undefined; status: ProposalStatus; /** @@ -293,7 +296,7 @@ export interface ProposalAminoMsg { } /** Proposal defines the core field members of a governance proposal. */ export interface ProposalSDKType { - proposal_id: Long; + proposal_id: bigint; content: TextProposalSDKType | RegisterIncentiveProposalSDKType | ClientUpdateProposalSDKType | UpgradeProposalSDKType | ReplacePoolIncentivesProposalSDKType | UpdatePoolIncentivesProposalSDKType | SetSuperfluidAssetsProposalSDKType | RemoveSuperfluidAssetsProposalSDKType | UpdateUnpoolWhiteListProposalSDKType | UpdateFeeTokenProposalSDKType | AnySDKType | undefined; status: ProposalStatus; final_tally_result: TallyResultSDKType; @@ -337,7 +340,7 @@ export interface TallyResultSDKType { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface Vote { - proposalId: Long; + proposalId: bigint; voter: string; /** * Deprecated: Prefer to use `options` instead. This field is set in queries @@ -379,7 +382,7 @@ export interface VoteAminoMsg { * A Vote consists of a proposal ID, the voter, and the vote option. */ export interface VoteSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; /** @deprecated */ option: VoteOption; @@ -493,17 +496,17 @@ function createBaseWeightedVoteOption(): WeightedVoteOption { export const WeightedVoteOption = { typeUrl: "/cosmos.gov.v1beta1.WeightedVoteOption", aminoType: "cosmos-sdk/WeightedVoteOption", - encode(message: WeightedVoteOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WeightedVoteOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.option !== 0) { writer.uint32(8).int32(message.option); } if (message.weight !== "") { - writer.uint32(18).string(message.weight); + writer.uint32(18).string(Decimal.fromUserInput(message.weight, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WeightedVoteOption { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WeightedVoteOption { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWeightedVoteOption(); while (reader.pos < end) { @@ -513,7 +516,7 @@ export const WeightedVoteOption = { message.option = (reader.int32() as any); break; case 2: - message.weight = reader.string(); + message.weight = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -523,10 +526,10 @@ export const WeightedVoteOption = { return message; }, fromJSON(object: any): WeightedVoteOption { - return { - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, - weight: isSet(object.weight) ? String(object.weight) : "" - }; + const obj = createBaseWeightedVoteOption(); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + if (isSet(object.weight)) obj.weight = String(object.weight); + return obj; }, toJSON(message: WeightedVoteOption): unknown { const obj: any = {}; @@ -588,6 +591,7 @@ export const WeightedVoteOption = { }; function createBaseTextProposal(): TextProposal { return { + $typeUrl: "/cosmos.gov.v1beta1.TextProposal", title: "", description: "" }; @@ -595,7 +599,7 @@ function createBaseTextProposal(): TextProposal { export const TextProposal = { typeUrl: "/cosmos.gov.v1beta1.TextProposal", aminoType: "cosmos-sdk/TextProposal", - encode(message: TextProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TextProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -604,8 +608,8 @@ export const TextProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TextProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TextProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTextProposal(); while (reader.pos < end) { @@ -625,10 +629,10 @@ export const TextProposal = { return message; }, fromJSON(object: any): TextProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "" - }; + const obj = createBaseTextProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + return obj; }, toJSON(message: TextProposal): unknown { const obj: any = {}; @@ -690,7 +694,7 @@ export const TextProposal = { }; function createBaseDeposit(): Deposit { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), depositor: "", amount: [] }; @@ -698,8 +702,8 @@ function createBaseDeposit(): Deposit { export const Deposit = { typeUrl: "/cosmos.gov.v1beta1.Deposit", aminoType: "cosmos-sdk/Deposit", - encode(message: Deposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: Deposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.depositor !== "") { @@ -710,15 +714,15 @@ export const Deposit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Deposit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Deposit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeposit(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.depositor = reader.string(); @@ -734,15 +738,15 @@ export const Deposit = { return message; }, fromJSON(object: any): Deposit { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseDeposit(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Deposit): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toJSON(e) : undefined); @@ -753,7 +757,9 @@ export const Deposit = { }, fromPartial(object: DeepPartial): Deposit { const message = createBaseDeposit(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.depositor = object.depositor ?? ""; message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; return message; @@ -778,7 +784,7 @@ export const Deposit = { }, fromAmino(object: DepositAmino): Deposit { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), depositor: object.depositor, amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] }; @@ -818,7 +824,7 @@ export const Deposit = { }; function createBaseProposal(): Proposal { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), content: Any.fromPartial({}), status: 0, finalTallyResult: TallyResult.fromPartial({}), @@ -832,8 +838,8 @@ function createBaseProposal(): Proposal { export const Proposal = { typeUrl: "/cosmos.gov.v1beta1.Proposal", aminoType: "cosmos-sdk/Proposal", - encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.content !== undefined) { @@ -862,15 +868,15 @@ export const Proposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Proposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Proposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProposal(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.content = (ProposalContentI_InterfaceDecoder(reader) as Any); @@ -904,21 +910,21 @@ export const Proposal = { return message; }, fromJSON(object: any): Proposal { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - content: isSet(object.content) ? Any.fromJSON(object.content) : undefined, - status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, - finalTallyResult: isSet(object.finalTallyResult) ? TallyResult.fromJSON(object.finalTallyResult) : undefined, - submitTime: isSet(object.submitTime) ? new Date(object.submitTime) : undefined, - depositEndTime: isSet(object.depositEndTime) ? new Date(object.depositEndTime) : undefined, - totalDeposit: Array.isArray(object?.totalDeposit) ? object.totalDeposit.map((e: any) => Coin.fromJSON(e)) : [], - votingStartTime: isSet(object.votingStartTime) ? new Date(object.votingStartTime) : undefined, - votingEndTime: isSet(object.votingEndTime) ? new Date(object.votingEndTime) : undefined - }; + const obj = createBaseProposal(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.content)) obj.content = Any.fromJSON(object.content); + if (isSet(object.status)) obj.status = proposalStatusFromJSON(object.status); + if (isSet(object.finalTallyResult)) obj.finalTallyResult = TallyResult.fromJSON(object.finalTallyResult); + if (isSet(object.submitTime)) obj.submitTime = new Date(object.submitTime); + if (isSet(object.depositEndTime)) obj.depositEndTime = new Date(object.depositEndTime); + if (Array.isArray(object?.totalDeposit)) object.totalDeposit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.votingStartTime)) obj.votingStartTime = new Date(object.votingStartTime); + if (isSet(object.votingEndTime)) obj.votingEndTime = new Date(object.votingEndTime); + return obj; }, toJSON(message: Proposal): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.content !== undefined && (obj.content = message.content ? Any.toJSON(message.content) : undefined); message.status !== undefined && (obj.status = proposalStatusToJSON(message.status)); message.finalTallyResult !== undefined && (obj.finalTallyResult = message.finalTallyResult ? TallyResult.toJSON(message.finalTallyResult) : undefined); @@ -935,10 +941,16 @@ export const Proposal = { }, fromPartial(object: DeepPartial): Proposal { const message = createBaseProposal(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; - message.content = object.content !== undefined && object.content !== null ? Any.fromPartial(object.content) : undefined; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } + if (object.content !== undefined && object.content !== null) { + message.content = Any.fromPartial(object.content); + } message.status = object.status ?? 0; - message.finalTallyResult = object.finalTallyResult !== undefined && object.finalTallyResult !== null ? TallyResult.fromPartial(object.finalTallyResult) : undefined; + if (object.finalTallyResult !== undefined && object.finalTallyResult !== null) { + message.finalTallyResult = TallyResult.fromPartial(object.finalTallyResult); + } message.submitTime = object.submitTime ?? undefined; message.depositEndTime = object.depositEndTime ?? undefined; message.totalDeposit = object.totalDeposit?.map(e => Coin.fromPartial(e)) || []; @@ -978,7 +990,7 @@ export const Proposal = { }, fromAmino(object: ProposalAmino): Proposal { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), content: object?.content ? ProposalContentI_FromAmino(object.content) : undefined, status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined, @@ -1039,7 +1051,7 @@ function createBaseTallyResult(): TallyResult { export const TallyResult = { typeUrl: "/cosmos.gov.v1beta1.TallyResult", aminoType: "cosmos-sdk/TallyResult", - encode(message: TallyResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TallyResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.yes !== "") { writer.uint32(10).string(message.yes); } @@ -1054,8 +1066,8 @@ export const TallyResult = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TallyResult { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TallyResult { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTallyResult(); while (reader.pos < end) { @@ -1081,12 +1093,12 @@ export const TallyResult = { return message; }, fromJSON(object: any): TallyResult { - return { - yes: isSet(object.yes) ? String(object.yes) : "", - abstain: isSet(object.abstain) ? String(object.abstain) : "", - no: isSet(object.no) ? String(object.no) : "", - noWithVeto: isSet(object.noWithVeto) ? String(object.noWithVeto) : "" - }; + const obj = createBaseTallyResult(); + if (isSet(object.yes)) obj.yes = String(object.yes); + if (isSet(object.abstain)) obj.abstain = String(object.abstain); + if (isSet(object.no)) obj.no = String(object.no); + if (isSet(object.noWithVeto)) obj.noWithVeto = String(object.noWithVeto); + return obj; }, toJSON(message: TallyResult): unknown { const obj: any = {}; @@ -1160,7 +1172,7 @@ export const TallyResult = { }; function createBaseVote(): Vote { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", option: 0, options: [] @@ -1169,8 +1181,8 @@ function createBaseVote(): Vote { export const Vote = { typeUrl: "/cosmos.gov.v1beta1.Vote", aminoType: "cosmos-sdk/Vote", - encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -1184,15 +1196,15 @@ export const Vote = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Vote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Vote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -1211,16 +1223,16 @@ export const Vote = { return message; }, fromJSON(object: any): Vote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, - options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromJSON(e)) : [] - }; + const obj = createBaseVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + if (Array.isArray(object?.options)) object.options.map((e: any) => WeightedVoteOption.fromJSON(e)); + return obj; }, toJSON(message: Vote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); if (message.options) { @@ -1232,7 +1244,9 @@ export const Vote = { }, fromPartial(object: DeepPartial): Vote { const message = createBaseVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.option = object.option ?? 0; message.options = object.options?.map(e => WeightedVoteOption.fromPartial(e)) || []; @@ -1260,7 +1274,7 @@ export const Vote = { }, fromAmino(object: VoteAmino): Vote { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [] @@ -1309,7 +1323,7 @@ function createBaseDepositParams(): DepositParams { export const DepositParams = { typeUrl: "/cosmos.gov.v1beta1.DepositParams", aminoType: "cosmos-sdk/DepositParams", - encode(message: DepositParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DepositParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.minDeposit) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1318,8 +1332,8 @@ export const DepositParams = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DepositParams { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DepositParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDepositParams(); while (reader.pos < end) { @@ -1339,10 +1353,10 @@ export const DepositParams = { return message; }, fromJSON(object: any): DepositParams { - return { - minDeposit: Array.isArray(object?.minDeposit) ? object.minDeposit.map((e: any) => Coin.fromJSON(e)) : [], - maxDepositPeriod: isSet(object.maxDepositPeriod) ? Duration.fromJSON(object.maxDepositPeriod) : undefined - }; + const obj = createBaseDepositParams(); + if (Array.isArray(object?.minDeposit)) object.minDeposit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.maxDepositPeriod)) obj.maxDepositPeriod = Duration.fromJSON(object.maxDepositPeriod); + return obj; }, toJSON(message: DepositParams): unknown { const obj: any = {}; @@ -1357,7 +1371,9 @@ export const DepositParams = { fromPartial(object: DeepPartial): DepositParams { const message = createBaseDepositParams(); message.minDeposit = object.minDeposit?.map(e => Coin.fromPartial(e)) || []; - message.maxDepositPeriod = object.maxDepositPeriod !== undefined && object.maxDepositPeriod !== null ? Duration.fromPartial(object.maxDepositPeriod) : undefined; + if (object.maxDepositPeriod !== undefined && object.maxDepositPeriod !== null) { + message.maxDepositPeriod = Duration.fromPartial(object.maxDepositPeriod); + } return message; }, fromSDK(object: DepositParamsSDKType): DepositParams { @@ -1422,14 +1438,14 @@ function createBaseVotingParams(): VotingParams { export const VotingParams = { typeUrl: "/cosmos.gov.v1beta1.VotingParams", aminoType: "cosmos-sdk/VotingParams", - encode(message: VotingParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: VotingParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingPeriod !== undefined) { Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): VotingParams { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): VotingParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVotingParams(); while (reader.pos < end) { @@ -1446,9 +1462,9 @@ export const VotingParams = { return message; }, fromJSON(object: any): VotingParams { - return { - votingPeriod: isSet(object.votingPeriod) ? Duration.fromJSON(object.votingPeriod) : undefined - }; + const obj = createBaseVotingParams(); + if (isSet(object.votingPeriod)) obj.votingPeriod = Duration.fromJSON(object.votingPeriod); + return obj; }, toJSON(message: VotingParams): unknown { const obj: any = {}; @@ -1457,7 +1473,9 @@ export const VotingParams = { }, fromPartial(object: DeepPartial): VotingParams { const message = createBaseVotingParams(); - message.votingPeriod = object.votingPeriod !== undefined && object.votingPeriod !== null ? Duration.fromPartial(object.votingPeriod) : undefined; + if (object.votingPeriod !== undefined && object.votingPeriod !== null) { + message.votingPeriod = Duration.fromPartial(object.votingPeriod); + } return message; }, fromSDK(object: VotingParamsSDKType): VotingParams { @@ -1512,7 +1530,7 @@ function createBaseTallyParams(): TallyParams { export const TallyParams = { typeUrl: "/cosmos.gov.v1beta1.TallyParams", aminoType: "cosmos-sdk/TallyParams", - encode(message: TallyParams, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TallyParams, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.quorum.length !== 0) { writer.uint32(10).bytes(message.quorum); } @@ -1524,8 +1542,8 @@ export const TallyParams = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TallyParams { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TallyParams { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTallyParams(); while (reader.pos < end) { @@ -1548,11 +1566,11 @@ export const TallyParams = { return message; }, fromJSON(object: any): TallyParams { - return { - quorum: isSet(object.quorum) ? bytesFromBase64(object.quorum) : new Uint8Array(), - threshold: isSet(object.threshold) ? bytesFromBase64(object.threshold) : new Uint8Array(), - vetoThreshold: isSet(object.vetoThreshold) ? bytesFromBase64(object.vetoThreshold) : new Uint8Array() - }; + const obj = createBaseTallyParams(); + if (isSet(object.quorum)) obj.quorum = bytesFromBase64(object.quorum); + if (isSet(object.threshold)) obj.threshold = bytesFromBase64(object.threshold); + if (isSet(object.vetoThreshold)) obj.vetoThreshold = bytesFromBase64(object.vetoThreshold); + return obj; }, toJSON(message: TallyParams): unknown { const obj: any = {}; @@ -1618,8 +1636,8 @@ export const TallyParams = { }; } }; -export const ProposalContentI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Array): TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.gov.v1beta1.TextProposal": diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts index 77799b15c4..f21f9d2ac2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/query.ts @@ -1,12 +1,12 @@ import { ProposalStatus, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, VotingParams, VotingParamsAmino, VotingParamsSDKType, DepositParams, DepositParamsAmino, DepositParamsSDKType, TallyParams, TallyParamsAmino, TallyParamsSDKType, Deposit, DepositAmino, DepositSDKType, TallyResult, TallyResultAmino, TallyResultSDKType, proposalStatusFromJSON, proposalStatusToJSON } from "./gov"; import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; /** QueryProposalRequest is the request type for the Query/Proposal RPC method. */ export interface QueryProposalRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface QueryProposalRequestProtoMsg { typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest"; @@ -23,7 +23,7 @@ export interface QueryProposalRequestAminoMsg { } /** QueryProposalRequest is the request type for the Query/Proposal RPC method. */ export interface QueryProposalRequestSDKType { - proposal_id: Long; + proposal_id: bigint; } /** QueryProposalResponse is the response type for the Query/Proposal RPC method. */ export interface QueryProposalResponse { @@ -119,7 +119,7 @@ export interface QueryProposalsResponseSDKType { /** QueryVoteRequest is the request type for the Query/Vote RPC method. */ export interface QueryVoteRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** voter defines the oter address for the proposals. */ voter: string; } @@ -140,7 +140,7 @@ export interface QueryVoteRequestAminoMsg { } /** QueryVoteRequest is the request type for the Query/Vote RPC method. */ export interface QueryVoteRequestSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; } /** QueryVoteResponse is the response type for the Query/Vote RPC method. */ @@ -168,7 +168,7 @@ export interface QueryVoteResponseSDKType { /** QueryVotesRequest is the request type for the Query/Votes RPC method. */ export interface QueryVotesRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -189,7 +189,7 @@ export interface QueryVotesRequestAminoMsg { } /** QueryVotesRequest is the request type for the Query/Votes RPC method. */ export interface QueryVotesRequestSDKType { - proposal_id: Long; + proposal_id: bigint; pagination: PageRequestSDKType; } /** QueryVotesResponse is the response type for the Query/Votes RPC method. */ @@ -282,7 +282,7 @@ export interface QueryParamsResponseSDKType { /** QueryDepositRequest is the request type for the Query/Deposit RPC method. */ export interface QueryDepositRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** depositor defines the deposit addresses from the proposals. */ depositor: string; } @@ -303,7 +303,7 @@ export interface QueryDepositRequestAminoMsg { } /** QueryDepositRequest is the request type for the Query/Deposit RPC method. */ export interface QueryDepositRequestSDKType { - proposal_id: Long; + proposal_id: bigint; depositor: string; } /** QueryDepositResponse is the response type for the Query/Deposit RPC method. */ @@ -331,7 +331,7 @@ export interface QueryDepositResponseSDKType { /** QueryDepositsRequest is the request type for the Query/Deposits RPC method. */ export interface QueryDepositsRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -352,7 +352,7 @@ export interface QueryDepositsRequestAminoMsg { } /** QueryDepositsRequest is the request type for the Query/Deposits RPC method. */ export interface QueryDepositsRequestSDKType { - proposal_id: Long; + proposal_id: bigint; pagination: PageRequestSDKType; } /** QueryDepositsResponse is the response type for the Query/Deposits RPC method. */ @@ -383,7 +383,7 @@ export interface QueryDepositsResponseSDKType { /** QueryTallyResultRequest is the request type for the Query/Tally RPC method. */ export interface QueryTallyResultRequest { /** proposal_id defines the unique id of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface QueryTallyResultRequestProtoMsg { typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest"; @@ -400,7 +400,7 @@ export interface QueryTallyResultRequestAminoMsg { } /** QueryTallyResultRequest is the request type for the Query/Tally RPC method. */ export interface QueryTallyResultRequestSDKType { - proposal_id: Long; + proposal_id: bigint; } /** QueryTallyResultResponse is the response type for the Query/Tally RPC method. */ export interface QueryTallyResultResponse { @@ -426,27 +426,27 @@ export interface QueryTallyResultResponseSDKType { } function createBaseQueryProposalRequest(): QueryProposalRequest { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const QueryProposalRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryProposalRequest", aminoType: "cosmos-sdk/QueryProposalRequest", - encode(message: QueryProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -456,18 +456,20 @@ export const QueryProposalRequest = { return message; }, fromJSON(object: any): QueryProposalRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseQueryProposalRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: QueryProposalRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryProposalRequest { const message = createBaseQueryProposalRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: QueryProposalRequestSDKType): QueryProposalRequest { @@ -482,7 +484,7 @@ export const QueryProposalRequest = { }, fromAmino(object: QueryProposalRequestAmino): QueryProposalRequest { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { @@ -520,14 +522,14 @@ function createBaseQueryProposalResponse(): QueryProposalResponse { export const QueryProposalResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryProposalResponse", aminoType: "cosmos-sdk/QueryProposalResponse", - encode(message: QueryProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposal !== undefined) { Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalResponse(); while (reader.pos < end) { @@ -544,9 +546,9 @@ export const QueryProposalResponse = { return message; }, fromJSON(object: any): QueryProposalResponse { - return { - proposal: isSet(object.proposal) ? Proposal.fromJSON(object.proposal) : undefined - }; + const obj = createBaseQueryProposalResponse(); + if (isSet(object.proposal)) obj.proposal = Proposal.fromJSON(object.proposal); + return obj; }, toJSON(message: QueryProposalResponse): unknown { const obj: any = {}; @@ -555,7 +557,9 @@ export const QueryProposalResponse = { }, fromPartial(object: DeepPartial): QueryProposalResponse { const message = createBaseQueryProposalResponse(); - message.proposal = object.proposal !== undefined && object.proposal !== null ? Proposal.fromPartial(object.proposal) : undefined; + if (object.proposal !== undefined && object.proposal !== null) { + message.proposal = Proposal.fromPartial(object.proposal); + } return message; }, fromSDK(object: QueryProposalResponseSDKType): QueryProposalResponse { @@ -611,7 +615,7 @@ function createBaseQueryProposalsRequest(): QueryProposalsRequest { export const QueryProposalsRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryProposalsRequest", aminoType: "cosmos-sdk/QueryProposalsRequest", - encode(message: QueryProposalsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposalStatus !== 0) { writer.uint32(8).int32(message.proposalStatus); } @@ -626,8 +630,8 @@ export const QueryProposalsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalsRequest(); while (reader.pos < end) { @@ -653,12 +657,12 @@ export const QueryProposalsRequest = { return message; }, fromJSON(object: any): QueryProposalsRequest { - return { - proposalStatus: isSet(object.proposalStatus) ? proposalStatusFromJSON(object.proposalStatus) : -1, - voter: isSet(object.voter) ? String(object.voter) : "", - depositor: isSet(object.depositor) ? String(object.depositor) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProposalsRequest(); + if (isSet(object.proposalStatus)) obj.proposalStatus = proposalStatusFromJSON(object.proposalStatus); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProposalsRequest): unknown { const obj: any = {}; @@ -673,7 +677,9 @@ export const QueryProposalsRequest = { message.proposalStatus = object.proposalStatus ?? 0; message.voter = object.voter ?? ""; message.depositor = object.depositor ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProposalsRequestSDKType): QueryProposalsRequest { @@ -739,7 +745,7 @@ function createBaseQueryProposalsResponse(): QueryProposalsResponse { export const QueryProposalsResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryProposalsResponse", aminoType: "cosmos-sdk/QueryProposalsResponse", - encode(message: QueryProposalsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proposals) { Proposal.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -748,8 +754,8 @@ export const QueryProposalsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalsResponse(); while (reader.pos < end) { @@ -769,10 +775,10 @@ export const QueryProposalsResponse = { return message; }, fromJSON(object: any): QueryProposalsResponse { - return { - proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProposalsResponse(); + if (Array.isArray(object?.proposals)) object.proposals.map((e: any) => Proposal.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProposalsResponse): unknown { const obj: any = {}; @@ -787,7 +793,9 @@ export const QueryProposalsResponse = { fromPartial(object: DeepPartial): QueryProposalsResponse { const message = createBaseQueryProposalsResponse(); message.proposals = object.proposals?.map(e => Proposal.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProposalsResponseSDKType): QueryProposalsResponse { @@ -846,15 +854,15 @@ export const QueryProposalsResponse = { }; function createBaseQueryVoteRequest(): QueryVoteRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "" }; } export const QueryVoteRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryVoteRequest", aminoType: "cosmos-sdk/QueryVoteRequest", - encode(message: QueryVoteRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryVoteRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -862,15 +870,15 @@ export const QueryVoteRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVoteRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVoteRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVoteRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -883,20 +891,22 @@ export const QueryVoteRequest = { return message; }, fromJSON(object: any): QueryVoteRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "" - }; + const obj = createBaseQueryVoteRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + return obj; }, toJSON(message: QueryVoteRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); return obj; }, fromPartial(object: DeepPartial): QueryVoteRequest { const message = createBaseQueryVoteRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; return message; }, @@ -914,7 +924,7 @@ export const QueryVoteRequest = { }, fromAmino(object: QueryVoteRequestAmino): QueryVoteRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter }; }, @@ -954,14 +964,14 @@ function createBaseQueryVoteResponse(): QueryVoteResponse { export const QueryVoteResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryVoteResponse", aminoType: "cosmos-sdk/QueryVoteResponse", - encode(message: QueryVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.vote !== undefined) { Vote.encode(message.vote, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVoteResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVoteResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVoteResponse(); while (reader.pos < end) { @@ -978,9 +988,9 @@ export const QueryVoteResponse = { return message; }, fromJSON(object: any): QueryVoteResponse { - return { - vote: isSet(object.vote) ? Vote.fromJSON(object.vote) : undefined - }; + const obj = createBaseQueryVoteResponse(); + if (isSet(object.vote)) obj.vote = Vote.fromJSON(object.vote); + return obj; }, toJSON(message: QueryVoteResponse): unknown { const obj: any = {}; @@ -989,7 +999,9 @@ export const QueryVoteResponse = { }, fromPartial(object: DeepPartial): QueryVoteResponse { const message = createBaseQueryVoteResponse(); - message.vote = object.vote !== undefined && object.vote !== null ? Vote.fromPartial(object.vote) : undefined; + if (object.vote !== undefined && object.vote !== null) { + message.vote = Vote.fromPartial(object.vote); + } return message; }, fromSDK(object: QueryVoteResponseSDKType): QueryVoteResponse { @@ -1036,15 +1048,15 @@ export const QueryVoteResponse = { }; function createBaseQueryVotesRequest(): QueryVotesRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryVotesRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryVotesRequest", aminoType: "cosmos-sdk/QueryVotesRequest", - encode(message: QueryVotesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryVotesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.pagination !== undefined) { @@ -1052,15 +1064,15 @@ export const QueryVotesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1073,21 +1085,25 @@ export const QueryVotesRequest = { return message; }, fromJSON(object: any): QueryVotesRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryVotesRequest { const message = createBaseQueryVotesRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesRequestSDKType): QueryVotesRequest { @@ -1104,7 +1120,7 @@ export const QueryVotesRequest = { }, fromAmino(object: QueryVotesRequestAmino): QueryVotesRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1145,7 +1161,7 @@ function createBaseQueryVotesResponse(): QueryVotesResponse { export const QueryVotesResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryVotesResponse", aminoType: "cosmos-sdk/QueryVotesResponse", - encode(message: QueryVotesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVotesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1154,8 +1170,8 @@ export const QueryVotesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesResponse(); while (reader.pos < end) { @@ -1175,10 +1191,10 @@ export const QueryVotesResponse = { return message; }, fromJSON(object: any): QueryVotesResponse { - return { - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesResponse(); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesResponse): unknown { const obj: any = {}; @@ -1193,7 +1209,9 @@ export const QueryVotesResponse = { fromPartial(object: DeepPartial): QueryVotesResponse { const message = createBaseQueryVotesResponse(); message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesResponseSDKType): QueryVotesResponse { @@ -1258,14 +1276,14 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(message: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.paramsType !== "") { writer.uint32(10).string(message.paramsType); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -1282,9 +1300,9 @@ export const QueryParamsRequest = { return message; }, fromJSON(object: any): QueryParamsRequest { - return { - paramsType: isSet(object.paramsType) ? String(object.paramsType) : "" - }; + const obj = createBaseQueryParamsRequest(); + if (isSet(object.paramsType)) obj.paramsType = String(object.paramsType); + return obj; }, toJSON(message: QueryParamsRequest): unknown { const obj: any = {}; @@ -1348,7 +1366,7 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingParams !== undefined) { VotingParams.encode(message.votingParams, writer.uint32(10).fork()).ldelim(); } @@ -1360,8 +1378,8 @@ export const QueryParamsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -1384,11 +1402,11 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - votingParams: isSet(object.votingParams) ? VotingParams.fromJSON(object.votingParams) : undefined, - depositParams: isSet(object.depositParams) ? DepositParams.fromJSON(object.depositParams) : undefined, - tallyParams: isSet(object.tallyParams) ? TallyParams.fromJSON(object.tallyParams) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.votingParams)) obj.votingParams = VotingParams.fromJSON(object.votingParams); + if (isSet(object.depositParams)) obj.depositParams = DepositParams.fromJSON(object.depositParams); + if (isSet(object.tallyParams)) obj.tallyParams = TallyParams.fromJSON(object.tallyParams); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -1399,9 +1417,15 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.votingParams = object.votingParams !== undefined && object.votingParams !== null ? VotingParams.fromPartial(object.votingParams) : undefined; - message.depositParams = object.depositParams !== undefined && object.depositParams !== null ? DepositParams.fromPartial(object.depositParams) : undefined; - message.tallyParams = object.tallyParams !== undefined && object.tallyParams !== null ? TallyParams.fromPartial(object.tallyParams) : undefined; + if (object.votingParams !== undefined && object.votingParams !== null) { + message.votingParams = VotingParams.fromPartial(object.votingParams); + } + if (object.depositParams !== undefined && object.depositParams !== null) { + message.depositParams = DepositParams.fromPartial(object.depositParams); + } + if (object.tallyParams !== undefined && object.tallyParams !== null) { + message.tallyParams = TallyParams.fromPartial(object.tallyParams); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -1456,15 +1480,15 @@ export const QueryParamsResponse = { }; function createBaseQueryDepositRequest(): QueryDepositRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), depositor: "" }; } export const QueryDepositRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryDepositRequest", aminoType: "cosmos-sdk/QueryDepositRequest", - encode(message: QueryDepositRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryDepositRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.depositor !== "") { @@ -1472,15 +1496,15 @@ export const QueryDepositRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.depositor = reader.string(); @@ -1493,20 +1517,22 @@ export const QueryDepositRequest = { return message; }, fromJSON(object: any): QueryDepositRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "" - }; + const obj = createBaseQueryDepositRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + return obj; }, toJSON(message: QueryDepositRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); return obj; }, fromPartial(object: DeepPartial): QueryDepositRequest { const message = createBaseQueryDepositRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.depositor = object.depositor ?? ""; return message; }, @@ -1524,7 +1550,7 @@ export const QueryDepositRequest = { }, fromAmino(object: QueryDepositRequestAmino): QueryDepositRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), depositor: object.depositor }; }, @@ -1564,14 +1590,14 @@ function createBaseQueryDepositResponse(): QueryDepositResponse { export const QueryDepositResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryDepositResponse", aminoType: "cosmos-sdk/QueryDepositResponse", - encode(message: QueryDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deposit !== undefined) { Deposit.encode(message.deposit, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositResponse(); while (reader.pos < end) { @@ -1588,9 +1614,9 @@ export const QueryDepositResponse = { return message; }, fromJSON(object: any): QueryDepositResponse { - return { - deposit: isSet(object.deposit) ? Deposit.fromJSON(object.deposit) : undefined - }; + const obj = createBaseQueryDepositResponse(); + if (isSet(object.deposit)) obj.deposit = Deposit.fromJSON(object.deposit); + return obj; }, toJSON(message: QueryDepositResponse): unknown { const obj: any = {}; @@ -1599,7 +1625,9 @@ export const QueryDepositResponse = { }, fromPartial(object: DeepPartial): QueryDepositResponse { const message = createBaseQueryDepositResponse(); - message.deposit = object.deposit !== undefined && object.deposit !== null ? Deposit.fromPartial(object.deposit) : undefined; + if (object.deposit !== undefined && object.deposit !== null) { + message.deposit = Deposit.fromPartial(object.deposit); + } return message; }, fromSDK(object: QueryDepositResponseSDKType): QueryDepositResponse { @@ -1646,15 +1674,15 @@ export const QueryDepositResponse = { }; function createBaseQueryDepositsRequest(): QueryDepositsRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryDepositsRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryDepositsRequest", aminoType: "cosmos-sdk/QueryDepositsRequest", - encode(message: QueryDepositsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryDepositsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.pagination !== undefined) { @@ -1662,15 +1690,15 @@ export const QueryDepositsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositsRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1683,21 +1711,25 @@ export const QueryDepositsRequest = { return message; }, fromJSON(object: any): QueryDepositsRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDepositsRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDepositsRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryDepositsRequest { const message = createBaseQueryDepositsRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDepositsRequestSDKType): QueryDepositsRequest { @@ -1714,7 +1746,7 @@ export const QueryDepositsRequest = { }, fromAmino(object: QueryDepositsRequestAmino): QueryDepositsRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1755,7 +1787,7 @@ function createBaseQueryDepositsResponse(): QueryDepositsResponse { export const QueryDepositsResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryDepositsResponse", aminoType: "cosmos-sdk/QueryDepositsResponse", - encode(message: QueryDepositsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDepositsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.deposits) { Deposit.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1764,8 +1796,8 @@ export const QueryDepositsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDepositsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDepositsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDepositsResponse(); while (reader.pos < end) { @@ -1785,10 +1817,10 @@ export const QueryDepositsResponse = { return message; }, fromJSON(object: any): QueryDepositsResponse { - return { - deposits: Array.isArray(object?.deposits) ? object.deposits.map((e: any) => Deposit.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDepositsResponse(); + if (Array.isArray(object?.deposits)) object.deposits.map((e: any) => Deposit.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDepositsResponse): unknown { const obj: any = {}; @@ -1803,7 +1835,9 @@ export const QueryDepositsResponse = { fromPartial(object: DeepPartial): QueryDepositsResponse { const message = createBaseQueryDepositsResponse(); message.deposits = object.deposits?.map(e => Deposit.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDepositsResponseSDKType): QueryDepositsResponse { @@ -1862,27 +1896,27 @@ export const QueryDepositsResponse = { }; function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const QueryTallyResultRequest = { typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultRequest", aminoType: "cosmos-sdk/QueryTallyResultRequest", - encode(message: QueryTallyResultRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryTallyResultRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTallyResultRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTallyResultRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTallyResultRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1892,18 +1926,20 @@ export const QueryTallyResultRequest = { return message; }, fromJSON(object: any): QueryTallyResultRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseQueryTallyResultRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: QueryTallyResultRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryTallyResultRequest { const message = createBaseQueryTallyResultRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: QueryTallyResultRequestSDKType): QueryTallyResultRequest { @@ -1918,7 +1954,7 @@ export const QueryTallyResultRequest = { }, fromAmino(object: QueryTallyResultRequestAmino): QueryTallyResultRequest { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { @@ -1956,14 +1992,14 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { export const QueryTallyResultResponse = { typeUrl: "/cosmos.gov.v1beta1.QueryTallyResultResponse", aminoType: "cosmos-sdk/QueryTallyResultResponse", - encode(message: QueryTallyResultResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTallyResultResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tally !== undefined) { TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTallyResultResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTallyResultResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTallyResultResponse(); while (reader.pos < end) { @@ -1980,9 +2016,9 @@ export const QueryTallyResultResponse = { return message; }, fromJSON(object: any): QueryTallyResultResponse { - return { - tally: isSet(object.tally) ? TallyResult.fromJSON(object.tally) : undefined - }; + const obj = createBaseQueryTallyResultResponse(); + if (isSet(object.tally)) obj.tally = TallyResult.fromJSON(object.tally); + return obj; }, toJSON(message: QueryTallyResultResponse): unknown { const obj: any = {}; @@ -1991,7 +2027,9 @@ export const QueryTallyResultResponse = { }, fromPartial(object: DeepPartial): QueryTallyResultResponse { const message = createBaseQueryTallyResultResponse(); - message.tally = object.tally !== undefined && object.tally !== null ? TallyResult.fromPartial(object.tally) : undefined; + if (object.tally !== undefined && object.tally !== null) { + message.tally = TallyResult.fromPartial(object.tally); + } return message; }, fromSDK(object: QueryTallyResultResponseSDKType): QueryTallyResultResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts index 2c89e8b234..42e2d66bc2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/gov/v1beta1/tx.ts @@ -6,8 +6,8 @@ import { ClientUpdateProposal, ClientUpdateProposalProtoMsg, ClientUpdateProposa import { ReplacePoolIncentivesProposal, ReplacePoolIncentivesProposalProtoMsg, ReplacePoolIncentivesProposalSDKType, UpdatePoolIncentivesProposal, UpdatePoolIncentivesProposalProtoMsg, UpdatePoolIncentivesProposalSDKType } from "../../../osmosis/pool-incentives/v1beta1/gov"; import { SetSuperfluidAssetsProposal, SetSuperfluidAssetsProposalProtoMsg, SetSuperfluidAssetsProposalSDKType, RemoveSuperfluidAssetsProposal, RemoveSuperfluidAssetsProposalProtoMsg, RemoveSuperfluidAssetsProposalSDKType, UpdateUnpoolWhiteListProposal, UpdateUnpoolWhiteListProposalProtoMsg, UpdateUnpoolWhiteListProposalSDKType } from "../../../osmosis/superfluid/v1beta1/gov"; import { UpdateFeeTokenProposal, UpdateFeeTokenProposalProtoMsg, UpdateFeeTokenProposalSDKType } from "../../../osmosis/txfees/v1beta1/gov"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.gov.v1beta1"; /** * MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary @@ -49,7 +49,7 @@ export interface MsgSubmitProposalSDKType { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponse { - proposalId: Long; + proposalId: bigint; } export interface MsgSubmitProposalResponseProtoMsg { typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse"; @@ -65,11 +65,11 @@ export interface MsgSubmitProposalResponseAminoMsg { } /** MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseSDKType { - proposal_id: Long; + proposal_id: bigint; } /** MsgVote defines a message to cast a vote. */ export interface MsgVote { - proposalId: Long; + proposalId: bigint; voter: string; option: VoteOption; } @@ -89,7 +89,7 @@ export interface MsgVoteAminoMsg { } /** MsgVote defines a message to cast a vote. */ export interface MsgVoteSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; option: VoteOption; } @@ -113,7 +113,7 @@ export interface MsgVoteResponseSDKType {} * Since: cosmos-sdk 0.43 */ export interface MsgVoteWeighted { - proposalId: Long; + proposalId: bigint; voter: string; options: WeightedVoteOption[]; } @@ -141,7 +141,7 @@ export interface MsgVoteWeightedAminoMsg { * Since: cosmos-sdk 0.43 */ export interface MsgVoteWeightedSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; options: WeightedVoteOptionSDKType[]; } @@ -173,7 +173,7 @@ export interface MsgVoteWeightedResponseAminoMsg { export interface MsgVoteWeightedResponseSDKType {} /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDeposit { - proposalId: Long; + proposalId: bigint; depositor: string; amount: Coin[]; } @@ -193,7 +193,7 @@ export interface MsgDepositAminoMsg { } /** MsgDeposit defines a message to submit a deposit to an existing proposal. */ export interface MsgDepositSDKType { - proposal_id: Long; + proposal_id: bigint; depositor: string; amount: CoinSDKType[]; } @@ -221,7 +221,7 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal { export const MsgSubmitProposal = { typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposal", aminoType: "cosmos-sdk/MsgSubmitProposal", - encode(message: MsgSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.content !== undefined) { Any.encode((message.content as Any), writer.uint32(10).fork()).ldelim(); } @@ -233,8 +233,8 @@ export const MsgSubmitProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitProposal(); while (reader.pos < end) { @@ -257,11 +257,11 @@ export const MsgSubmitProposal = { return message; }, fromJSON(object: any): MsgSubmitProposal { - return { - content: isSet(object.content) ? Any.fromJSON(object.content) : undefined, - initialDeposit: Array.isArray(object?.initialDeposit) ? object.initialDeposit.map((e: any) => Coin.fromJSON(e)) : [], - proposer: isSet(object.proposer) ? String(object.proposer) : "" - }; + const obj = createBaseMsgSubmitProposal(); + if (isSet(object.content)) obj.content = Any.fromJSON(object.content); + if (Array.isArray(object?.initialDeposit)) object.initialDeposit.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.proposer)) obj.proposer = String(object.proposer); + return obj; }, toJSON(message: MsgSubmitProposal): unknown { const obj: any = {}; @@ -276,7 +276,9 @@ export const MsgSubmitProposal = { }, fromPartial(object: DeepPartial): MsgSubmitProposal { const message = createBaseMsgSubmitProposal(); - message.content = object.content !== undefined && object.content !== null ? Any.fromPartial(object.content) : undefined; + if (object.content !== undefined && object.content !== null) { + message.content = Any.fromPartial(object.content); + } message.initialDeposit = object.initialDeposit?.map(e => Coin.fromPartial(e)) || []; message.proposer = object.proposer ?? ""; return message; @@ -341,27 +343,27 @@ export const MsgSubmitProposal = { }; function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const MsgSubmitProposalResponse = { typeUrl: "/cosmos.gov.v1beta1.MsgSubmitProposalResponse", aminoType: "cosmos-sdk/MsgSubmitProposalResponse", - encode(message: MsgSubmitProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgSubmitProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitProposalResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -371,18 +373,20 @@ export const MsgSubmitProposalResponse = { return message; }, fromJSON(object: any): MsgSubmitProposalResponse { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseMsgSubmitProposalResponse(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: MsgSubmitProposalResponse): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgSubmitProposalResponse { const message = createBaseMsgSubmitProposalResponse(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: MsgSubmitProposalResponseSDKType): MsgSubmitProposalResponse { @@ -397,7 +401,7 @@ export const MsgSubmitProposalResponse = { }, fromAmino(object: MsgSubmitProposalResponseAmino): MsgSubmitProposalResponse { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { @@ -429,7 +433,7 @@ export const MsgSubmitProposalResponse = { }; function createBaseMsgVote(): MsgVote { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", option: 0 }; @@ -437,8 +441,8 @@ function createBaseMsgVote(): MsgVote { export const MsgVote = { typeUrl: "/cosmos.gov.v1beta1.MsgVote", aminoType: "cosmos-sdk/MsgVote", - encode(message: MsgVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -449,15 +453,15 @@ export const MsgVote = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -473,22 +477,24 @@ export const MsgVote = { return message; }, fromJSON(object: any): MsgVote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1 - }; + const obj = createBaseMsgVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + return obj; }, toJSON(message: MsgVote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); return obj; }, fromPartial(object: DeepPartial): MsgVote { const message = createBaseMsgVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.option = object.option ?? 0; return message; @@ -509,7 +515,7 @@ export const MsgVote = { }, fromAmino(object: MsgVoteAmino): MsgVote { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1 }; @@ -549,11 +555,11 @@ function createBaseMsgVoteResponse(): MsgVoteResponse { export const MsgVoteResponse = { typeUrl: "/cosmos.gov.v1beta1.MsgVoteResponse", aminoType: "cosmos-sdk/MsgVoteResponse", - encode(_: MsgVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteResponse(); while (reader.pos < end) { @@ -567,7 +573,8 @@ export const MsgVoteResponse = { return message; }, fromJSON(_: any): MsgVoteResponse { - return {}; + const obj = createBaseMsgVoteResponse(); + return obj; }, toJSON(_: MsgVoteResponse): unknown { const obj: any = {}; @@ -615,7 +622,7 @@ export const MsgVoteResponse = { }; function createBaseMsgVoteWeighted(): MsgVoteWeighted { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", options: [] }; @@ -623,8 +630,8 @@ function createBaseMsgVoteWeighted(): MsgVoteWeighted { export const MsgVoteWeighted = { typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeighted", aminoType: "cosmos-sdk/MsgVoteWeighted", - encode(message: MsgVoteWeighted, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgVoteWeighted, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -635,15 +642,15 @@ export const MsgVoteWeighted = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteWeighted { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteWeighted { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteWeighted(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -659,15 +666,15 @@ export const MsgVoteWeighted = { return message; }, fromJSON(object: any): MsgVoteWeighted { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromJSON(e)) : [] - }; + const obj = createBaseMsgVoteWeighted(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (Array.isArray(object?.options)) object.options.map((e: any) => WeightedVoteOption.fromJSON(e)); + return obj; }, toJSON(message: MsgVoteWeighted): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); if (message.options) { obj.options = message.options.map(e => e ? WeightedVoteOption.toJSON(e) : undefined); @@ -678,7 +685,9 @@ export const MsgVoteWeighted = { }, fromPartial(object: DeepPartial): MsgVoteWeighted { const message = createBaseMsgVoteWeighted(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.options = object.options?.map(e => WeightedVoteOption.fromPartial(e)) || []; return message; @@ -703,7 +712,7 @@ export const MsgVoteWeighted = { }, fromAmino(object: MsgVoteWeightedAmino): MsgVoteWeighted { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, options: Array.isArray(object?.options) ? object.options.map((e: any) => WeightedVoteOption.fromAmino(e)) : [] }; @@ -747,11 +756,11 @@ function createBaseMsgVoteWeightedResponse(): MsgVoteWeightedResponse { export const MsgVoteWeightedResponse = { typeUrl: "/cosmos.gov.v1beta1.MsgVoteWeightedResponse", aminoType: "cosmos-sdk/MsgVoteWeightedResponse", - encode(_: MsgVoteWeightedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgVoteWeightedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteWeightedResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteWeightedResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteWeightedResponse(); while (reader.pos < end) { @@ -765,7 +774,8 @@ export const MsgVoteWeightedResponse = { return message; }, fromJSON(_: any): MsgVoteWeightedResponse { - return {}; + const obj = createBaseMsgVoteWeightedResponse(); + return obj; }, toJSON(_: MsgVoteWeightedResponse): unknown { const obj: any = {}; @@ -813,7 +823,7 @@ export const MsgVoteWeightedResponse = { }; function createBaseMsgDeposit(): MsgDeposit { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), depositor: "", amount: [] }; @@ -821,8 +831,8 @@ function createBaseMsgDeposit(): MsgDeposit { export const MsgDeposit = { typeUrl: "/cosmos.gov.v1beta1.MsgDeposit", aminoType: "cosmos-sdk/MsgDeposit", - encode(message: MsgDeposit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgDeposit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.depositor !== "") { @@ -833,15 +843,15 @@ export const MsgDeposit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDeposit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDeposit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDeposit(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.depositor = reader.string(); @@ -857,15 +867,15 @@ export const MsgDeposit = { return message; }, fromJSON(object: any): MsgDeposit { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - depositor: isSet(object.depositor) ? String(object.depositor) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgDeposit(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.depositor)) obj.depositor = String(object.depositor); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgDeposit): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.depositor !== undefined && (obj.depositor = message.depositor); if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toJSON(e) : undefined); @@ -876,7 +886,9 @@ export const MsgDeposit = { }, fromPartial(object: DeepPartial): MsgDeposit { const message = createBaseMsgDeposit(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.depositor = object.depositor ?? ""; message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; return message; @@ -901,7 +913,7 @@ export const MsgDeposit = { }, fromAmino(object: MsgDepositAmino): MsgDeposit { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), depositor: object.depositor, amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] }; @@ -945,11 +957,11 @@ function createBaseMsgDepositResponse(): MsgDepositResponse { export const MsgDepositResponse = { typeUrl: "/cosmos.gov.v1beta1.MsgDepositResponse", aminoType: "cosmos-sdk/MsgDepositResponse", - encode(_: MsgDepositResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDepositResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDepositResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDepositResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDepositResponse(); while (reader.pos < end) { @@ -963,7 +975,8 @@ export const MsgDepositResponse = { return message; }, fromJSON(_: any): MsgDepositResponse { - return {}; + const obj = createBaseMsgDepositResponse(); + return obj; }, toJSON(_: MsgDepositResponse): unknown { const obj: any = {}; @@ -1009,8 +1022,8 @@ export const MsgDepositResponse = { }; } }; -export const ProposalContentI_InterfaceDecoder = (input: _m0.Reader | Uint8Array): TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const ProposalContentI_InterfaceDecoder = (input: BinaryReader | Uint8Array): TextProposal | RegisterIncentiveProposal | ClientUpdateProposal | UpgradeProposal | ReplacePoolIncentivesProposal | UpdatePoolIncentivesProposal | SetSuperfluidAssetsProposal | RemoveSuperfluidAssetsProposal | UpdateUnpoolWhiteListProposal | UpdateFeeTokenProposal | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.gov.v1beta1.TextProposal": diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts index e2d4e2cd39..1a6921e3b8 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/events.ts @@ -1,11 +1,11 @@ import { ProposalExecutorResult, proposalExecutorResultFromJSON, proposalExecutorResultToJSON } from "./types"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; /** EventCreateGroup is an event emitted when a group is created. */ export interface EventCreateGroup { /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; } export interface EventCreateGroupProtoMsg { typeUrl: "/cosmos.group.v1.EventCreateGroup"; @@ -22,12 +22,12 @@ export interface EventCreateGroupAminoMsg { } /** EventCreateGroup is an event emitted when a group is created. */ export interface EventCreateGroupSDKType { - group_id: Long; + group_id: bigint; } /** EventUpdateGroup is an event emitted when a group is updated. */ export interface EventUpdateGroup { /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; } export interface EventUpdateGroupProtoMsg { typeUrl: "/cosmos.group.v1.EventUpdateGroup"; @@ -44,7 +44,7 @@ export interface EventUpdateGroupAminoMsg { } /** EventUpdateGroup is an event emitted when a group is updated. */ export interface EventUpdateGroupSDKType { - group_id: Long; + group_id: bigint; } /** EventCreateGroupPolicy is an event emitted when a group policy is created. */ export interface EventCreateGroupPolicy { @@ -93,7 +93,7 @@ export interface EventUpdateGroupPolicySDKType { /** EventSubmitProposal is an event emitted when a proposal is created. */ export interface EventSubmitProposal { /** proposal_id is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface EventSubmitProposalProtoMsg { typeUrl: "/cosmos.group.v1.EventSubmitProposal"; @@ -110,12 +110,12 @@ export interface EventSubmitProposalAminoMsg { } /** EventSubmitProposal is an event emitted when a proposal is created. */ export interface EventSubmitProposalSDKType { - proposal_id: Long; + proposal_id: bigint; } /** EventWithdrawProposal is an event emitted when a proposal is withdrawn. */ export interface EventWithdrawProposal { /** proposal_id is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface EventWithdrawProposalProtoMsg { typeUrl: "/cosmos.group.v1.EventWithdrawProposal"; @@ -132,12 +132,12 @@ export interface EventWithdrawProposalAminoMsg { } /** EventWithdrawProposal is an event emitted when a proposal is withdrawn. */ export interface EventWithdrawProposalSDKType { - proposal_id: Long; + proposal_id: bigint; } /** EventVote is an event emitted when a voter votes on a proposal. */ export interface EventVote { /** proposal_id is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface EventVoteProtoMsg { typeUrl: "/cosmos.group.v1.EventVote"; @@ -154,12 +154,12 @@ export interface EventVoteAminoMsg { } /** EventVote is an event emitted when a voter votes on a proposal. */ export interface EventVoteSDKType { - proposal_id: Long; + proposal_id: bigint; } /** EventExec is an event emitted when a proposal is executed. */ export interface EventExec { /** proposal_id is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; /** result is the proposal execution result. */ result: ProposalExecutorResult; } @@ -180,13 +180,13 @@ export interface EventExecAminoMsg { } /** EventExec is an event emitted when a proposal is executed. */ export interface EventExecSDKType { - proposal_id: Long; + proposal_id: bigint; result: ProposalExecutorResult; } /** EventLeaveGroup is an event emitted when group member leaves the group. */ export interface EventLeaveGroup { /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** address is the account address of the group member. */ address: string; } @@ -207,32 +207,32 @@ export interface EventLeaveGroupAminoMsg { } /** EventLeaveGroup is an event emitted when group member leaves the group. */ export interface EventLeaveGroupSDKType { - group_id: Long; + group_id: bigint; address: string; } function createBaseEventCreateGroup(): EventCreateGroup { return { - groupId: Long.UZERO + groupId: BigInt(0) }; } export const EventCreateGroup = { typeUrl: "/cosmos.group.v1.EventCreateGroup", aminoType: "cosmos-sdk/EventCreateGroup", - encode(message: EventCreateGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: EventCreateGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventCreateGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventCreateGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventCreateGroup(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -242,18 +242,20 @@ export const EventCreateGroup = { return message; }, fromJSON(object: any): EventCreateGroup { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO - }; + const obj = createBaseEventCreateGroup(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + return obj; }, toJSON(message: EventCreateGroup): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EventCreateGroup { const message = createBaseEventCreateGroup(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } return message; }, fromSDK(object: EventCreateGroupSDKType): EventCreateGroup { @@ -268,7 +270,7 @@ export const EventCreateGroup = { }, fromAmino(object: EventCreateGroupAmino): EventCreateGroup { return { - groupId: Long.fromString(object.group_id) + groupId: BigInt(object.group_id) }; }, toAmino(message: EventCreateGroup): EventCreateGroupAmino { @@ -300,27 +302,27 @@ export const EventCreateGroup = { }; function createBaseEventUpdateGroup(): EventUpdateGroup { return { - groupId: Long.UZERO + groupId: BigInt(0) }; } export const EventUpdateGroup = { typeUrl: "/cosmos.group.v1.EventUpdateGroup", aminoType: "cosmos-sdk/EventUpdateGroup", - encode(message: EventUpdateGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: EventUpdateGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventUpdateGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventUpdateGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventUpdateGroup(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -330,18 +332,20 @@ export const EventUpdateGroup = { return message; }, fromJSON(object: any): EventUpdateGroup { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO - }; + const obj = createBaseEventUpdateGroup(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + return obj; }, toJSON(message: EventUpdateGroup): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EventUpdateGroup { const message = createBaseEventUpdateGroup(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } return message; }, fromSDK(object: EventUpdateGroupSDKType): EventUpdateGroup { @@ -356,7 +360,7 @@ export const EventUpdateGroup = { }, fromAmino(object: EventUpdateGroupAmino): EventUpdateGroup { return { - groupId: Long.fromString(object.group_id) + groupId: BigInt(object.group_id) }; }, toAmino(message: EventUpdateGroup): EventUpdateGroupAmino { @@ -394,14 +398,14 @@ function createBaseEventCreateGroupPolicy(): EventCreateGroupPolicy { export const EventCreateGroupPolicy = { typeUrl: "/cosmos.group.v1.EventCreateGroupPolicy", aminoType: "cosmos-sdk/EventCreateGroupPolicy", - encode(message: EventCreateGroupPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EventCreateGroupPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventCreateGroupPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventCreateGroupPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventCreateGroupPolicy(); while (reader.pos < end) { @@ -418,9 +422,9 @@ export const EventCreateGroupPolicy = { return message; }, fromJSON(object: any): EventCreateGroupPolicy { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseEventCreateGroupPolicy(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: EventCreateGroupPolicy): unknown { const obj: any = {}; @@ -482,14 +486,14 @@ function createBaseEventUpdateGroupPolicy(): EventUpdateGroupPolicy { export const EventUpdateGroupPolicy = { typeUrl: "/cosmos.group.v1.EventUpdateGroupPolicy", aminoType: "cosmos-sdk/EventUpdateGroupPolicy", - encode(message: EventUpdateGroupPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EventUpdateGroupPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventUpdateGroupPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventUpdateGroupPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventUpdateGroupPolicy(); while (reader.pos < end) { @@ -506,9 +510,9 @@ export const EventUpdateGroupPolicy = { return message; }, fromJSON(object: any): EventUpdateGroupPolicy { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseEventUpdateGroupPolicy(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: EventUpdateGroupPolicy): unknown { const obj: any = {}; @@ -564,27 +568,27 @@ export const EventUpdateGroupPolicy = { }; function createBaseEventSubmitProposal(): EventSubmitProposal { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const EventSubmitProposal = { typeUrl: "/cosmos.group.v1.EventSubmitProposal", aminoType: "cosmos-sdk/EventSubmitProposal", - encode(message: EventSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: EventSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventSubmitProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventSubmitProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventSubmitProposal(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -594,18 +598,20 @@ export const EventSubmitProposal = { return message; }, fromJSON(object: any): EventSubmitProposal { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseEventSubmitProposal(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: EventSubmitProposal): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EventSubmitProposal { const message = createBaseEventSubmitProposal(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: EventSubmitProposalSDKType): EventSubmitProposal { @@ -620,7 +626,7 @@ export const EventSubmitProposal = { }, fromAmino(object: EventSubmitProposalAmino): EventSubmitProposal { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: EventSubmitProposal): EventSubmitProposalAmino { @@ -652,27 +658,27 @@ export const EventSubmitProposal = { }; function createBaseEventWithdrawProposal(): EventWithdrawProposal { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const EventWithdrawProposal = { typeUrl: "/cosmos.group.v1.EventWithdrawProposal", aminoType: "cosmos-sdk/EventWithdrawProposal", - encode(message: EventWithdrawProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: EventWithdrawProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventWithdrawProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventWithdrawProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventWithdrawProposal(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -682,18 +688,20 @@ export const EventWithdrawProposal = { return message; }, fromJSON(object: any): EventWithdrawProposal { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseEventWithdrawProposal(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: EventWithdrawProposal): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EventWithdrawProposal { const message = createBaseEventWithdrawProposal(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: EventWithdrawProposalSDKType): EventWithdrawProposal { @@ -708,7 +716,7 @@ export const EventWithdrawProposal = { }, fromAmino(object: EventWithdrawProposalAmino): EventWithdrawProposal { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: EventWithdrawProposal): EventWithdrawProposalAmino { @@ -740,27 +748,27 @@ export const EventWithdrawProposal = { }; function createBaseEventVote(): EventVote { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const EventVote = { typeUrl: "/cosmos.group.v1.EventVote", aminoType: "cosmos-sdk/EventVote", - encode(message: EventVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: EventVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventVote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventVote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -770,18 +778,20 @@ export const EventVote = { return message; }, fromJSON(object: any): EventVote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseEventVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: EventVote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EventVote { const message = createBaseEventVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: EventVoteSDKType): EventVote { @@ -796,7 +806,7 @@ export const EventVote = { }, fromAmino(object: EventVoteAmino): EventVote { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: EventVote): EventVoteAmino { @@ -828,15 +838,15 @@ export const EventVote = { }; function createBaseEventExec(): EventExec { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), result: 0 }; } export const EventExec = { typeUrl: "/cosmos.group.v1.EventExec", aminoType: "cosmos-sdk/EventExec", - encode(message: EventExec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: EventExec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.result !== 0) { @@ -844,15 +854,15 @@ export const EventExec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventExec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventExec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventExec(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.result = (reader.int32() as any); @@ -865,20 +875,22 @@ export const EventExec = { return message; }, fromJSON(object: any): EventExec { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - result: isSet(object.result) ? proposalExecutorResultFromJSON(object.result) : -1 - }; + const obj = createBaseEventExec(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.result)) obj.result = proposalExecutorResultFromJSON(object.result); + return obj; }, toJSON(message: EventExec): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.result !== undefined && (obj.result = proposalExecutorResultToJSON(message.result)); return obj; }, fromPartial(object: DeepPartial): EventExec { const message = createBaseEventExec(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.result = object.result ?? 0; return message; }, @@ -896,7 +908,7 @@ export const EventExec = { }, fromAmino(object: EventExecAmino): EventExec { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), result: isSet(object.result) ? proposalExecutorResultFromJSON(object.result) : -1 }; }, @@ -930,15 +942,15 @@ export const EventExec = { }; function createBaseEventLeaveGroup(): EventLeaveGroup { return { - groupId: Long.UZERO, + groupId: BigInt(0), address: "" }; } export const EventLeaveGroup = { typeUrl: "/cosmos.group.v1.EventLeaveGroup", aminoType: "cosmos-sdk/EventLeaveGroup", - encode(message: EventLeaveGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: EventLeaveGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } if (message.address !== "") { @@ -946,15 +958,15 @@ export const EventLeaveGroup = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventLeaveGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventLeaveGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventLeaveGroup(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 2: message.address = reader.string(); @@ -967,20 +979,22 @@ export const EventLeaveGroup = { return message; }, fromJSON(object: any): EventLeaveGroup { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseEventLeaveGroup(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: EventLeaveGroup): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.address !== undefined && (obj.address = message.address); return obj; }, fromPartial(object: DeepPartial): EventLeaveGroup { const message = createBaseEventLeaveGroup(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.address = object.address ?? ""; return message; }, @@ -998,7 +1012,7 @@ export const EventLeaveGroup = { }, fromAmino(object: EventLeaveGroupAmino): EventLeaveGroup { return { - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), address: object.address }; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts index d7eb71e675..920ac7a4a0 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/genesis.ts @@ -1,6 +1,6 @@ import { GroupInfo, GroupInfoAmino, GroupInfoSDKType, GroupMember, GroupMemberAmino, GroupMemberSDKType, GroupPolicyInfo, GroupPolicyInfoAmino, GroupPolicyInfoSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType } from "./types"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; /** GenesisState defines the group module's genesis state. */ export interface GenesisState { @@ -8,7 +8,7 @@ export interface GenesisState { * group_seq is the group table orm.Sequence, * it is used to get the next group ID. */ - groupSeq: Long; + groupSeq: bigint; /** groups is the list of groups info. */ groups: GroupInfo[]; /** group_members is the list of groups members. */ @@ -17,14 +17,14 @@ export interface GenesisState { * group_policy_seq is the group policy table orm.Sequence, * it is used to generate the next group policy account address. */ - groupPolicySeq: Long; + groupPolicySeq: bigint; /** group_policies is the list of group policies info. */ groupPolicies: GroupPolicyInfo[]; /** * proposal_seq is the proposal table orm.Sequence, * it is used to get the next proposal ID. */ - proposalSeq: Long; + proposalSeq: bigint; /** proposals is the list of proposals. */ proposals: Proposal[]; /** votes is the list of votes. */ @@ -68,23 +68,23 @@ export interface GenesisStateAminoMsg { } /** GenesisState defines the group module's genesis state. */ export interface GenesisStateSDKType { - group_seq: Long; + group_seq: bigint; groups: GroupInfoSDKType[]; group_members: GroupMemberSDKType[]; - group_policy_seq: Long; + group_policy_seq: bigint; group_policies: GroupPolicyInfoSDKType[]; - proposal_seq: Long; + proposal_seq: bigint; proposals: ProposalSDKType[]; votes: VoteSDKType[]; } function createBaseGenesisState(): GenesisState { return { - groupSeq: Long.UZERO, + groupSeq: BigInt(0), groups: [], groupMembers: [], - groupPolicySeq: Long.UZERO, + groupPolicySeq: BigInt(0), groupPolicies: [], - proposalSeq: Long.UZERO, + proposalSeq: BigInt(0), proposals: [], votes: [] }; @@ -92,8 +92,8 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.group.v1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupSeq.isZero()) { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupSeq !== BigInt(0)) { writer.uint32(8).uint64(message.groupSeq); } for (const v of message.groups) { @@ -102,13 +102,13 @@ export const GenesisState = { for (const v of message.groupMembers) { GroupMember.encode(v!, writer.uint32(26).fork()).ldelim(); } - if (!message.groupPolicySeq.isZero()) { + if (message.groupPolicySeq !== BigInt(0)) { writer.uint32(32).uint64(message.groupPolicySeq); } for (const v of message.groupPolicies) { GroupPolicyInfo.encode(v!, writer.uint32(42).fork()).ldelim(); } - if (!message.proposalSeq.isZero()) { + if (message.proposalSeq !== BigInt(0)) { writer.uint32(48).uint64(message.proposalSeq); } for (const v of message.proposals) { @@ -119,15 +119,15 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupSeq = (reader.uint64() as Long); + message.groupSeq = reader.uint64(); break; case 2: message.groups.push(GroupInfo.decode(reader, reader.uint32())); @@ -136,13 +136,13 @@ export const GenesisState = { message.groupMembers.push(GroupMember.decode(reader, reader.uint32())); break; case 4: - message.groupPolicySeq = (reader.uint64() as Long); + message.groupPolicySeq = reader.uint64(); break; case 5: message.groupPolicies.push(GroupPolicyInfo.decode(reader, reader.uint32())); break; case 6: - message.proposalSeq = (reader.uint64() as Long); + message.proposalSeq = reader.uint64(); break; case 7: message.proposals.push(Proposal.decode(reader, reader.uint32())); @@ -158,20 +158,20 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - groupSeq: isSet(object.groupSeq) ? Long.fromValue(object.groupSeq) : Long.UZERO, - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromJSON(e)) : [], - groupMembers: Array.isArray(object?.groupMembers) ? object.groupMembers.map((e: any) => GroupMember.fromJSON(e)) : [], - groupPolicySeq: isSet(object.groupPolicySeq) ? Long.fromValue(object.groupPolicySeq) : Long.UZERO, - groupPolicies: Array.isArray(object?.groupPolicies) ? object.groupPolicies.map((e: any) => GroupPolicyInfo.fromJSON(e)) : [], - proposalSeq: isSet(object.proposalSeq) ? Long.fromValue(object.proposalSeq) : Long.UZERO, - proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromJSON(e)) : [], - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.groupSeq)) obj.groupSeq = BigInt(object.groupSeq.toString()); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => GroupInfo.fromJSON(e)); + if (Array.isArray(object?.groupMembers)) object.groupMembers.map((e: any) => GroupMember.fromJSON(e)); + if (isSet(object.groupPolicySeq)) obj.groupPolicySeq = BigInt(object.groupPolicySeq.toString()); + if (Array.isArray(object?.groupPolicies)) object.groupPolicies.map((e: any) => GroupPolicyInfo.fromJSON(e)); + if (isSet(object.proposalSeq)) obj.proposalSeq = BigInt(object.proposalSeq.toString()); + if (Array.isArray(object?.proposals)) object.proposals.map((e: any) => Proposal.fromJSON(e)); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; - message.groupSeq !== undefined && (obj.groupSeq = (message.groupSeq || Long.UZERO).toString()); + message.groupSeq !== undefined && (obj.groupSeq = (message.groupSeq || BigInt(0)).toString()); if (message.groups) { obj.groups = message.groups.map(e => e ? GroupInfo.toJSON(e) : undefined); } else { @@ -182,13 +182,13 @@ export const GenesisState = { } else { obj.groupMembers = []; } - message.groupPolicySeq !== undefined && (obj.groupPolicySeq = (message.groupPolicySeq || Long.UZERO).toString()); + message.groupPolicySeq !== undefined && (obj.groupPolicySeq = (message.groupPolicySeq || BigInt(0)).toString()); if (message.groupPolicies) { obj.groupPolicies = message.groupPolicies.map(e => e ? GroupPolicyInfo.toJSON(e) : undefined); } else { obj.groupPolicies = []; } - message.proposalSeq !== undefined && (obj.proposalSeq = (message.proposalSeq || Long.UZERO).toString()); + message.proposalSeq !== undefined && (obj.proposalSeq = (message.proposalSeq || BigInt(0)).toString()); if (message.proposals) { obj.proposals = message.proposals.map(e => e ? Proposal.toJSON(e) : undefined); } else { @@ -203,12 +203,18 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.groupSeq = object.groupSeq !== undefined && object.groupSeq !== null ? Long.fromValue(object.groupSeq) : Long.UZERO; + if (object.groupSeq !== undefined && object.groupSeq !== null) { + message.groupSeq = BigInt(object.groupSeq.toString()); + } message.groups = object.groups?.map(e => GroupInfo.fromPartial(e)) || []; message.groupMembers = object.groupMembers?.map(e => GroupMember.fromPartial(e)) || []; - message.groupPolicySeq = object.groupPolicySeq !== undefined && object.groupPolicySeq !== null ? Long.fromValue(object.groupPolicySeq) : Long.UZERO; + if (object.groupPolicySeq !== undefined && object.groupPolicySeq !== null) { + message.groupPolicySeq = BigInt(object.groupPolicySeq.toString()); + } message.groupPolicies = object.groupPolicies?.map(e => GroupPolicyInfo.fromPartial(e)) || []; - message.proposalSeq = object.proposalSeq !== undefined && object.proposalSeq !== null ? Long.fromValue(object.proposalSeq) : Long.UZERO; + if (object.proposalSeq !== undefined && object.proposalSeq !== null) { + message.proposalSeq = BigInt(object.proposalSeq.toString()); + } message.proposals = object.proposals?.map(e => Proposal.fromPartial(e)) || []; message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; return message; @@ -259,12 +265,12 @@ export const GenesisState = { }, fromAmino(object: GenesisStateAmino): GenesisState { return { - groupSeq: Long.fromString(object.group_seq), + groupSeq: BigInt(object.group_seq), groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromAmino(e)) : [], groupMembers: Array.isArray(object?.group_members) ? object.group_members.map((e: any) => GroupMember.fromAmino(e)) : [], - groupPolicySeq: Long.fromString(object.group_policy_seq), + groupPolicySeq: BigInt(object.group_policy_seq), groupPolicies: Array.isArray(object?.group_policies) ? object.group_policies.map((e: any) => GroupPolicyInfo.fromAmino(e)) : [], - proposalSeq: Long.fromString(object.proposal_seq), + proposalSeq: BigInt(object.proposal_seq), proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromAmino(e)) : [], votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromAmino(e)) : [] }; diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts index 1a801275eb..140d233052 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/query.ts @@ -1,12 +1,12 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { GroupInfo, GroupInfoAmino, GroupInfoSDKType, GroupPolicyInfo, GroupPolicyInfoAmino, GroupPolicyInfoSDKType, GroupMember, GroupMemberAmino, GroupMemberSDKType, Proposal, ProposalAmino, ProposalSDKType, Vote, VoteAmino, VoteSDKType, TallyResult, TallyResultAmino, TallyResultSDKType } from "./types"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; /** QueryGroupInfoRequest is the Query/GroupInfo request type. */ export interface QueryGroupInfoRequest { /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; } export interface QueryGroupInfoRequestProtoMsg { typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest"; @@ -23,7 +23,7 @@ export interface QueryGroupInfoRequestAminoMsg { } /** QueryGroupInfoRequest is the Query/GroupInfo request type. */ export interface QueryGroupInfoRequestSDKType { - group_id: Long; + group_id: bigint; } /** QueryGroupInfoResponse is the Query/GroupInfo response type. */ export interface QueryGroupInfoResponse { @@ -94,7 +94,7 @@ export interface QueryGroupPolicyInfoResponseSDKType { /** QueryGroupMembersRequest is the Query/GroupMembers request type. */ export interface QueryGroupMembersRequest { /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -115,7 +115,7 @@ export interface QueryGroupMembersRequestAminoMsg { } /** QueryGroupMembersRequest is the Query/GroupMembers request type. */ export interface QueryGroupMembersRequestSDKType { - group_id: Long; + group_id: bigint; pagination: PageRequestSDKType; } /** QueryGroupMembersResponse is the Query/GroupMembersResponse response type. */ @@ -202,7 +202,7 @@ export interface QueryGroupsByAdminResponseSDKType { /** QueryGroupPoliciesByGroupRequest is the Query/GroupPoliciesByGroup request type. */ export interface QueryGroupPoliciesByGroupRequest { /** group_id is the unique ID of the group policy's group. */ - groupId: Long; + groupId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -223,7 +223,7 @@ export interface QueryGroupPoliciesByGroupRequestAminoMsg { } /** QueryGroupPoliciesByGroupRequest is the Query/GroupPoliciesByGroup request type. */ export interface QueryGroupPoliciesByGroupRequestSDKType { - group_id: Long; + group_id: bigint; pagination: PageRequestSDKType; } /** QueryGroupPoliciesByGroupResponse is the Query/GroupPoliciesByGroup response type. */ @@ -310,7 +310,7 @@ export interface QueryGroupPoliciesByAdminResponseSDKType { /** QueryProposalRequest is the Query/Proposal request type. */ export interface QueryProposalRequest { /** proposal_id is the unique ID of a proposal. */ - proposalId: Long; + proposalId: bigint; } export interface QueryProposalRequestProtoMsg { typeUrl: "/cosmos.group.v1.QueryProposalRequest"; @@ -327,7 +327,7 @@ export interface QueryProposalRequestAminoMsg { } /** QueryProposalRequest is the Query/Proposal request type. */ export interface QueryProposalRequestSDKType { - proposal_id: Long; + proposal_id: bigint; } /** QueryProposalResponse is the Query/Proposal response type. */ export interface QueryProposalResponse { @@ -408,7 +408,7 @@ export interface QueryProposalsByGroupPolicyResponseSDKType { /** QueryVoteByProposalVoterRequest is the Query/VoteByProposalVoter request type. */ export interface QueryVoteByProposalVoterRequest { /** proposal_id is the unique ID of a proposal. */ - proposalId: Long; + proposalId: bigint; /** voter is a proposal voter account address. */ voter: string; } @@ -429,7 +429,7 @@ export interface QueryVoteByProposalVoterRequestAminoMsg { } /** QueryVoteByProposalVoterRequest is the Query/VoteByProposalVoter request type. */ export interface QueryVoteByProposalVoterRequestSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; } /** QueryVoteByProposalVoterResponse is the Query/VoteByProposalVoter response type. */ @@ -457,7 +457,7 @@ export interface QueryVoteByProposalVoterResponseSDKType { /** QueryVotesByProposalRequest is the Query/VotesByProposal request type. */ export interface QueryVotesByProposalRequest { /** proposal_id is the unique ID of a proposal. */ - proposalId: Long; + proposalId: bigint; /** pagination defines an optional pagination for the request. */ pagination: PageRequest; } @@ -478,7 +478,7 @@ export interface QueryVotesByProposalRequestAminoMsg { } /** QueryVotesByProposalRequest is the Query/VotesByProposal request type. */ export interface QueryVotesByProposalRequestSDKType { - proposal_id: Long; + proposal_id: bigint; pagination: PageRequestSDKType; } /** QueryVotesByProposalResponse is the Query/VotesByProposal response type. */ @@ -619,7 +619,7 @@ export interface QueryGroupsByMemberResponseSDKType { /** QueryTallyResultRequest is the Query/TallyResult request type. */ export interface QueryTallyResultRequest { /** proposal_id is the unique id of a proposal. */ - proposalId: Long; + proposalId: bigint; } export interface QueryTallyResultRequestProtoMsg { typeUrl: "/cosmos.group.v1.QueryTallyResultRequest"; @@ -636,7 +636,7 @@ export interface QueryTallyResultRequestAminoMsg { } /** QueryTallyResultRequest is the Query/TallyResult request type. */ export interface QueryTallyResultRequestSDKType { - proposal_id: Long; + proposal_id: bigint; } /** QueryTallyResultResponse is the Query/TallyResult response type. */ export interface QueryTallyResultResponse { @@ -662,27 +662,27 @@ export interface QueryTallyResultResponseSDKType { } function createBaseQueryGroupInfoRequest(): QueryGroupInfoRequest { return { - groupId: Long.UZERO + groupId: BigInt(0) }; } export const QueryGroupInfoRequest = { typeUrl: "/cosmos.group.v1.QueryGroupInfoRequest", aminoType: "cosmos-sdk/QueryGroupInfoRequest", - encode(message: QueryGroupInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: QueryGroupInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupInfoRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -692,18 +692,20 @@ export const QueryGroupInfoRequest = { return message; }, fromJSON(object: any): QueryGroupInfoRequest { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO - }; + const obj = createBaseQueryGroupInfoRequest(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + return obj; }, toJSON(message: QueryGroupInfoRequest): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryGroupInfoRequest { const message = createBaseQueryGroupInfoRequest(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } return message; }, fromSDK(object: QueryGroupInfoRequestSDKType): QueryGroupInfoRequest { @@ -718,7 +720,7 @@ export const QueryGroupInfoRequest = { }, fromAmino(object: QueryGroupInfoRequestAmino): QueryGroupInfoRequest { return { - groupId: Long.fromString(object.group_id) + groupId: BigInt(object.group_id) }; }, toAmino(message: QueryGroupInfoRequest): QueryGroupInfoRequestAmino { @@ -756,14 +758,14 @@ function createBaseQueryGroupInfoResponse(): QueryGroupInfoResponse { export const QueryGroupInfoResponse = { typeUrl: "/cosmos.group.v1.QueryGroupInfoResponse", aminoType: "cosmos-sdk/QueryGroupInfoResponse", - encode(message: QueryGroupInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.info !== undefined) { GroupInfo.encode(message.info, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupInfoResponse(); while (reader.pos < end) { @@ -780,9 +782,9 @@ export const QueryGroupInfoResponse = { return message; }, fromJSON(object: any): QueryGroupInfoResponse { - return { - info: isSet(object.info) ? GroupInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseQueryGroupInfoResponse(); + if (isSet(object.info)) obj.info = GroupInfo.fromJSON(object.info); + return obj; }, toJSON(message: QueryGroupInfoResponse): unknown { const obj: any = {}; @@ -791,7 +793,9 @@ export const QueryGroupInfoResponse = { }, fromPartial(object: DeepPartial): QueryGroupInfoResponse { const message = createBaseQueryGroupInfoResponse(); - message.info = object.info !== undefined && object.info !== null ? GroupInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = GroupInfo.fromPartial(object.info); + } return message; }, fromSDK(object: QueryGroupInfoResponseSDKType): QueryGroupInfoResponse { @@ -844,14 +848,14 @@ function createBaseQueryGroupPolicyInfoRequest(): QueryGroupPolicyInfoRequest { export const QueryGroupPolicyInfoRequest = { typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoRequest", aminoType: "cosmos-sdk/QueryGroupPolicyInfoRequest", - encode(message: QueryGroupPolicyInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupPolicyInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupPolicyInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupPolicyInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupPolicyInfoRequest(); while (reader.pos < end) { @@ -868,9 +872,9 @@ export const QueryGroupPolicyInfoRequest = { return message; }, fromJSON(object: any): QueryGroupPolicyInfoRequest { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseQueryGroupPolicyInfoRequest(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: QueryGroupPolicyInfoRequest): unknown { const obj: any = {}; @@ -932,14 +936,14 @@ function createBaseQueryGroupPolicyInfoResponse(): QueryGroupPolicyInfoResponse export const QueryGroupPolicyInfoResponse = { typeUrl: "/cosmos.group.v1.QueryGroupPolicyInfoResponse", aminoType: "cosmos-sdk/QueryGroupPolicyInfoResponse", - encode(message: QueryGroupPolicyInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupPolicyInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.info !== undefined) { GroupPolicyInfo.encode(message.info, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupPolicyInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupPolicyInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupPolicyInfoResponse(); while (reader.pos < end) { @@ -956,9 +960,9 @@ export const QueryGroupPolicyInfoResponse = { return message; }, fromJSON(object: any): QueryGroupPolicyInfoResponse { - return { - info: isSet(object.info) ? GroupPolicyInfo.fromJSON(object.info) : undefined - }; + const obj = createBaseQueryGroupPolicyInfoResponse(); + if (isSet(object.info)) obj.info = GroupPolicyInfo.fromJSON(object.info); + return obj; }, toJSON(message: QueryGroupPolicyInfoResponse): unknown { const obj: any = {}; @@ -967,7 +971,9 @@ export const QueryGroupPolicyInfoResponse = { }, fromPartial(object: DeepPartial): QueryGroupPolicyInfoResponse { const message = createBaseQueryGroupPolicyInfoResponse(); - message.info = object.info !== undefined && object.info !== null ? GroupPolicyInfo.fromPartial(object.info) : undefined; + if (object.info !== undefined && object.info !== null) { + message.info = GroupPolicyInfo.fromPartial(object.info); + } return message; }, fromSDK(object: QueryGroupPolicyInfoResponseSDKType): QueryGroupPolicyInfoResponse { @@ -1014,15 +1020,15 @@ export const QueryGroupPolicyInfoResponse = { }; function createBaseQueryGroupMembersRequest(): QueryGroupMembersRequest { return { - groupId: Long.UZERO, + groupId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryGroupMembersRequest = { typeUrl: "/cosmos.group.v1.QueryGroupMembersRequest", aminoType: "cosmos-sdk/QueryGroupMembersRequest", - encode(message: QueryGroupMembersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: QueryGroupMembersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } if (message.pagination !== undefined) { @@ -1030,15 +1036,15 @@ export const QueryGroupMembersRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupMembersRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupMembersRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupMembersRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1051,21 +1057,25 @@ export const QueryGroupMembersRequest = { return message; }, fromJSON(object: any): QueryGroupMembersRequest { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupMembersRequest(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupMembersRequest): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryGroupMembersRequest { const message = createBaseQueryGroupMembersRequest(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupMembersRequestSDKType): QueryGroupMembersRequest { @@ -1082,7 +1092,7 @@ export const QueryGroupMembersRequest = { }, fromAmino(object: QueryGroupMembersRequestAmino): QueryGroupMembersRequest { return { - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1123,7 +1133,7 @@ function createBaseQueryGroupMembersResponse(): QueryGroupMembersResponse { export const QueryGroupMembersResponse = { typeUrl: "/cosmos.group.v1.QueryGroupMembersResponse", aminoType: "cosmos-sdk/QueryGroupMembersResponse", - encode(message: QueryGroupMembersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupMembersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.members) { GroupMember.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1132,8 +1142,8 @@ export const QueryGroupMembersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupMembersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupMembersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupMembersResponse(); while (reader.pos < end) { @@ -1153,10 +1163,10 @@ export const QueryGroupMembersResponse = { return message; }, fromJSON(object: any): QueryGroupMembersResponse { - return { - members: Array.isArray(object?.members) ? object.members.map((e: any) => GroupMember.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupMembersResponse(); + if (Array.isArray(object?.members)) object.members.map((e: any) => GroupMember.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupMembersResponse): unknown { const obj: any = {}; @@ -1171,7 +1181,9 @@ export const QueryGroupMembersResponse = { fromPartial(object: DeepPartial): QueryGroupMembersResponse { const message = createBaseQueryGroupMembersResponse(); message.members = object.members?.map(e => GroupMember.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupMembersResponseSDKType): QueryGroupMembersResponse { @@ -1237,7 +1249,7 @@ function createBaseQueryGroupsByAdminRequest(): QueryGroupsByAdminRequest { export const QueryGroupsByAdminRequest = { typeUrl: "/cosmos.group.v1.QueryGroupsByAdminRequest", aminoType: "cosmos-sdk/QueryGroupsByAdminRequest", - encode(message: QueryGroupsByAdminRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupsByAdminRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -1246,8 +1258,8 @@ export const QueryGroupsByAdminRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupsByAdminRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupsByAdminRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupsByAdminRequest(); while (reader.pos < end) { @@ -1267,10 +1279,10 @@ export const QueryGroupsByAdminRequest = { return message; }, fromJSON(object: any): QueryGroupsByAdminRequest { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupsByAdminRequest(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupsByAdminRequest): unknown { const obj: any = {}; @@ -1281,7 +1293,9 @@ export const QueryGroupsByAdminRequest = { fromPartial(object: DeepPartial): QueryGroupsByAdminRequest { const message = createBaseQueryGroupsByAdminRequest(); message.admin = object.admin ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupsByAdminRequestSDKType): QueryGroupsByAdminRequest { @@ -1339,7 +1353,7 @@ function createBaseQueryGroupsByAdminResponse(): QueryGroupsByAdminResponse { export const QueryGroupsByAdminResponse = { typeUrl: "/cosmos.group.v1.QueryGroupsByAdminResponse", aminoType: "cosmos-sdk/QueryGroupsByAdminResponse", - encode(message: QueryGroupsByAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupsByAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groups) { GroupInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1348,8 +1362,8 @@ export const QueryGroupsByAdminResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupsByAdminResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupsByAdminResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupsByAdminResponse(); while (reader.pos < end) { @@ -1369,10 +1383,10 @@ export const QueryGroupsByAdminResponse = { return message; }, fromJSON(object: any): QueryGroupsByAdminResponse { - return { - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupsByAdminResponse(); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => GroupInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupsByAdminResponse): unknown { const obj: any = {}; @@ -1387,7 +1401,9 @@ export const QueryGroupsByAdminResponse = { fromPartial(object: DeepPartial): QueryGroupsByAdminResponse { const message = createBaseQueryGroupsByAdminResponse(); message.groups = object.groups?.map(e => GroupInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupsByAdminResponseSDKType): QueryGroupsByAdminResponse { @@ -1446,15 +1462,15 @@ export const QueryGroupsByAdminResponse = { }; function createBaseQueryGroupPoliciesByGroupRequest(): QueryGroupPoliciesByGroupRequest { return { - groupId: Long.UZERO, + groupId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryGroupPoliciesByGroupRequest = { typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupRequest", aminoType: "cosmos-sdk/QueryGroupPoliciesByGroupRequest", - encode(message: QueryGroupPoliciesByGroupRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: QueryGroupPoliciesByGroupRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } if (message.pagination !== undefined) { @@ -1462,15 +1478,15 @@ export const QueryGroupPoliciesByGroupRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupPoliciesByGroupRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupPoliciesByGroupRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupPoliciesByGroupRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1483,21 +1499,25 @@ export const QueryGroupPoliciesByGroupRequest = { return message; }, fromJSON(object: any): QueryGroupPoliciesByGroupRequest { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupPoliciesByGroupRequest(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupPoliciesByGroupRequest): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryGroupPoliciesByGroupRequest { const message = createBaseQueryGroupPoliciesByGroupRequest(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupPoliciesByGroupRequestSDKType): QueryGroupPoliciesByGroupRequest { @@ -1514,7 +1534,7 @@ export const QueryGroupPoliciesByGroupRequest = { }, fromAmino(object: QueryGroupPoliciesByGroupRequestAmino): QueryGroupPoliciesByGroupRequest { return { - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1555,7 +1575,7 @@ function createBaseQueryGroupPoliciesByGroupResponse(): QueryGroupPoliciesByGrou export const QueryGroupPoliciesByGroupResponse = { typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByGroupResponse", aminoType: "cosmos-sdk/QueryGroupPoliciesByGroupResponse", - encode(message: QueryGroupPoliciesByGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupPoliciesByGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groupPolicies) { GroupPolicyInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1564,8 +1584,8 @@ export const QueryGroupPoliciesByGroupResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupPoliciesByGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupPoliciesByGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupPoliciesByGroupResponse(); while (reader.pos < end) { @@ -1585,10 +1605,10 @@ export const QueryGroupPoliciesByGroupResponse = { return message; }, fromJSON(object: any): QueryGroupPoliciesByGroupResponse { - return { - groupPolicies: Array.isArray(object?.groupPolicies) ? object.groupPolicies.map((e: any) => GroupPolicyInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupPoliciesByGroupResponse(); + if (Array.isArray(object?.groupPolicies)) object.groupPolicies.map((e: any) => GroupPolicyInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupPoliciesByGroupResponse): unknown { const obj: any = {}; @@ -1603,7 +1623,9 @@ export const QueryGroupPoliciesByGroupResponse = { fromPartial(object: DeepPartial): QueryGroupPoliciesByGroupResponse { const message = createBaseQueryGroupPoliciesByGroupResponse(); message.groupPolicies = object.groupPolicies?.map(e => GroupPolicyInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupPoliciesByGroupResponseSDKType): QueryGroupPoliciesByGroupResponse { @@ -1669,7 +1691,7 @@ function createBaseQueryGroupPoliciesByAdminRequest(): QueryGroupPoliciesByAdmin export const QueryGroupPoliciesByAdminRequest = { typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminRequest", aminoType: "cosmos-sdk/QueryGroupPoliciesByAdminRequest", - encode(message: QueryGroupPoliciesByAdminRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupPoliciesByAdminRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -1678,8 +1700,8 @@ export const QueryGroupPoliciesByAdminRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupPoliciesByAdminRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupPoliciesByAdminRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupPoliciesByAdminRequest(); while (reader.pos < end) { @@ -1699,10 +1721,10 @@ export const QueryGroupPoliciesByAdminRequest = { return message; }, fromJSON(object: any): QueryGroupPoliciesByAdminRequest { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupPoliciesByAdminRequest(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupPoliciesByAdminRequest): unknown { const obj: any = {}; @@ -1713,7 +1735,9 @@ export const QueryGroupPoliciesByAdminRequest = { fromPartial(object: DeepPartial): QueryGroupPoliciesByAdminRequest { const message = createBaseQueryGroupPoliciesByAdminRequest(); message.admin = object.admin ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupPoliciesByAdminRequestSDKType): QueryGroupPoliciesByAdminRequest { @@ -1771,7 +1795,7 @@ function createBaseQueryGroupPoliciesByAdminResponse(): QueryGroupPoliciesByAdmi export const QueryGroupPoliciesByAdminResponse = { typeUrl: "/cosmos.group.v1.QueryGroupPoliciesByAdminResponse", aminoType: "cosmos-sdk/QueryGroupPoliciesByAdminResponse", - encode(message: QueryGroupPoliciesByAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupPoliciesByAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groupPolicies) { GroupPolicyInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1780,8 +1804,8 @@ export const QueryGroupPoliciesByAdminResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupPoliciesByAdminResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupPoliciesByAdminResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupPoliciesByAdminResponse(); while (reader.pos < end) { @@ -1801,10 +1825,10 @@ export const QueryGroupPoliciesByAdminResponse = { return message; }, fromJSON(object: any): QueryGroupPoliciesByAdminResponse { - return { - groupPolicies: Array.isArray(object?.groupPolicies) ? object.groupPolicies.map((e: any) => GroupPolicyInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupPoliciesByAdminResponse(); + if (Array.isArray(object?.groupPolicies)) object.groupPolicies.map((e: any) => GroupPolicyInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupPoliciesByAdminResponse): unknown { const obj: any = {}; @@ -1819,7 +1843,9 @@ export const QueryGroupPoliciesByAdminResponse = { fromPartial(object: DeepPartial): QueryGroupPoliciesByAdminResponse { const message = createBaseQueryGroupPoliciesByAdminResponse(); message.groupPolicies = object.groupPolicies?.map(e => GroupPolicyInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupPoliciesByAdminResponseSDKType): QueryGroupPoliciesByAdminResponse { @@ -1878,27 +1904,27 @@ export const QueryGroupPoliciesByAdminResponse = { }; function createBaseQueryProposalRequest(): QueryProposalRequest { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const QueryProposalRequest = { typeUrl: "/cosmos.group.v1.QueryProposalRequest", aminoType: "cosmos-sdk/QueryProposalRequest", - encode(message: QueryProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1908,18 +1934,20 @@ export const QueryProposalRequest = { return message; }, fromJSON(object: any): QueryProposalRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseQueryProposalRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: QueryProposalRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryProposalRequest { const message = createBaseQueryProposalRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: QueryProposalRequestSDKType): QueryProposalRequest { @@ -1934,7 +1962,7 @@ export const QueryProposalRequest = { }, fromAmino(object: QueryProposalRequestAmino): QueryProposalRequest { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: QueryProposalRequest): QueryProposalRequestAmino { @@ -1972,14 +2000,14 @@ function createBaseQueryProposalResponse(): QueryProposalResponse { export const QueryProposalResponse = { typeUrl: "/cosmos.group.v1.QueryProposalResponse", aminoType: "cosmos-sdk/QueryProposalResponse", - encode(message: QueryProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.proposal !== undefined) { Proposal.encode(message.proposal, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalResponse(); while (reader.pos < end) { @@ -1996,9 +2024,9 @@ export const QueryProposalResponse = { return message; }, fromJSON(object: any): QueryProposalResponse { - return { - proposal: isSet(object.proposal) ? Proposal.fromJSON(object.proposal) : undefined - }; + const obj = createBaseQueryProposalResponse(); + if (isSet(object.proposal)) obj.proposal = Proposal.fromJSON(object.proposal); + return obj; }, toJSON(message: QueryProposalResponse): unknown { const obj: any = {}; @@ -2007,7 +2035,9 @@ export const QueryProposalResponse = { }, fromPartial(object: DeepPartial): QueryProposalResponse { const message = createBaseQueryProposalResponse(); - message.proposal = object.proposal !== undefined && object.proposal !== null ? Proposal.fromPartial(object.proposal) : undefined; + if (object.proposal !== undefined && object.proposal !== null) { + message.proposal = Proposal.fromPartial(object.proposal); + } return message; }, fromSDK(object: QueryProposalResponseSDKType): QueryProposalResponse { @@ -2061,7 +2091,7 @@ function createBaseQueryProposalsByGroupPolicyRequest(): QueryProposalsByGroupPo export const QueryProposalsByGroupPolicyRequest = { typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyRequest", aminoType: "cosmos-sdk/QueryProposalsByGroupPolicyRequest", - encode(message: QueryProposalsByGroupPolicyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalsByGroupPolicyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -2070,8 +2100,8 @@ export const QueryProposalsByGroupPolicyRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalsByGroupPolicyRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalsByGroupPolicyRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalsByGroupPolicyRequest(); while (reader.pos < end) { @@ -2091,10 +2121,10 @@ export const QueryProposalsByGroupPolicyRequest = { return message; }, fromJSON(object: any): QueryProposalsByGroupPolicyRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProposalsByGroupPolicyRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProposalsByGroupPolicyRequest): unknown { const obj: any = {}; @@ -2105,7 +2135,9 @@ export const QueryProposalsByGroupPolicyRequest = { fromPartial(object: DeepPartial): QueryProposalsByGroupPolicyRequest { const message = createBaseQueryProposalsByGroupPolicyRequest(); message.address = object.address ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProposalsByGroupPolicyRequestSDKType): QueryProposalsByGroupPolicyRequest { @@ -2163,7 +2195,7 @@ function createBaseQueryProposalsByGroupPolicyResponse(): QueryProposalsByGroupP export const QueryProposalsByGroupPolicyResponse = { typeUrl: "/cosmos.group.v1.QueryProposalsByGroupPolicyResponse", aminoType: "cosmos-sdk/QueryProposalsByGroupPolicyResponse", - encode(message: QueryProposalsByGroupPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryProposalsByGroupPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.proposals) { Proposal.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2172,8 +2204,8 @@ export const QueryProposalsByGroupPolicyResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryProposalsByGroupPolicyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryProposalsByGroupPolicyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryProposalsByGroupPolicyResponse(); while (reader.pos < end) { @@ -2193,10 +2225,10 @@ export const QueryProposalsByGroupPolicyResponse = { return message; }, fromJSON(object: any): QueryProposalsByGroupPolicyResponse { - return { - proposals: Array.isArray(object?.proposals) ? object.proposals.map((e: any) => Proposal.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryProposalsByGroupPolicyResponse(); + if (Array.isArray(object?.proposals)) object.proposals.map((e: any) => Proposal.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryProposalsByGroupPolicyResponse): unknown { const obj: any = {}; @@ -2211,7 +2243,9 @@ export const QueryProposalsByGroupPolicyResponse = { fromPartial(object: DeepPartial): QueryProposalsByGroupPolicyResponse { const message = createBaseQueryProposalsByGroupPolicyResponse(); message.proposals = object.proposals?.map(e => Proposal.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryProposalsByGroupPolicyResponseSDKType): QueryProposalsByGroupPolicyResponse { @@ -2270,15 +2304,15 @@ export const QueryProposalsByGroupPolicyResponse = { }; function createBaseQueryVoteByProposalVoterRequest(): QueryVoteByProposalVoterRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "" }; } export const QueryVoteByProposalVoterRequest = { typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterRequest", aminoType: "cosmos-sdk/QueryVoteByProposalVoterRequest", - encode(message: QueryVoteByProposalVoterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryVoteByProposalVoterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -2286,15 +2320,15 @@ export const QueryVoteByProposalVoterRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVoteByProposalVoterRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVoteByProposalVoterRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVoteByProposalVoterRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -2307,20 +2341,22 @@ export const QueryVoteByProposalVoterRequest = { return message; }, fromJSON(object: any): QueryVoteByProposalVoterRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "" - }; + const obj = createBaseQueryVoteByProposalVoterRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + return obj; }, toJSON(message: QueryVoteByProposalVoterRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); return obj; }, fromPartial(object: DeepPartial): QueryVoteByProposalVoterRequest { const message = createBaseQueryVoteByProposalVoterRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; return message; }, @@ -2338,7 +2374,7 @@ export const QueryVoteByProposalVoterRequest = { }, fromAmino(object: QueryVoteByProposalVoterRequestAmino): QueryVoteByProposalVoterRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter }; }, @@ -2378,14 +2414,14 @@ function createBaseQueryVoteByProposalVoterResponse(): QueryVoteByProposalVoterR export const QueryVoteByProposalVoterResponse = { typeUrl: "/cosmos.group.v1.QueryVoteByProposalVoterResponse", aminoType: "cosmos-sdk/QueryVoteByProposalVoterResponse", - encode(message: QueryVoteByProposalVoterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVoteByProposalVoterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.vote !== undefined) { Vote.encode(message.vote, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVoteByProposalVoterResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVoteByProposalVoterResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVoteByProposalVoterResponse(); while (reader.pos < end) { @@ -2402,9 +2438,9 @@ export const QueryVoteByProposalVoterResponse = { return message; }, fromJSON(object: any): QueryVoteByProposalVoterResponse { - return { - vote: isSet(object.vote) ? Vote.fromJSON(object.vote) : undefined - }; + const obj = createBaseQueryVoteByProposalVoterResponse(); + if (isSet(object.vote)) obj.vote = Vote.fromJSON(object.vote); + return obj; }, toJSON(message: QueryVoteByProposalVoterResponse): unknown { const obj: any = {}; @@ -2413,7 +2449,9 @@ export const QueryVoteByProposalVoterResponse = { }, fromPartial(object: DeepPartial): QueryVoteByProposalVoterResponse { const message = createBaseQueryVoteByProposalVoterResponse(); - message.vote = object.vote !== undefined && object.vote !== null ? Vote.fromPartial(object.vote) : undefined; + if (object.vote !== undefined && object.vote !== null) { + message.vote = Vote.fromPartial(object.vote); + } return message; }, fromSDK(object: QueryVoteByProposalVoterResponseSDKType): QueryVoteByProposalVoterResponse { @@ -2460,15 +2498,15 @@ export const QueryVoteByProposalVoterResponse = { }; function createBaseQueryVotesByProposalRequest(): QueryVotesByProposalRequest { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryVotesByProposalRequest = { typeUrl: "/cosmos.group.v1.QueryVotesByProposalRequest", aminoType: "cosmos-sdk/QueryVotesByProposalRequest", - encode(message: QueryVotesByProposalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryVotesByProposalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.pagination !== undefined) { @@ -2476,15 +2514,15 @@ export const QueryVotesByProposalRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesByProposalRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesByProposalRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesByProposalRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -2497,21 +2535,25 @@ export const QueryVotesByProposalRequest = { return message; }, fromJSON(object: any): QueryVotesByProposalRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesByProposalRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesByProposalRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryVotesByProposalRequest { const message = createBaseQueryVotesByProposalRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesByProposalRequestSDKType): QueryVotesByProposalRequest { @@ -2528,7 +2570,7 @@ export const QueryVotesByProposalRequest = { }, fromAmino(object: QueryVotesByProposalRequestAmino): QueryVotesByProposalRequest { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -2569,7 +2611,7 @@ function createBaseQueryVotesByProposalResponse(): QueryVotesByProposalResponse export const QueryVotesByProposalResponse = { typeUrl: "/cosmos.group.v1.QueryVotesByProposalResponse", aminoType: "cosmos-sdk/QueryVotesByProposalResponse", - encode(message: QueryVotesByProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVotesByProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2578,8 +2620,8 @@ export const QueryVotesByProposalResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesByProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesByProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesByProposalResponse(); while (reader.pos < end) { @@ -2599,10 +2641,10 @@ export const QueryVotesByProposalResponse = { return message; }, fromJSON(object: any): QueryVotesByProposalResponse { - return { - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesByProposalResponse(); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesByProposalResponse): unknown { const obj: any = {}; @@ -2617,7 +2659,9 @@ export const QueryVotesByProposalResponse = { fromPartial(object: DeepPartial): QueryVotesByProposalResponse { const message = createBaseQueryVotesByProposalResponse(); message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesByProposalResponseSDKType): QueryVotesByProposalResponse { @@ -2683,7 +2727,7 @@ function createBaseQueryVotesByVoterRequest(): QueryVotesByVoterRequest { export const QueryVotesByVoterRequest = { typeUrl: "/cosmos.group.v1.QueryVotesByVoterRequest", aminoType: "cosmos-sdk/QueryVotesByVoterRequest", - encode(message: QueryVotesByVoterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVotesByVoterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.voter !== "") { writer.uint32(10).string(message.voter); } @@ -2692,8 +2736,8 @@ export const QueryVotesByVoterRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesByVoterRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesByVoterRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesByVoterRequest(); while (reader.pos < end) { @@ -2713,10 +2757,10 @@ export const QueryVotesByVoterRequest = { return message; }, fromJSON(object: any): QueryVotesByVoterRequest { - return { - voter: isSet(object.voter) ? String(object.voter) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesByVoterRequest(); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesByVoterRequest): unknown { const obj: any = {}; @@ -2727,7 +2771,9 @@ export const QueryVotesByVoterRequest = { fromPartial(object: DeepPartial): QueryVotesByVoterRequest { const message = createBaseQueryVotesByVoterRequest(); message.voter = object.voter ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesByVoterRequestSDKType): QueryVotesByVoterRequest { @@ -2785,7 +2831,7 @@ function createBaseQueryVotesByVoterResponse(): QueryVotesByVoterResponse { export const QueryVotesByVoterResponse = { typeUrl: "/cosmos.group.v1.QueryVotesByVoterResponse", aminoType: "cosmos-sdk/QueryVotesByVoterResponse", - encode(message: QueryVotesByVoterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryVotesByVoterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.votes) { Vote.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2794,8 +2840,8 @@ export const QueryVotesByVoterResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryVotesByVoterResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryVotesByVoterResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryVotesByVoterResponse(); while (reader.pos < end) { @@ -2815,10 +2861,10 @@ export const QueryVotesByVoterResponse = { return message; }, fromJSON(object: any): QueryVotesByVoterResponse { - return { - votes: Array.isArray(object?.votes) ? object.votes.map((e: any) => Vote.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryVotesByVoterResponse(); + if (Array.isArray(object?.votes)) object.votes.map((e: any) => Vote.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryVotesByVoterResponse): unknown { const obj: any = {}; @@ -2833,7 +2879,9 @@ export const QueryVotesByVoterResponse = { fromPartial(object: DeepPartial): QueryVotesByVoterResponse { const message = createBaseQueryVotesByVoterResponse(); message.votes = object.votes?.map(e => Vote.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryVotesByVoterResponseSDKType): QueryVotesByVoterResponse { @@ -2899,7 +2947,7 @@ function createBaseQueryGroupsByMemberRequest(): QueryGroupsByMemberRequest { export const QueryGroupsByMemberRequest = { typeUrl: "/cosmos.group.v1.QueryGroupsByMemberRequest", aminoType: "cosmos-sdk/QueryGroupsByMemberRequest", - encode(message: QueryGroupsByMemberRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupsByMemberRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -2908,8 +2956,8 @@ export const QueryGroupsByMemberRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupsByMemberRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupsByMemberRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupsByMemberRequest(); while (reader.pos < end) { @@ -2929,10 +2977,10 @@ export const QueryGroupsByMemberRequest = { return message; }, fromJSON(object: any): QueryGroupsByMemberRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupsByMemberRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupsByMemberRequest): unknown { const obj: any = {}; @@ -2943,7 +2991,9 @@ export const QueryGroupsByMemberRequest = { fromPartial(object: DeepPartial): QueryGroupsByMemberRequest { const message = createBaseQueryGroupsByMemberRequest(); message.address = object.address ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupsByMemberRequestSDKType): QueryGroupsByMemberRequest { @@ -3001,7 +3051,7 @@ function createBaseQueryGroupsByMemberResponse(): QueryGroupsByMemberResponse { export const QueryGroupsByMemberResponse = { typeUrl: "/cosmos.group.v1.QueryGroupsByMemberResponse", aminoType: "cosmos-sdk/QueryGroupsByMemberResponse", - encode(message: QueryGroupsByMemberResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGroupsByMemberResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.groups) { GroupInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -3010,8 +3060,8 @@ export const QueryGroupsByMemberResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGroupsByMemberResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGroupsByMemberResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGroupsByMemberResponse(); while (reader.pos < end) { @@ -3031,10 +3081,10 @@ export const QueryGroupsByMemberResponse = { return message; }, fromJSON(object: any): QueryGroupsByMemberResponse { - return { - groups: Array.isArray(object?.groups) ? object.groups.map((e: any) => GroupInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGroupsByMemberResponse(); + if (Array.isArray(object?.groups)) object.groups.map((e: any) => GroupInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGroupsByMemberResponse): unknown { const obj: any = {}; @@ -3049,7 +3099,9 @@ export const QueryGroupsByMemberResponse = { fromPartial(object: DeepPartial): QueryGroupsByMemberResponse { const message = createBaseQueryGroupsByMemberResponse(); message.groups = object.groups?.map(e => GroupInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGroupsByMemberResponseSDKType): QueryGroupsByMemberResponse { @@ -3108,27 +3160,27 @@ export const QueryGroupsByMemberResponse = { }; function createBaseQueryTallyResultRequest(): QueryTallyResultRequest { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const QueryTallyResultRequest = { typeUrl: "/cosmos.group.v1.QueryTallyResultRequest", aminoType: "cosmos-sdk/QueryTallyResultRequest", - encode(message: QueryTallyResultRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: QueryTallyResultRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTallyResultRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTallyResultRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTallyResultRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -3138,18 +3190,20 @@ export const QueryTallyResultRequest = { return message; }, fromJSON(object: any): QueryTallyResultRequest { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseQueryTallyResultRequest(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: QueryTallyResultRequest): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryTallyResultRequest { const message = createBaseQueryTallyResultRequest(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: QueryTallyResultRequestSDKType): QueryTallyResultRequest { @@ -3164,7 +3218,7 @@ export const QueryTallyResultRequest = { }, fromAmino(object: QueryTallyResultRequestAmino): QueryTallyResultRequest { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: QueryTallyResultRequest): QueryTallyResultRequestAmino { @@ -3202,14 +3256,14 @@ function createBaseQueryTallyResultResponse(): QueryTallyResultResponse { export const QueryTallyResultResponse = { typeUrl: "/cosmos.group.v1.QueryTallyResultResponse", aminoType: "cosmos-sdk/QueryTallyResultResponse", - encode(message: QueryTallyResultResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTallyResultResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tally !== undefined) { TallyResult.encode(message.tally, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTallyResultResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTallyResultResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTallyResultResponse(); while (reader.pos < end) { @@ -3226,9 +3280,9 @@ export const QueryTallyResultResponse = { return message; }, fromJSON(object: any): QueryTallyResultResponse { - return { - tally: isSet(object.tally) ? TallyResult.fromJSON(object.tally) : undefined - }; + const obj = createBaseQueryTallyResultResponse(); + if (isSet(object.tally)) obj.tally = TallyResult.fromJSON(object.tally); + return obj; }, toJSON(message: QueryTallyResultResponse): unknown { const obj: any = {}; @@ -3237,7 +3291,9 @@ export const QueryTallyResultResponse = { }, fromPartial(object: DeepPartial): QueryTallyResultResponse { const message = createBaseQueryTallyResultResponse(); - message.tally = object.tally !== undefined && object.tally !== null ? TallyResult.fromPartial(object.tally) : undefined; + if (object.tally !== undefined && object.tally !== null) { + message.tally = TallyResult.fromPartial(object.tally); + } return message; }, fromSDK(object: QueryTallyResultResponseSDKType): QueryTallyResultResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts index 8b337a7e0d..04db3b4827 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/tx.ts @@ -1,7 +1,7 @@ import { Member, MemberAmino, MemberSDKType, VoteOption, ThresholdDecisionPolicy, ThresholdDecisionPolicyProtoMsg, ThresholdDecisionPolicySDKType, PercentageDecisionPolicy, PercentageDecisionPolicyProtoMsg, PercentageDecisionPolicySDKType, voteOptionFromJSON, voteOptionToJSON } from "./types"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; /** Exec defines modes of execution of a proposal on creation or on new vote. */ export enum Exec { @@ -81,7 +81,7 @@ export interface MsgCreateGroupSDKType { /** MsgCreateGroupResponse is the Msg/CreateGroup response type. */ export interface MsgCreateGroupResponse { /** group_id is the unique ID of the newly created group. */ - groupId: Long; + groupId: bigint; } export interface MsgCreateGroupResponseProtoMsg { typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse"; @@ -98,14 +98,14 @@ export interface MsgCreateGroupResponseAminoMsg { } /** MsgCreateGroupResponse is the Msg/CreateGroup response type. */ export interface MsgCreateGroupResponseSDKType { - group_id: Long; + group_id: bigint; } /** MsgUpdateGroupMembers is the Msg/UpdateGroupMembers request type. */ export interface MsgUpdateGroupMembers { /** admin is the account address of the group admin. */ admin: string; /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** * member_updates is the list of members to update, * set weight to 0 to remove a member. @@ -135,7 +135,7 @@ export interface MsgUpdateGroupMembersAminoMsg { /** MsgUpdateGroupMembers is the Msg/UpdateGroupMembers request type. */ export interface MsgUpdateGroupMembersSDKType { admin: string; - group_id: Long; + group_id: bigint; member_updates: MemberSDKType[]; } /** MsgUpdateGroupMembersResponse is the Msg/UpdateGroupMembers response type. */ @@ -157,7 +157,7 @@ export interface MsgUpdateGroupAdmin { /** admin is the current account address of the group admin. */ admin: string; /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** new_admin is the group new admin account address. */ newAdmin: string; } @@ -181,7 +181,7 @@ export interface MsgUpdateGroupAdminAminoMsg { /** MsgUpdateGroupAdmin is the Msg/UpdateGroupAdmin request type. */ export interface MsgUpdateGroupAdminSDKType { admin: string; - group_id: Long; + group_id: bigint; new_admin: string; } /** MsgUpdateGroupAdminResponse is the Msg/UpdateGroupAdmin response type. */ @@ -203,7 +203,7 @@ export interface MsgUpdateGroupMetadata { /** admin is the account address of the group admin. */ admin: string; /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** metadata is the updated group's metadata. */ metadata: string; } @@ -227,7 +227,7 @@ export interface MsgUpdateGroupMetadataAminoMsg { /** MsgUpdateGroupMetadata is the Msg/UpdateGroupMetadata request type. */ export interface MsgUpdateGroupMetadataSDKType { admin: string; - group_id: Long; + group_id: bigint; metadata: string; } /** MsgUpdateGroupMetadataResponse is the Msg/UpdateGroupMetadata response type. */ @@ -249,7 +249,7 @@ export interface MsgCreateGroupPolicy { /** admin is the account address of the group admin. */ admin: string; /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** metadata is any arbitrary metadata attached to the group policy. */ metadata: string; /** decision_policy specifies the group policy's decision policy. */ @@ -280,7 +280,7 @@ export interface MsgCreateGroupPolicyAminoMsg { /** MsgCreateGroupPolicy is the Msg/CreateGroupPolicy request type. */ export interface MsgCreateGroupPolicySDKType { admin: string; - group_id: Long; + group_id: bigint; metadata: string; decision_policy: ThresholdDecisionPolicySDKType | PercentageDecisionPolicySDKType | AnySDKType | undefined; } @@ -391,7 +391,7 @@ export interface MsgCreateGroupWithPolicySDKType { /** MsgCreateGroupWithPolicyResponse is the Msg/CreateGroupWithPolicy response type. */ export interface MsgCreateGroupWithPolicyResponse { /** group_id is the unique ID of the newly created group with policy. */ - groupId: Long; + groupId: bigint; /** group_policy_address is the account address of the newly created group policy. */ groupPolicyAddress: string; } @@ -412,7 +412,7 @@ export interface MsgCreateGroupWithPolicyResponseAminoMsg { } /** MsgCreateGroupWithPolicyResponse is the Msg/CreateGroupWithPolicy response type. */ export interface MsgCreateGroupWithPolicyResponseSDKType { - group_id: Long; + group_id: bigint; group_policy_address: string; } /** MsgUpdateGroupPolicyAdminResponse is the Msg/UpdateGroupPolicyAdmin response type. */ @@ -583,7 +583,7 @@ export interface MsgSubmitProposalSDKType { /** MsgSubmitProposalResponse is the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponse { /** proposal is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; } export interface MsgSubmitProposalResponseProtoMsg { typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse"; @@ -600,12 +600,12 @@ export interface MsgSubmitProposalResponseAminoMsg { } /** MsgSubmitProposalResponse is the Msg/SubmitProposal response type. */ export interface MsgSubmitProposalResponseSDKType { - proposal_id: Long; + proposal_id: bigint; } /** MsgWithdrawProposal is the Msg/WithdrawProposal request type. */ export interface MsgWithdrawProposal { /** proposal is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; /** address is the admin of the group policy or one of the proposer of the proposal. */ address: string; } @@ -626,7 +626,7 @@ export interface MsgWithdrawProposalAminoMsg { } /** MsgWithdrawProposal is the Msg/WithdrawProposal request type. */ export interface MsgWithdrawProposalSDKType { - proposal_id: Long; + proposal_id: bigint; address: string; } /** MsgWithdrawProposalResponse is the Msg/WithdrawProposal response type. */ @@ -646,7 +646,7 @@ export interface MsgWithdrawProposalResponseSDKType {} /** MsgVote is the Msg/Vote request type. */ export interface MsgVote { /** proposal is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; /** voter is the voter account address. */ voter: string; /** option is the voter's choice on the proposal. */ @@ -685,7 +685,7 @@ export interface MsgVoteAminoMsg { } /** MsgVote is the Msg/Vote request type. */ export interface MsgVoteSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; option: VoteOption; metadata: string; @@ -708,7 +708,7 @@ export interface MsgVoteResponseSDKType {} /** MsgExec is the Msg/Exec request type. */ export interface MsgExec { /** proposal is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; /** signer is the account address used to execute the proposal. */ signer: string; } @@ -729,7 +729,7 @@ export interface MsgExecAminoMsg { } /** MsgExec is the Msg/Exec request type. */ export interface MsgExecSDKType { - proposal_id: Long; + proposal_id: bigint; signer: string; } /** MsgExecResponse is the Msg/Exec request type. */ @@ -751,7 +751,7 @@ export interface MsgLeaveGroup { /** address is the account address of the group member. */ address: string; /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; } export interface MsgLeaveGroupProtoMsg { typeUrl: "/cosmos.group.v1.MsgLeaveGroup"; @@ -771,7 +771,7 @@ export interface MsgLeaveGroupAminoMsg { /** MsgLeaveGroup is the Msg/LeaveGroup request type. */ export interface MsgLeaveGroupSDKType { address: string; - group_id: Long; + group_id: bigint; } /** MsgLeaveGroupResponse is the Msg/LeaveGroup response type. */ export interface MsgLeaveGroupResponse {} @@ -797,7 +797,7 @@ function createBaseMsgCreateGroup(): MsgCreateGroup { export const MsgCreateGroup = { typeUrl: "/cosmos.group.v1.MsgCreateGroup", aminoType: "cosmos-sdk/MsgCreateGroup", - encode(message: MsgCreateGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -809,8 +809,8 @@ export const MsgCreateGroup = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateGroup(); while (reader.pos < end) { @@ -833,11 +833,11 @@ export const MsgCreateGroup = { return message; }, fromJSON(object: any): MsgCreateGroup { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - members: Array.isArray(object?.members) ? object.members.map((e: any) => Member.fromJSON(e)) : [], - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseMsgCreateGroup(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (Array.isArray(object?.members)) object.members.map((e: any) => Member.fromJSON(e)); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: MsgCreateGroup): unknown { const obj: any = {}; @@ -917,27 +917,27 @@ export const MsgCreateGroup = { }; function createBaseMsgCreateGroupResponse(): MsgCreateGroupResponse { return { - groupId: Long.UZERO + groupId: BigInt(0) }; } export const MsgCreateGroupResponse = { typeUrl: "/cosmos.group.v1.MsgCreateGroupResponse", aminoType: "cosmos-sdk/MsgCreateGroupResponse", - encode(message: MsgCreateGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: MsgCreateGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateGroupResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -947,18 +947,20 @@ export const MsgCreateGroupResponse = { return message; }, fromJSON(object: any): MsgCreateGroupResponse { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO - }; + const obj = createBaseMsgCreateGroupResponse(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + return obj; }, toJSON(message: MsgCreateGroupResponse): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgCreateGroupResponse { const message = createBaseMsgCreateGroupResponse(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } return message; }, fromSDK(object: MsgCreateGroupResponseSDKType): MsgCreateGroupResponse { @@ -973,7 +975,7 @@ export const MsgCreateGroupResponse = { }, fromAmino(object: MsgCreateGroupResponseAmino): MsgCreateGroupResponse { return { - groupId: Long.fromString(object.group_id) + groupId: BigInt(object.group_id) }; }, toAmino(message: MsgCreateGroupResponse): MsgCreateGroupResponseAmino { @@ -1006,18 +1008,18 @@ export const MsgCreateGroupResponse = { function createBaseMsgUpdateGroupMembers(): MsgUpdateGroupMembers { return { admin: "", - groupId: Long.UZERO, + groupId: BigInt(0), memberUpdates: [] }; } export const MsgUpdateGroupMembers = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembers", aminoType: "cosmos-sdk/MsgUpdateGroupMembers", - encode(message: MsgUpdateGroupMembers, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateGroupMembers, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } - if (!message.groupId.isZero()) { + if (message.groupId !== BigInt(0)) { writer.uint32(16).uint64(message.groupId); } for (const v of message.memberUpdates) { @@ -1025,8 +1027,8 @@ export const MsgUpdateGroupMembers = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupMembers { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupMembers { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupMembers(); while (reader.pos < end) { @@ -1036,7 +1038,7 @@ export const MsgUpdateGroupMembers = { message.admin = reader.string(); break; case 2: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 3: message.memberUpdates.push(Member.decode(reader, reader.uint32())); @@ -1049,16 +1051,16 @@ export const MsgUpdateGroupMembers = { return message; }, fromJSON(object: any): MsgUpdateGroupMembers { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - memberUpdates: Array.isArray(object?.memberUpdates) ? object.memberUpdates.map((e: any) => Member.fromJSON(e)) : [] - }; + const obj = createBaseMsgUpdateGroupMembers(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (Array.isArray(object?.memberUpdates)) object.memberUpdates.map((e: any) => Member.fromJSON(e)); + return obj; }, toJSON(message: MsgUpdateGroupMembers): unknown { const obj: any = {}; message.admin !== undefined && (obj.admin = message.admin); - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); if (message.memberUpdates) { obj.memberUpdates = message.memberUpdates.map(e => e ? Member.toJSON(e) : undefined); } else { @@ -1069,7 +1071,9 @@ export const MsgUpdateGroupMembers = { fromPartial(object: DeepPartial): MsgUpdateGroupMembers { const message = createBaseMsgUpdateGroupMembers(); message.admin = object.admin ?? ""; - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.memberUpdates = object.memberUpdates?.map(e => Member.fromPartial(e)) || []; return message; }, @@ -1094,7 +1098,7 @@ export const MsgUpdateGroupMembers = { fromAmino(object: MsgUpdateGroupMembersAmino): MsgUpdateGroupMembers { return { admin: object.admin, - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), memberUpdates: Array.isArray(object?.member_updates) ? object.member_updates.map((e: any) => Member.fromAmino(e)) : [] }; }, @@ -1137,11 +1141,11 @@ function createBaseMsgUpdateGroupMembersResponse(): MsgUpdateGroupMembersRespons export const MsgUpdateGroupMembersResponse = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupMembersResponse", aminoType: "cosmos-sdk/MsgUpdateGroupMembersResponse", - encode(_: MsgUpdateGroupMembersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateGroupMembersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupMembersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupMembersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupMembersResponse(); while (reader.pos < end) { @@ -1155,7 +1159,8 @@ export const MsgUpdateGroupMembersResponse = { return message; }, fromJSON(_: any): MsgUpdateGroupMembersResponse { - return {}; + const obj = createBaseMsgUpdateGroupMembersResponse(); + return obj; }, toJSON(_: MsgUpdateGroupMembersResponse): unknown { const obj: any = {}; @@ -1204,18 +1209,18 @@ export const MsgUpdateGroupMembersResponse = { function createBaseMsgUpdateGroupAdmin(): MsgUpdateGroupAdmin { return { admin: "", - groupId: Long.UZERO, + groupId: BigInt(0), newAdmin: "" }; } export const MsgUpdateGroupAdmin = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdmin", aminoType: "cosmos-sdk/MsgUpdateGroupAdmin", - encode(message: MsgUpdateGroupAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateGroupAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } - if (!message.groupId.isZero()) { + if (message.groupId !== BigInt(0)) { writer.uint32(16).uint64(message.groupId); } if (message.newAdmin !== "") { @@ -1223,8 +1228,8 @@ export const MsgUpdateGroupAdmin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupAdmin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupAdmin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupAdmin(); while (reader.pos < end) { @@ -1234,7 +1239,7 @@ export const MsgUpdateGroupAdmin = { message.admin = reader.string(); break; case 2: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 3: message.newAdmin = reader.string(); @@ -1247,23 +1252,25 @@ export const MsgUpdateGroupAdmin = { return message; }, fromJSON(object: any): MsgUpdateGroupAdmin { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - newAdmin: isSet(object.newAdmin) ? String(object.newAdmin) : "" - }; + const obj = createBaseMsgUpdateGroupAdmin(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.newAdmin)) obj.newAdmin = String(object.newAdmin); + return obj; }, toJSON(message: MsgUpdateGroupAdmin): unknown { const obj: any = {}; message.admin !== undefined && (obj.admin = message.admin); - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.newAdmin !== undefined && (obj.newAdmin = message.newAdmin); return obj; }, fromPartial(object: DeepPartial): MsgUpdateGroupAdmin { const message = createBaseMsgUpdateGroupAdmin(); message.admin = object.admin ?? ""; - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.newAdmin = object.newAdmin ?? ""; return message; }, @@ -1284,7 +1291,7 @@ export const MsgUpdateGroupAdmin = { fromAmino(object: MsgUpdateGroupAdminAmino): MsgUpdateGroupAdmin { return { admin: object.admin, - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), newAdmin: object.new_admin }; }, @@ -1323,11 +1330,11 @@ function createBaseMsgUpdateGroupAdminResponse(): MsgUpdateGroupAdminResponse { export const MsgUpdateGroupAdminResponse = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupAdminResponse", aminoType: "cosmos-sdk/MsgUpdateGroupAdminResponse", - encode(_: MsgUpdateGroupAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateGroupAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupAdminResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupAdminResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupAdminResponse(); while (reader.pos < end) { @@ -1341,7 +1348,8 @@ export const MsgUpdateGroupAdminResponse = { return message; }, fromJSON(_: any): MsgUpdateGroupAdminResponse { - return {}; + const obj = createBaseMsgUpdateGroupAdminResponse(); + return obj; }, toJSON(_: MsgUpdateGroupAdminResponse): unknown { const obj: any = {}; @@ -1390,18 +1398,18 @@ export const MsgUpdateGroupAdminResponse = { function createBaseMsgUpdateGroupMetadata(): MsgUpdateGroupMetadata { return { admin: "", - groupId: Long.UZERO, + groupId: BigInt(0), metadata: "" }; } export const MsgUpdateGroupMetadata = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadata", aminoType: "cosmos-sdk/MsgUpdateGroupMetadata", - encode(message: MsgUpdateGroupMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateGroupMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } - if (!message.groupId.isZero()) { + if (message.groupId !== BigInt(0)) { writer.uint32(16).uint64(message.groupId); } if (message.metadata !== "") { @@ -1409,8 +1417,8 @@ export const MsgUpdateGroupMetadata = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupMetadata(); while (reader.pos < end) { @@ -1420,7 +1428,7 @@ export const MsgUpdateGroupMetadata = { message.admin = reader.string(); break; case 2: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 3: message.metadata = reader.string(); @@ -1433,23 +1441,25 @@ export const MsgUpdateGroupMetadata = { return message; }, fromJSON(object: any): MsgUpdateGroupMetadata { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseMsgUpdateGroupMetadata(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: MsgUpdateGroupMetadata): unknown { const obj: any = {}; message.admin !== undefined && (obj.admin = message.admin); - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.metadata !== undefined && (obj.metadata = message.metadata); return obj; }, fromPartial(object: DeepPartial): MsgUpdateGroupMetadata { const message = createBaseMsgUpdateGroupMetadata(); message.admin = object.admin ?? ""; - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.metadata = object.metadata ?? ""; return message; }, @@ -1470,7 +1480,7 @@ export const MsgUpdateGroupMetadata = { fromAmino(object: MsgUpdateGroupMetadataAmino): MsgUpdateGroupMetadata { return { admin: object.admin, - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), metadata: object.metadata }; }, @@ -1509,11 +1519,11 @@ function createBaseMsgUpdateGroupMetadataResponse(): MsgUpdateGroupMetadataRespo export const MsgUpdateGroupMetadataResponse = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupMetadataResponse", aminoType: "cosmos-sdk/MsgUpdateGroupMetadataResponse", - encode(_: MsgUpdateGroupMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateGroupMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupMetadataResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupMetadataResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupMetadataResponse(); while (reader.pos < end) { @@ -1527,7 +1537,8 @@ export const MsgUpdateGroupMetadataResponse = { return message; }, fromJSON(_: any): MsgUpdateGroupMetadataResponse { - return {}; + const obj = createBaseMsgUpdateGroupMetadataResponse(); + return obj; }, toJSON(_: MsgUpdateGroupMetadataResponse): unknown { const obj: any = {}; @@ -1576,7 +1587,7 @@ export const MsgUpdateGroupMetadataResponse = { function createBaseMsgCreateGroupPolicy(): MsgCreateGroupPolicy { return { admin: "", - groupId: Long.UZERO, + groupId: BigInt(0), metadata: "", decisionPolicy: Any.fromPartial({}) }; @@ -1584,11 +1595,11 @@ function createBaseMsgCreateGroupPolicy(): MsgCreateGroupPolicy { export const MsgCreateGroupPolicy = { typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicy", aminoType: "cosmos-sdk/MsgCreateGroupPolicy", - encode(message: MsgCreateGroupPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateGroupPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } - if (!message.groupId.isZero()) { + if (message.groupId !== BigInt(0)) { writer.uint32(16).uint64(message.groupId); } if (message.metadata !== "") { @@ -1599,8 +1610,8 @@ export const MsgCreateGroupPolicy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateGroupPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateGroupPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateGroupPolicy(); while (reader.pos < end) { @@ -1610,7 +1621,7 @@ export const MsgCreateGroupPolicy = { message.admin = reader.string(); break; case 2: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 3: message.metadata = reader.string(); @@ -1626,17 +1637,17 @@ export const MsgCreateGroupPolicy = { return message; }, fromJSON(object: any): MsgCreateGroupPolicy { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - metadata: isSet(object.metadata) ? String(object.metadata) : "", - decisionPolicy: isSet(object.decisionPolicy) ? Any.fromJSON(object.decisionPolicy) : undefined - }; + const obj = createBaseMsgCreateGroupPolicy(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (isSet(object.decisionPolicy)) obj.decisionPolicy = Any.fromJSON(object.decisionPolicy); + return obj; }, toJSON(message: MsgCreateGroupPolicy): unknown { const obj: any = {}; message.admin !== undefined && (obj.admin = message.admin); - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.metadata !== undefined && (obj.metadata = message.metadata); message.decisionPolicy !== undefined && (obj.decisionPolicy = message.decisionPolicy ? Any.toJSON(message.decisionPolicy) : undefined); return obj; @@ -1644,9 +1655,13 @@ export const MsgCreateGroupPolicy = { fromPartial(object: DeepPartial): MsgCreateGroupPolicy { const message = createBaseMsgCreateGroupPolicy(); message.admin = object.admin ?? ""; - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.metadata = object.metadata ?? ""; - message.decisionPolicy = object.decisionPolicy !== undefined && object.decisionPolicy !== null ? Any.fromPartial(object.decisionPolicy) : undefined; + if (object.decisionPolicy !== undefined && object.decisionPolicy !== null) { + message.decisionPolicy = Any.fromPartial(object.decisionPolicy); + } return message; }, fromSDK(object: MsgCreateGroupPolicySDKType): MsgCreateGroupPolicy { @@ -1668,7 +1683,7 @@ export const MsgCreateGroupPolicy = { fromAmino(object: MsgCreateGroupPolicyAmino): MsgCreateGroupPolicy { return { admin: object.admin, - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), metadata: object.metadata, decisionPolicy: object?.decision_policy ? DecisionPolicy_FromAmino(object.decision_policy) : undefined }; @@ -1711,14 +1726,14 @@ function createBaseMsgCreateGroupPolicyResponse(): MsgCreateGroupPolicyResponse export const MsgCreateGroupPolicyResponse = { typeUrl: "/cosmos.group.v1.MsgCreateGroupPolicyResponse", aminoType: "cosmos-sdk/MsgCreateGroupPolicyResponse", - encode(message: MsgCreateGroupPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateGroupPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateGroupPolicyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateGroupPolicyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateGroupPolicyResponse(); while (reader.pos < end) { @@ -1735,9 +1750,9 @@ export const MsgCreateGroupPolicyResponse = { return message; }, fromJSON(object: any): MsgCreateGroupPolicyResponse { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseMsgCreateGroupPolicyResponse(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: MsgCreateGroupPolicyResponse): unknown { const obj: any = {}; @@ -1801,7 +1816,7 @@ function createBaseMsgUpdateGroupPolicyAdmin(): MsgUpdateGroupPolicyAdmin { export const MsgUpdateGroupPolicyAdmin = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdmin", aminoType: "cosmos-sdk/MsgUpdateGroupPolicyAdmin", - encode(message: MsgUpdateGroupPolicyAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateGroupPolicyAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -1813,8 +1828,8 @@ export const MsgUpdateGroupPolicyAdmin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupPolicyAdmin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupPolicyAdmin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupPolicyAdmin(); while (reader.pos < end) { @@ -1837,11 +1852,11 @@ export const MsgUpdateGroupPolicyAdmin = { return message; }, fromJSON(object: any): MsgUpdateGroupPolicyAdmin { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - address: isSet(object.address) ? String(object.address) : "", - newAdmin: isSet(object.newAdmin) ? String(object.newAdmin) : "" - }; + const obj = createBaseMsgUpdateGroupPolicyAdmin(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.newAdmin)) obj.newAdmin = String(object.newAdmin); + return obj; }, toJSON(message: MsgUpdateGroupPolicyAdmin): unknown { const obj: any = {}; @@ -1920,7 +1935,7 @@ function createBaseMsgCreateGroupWithPolicy(): MsgCreateGroupWithPolicy { export const MsgCreateGroupWithPolicy = { typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicy", aminoType: "cosmos-sdk/MsgCreateGroupWithPolicy", - encode(message: MsgCreateGroupWithPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateGroupWithPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -1941,8 +1956,8 @@ export const MsgCreateGroupWithPolicy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateGroupWithPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateGroupWithPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateGroupWithPolicy(); while (reader.pos < end) { @@ -1974,14 +1989,14 @@ export const MsgCreateGroupWithPolicy = { return message; }, fromJSON(object: any): MsgCreateGroupWithPolicy { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - members: Array.isArray(object?.members) ? object.members.map((e: any) => Member.fromJSON(e)) : [], - groupMetadata: isSet(object.groupMetadata) ? String(object.groupMetadata) : "", - groupPolicyMetadata: isSet(object.groupPolicyMetadata) ? String(object.groupPolicyMetadata) : "", - groupPolicyAsAdmin: isSet(object.groupPolicyAsAdmin) ? Boolean(object.groupPolicyAsAdmin) : false, - decisionPolicy: isSet(object.decisionPolicy) ? Any.fromJSON(object.decisionPolicy) : undefined - }; + const obj = createBaseMsgCreateGroupWithPolicy(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (Array.isArray(object?.members)) object.members.map((e: any) => Member.fromJSON(e)); + if (isSet(object.groupMetadata)) obj.groupMetadata = String(object.groupMetadata); + if (isSet(object.groupPolicyMetadata)) obj.groupPolicyMetadata = String(object.groupPolicyMetadata); + if (isSet(object.groupPolicyAsAdmin)) obj.groupPolicyAsAdmin = Boolean(object.groupPolicyAsAdmin); + if (isSet(object.decisionPolicy)) obj.decisionPolicy = Any.fromJSON(object.decisionPolicy); + return obj; }, toJSON(message: MsgCreateGroupWithPolicy): unknown { const obj: any = {}; @@ -2004,7 +2019,9 @@ export const MsgCreateGroupWithPolicy = { message.groupMetadata = object.groupMetadata ?? ""; message.groupPolicyMetadata = object.groupPolicyMetadata ?? ""; message.groupPolicyAsAdmin = object.groupPolicyAsAdmin ?? false; - message.decisionPolicy = object.decisionPolicy !== undefined && object.decisionPolicy !== null ? Any.fromPartial(object.decisionPolicy) : undefined; + if (object.decisionPolicy !== undefined && object.decisionPolicy !== null) { + message.decisionPolicy = Any.fromPartial(object.decisionPolicy); + } return message; }, fromSDK(object: MsgCreateGroupWithPolicySDKType): MsgCreateGroupWithPolicy { @@ -2079,15 +2096,15 @@ export const MsgCreateGroupWithPolicy = { }; function createBaseMsgCreateGroupWithPolicyResponse(): MsgCreateGroupWithPolicyResponse { return { - groupId: Long.UZERO, + groupId: BigInt(0), groupPolicyAddress: "" }; } export const MsgCreateGroupWithPolicyResponse = { typeUrl: "/cosmos.group.v1.MsgCreateGroupWithPolicyResponse", aminoType: "cosmos-sdk/MsgCreateGroupWithPolicyResponse", - encode(message: MsgCreateGroupWithPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: MsgCreateGroupWithPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } if (message.groupPolicyAddress !== "") { @@ -2095,15 +2112,15 @@ export const MsgCreateGroupWithPolicyResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateGroupWithPolicyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateGroupWithPolicyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateGroupWithPolicyResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 2: message.groupPolicyAddress = reader.string(); @@ -2116,20 +2133,22 @@ export const MsgCreateGroupWithPolicyResponse = { return message; }, fromJSON(object: any): MsgCreateGroupWithPolicyResponse { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - groupPolicyAddress: isSet(object.groupPolicyAddress) ? String(object.groupPolicyAddress) : "" - }; + const obj = createBaseMsgCreateGroupWithPolicyResponse(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.groupPolicyAddress)) obj.groupPolicyAddress = String(object.groupPolicyAddress); + return obj; }, toJSON(message: MsgCreateGroupWithPolicyResponse): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.groupPolicyAddress !== undefined && (obj.groupPolicyAddress = message.groupPolicyAddress); return obj; }, fromPartial(object: DeepPartial): MsgCreateGroupWithPolicyResponse { const message = createBaseMsgCreateGroupWithPolicyResponse(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.groupPolicyAddress = object.groupPolicyAddress ?? ""; return message; }, @@ -2147,7 +2166,7 @@ export const MsgCreateGroupWithPolicyResponse = { }, fromAmino(object: MsgCreateGroupWithPolicyResponseAmino): MsgCreateGroupWithPolicyResponse { return { - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), groupPolicyAddress: object.group_policy_address }; }, @@ -2185,11 +2204,11 @@ function createBaseMsgUpdateGroupPolicyAdminResponse(): MsgUpdateGroupPolicyAdmi export const MsgUpdateGroupPolicyAdminResponse = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyAdminResponse", aminoType: "cosmos-sdk/MsgUpdateGroupPolicyAdminResponse", - encode(_: MsgUpdateGroupPolicyAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateGroupPolicyAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupPolicyAdminResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupPolicyAdminResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupPolicyAdminResponse(); while (reader.pos < end) { @@ -2203,7 +2222,8 @@ export const MsgUpdateGroupPolicyAdminResponse = { return message; }, fromJSON(_: any): MsgUpdateGroupPolicyAdminResponse { - return {}; + const obj = createBaseMsgUpdateGroupPolicyAdminResponse(); + return obj; }, toJSON(_: MsgUpdateGroupPolicyAdminResponse): unknown { const obj: any = {}; @@ -2259,7 +2279,7 @@ function createBaseMsgUpdateGroupPolicyDecisionPolicy(): MsgUpdateGroupPolicyDec export const MsgUpdateGroupPolicyDecisionPolicy = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicy", aminoType: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicy", - encode(message: MsgUpdateGroupPolicyDecisionPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateGroupPolicyDecisionPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -2271,8 +2291,8 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupPolicyDecisionPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupPolicyDecisionPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupPolicyDecisionPolicy(); while (reader.pos < end) { @@ -2295,11 +2315,11 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { return message; }, fromJSON(object: any): MsgUpdateGroupPolicyDecisionPolicy { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - address: isSet(object.address) ? String(object.address) : "", - decisionPolicy: isSet(object.decisionPolicy) ? Any.fromJSON(object.decisionPolicy) : undefined - }; + const obj = createBaseMsgUpdateGroupPolicyDecisionPolicy(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.decisionPolicy)) obj.decisionPolicy = Any.fromJSON(object.decisionPolicy); + return obj; }, toJSON(message: MsgUpdateGroupPolicyDecisionPolicy): unknown { const obj: any = {}; @@ -2312,7 +2332,9 @@ export const MsgUpdateGroupPolicyDecisionPolicy = { const message = createBaseMsgUpdateGroupPolicyDecisionPolicy(); message.admin = object.admin ?? ""; message.address = object.address ?? ""; - message.decisionPolicy = object.decisionPolicy !== undefined && object.decisionPolicy !== null ? Any.fromPartial(object.decisionPolicy) : undefined; + if (object.decisionPolicy !== undefined && object.decisionPolicy !== null) { + message.decisionPolicy = Any.fromPartial(object.decisionPolicy); + } return message; }, fromSDK(object: MsgUpdateGroupPolicyDecisionPolicySDKType): MsgUpdateGroupPolicyDecisionPolicy { @@ -2371,11 +2393,11 @@ function createBaseMsgUpdateGroupPolicyDecisionPolicyResponse(): MsgUpdateGroupP export const MsgUpdateGroupPolicyDecisionPolicyResponse = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyDecisionPolicyResponse", aminoType: "cosmos-sdk/MsgUpdateGroupPolicyDecisionPolicyResponse", - encode(_: MsgUpdateGroupPolicyDecisionPolicyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateGroupPolicyDecisionPolicyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupPolicyDecisionPolicyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupPolicyDecisionPolicyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupPolicyDecisionPolicyResponse(); while (reader.pos < end) { @@ -2389,7 +2411,8 @@ export const MsgUpdateGroupPolicyDecisionPolicyResponse = { return message; }, fromJSON(_: any): MsgUpdateGroupPolicyDecisionPolicyResponse { - return {}; + const obj = createBaseMsgUpdateGroupPolicyDecisionPolicyResponse(); + return obj; }, toJSON(_: MsgUpdateGroupPolicyDecisionPolicyResponse): unknown { const obj: any = {}; @@ -2445,7 +2468,7 @@ function createBaseMsgUpdateGroupPolicyMetadata(): MsgUpdateGroupPolicyMetadata export const MsgUpdateGroupPolicyMetadata = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadata", aminoType: "cosmos-sdk/MsgUpdateGroupPolicyMetadata", - encode(message: MsgUpdateGroupPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateGroupPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.admin !== "") { writer.uint32(10).string(message.admin); } @@ -2457,8 +2480,8 @@ export const MsgUpdateGroupPolicyMetadata = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupPolicyMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupPolicyMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupPolicyMetadata(); while (reader.pos < end) { @@ -2481,11 +2504,11 @@ export const MsgUpdateGroupPolicyMetadata = { return message; }, fromJSON(object: any): MsgUpdateGroupPolicyMetadata { - return { - admin: isSet(object.admin) ? String(object.admin) : "", - address: isSet(object.address) ? String(object.address) : "", - metadata: isSet(object.metadata) ? String(object.metadata) : "" - }; + const obj = createBaseMsgUpdateGroupPolicyMetadata(); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + return obj; }, toJSON(message: MsgUpdateGroupPolicyMetadata): unknown { const obj: any = {}; @@ -2557,11 +2580,11 @@ function createBaseMsgUpdateGroupPolicyMetadataResponse(): MsgUpdateGroupPolicyM export const MsgUpdateGroupPolicyMetadataResponse = { typeUrl: "/cosmos.group.v1.MsgUpdateGroupPolicyMetadataResponse", aminoType: "cosmos-sdk/MsgUpdateGroupPolicyMetadataResponse", - encode(_: MsgUpdateGroupPolicyMetadataResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateGroupPolicyMetadataResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateGroupPolicyMetadataResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateGroupPolicyMetadataResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateGroupPolicyMetadataResponse(); while (reader.pos < end) { @@ -2575,7 +2598,8 @@ export const MsgUpdateGroupPolicyMetadataResponse = { return message; }, fromJSON(_: any): MsgUpdateGroupPolicyMetadataResponse { - return {}; + const obj = createBaseMsgUpdateGroupPolicyMetadataResponse(); + return obj; }, toJSON(_: MsgUpdateGroupPolicyMetadataResponse): unknown { const obj: any = {}; @@ -2633,7 +2657,7 @@ function createBaseMsgSubmitProposal(): MsgSubmitProposal { export const MsgSubmitProposal = { typeUrl: "/cosmos.group.v1.MsgSubmitProposal", aminoType: "cosmos-sdk/group/MsgSubmitProposal", - encode(message: MsgSubmitProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSubmitProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -2651,8 +2675,8 @@ export const MsgSubmitProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitProposal(); while (reader.pos < end) { @@ -2681,13 +2705,13 @@ export const MsgSubmitProposal = { return message; }, fromJSON(object: any): MsgSubmitProposal { - return { - address: isSet(object.address) ? String(object.address) : "", - proposers: Array.isArray(object?.proposers) ? object.proposers.map((e: any) => String(e)) : [], - metadata: isSet(object.metadata) ? String(object.metadata) : "", - messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromJSON(e)) : [], - exec: isSet(object.exec) ? execFromJSON(object.exec) : -1 - }; + const obj = createBaseMsgSubmitProposal(); + if (isSet(object.address)) obj.address = String(object.address); + if (Array.isArray(object?.proposers)) object.proposers.map((e: any) => String(e)); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (Array.isArray(object?.messages)) object.messages.map((e: any) => Any.fromJSON(e)); + if (isSet(object.exec)) obj.exec = execFromJSON(object.exec); + return obj; }, toJSON(message: MsgSubmitProposal): unknown { const obj: any = {}; @@ -2791,27 +2815,27 @@ export const MsgSubmitProposal = { }; function createBaseMsgSubmitProposalResponse(): MsgSubmitProposalResponse { return { - proposalId: Long.UZERO + proposalId: BigInt(0) }; } export const MsgSubmitProposalResponse = { typeUrl: "/cosmos.group.v1.MsgSubmitProposalResponse", aminoType: "cosmos-sdk/MsgSubmitProposalResponse", - encode(message: MsgSubmitProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgSubmitProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSubmitProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSubmitProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSubmitProposalResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -2821,18 +2845,20 @@ export const MsgSubmitProposalResponse = { return message; }, fromJSON(object: any): MsgSubmitProposalResponse { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO - }; + const obj = createBaseMsgSubmitProposalResponse(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + return obj; }, toJSON(message: MsgSubmitProposalResponse): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgSubmitProposalResponse { const message = createBaseMsgSubmitProposalResponse(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } return message; }, fromSDK(object: MsgSubmitProposalResponseSDKType): MsgSubmitProposalResponse { @@ -2847,7 +2873,7 @@ export const MsgSubmitProposalResponse = { }, fromAmino(object: MsgSubmitProposalResponseAmino): MsgSubmitProposalResponse { return { - proposalId: Long.fromString(object.proposal_id) + proposalId: BigInt(object.proposal_id) }; }, toAmino(message: MsgSubmitProposalResponse): MsgSubmitProposalResponseAmino { @@ -2879,15 +2905,15 @@ export const MsgSubmitProposalResponse = { }; function createBaseMsgWithdrawProposal(): MsgWithdrawProposal { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), address: "" }; } export const MsgWithdrawProposal = { typeUrl: "/cosmos.group.v1.MsgWithdrawProposal", aminoType: "cosmos-sdk/group/MsgWithdrawProposal", - encode(message: MsgWithdrawProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgWithdrawProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.address !== "") { @@ -2895,15 +2921,15 @@ export const MsgWithdrawProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawProposal(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.address = reader.string(); @@ -2916,20 +2942,22 @@ export const MsgWithdrawProposal = { return message; }, fromJSON(object: any): MsgWithdrawProposal { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseMsgWithdrawProposal(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: MsgWithdrawProposal): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.address !== undefined && (obj.address = message.address); return obj; }, fromPartial(object: DeepPartial): MsgWithdrawProposal { const message = createBaseMsgWithdrawProposal(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.address = object.address ?? ""; return message; }, @@ -2947,7 +2975,7 @@ export const MsgWithdrawProposal = { }, fromAmino(object: MsgWithdrawProposalAmino): MsgWithdrawProposal { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), address: object.address }; }, @@ -2985,11 +3013,11 @@ function createBaseMsgWithdrawProposalResponse(): MsgWithdrawProposalResponse { export const MsgWithdrawProposalResponse = { typeUrl: "/cosmos.group.v1.MsgWithdrawProposalResponse", aminoType: "cosmos-sdk/MsgWithdrawProposalResponse", - encode(_: MsgWithdrawProposalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgWithdrawProposalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgWithdrawProposalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgWithdrawProposalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgWithdrawProposalResponse(); while (reader.pos < end) { @@ -3003,7 +3031,8 @@ export const MsgWithdrawProposalResponse = { return message; }, fromJSON(_: any): MsgWithdrawProposalResponse { - return {}; + const obj = createBaseMsgWithdrawProposalResponse(); + return obj; }, toJSON(_: MsgWithdrawProposalResponse): unknown { const obj: any = {}; @@ -3051,7 +3080,7 @@ export const MsgWithdrawProposalResponse = { }; function createBaseMsgVote(): MsgVote { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", option: 0, metadata: "", @@ -3061,8 +3090,8 @@ function createBaseMsgVote(): MsgVote { export const MsgVote = { typeUrl: "/cosmos.group.v1.MsgVote", aminoType: "cosmos-sdk/group/MsgVote", - encode(message: MsgVote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgVote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -3079,15 +3108,15 @@ export const MsgVote = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -3109,17 +3138,17 @@ export const MsgVote = { return message; }, fromJSON(object: any): MsgVote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, - metadata: isSet(object.metadata) ? String(object.metadata) : "", - exec: isSet(object.exec) ? execFromJSON(object.exec) : -1 - }; + const obj = createBaseMsgVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (isSet(object.exec)) obj.exec = execFromJSON(object.exec); + return obj; }, toJSON(message: MsgVote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); message.metadata !== undefined && (obj.metadata = message.metadata); @@ -3128,7 +3157,9 @@ export const MsgVote = { }, fromPartial(object: DeepPartial): MsgVote { const message = createBaseMsgVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.option = object.option ?? 0; message.metadata = object.metadata ?? ""; @@ -3155,7 +3186,7 @@ export const MsgVote = { }, fromAmino(object: MsgVoteAmino): MsgVote { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, metadata: object.metadata, @@ -3199,11 +3230,11 @@ function createBaseMsgVoteResponse(): MsgVoteResponse { export const MsgVoteResponse = { typeUrl: "/cosmos.group.v1.MsgVoteResponse", aminoType: "cosmos-sdk/MsgVoteResponse", - encode(_: MsgVoteResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgVoteResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgVoteResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgVoteResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgVoteResponse(); while (reader.pos < end) { @@ -3217,7 +3248,8 @@ export const MsgVoteResponse = { return message; }, fromJSON(_: any): MsgVoteResponse { - return {}; + const obj = createBaseMsgVoteResponse(); + return obj; }, toJSON(_: MsgVoteResponse): unknown { const obj: any = {}; @@ -3265,15 +3297,15 @@ export const MsgVoteResponse = { }; function createBaseMsgExec(): MsgExec { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), signer: "" }; } export const MsgExec = { typeUrl: "/cosmos.group.v1.MsgExec", aminoType: "cosmos-sdk/group/MsgExec", - encode(message: MsgExec, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: MsgExec, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.signer !== "") { @@ -3281,15 +3313,15 @@ export const MsgExec = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExec { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExec { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExec(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.signer = reader.string(); @@ -3302,20 +3334,22 @@ export const MsgExec = { return message; }, fromJSON(object: any): MsgExec { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - signer: isSet(object.signer) ? String(object.signer) : "" - }; + const obj = createBaseMsgExec(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.signer)) obj.signer = String(object.signer); + return obj; }, toJSON(message: MsgExec): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.signer !== undefined && (obj.signer = message.signer); return obj; }, fromPartial(object: DeepPartial): MsgExec { const message = createBaseMsgExec(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.signer = object.signer ?? ""; return message; }, @@ -3333,7 +3367,7 @@ export const MsgExec = { }, fromAmino(object: MsgExecAmino): MsgExec { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), signer: object.signer }; }, @@ -3371,11 +3405,11 @@ function createBaseMsgExecResponse(): MsgExecResponse { export const MsgExecResponse = { typeUrl: "/cosmos.group.v1.MsgExecResponse", aminoType: "cosmos-sdk/MsgExecResponse", - encode(_: MsgExecResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgExecResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExecResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExecResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExecResponse(); while (reader.pos < end) { @@ -3389,7 +3423,8 @@ export const MsgExecResponse = { return message; }, fromJSON(_: any): MsgExecResponse { - return {}; + const obj = createBaseMsgExecResponse(); + return obj; }, toJSON(_: MsgExecResponse): unknown { const obj: any = {}; @@ -3438,23 +3473,23 @@ export const MsgExecResponse = { function createBaseMsgLeaveGroup(): MsgLeaveGroup { return { address: "", - groupId: Long.UZERO + groupId: BigInt(0) }; } export const MsgLeaveGroup = { typeUrl: "/cosmos.group.v1.MsgLeaveGroup", aminoType: "cosmos-sdk/group/MsgLeaveGroup", - encode(message: MsgLeaveGroup, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgLeaveGroup, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } - if (!message.groupId.isZero()) { + if (message.groupId !== BigInt(0)) { writer.uint32(16).uint64(message.groupId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgLeaveGroup { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgLeaveGroup { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgLeaveGroup(); while (reader.pos < end) { @@ -3464,7 +3499,7 @@ export const MsgLeaveGroup = { message.address = reader.string(); break; case 2: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -3474,21 +3509,23 @@ export const MsgLeaveGroup = { return message; }, fromJSON(object: any): MsgLeaveGroup { - return { - address: isSet(object.address) ? String(object.address) : "", - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO - }; + const obj = createBaseMsgLeaveGroup(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + return obj; }, toJSON(message: MsgLeaveGroup): unknown { const obj: any = {}; message.address !== undefined && (obj.address = message.address); - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgLeaveGroup { const message = createBaseMsgLeaveGroup(); message.address = object.address ?? ""; - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } return message; }, fromSDK(object: MsgLeaveGroupSDKType): MsgLeaveGroup { @@ -3506,7 +3543,7 @@ export const MsgLeaveGroup = { fromAmino(object: MsgLeaveGroupAmino): MsgLeaveGroup { return { address: object.address, - groupId: Long.fromString(object.group_id) + groupId: BigInt(object.group_id) }; }, toAmino(message: MsgLeaveGroup): MsgLeaveGroupAmino { @@ -3543,11 +3580,11 @@ function createBaseMsgLeaveGroupResponse(): MsgLeaveGroupResponse { export const MsgLeaveGroupResponse = { typeUrl: "/cosmos.group.v1.MsgLeaveGroupResponse", aminoType: "cosmos-sdk/MsgLeaveGroupResponse", - encode(_: MsgLeaveGroupResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgLeaveGroupResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgLeaveGroupResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgLeaveGroupResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgLeaveGroupResponse(); while (reader.pos < end) { @@ -3561,7 +3598,8 @@ export const MsgLeaveGroupResponse = { return message; }, fromJSON(_: any): MsgLeaveGroupResponse { - return {}; + const obj = createBaseMsgLeaveGroupResponse(); + return obj; }, toJSON(_: MsgLeaveGroupResponse): unknown { const obj: any = {}; @@ -3607,8 +3645,8 @@ export const MsgLeaveGroupResponse = { }; } }; -export const DecisionPolicy_InterfaceDecoder = (input: _m0.Reader | Uint8Array): ThresholdDecisionPolicy | PercentageDecisionPolicy | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const DecisionPolicy_InterfaceDecoder = (input: BinaryReader | Uint8Array): ThresholdDecisionPolicy | PercentageDecisionPolicy | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.group.v1.ThresholdDecisionPolicy": diff --git a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts index 3d2eb29c3a..c2fbf601c2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts +++ b/__fixtures__/v-next/outputv2/cosmos/group/v1/types.ts @@ -1,8 +1,8 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.group.v1"; /** VoteOption enumerates the valid vote options for a given proposal. */ export enum VoteOption { @@ -287,6 +287,7 @@ export interface MembersSDKType { } /** ThresholdDecisionPolicy implements the DecisionPolicy interface */ export interface ThresholdDecisionPolicy { + $typeUrl?: string; /** threshold is the minimum weighted sum of yes votes that must be met or exceeded for a proposal to succeed. */ threshold: string; /** windows defines the different windows for voting and execution. */ @@ -309,11 +310,13 @@ export interface ThresholdDecisionPolicyAminoMsg { } /** ThresholdDecisionPolicy implements the DecisionPolicy interface */ export interface ThresholdDecisionPolicySDKType { + $typeUrl?: string; threshold: string; windows: DecisionPolicyWindowsSDKType; } /** PercentageDecisionPolicy implements the DecisionPolicy interface */ export interface PercentageDecisionPolicy { + $typeUrl?: string; /** percentage is the minimum percentage the weighted sum of yes votes must meet for a proposal to succeed. */ percentage: string; /** windows defines the different windows for voting and execution. */ @@ -336,6 +339,7 @@ export interface PercentageDecisionPolicyAminoMsg { } /** PercentageDecisionPolicy implements the DecisionPolicy interface */ export interface PercentageDecisionPolicySDKType { + $typeUrl?: string; percentage: string; windows: DecisionPolicyWindowsSDKType; } @@ -399,7 +403,7 @@ export interface DecisionPolicyWindowsSDKType { /** GroupInfo represents the high-level on-chain information for a group. */ export interface GroupInfo { /** id is the unique ID of the group. */ - id: Long; + id: bigint; /** admin is the account address of the group's admin. */ admin: string; /** metadata is any arbitrary metadata to attached to the group. */ @@ -410,7 +414,7 @@ export interface GroupInfo { * or any member is added or removed this version is incremented and will * cause proposals based on older versions of this group to fail */ - version: Long; + version: bigint; /** total_weight is the sum of the group members' weights. */ totalWeight: string; /** created_at is a timestamp specifying when a group was created. */ @@ -446,17 +450,17 @@ export interface GroupInfoAminoMsg { } /** GroupInfo represents the high-level on-chain information for a group. */ export interface GroupInfoSDKType { - id: Long; + id: bigint; admin: string; metadata: string; - version: Long; + version: bigint; total_weight: string; created_at: Date; } /** GroupMember represents the relationship between a group and a member. */ export interface GroupMember { /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** member is the member data. */ member: Member; } @@ -477,7 +481,7 @@ export interface GroupMemberAminoMsg { } /** GroupMember represents the relationship between a group and a member. */ export interface GroupMemberSDKType { - group_id: Long; + group_id: bigint; member: MemberSDKType; } /** GroupPolicyInfo represents the high-level on-chain information for a group policy. */ @@ -485,7 +489,7 @@ export interface GroupPolicyInfo { /** address is the account address of group policy. */ address: string; /** group_id is the unique ID of the group. */ - groupId: Long; + groupId: bigint; /** admin is the account address of the group admin. */ admin: string; /** metadata is any arbitrary metadata to attached to the group policy. */ @@ -494,7 +498,7 @@ export interface GroupPolicyInfo { * version is used to track changes to a group's GroupPolicyInfo structure that * would create a different result on a running proposal. */ - version: Long; + version: bigint; /** decision_policy specifies the group policy's decision policy. */ decisionPolicy: ThresholdDecisionPolicy | PercentageDecisionPolicy | Any | undefined; /** created_at is a timestamp specifying when a group policy was created. */ @@ -534,10 +538,10 @@ export interface GroupPolicyInfoAminoMsg { /** GroupPolicyInfo represents the high-level on-chain information for a group policy. */ export interface GroupPolicyInfoSDKType { address: string; - group_id: Long; + group_id: bigint; admin: string; metadata: string; - version: Long; + version: bigint; decision_policy: ThresholdDecisionPolicySDKType | PercentageDecisionPolicySDKType | AnySDKType | undefined; created_at: Date; } @@ -549,7 +553,7 @@ export interface GroupPolicyInfoSDKType { */ export interface Proposal { /** id is the unique id of the proposal. */ - id: Long; + id: bigint; /** address is the account address of group policy. */ address: string; /** metadata is any arbitrary metadata to attached to the proposal. */ @@ -562,12 +566,12 @@ export interface Proposal { * group_version tracks the version of the group that this proposal corresponds to. * When group membership is changed, existing proposals from previous group versions will become invalid. */ - groupVersion: Long; + groupVersion: bigint; /** * group_policy_version tracks the version of the group policy that this proposal corresponds to. * When a decision policy is changed, existing proposals from previous policy versions will become invalid. */ - groupPolicyVersion: Long; + groupPolicyVersion: bigint; /** status represents the high level position in the life cycle of the proposal. Initial value is Submitted. */ status: ProposalStatus; /** @@ -664,13 +668,13 @@ export interface ProposalAminoMsg { * passes as well as some optional metadata associated with the proposal. */ export interface ProposalSDKType { - id: Long; + id: bigint; address: string; metadata: string; proposers: string[]; submit_time: Date; - group_version: Long; - group_policy_version: Long; + group_version: bigint; + group_policy_version: bigint; status: ProposalStatus; result: ProposalResult; final_tally_result: TallyResultSDKType; @@ -718,7 +722,7 @@ export interface TallyResultSDKType { /** Vote represents a vote for a proposal. */ export interface Vote { /** proposal is the unique ID of the proposal. */ - proposalId: Long; + proposalId: bigint; /** voter is the account address of the voter. */ voter: string; /** option is the voter's choice on the proposal. */ @@ -751,7 +755,7 @@ export interface VoteAminoMsg { } /** Vote represents a vote for a proposal. */ export interface VoteSDKType { - proposal_id: Long; + proposal_id: bigint; voter: string; option: VoteOption; metadata: string; @@ -768,7 +772,7 @@ function createBaseMember(): Member { export const Member = { typeUrl: "/cosmos.group.v1.Member", aminoType: "cosmos-sdk/Member", - encode(message: Member, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Member, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -783,8 +787,8 @@ export const Member = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Member { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Member { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMember(); while (reader.pos < end) { @@ -810,12 +814,12 @@ export const Member = { return message; }, fromJSON(object: any): Member { - return { - address: isSet(object.address) ? String(object.address) : "", - weight: isSet(object.weight) ? String(object.weight) : "", - metadata: isSet(object.metadata) ? String(object.metadata) : "", - addedAt: isSet(object.addedAt) ? new Date(object.addedAt) : undefined - }; + const obj = createBaseMember(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.weight)) obj.weight = String(object.weight); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (isSet(object.addedAt)) obj.addedAt = new Date(object.addedAt); + return obj; }, toJSON(message: Member): unknown { const obj: any = {}; @@ -895,14 +899,14 @@ function createBaseMembers(): Members { export const Members = { typeUrl: "/cosmos.group.v1.Members", aminoType: "cosmos-sdk/Members", - encode(message: Members, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Members, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.members) { Member.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Members { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Members { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMembers(); while (reader.pos < end) { @@ -919,9 +923,9 @@ export const Members = { return message; }, fromJSON(object: any): Members { - return { - members: Array.isArray(object?.members) ? object.members.map((e: any) => Member.fromJSON(e)) : [] - }; + const obj = createBaseMembers(); + if (Array.isArray(object?.members)) object.members.map((e: any) => Member.fromJSON(e)); + return obj; }, toJSON(message: Members): unknown { const obj: any = {}; @@ -989,6 +993,7 @@ export const Members = { }; function createBaseThresholdDecisionPolicy(): ThresholdDecisionPolicy { return { + $typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy", threshold: "", windows: DecisionPolicyWindows.fromPartial({}) }; @@ -996,7 +1001,7 @@ function createBaseThresholdDecisionPolicy(): ThresholdDecisionPolicy { export const ThresholdDecisionPolicy = { typeUrl: "/cosmos.group.v1.ThresholdDecisionPolicy", aminoType: "cosmos-sdk/ThresholdDecisionPolicy", - encode(message: ThresholdDecisionPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ThresholdDecisionPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.threshold !== "") { writer.uint32(10).string(message.threshold); } @@ -1005,8 +1010,8 @@ export const ThresholdDecisionPolicy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ThresholdDecisionPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ThresholdDecisionPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseThresholdDecisionPolicy(); while (reader.pos < end) { @@ -1026,10 +1031,10 @@ export const ThresholdDecisionPolicy = { return message; }, fromJSON(object: any): ThresholdDecisionPolicy { - return { - threshold: isSet(object.threshold) ? String(object.threshold) : "", - windows: isSet(object.windows) ? DecisionPolicyWindows.fromJSON(object.windows) : undefined - }; + const obj = createBaseThresholdDecisionPolicy(); + if (isSet(object.threshold)) obj.threshold = String(object.threshold); + if (isSet(object.windows)) obj.windows = DecisionPolicyWindows.fromJSON(object.windows); + return obj; }, toJSON(message: ThresholdDecisionPolicy): unknown { const obj: any = {}; @@ -1040,7 +1045,9 @@ export const ThresholdDecisionPolicy = { fromPartial(object: DeepPartial): ThresholdDecisionPolicy { const message = createBaseThresholdDecisionPolicy(); message.threshold = object.threshold ?? ""; - message.windows = object.windows !== undefined && object.windows !== null ? DecisionPolicyWindows.fromPartial(object.windows) : undefined; + if (object.windows !== undefined && object.windows !== null) { + message.windows = DecisionPolicyWindows.fromPartial(object.windows); + } return message; }, fromSDK(object: ThresholdDecisionPolicySDKType): ThresholdDecisionPolicy { @@ -1091,6 +1098,7 @@ export const ThresholdDecisionPolicy = { }; function createBasePercentageDecisionPolicy(): PercentageDecisionPolicy { return { + $typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy", percentage: "", windows: DecisionPolicyWindows.fromPartial({}) }; @@ -1098,7 +1106,7 @@ function createBasePercentageDecisionPolicy(): PercentageDecisionPolicy { export const PercentageDecisionPolicy = { typeUrl: "/cosmos.group.v1.PercentageDecisionPolicy", aminoType: "cosmos-sdk/PercentageDecisionPolicy", - encode(message: PercentageDecisionPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PercentageDecisionPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.percentage !== "") { writer.uint32(10).string(message.percentage); } @@ -1107,8 +1115,8 @@ export const PercentageDecisionPolicy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PercentageDecisionPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PercentageDecisionPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePercentageDecisionPolicy(); while (reader.pos < end) { @@ -1128,10 +1136,10 @@ export const PercentageDecisionPolicy = { return message; }, fromJSON(object: any): PercentageDecisionPolicy { - return { - percentage: isSet(object.percentage) ? String(object.percentage) : "", - windows: isSet(object.windows) ? DecisionPolicyWindows.fromJSON(object.windows) : undefined - }; + const obj = createBasePercentageDecisionPolicy(); + if (isSet(object.percentage)) obj.percentage = String(object.percentage); + if (isSet(object.windows)) obj.windows = DecisionPolicyWindows.fromJSON(object.windows); + return obj; }, toJSON(message: PercentageDecisionPolicy): unknown { const obj: any = {}; @@ -1142,7 +1150,9 @@ export const PercentageDecisionPolicy = { fromPartial(object: DeepPartial): PercentageDecisionPolicy { const message = createBasePercentageDecisionPolicy(); message.percentage = object.percentage ?? ""; - message.windows = object.windows !== undefined && object.windows !== null ? DecisionPolicyWindows.fromPartial(object.windows) : undefined; + if (object.windows !== undefined && object.windows !== null) { + message.windows = DecisionPolicyWindows.fromPartial(object.windows); + } return message; }, fromSDK(object: PercentageDecisionPolicySDKType): PercentageDecisionPolicy { @@ -1200,7 +1210,7 @@ function createBaseDecisionPolicyWindows(): DecisionPolicyWindows { export const DecisionPolicyWindows = { typeUrl: "/cosmos.group.v1.DecisionPolicyWindows", aminoType: "cosmos-sdk/DecisionPolicyWindows", - encode(message: DecisionPolicyWindows, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DecisionPolicyWindows, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.votingPeriod !== undefined) { Duration.encode(message.votingPeriod, writer.uint32(10).fork()).ldelim(); } @@ -1209,8 +1219,8 @@ export const DecisionPolicyWindows = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DecisionPolicyWindows { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DecisionPolicyWindows { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecisionPolicyWindows(); while (reader.pos < end) { @@ -1230,10 +1240,10 @@ export const DecisionPolicyWindows = { return message; }, fromJSON(object: any): DecisionPolicyWindows { - return { - votingPeriod: isSet(object.votingPeriod) ? Duration.fromJSON(object.votingPeriod) : undefined, - minExecutionPeriod: isSet(object.minExecutionPeriod) ? Duration.fromJSON(object.minExecutionPeriod) : undefined - }; + const obj = createBaseDecisionPolicyWindows(); + if (isSet(object.votingPeriod)) obj.votingPeriod = Duration.fromJSON(object.votingPeriod); + if (isSet(object.minExecutionPeriod)) obj.minExecutionPeriod = Duration.fromJSON(object.minExecutionPeriod); + return obj; }, toJSON(message: DecisionPolicyWindows): unknown { const obj: any = {}; @@ -1243,8 +1253,12 @@ export const DecisionPolicyWindows = { }, fromPartial(object: DeepPartial): DecisionPolicyWindows { const message = createBaseDecisionPolicyWindows(); - message.votingPeriod = object.votingPeriod !== undefined && object.votingPeriod !== null ? Duration.fromPartial(object.votingPeriod) : undefined; - message.minExecutionPeriod = object.minExecutionPeriod !== undefined && object.minExecutionPeriod !== null ? Duration.fromPartial(object.minExecutionPeriod) : undefined; + if (object.votingPeriod !== undefined && object.votingPeriod !== null) { + message.votingPeriod = Duration.fromPartial(object.votingPeriod); + } + if (object.minExecutionPeriod !== undefined && object.minExecutionPeriod !== null) { + message.minExecutionPeriod = Duration.fromPartial(object.minExecutionPeriod); + } return message; }, fromSDK(object: DecisionPolicyWindowsSDKType): DecisionPolicyWindows { @@ -1295,10 +1309,10 @@ export const DecisionPolicyWindows = { }; function createBaseGroupInfo(): GroupInfo { return { - id: Long.UZERO, + id: BigInt(0), admin: "", metadata: "", - version: Long.UZERO, + version: BigInt(0), totalWeight: "", createdAt: new Date() }; @@ -1306,8 +1320,8 @@ function createBaseGroupInfo(): GroupInfo { export const GroupInfo = { typeUrl: "/cosmos.group.v1.GroupInfo", aminoType: "cosmos-sdk/GroupInfo", - encode(message: GroupInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.id.isZero()) { + encode(message: GroupInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); } if (message.admin !== "") { @@ -1316,7 +1330,7 @@ export const GroupInfo = { if (message.metadata !== "") { writer.uint32(26).string(message.metadata); } - if (!message.version.isZero()) { + if (message.version !== BigInt(0)) { writer.uint32(32).uint64(message.version); } if (message.totalWeight !== "") { @@ -1327,15 +1341,15 @@ export const GroupInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupInfo(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.id = (reader.uint64() as Long); + message.id = reader.uint64(); break; case 2: message.admin = reader.string(); @@ -1344,7 +1358,7 @@ export const GroupInfo = { message.metadata = reader.string(); break; case 4: - message.version = (reader.uint64() as Long); + message.version = reader.uint64(); break; case 5: message.totalWeight = reader.string(); @@ -1360,31 +1374,35 @@ export const GroupInfo = { return message; }, fromJSON(object: any): GroupInfo { - return { - id: isSet(object.id) ? Long.fromValue(object.id) : Long.UZERO, - admin: isSet(object.admin) ? String(object.admin) : "", - metadata: isSet(object.metadata) ? String(object.metadata) : "", - version: isSet(object.version) ? Long.fromValue(object.version) : Long.UZERO, - totalWeight: isSet(object.totalWeight) ? String(object.totalWeight) : "", - createdAt: isSet(object.createdAt) ? new Date(object.createdAt) : undefined - }; + const obj = createBaseGroupInfo(); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (isSet(object.version)) obj.version = BigInt(object.version.toString()); + if (isSet(object.totalWeight)) obj.totalWeight = String(object.totalWeight); + if (isSet(object.createdAt)) obj.createdAt = new Date(object.createdAt); + return obj; }, toJSON(message: GroupInfo): unknown { const obj: any = {}; - message.id !== undefined && (obj.id = (message.id || Long.UZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); message.admin !== undefined && (obj.admin = message.admin); message.metadata !== undefined && (obj.metadata = message.metadata); - message.version !== undefined && (obj.version = (message.version || Long.UZERO).toString()); + message.version !== undefined && (obj.version = (message.version || BigInt(0)).toString()); message.totalWeight !== undefined && (obj.totalWeight = message.totalWeight); message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString()); return obj; }, fromPartial(object: DeepPartial): GroupInfo { const message = createBaseGroupInfo(); - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.UZERO; + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } message.admin = object.admin ?? ""; message.metadata = object.metadata ?? ""; - message.version = object.version !== undefined && object.version !== null ? Long.fromValue(object.version) : Long.UZERO; + if (object.version !== undefined && object.version !== null) { + message.version = BigInt(object.version.toString()); + } message.totalWeight = object.totalWeight ?? ""; message.createdAt = object.createdAt ?? undefined; return message; @@ -1411,10 +1429,10 @@ export const GroupInfo = { }, fromAmino(object: GroupInfoAmino): GroupInfo { return { - id: Long.fromString(object.id), + id: BigInt(object.id), admin: object.admin, metadata: object.metadata, - version: Long.fromString(object.version), + version: BigInt(object.version), totalWeight: object.total_weight, createdAt: object.created_at }; @@ -1453,15 +1471,15 @@ export const GroupInfo = { }; function createBaseGroupMember(): GroupMember { return { - groupId: Long.UZERO, + groupId: BigInt(0), member: Member.fromPartial({}) }; } export const GroupMember = { typeUrl: "/cosmos.group.v1.GroupMember", aminoType: "cosmos-sdk/GroupMember", - encode(message: GroupMember, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.groupId.isZero()) { + encode(message: GroupMember, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.groupId !== BigInt(0)) { writer.uint32(8).uint64(message.groupId); } if (message.member !== undefined) { @@ -1469,15 +1487,15 @@ export const GroupMember = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupMember { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupMember { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupMember(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 2: message.member = Member.decode(reader, reader.uint32()); @@ -1490,21 +1508,25 @@ export const GroupMember = { return message; }, fromJSON(object: any): GroupMember { - return { - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - member: isSet(object.member) ? Member.fromJSON(object.member) : undefined - }; + const obj = createBaseGroupMember(); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.member)) obj.member = Member.fromJSON(object.member); + return obj; }, toJSON(message: GroupMember): unknown { const obj: any = {}; - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.member !== undefined && (obj.member = message.member ? Member.toJSON(message.member) : undefined); return obj; }, fromPartial(object: DeepPartial): GroupMember { const message = createBaseGroupMember(); - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; - message.member = object.member !== undefined && object.member !== null ? Member.fromPartial(object.member) : undefined; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } + if (object.member !== undefined && object.member !== null) { + message.member = Member.fromPartial(object.member); + } return message; }, fromSDK(object: GroupMemberSDKType): GroupMember { @@ -1521,7 +1543,7 @@ export const GroupMember = { }, fromAmino(object: GroupMemberAmino): GroupMember { return { - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), member: object?.member ? Member.fromAmino(object.member) : undefined }; }, @@ -1556,10 +1578,10 @@ export const GroupMember = { function createBaseGroupPolicyInfo(): GroupPolicyInfo { return { address: "", - groupId: Long.UZERO, + groupId: BigInt(0), admin: "", metadata: "", - version: Long.UZERO, + version: BigInt(0), decisionPolicy: Any.fromPartial({}), createdAt: new Date() }; @@ -1567,11 +1589,11 @@ function createBaseGroupPolicyInfo(): GroupPolicyInfo { export const GroupPolicyInfo = { typeUrl: "/cosmos.group.v1.GroupPolicyInfo", aminoType: "cosmos-sdk/GroupPolicyInfo", - encode(message: GroupPolicyInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GroupPolicyInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } - if (!message.groupId.isZero()) { + if (message.groupId !== BigInt(0)) { writer.uint32(16).uint64(message.groupId); } if (message.admin !== "") { @@ -1580,7 +1602,7 @@ export const GroupPolicyInfo = { if (message.metadata !== "") { writer.uint32(34).string(message.metadata); } - if (!message.version.isZero()) { + if (message.version !== BigInt(0)) { writer.uint32(40).uint64(message.version); } if (message.decisionPolicy !== undefined) { @@ -1591,8 +1613,8 @@ export const GroupPolicyInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GroupPolicyInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GroupPolicyInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGroupPolicyInfo(); while (reader.pos < end) { @@ -1602,7 +1624,7 @@ export const GroupPolicyInfo = { message.address = reader.string(); break; case 2: - message.groupId = (reader.uint64() as Long); + message.groupId = reader.uint64(); break; case 3: message.admin = reader.string(); @@ -1611,7 +1633,7 @@ export const GroupPolicyInfo = { message.metadata = reader.string(); break; case 5: - message.version = (reader.uint64() as Long); + message.version = reader.uint64(); break; case 6: message.decisionPolicy = (DecisionPolicy_InterfaceDecoder(reader) as Any); @@ -1627,23 +1649,23 @@ export const GroupPolicyInfo = { return message; }, fromJSON(object: any): GroupPolicyInfo { - return { - address: isSet(object.address) ? String(object.address) : "", - groupId: isSet(object.groupId) ? Long.fromValue(object.groupId) : Long.UZERO, - admin: isSet(object.admin) ? String(object.admin) : "", - metadata: isSet(object.metadata) ? String(object.metadata) : "", - version: isSet(object.version) ? Long.fromValue(object.version) : Long.UZERO, - decisionPolicy: isSet(object.decisionPolicy) ? Any.fromJSON(object.decisionPolicy) : undefined, - createdAt: isSet(object.createdAt) ? new Date(object.createdAt) : undefined - }; + const obj = createBaseGroupPolicyInfo(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.groupId)) obj.groupId = BigInt(object.groupId.toString()); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (isSet(object.version)) obj.version = BigInt(object.version.toString()); + if (isSet(object.decisionPolicy)) obj.decisionPolicy = Any.fromJSON(object.decisionPolicy); + if (isSet(object.createdAt)) obj.createdAt = new Date(object.createdAt); + return obj; }, toJSON(message: GroupPolicyInfo): unknown { const obj: any = {}; message.address !== undefined && (obj.address = message.address); - message.groupId !== undefined && (obj.groupId = (message.groupId || Long.UZERO).toString()); + message.groupId !== undefined && (obj.groupId = (message.groupId || BigInt(0)).toString()); message.admin !== undefined && (obj.admin = message.admin); message.metadata !== undefined && (obj.metadata = message.metadata); - message.version !== undefined && (obj.version = (message.version || Long.UZERO).toString()); + message.version !== undefined && (obj.version = (message.version || BigInt(0)).toString()); message.decisionPolicy !== undefined && (obj.decisionPolicy = message.decisionPolicy ? Any.toJSON(message.decisionPolicy) : undefined); message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString()); return obj; @@ -1651,11 +1673,17 @@ export const GroupPolicyInfo = { fromPartial(object: DeepPartial): GroupPolicyInfo { const message = createBaseGroupPolicyInfo(); message.address = object.address ?? ""; - message.groupId = object.groupId !== undefined && object.groupId !== null ? Long.fromValue(object.groupId) : Long.UZERO; + if (object.groupId !== undefined && object.groupId !== null) { + message.groupId = BigInt(object.groupId.toString()); + } message.admin = object.admin ?? ""; message.metadata = object.metadata ?? ""; - message.version = object.version !== undefined && object.version !== null ? Long.fromValue(object.version) : Long.UZERO; - message.decisionPolicy = object.decisionPolicy !== undefined && object.decisionPolicy !== null ? Any.fromPartial(object.decisionPolicy) : undefined; + if (object.version !== undefined && object.version !== null) { + message.version = BigInt(object.version.toString()); + } + if (object.decisionPolicy !== undefined && object.decisionPolicy !== null) { + message.decisionPolicy = Any.fromPartial(object.decisionPolicy); + } message.createdAt = object.createdAt ?? undefined; return message; }, @@ -1684,10 +1712,10 @@ export const GroupPolicyInfo = { fromAmino(object: GroupPolicyInfoAmino): GroupPolicyInfo { return { address: object.address, - groupId: Long.fromString(object.group_id), + groupId: BigInt(object.group_id), admin: object.admin, metadata: object.metadata, - version: Long.fromString(object.version), + version: BigInt(object.version), decisionPolicy: object?.decision_policy ? DecisionPolicy_FromAmino(object.decision_policy) : undefined, createdAt: object.created_at }; @@ -1727,13 +1755,13 @@ export const GroupPolicyInfo = { }; function createBaseProposal(): Proposal { return { - id: Long.UZERO, + id: BigInt(0), address: "", metadata: "", proposers: [], submitTime: new Date(), - groupVersion: Long.UZERO, - groupPolicyVersion: Long.UZERO, + groupVersion: BigInt(0), + groupPolicyVersion: BigInt(0), status: 0, result: 0, finalTallyResult: TallyResult.fromPartial({}), @@ -1745,8 +1773,8 @@ function createBaseProposal(): Proposal { export const Proposal = { typeUrl: "/cosmos.group.v1.Proposal", aminoType: "cosmos-sdk/Proposal", - encode(message: Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.id.isZero()) { + encode(message: Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.id !== BigInt(0)) { writer.uint32(8).uint64(message.id); } if (message.address !== "") { @@ -1761,10 +1789,10 @@ export const Proposal = { if (message.submitTime !== undefined) { Timestamp.encode(toTimestamp(message.submitTime), writer.uint32(42).fork()).ldelim(); } - if (!message.groupVersion.isZero()) { + if (message.groupVersion !== BigInt(0)) { writer.uint32(48).uint64(message.groupVersion); } - if (!message.groupPolicyVersion.isZero()) { + if (message.groupPolicyVersion !== BigInt(0)) { writer.uint32(56).uint64(message.groupPolicyVersion); } if (message.status !== 0) { @@ -1787,15 +1815,15 @@ export const Proposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Proposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Proposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProposal(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.id = (reader.uint64() as Long); + message.id = reader.uint64(); break; case 2: message.address = reader.string(); @@ -1810,10 +1838,10 @@ export const Proposal = { message.submitTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); break; case 6: - message.groupVersion = (reader.uint64() as Long); + message.groupVersion = reader.uint64(); break; case 7: - message.groupPolicyVersion = (reader.uint64() as Long); + message.groupPolicyVersion = reader.uint64(); break; case 8: message.status = (reader.int32() as any); @@ -1841,25 +1869,25 @@ export const Proposal = { return message; }, fromJSON(object: any): Proposal { - return { - id: isSet(object.id) ? Long.fromValue(object.id) : Long.UZERO, - address: isSet(object.address) ? String(object.address) : "", - metadata: isSet(object.metadata) ? String(object.metadata) : "", - proposers: Array.isArray(object?.proposers) ? object.proposers.map((e: any) => String(e)) : [], - submitTime: isSet(object.submitTime) ? new Date(object.submitTime) : undefined, - groupVersion: isSet(object.groupVersion) ? Long.fromValue(object.groupVersion) : Long.UZERO, - groupPolicyVersion: isSet(object.groupPolicyVersion) ? Long.fromValue(object.groupPolicyVersion) : Long.UZERO, - status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, - result: isSet(object.result) ? proposalResultFromJSON(object.result) : -1, - finalTallyResult: isSet(object.finalTallyResult) ? TallyResult.fromJSON(object.finalTallyResult) : undefined, - votingPeriodEnd: isSet(object.votingPeriodEnd) ? new Date(object.votingPeriodEnd) : undefined, - executorResult: isSet(object.executorResult) ? proposalExecutorResultFromJSON(object.executorResult) : -1, - messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseProposal(); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (Array.isArray(object?.proposers)) object.proposers.map((e: any) => String(e)); + if (isSet(object.submitTime)) obj.submitTime = new Date(object.submitTime); + if (isSet(object.groupVersion)) obj.groupVersion = BigInt(object.groupVersion.toString()); + if (isSet(object.groupPolicyVersion)) obj.groupPolicyVersion = BigInt(object.groupPolicyVersion.toString()); + if (isSet(object.status)) obj.status = proposalStatusFromJSON(object.status); + if (isSet(object.result)) obj.result = proposalResultFromJSON(object.result); + if (isSet(object.finalTallyResult)) obj.finalTallyResult = TallyResult.fromJSON(object.finalTallyResult); + if (isSet(object.votingPeriodEnd)) obj.votingPeriodEnd = new Date(object.votingPeriodEnd); + if (isSet(object.executorResult)) obj.executorResult = proposalExecutorResultFromJSON(object.executorResult); + if (Array.isArray(object?.messages)) object.messages.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: Proposal): unknown { const obj: any = {}; - message.id !== undefined && (obj.id = (message.id || Long.UZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); message.address !== undefined && (obj.address = message.address); message.metadata !== undefined && (obj.metadata = message.metadata); if (message.proposers) { @@ -1868,8 +1896,8 @@ export const Proposal = { obj.proposers = []; } message.submitTime !== undefined && (obj.submitTime = message.submitTime.toISOString()); - message.groupVersion !== undefined && (obj.groupVersion = (message.groupVersion || Long.UZERO).toString()); - message.groupPolicyVersion !== undefined && (obj.groupPolicyVersion = (message.groupPolicyVersion || Long.UZERO).toString()); + message.groupVersion !== undefined && (obj.groupVersion = (message.groupVersion || BigInt(0)).toString()); + message.groupPolicyVersion !== undefined && (obj.groupPolicyVersion = (message.groupPolicyVersion || BigInt(0)).toString()); message.status !== undefined && (obj.status = proposalStatusToJSON(message.status)); message.result !== undefined && (obj.result = proposalResultToJSON(message.result)); message.finalTallyResult !== undefined && (obj.finalTallyResult = message.finalTallyResult ? TallyResult.toJSON(message.finalTallyResult) : undefined); @@ -1884,16 +1912,24 @@ export const Proposal = { }, fromPartial(object: DeepPartial): Proposal { const message = createBaseProposal(); - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.UZERO; + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } message.address = object.address ?? ""; message.metadata = object.metadata ?? ""; message.proposers = object.proposers?.map(e => e) || []; message.submitTime = object.submitTime ?? undefined; - message.groupVersion = object.groupVersion !== undefined && object.groupVersion !== null ? Long.fromValue(object.groupVersion) : Long.UZERO; - message.groupPolicyVersion = object.groupPolicyVersion !== undefined && object.groupPolicyVersion !== null ? Long.fromValue(object.groupPolicyVersion) : Long.UZERO; + if (object.groupVersion !== undefined && object.groupVersion !== null) { + message.groupVersion = BigInt(object.groupVersion.toString()); + } + if (object.groupPolicyVersion !== undefined && object.groupPolicyVersion !== null) { + message.groupPolicyVersion = BigInt(object.groupPolicyVersion.toString()); + } message.status = object.status ?? 0; message.result = object.result ?? 0; - message.finalTallyResult = object.finalTallyResult !== undefined && object.finalTallyResult !== null ? TallyResult.fromPartial(object.finalTallyResult) : undefined; + if (object.finalTallyResult !== undefined && object.finalTallyResult !== null) { + message.finalTallyResult = TallyResult.fromPartial(object.finalTallyResult); + } message.votingPeriodEnd = object.votingPeriodEnd ?? undefined; message.executorResult = object.executorResult ?? 0; message.messages = object.messages?.map(e => Any.fromPartial(e)) || []; @@ -1943,13 +1979,13 @@ export const Proposal = { }, fromAmino(object: ProposalAmino): Proposal { return { - id: Long.fromString(object.id), + id: BigInt(object.id), address: object.address, metadata: object.metadata, proposers: Array.isArray(object?.proposers) ? object.proposers.map((e: any) => e) : [], submitTime: object.submit_time, - groupVersion: Long.fromString(object.group_version), - groupPolicyVersion: Long.fromString(object.group_policy_version), + groupVersion: BigInt(object.group_version), + groupPolicyVersion: BigInt(object.group_policy_version), status: isSet(object.status) ? proposalStatusFromJSON(object.status) : -1, result: isSet(object.result) ? proposalResultFromJSON(object.result) : -1, finalTallyResult: object?.final_tally_result ? TallyResult.fromAmino(object.final_tally_result) : undefined, @@ -2016,7 +2052,7 @@ function createBaseTallyResult(): TallyResult { export const TallyResult = { typeUrl: "/cosmos.group.v1.TallyResult", aminoType: "cosmos-sdk/TallyResult", - encode(message: TallyResult, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TallyResult, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.yesCount !== "") { writer.uint32(10).string(message.yesCount); } @@ -2031,8 +2067,8 @@ export const TallyResult = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TallyResult { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TallyResult { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTallyResult(); while (reader.pos < end) { @@ -2058,12 +2094,12 @@ export const TallyResult = { return message; }, fromJSON(object: any): TallyResult { - return { - yesCount: isSet(object.yesCount) ? String(object.yesCount) : "", - abstainCount: isSet(object.abstainCount) ? String(object.abstainCount) : "", - noCount: isSet(object.noCount) ? String(object.noCount) : "", - noWithVetoCount: isSet(object.noWithVetoCount) ? String(object.noWithVetoCount) : "" - }; + const obj = createBaseTallyResult(); + if (isSet(object.yesCount)) obj.yesCount = String(object.yesCount); + if (isSet(object.abstainCount)) obj.abstainCount = String(object.abstainCount); + if (isSet(object.noCount)) obj.noCount = String(object.noCount); + if (isSet(object.noWithVetoCount)) obj.noWithVetoCount = String(object.noWithVetoCount); + return obj; }, toJSON(message: TallyResult): unknown { const obj: any = {}; @@ -2137,7 +2173,7 @@ export const TallyResult = { }; function createBaseVote(): Vote { return { - proposalId: Long.UZERO, + proposalId: BigInt(0), voter: "", option: 0, metadata: "", @@ -2147,8 +2183,8 @@ function createBaseVote(): Vote { export const Vote = { typeUrl: "/cosmos.group.v1.Vote", aminoType: "cosmos-sdk/Vote", - encode(message: Vote, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.proposalId.isZero()) { + encode(message: Vote, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.proposalId !== BigInt(0)) { writer.uint32(8).uint64(message.proposalId); } if (message.voter !== "") { @@ -2165,15 +2201,15 @@ export const Vote = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Vote { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Vote { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVote(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.proposalId = (reader.uint64() as Long); + message.proposalId = reader.uint64(); break; case 2: message.voter = reader.string(); @@ -2195,17 +2231,17 @@ export const Vote = { return message; }, fromJSON(object: any): Vote { - return { - proposalId: isSet(object.proposalId) ? Long.fromValue(object.proposalId) : Long.UZERO, - voter: isSet(object.voter) ? String(object.voter) : "", - option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, - metadata: isSet(object.metadata) ? String(object.metadata) : "", - submitTime: isSet(object.submitTime) ? new Date(object.submitTime) : undefined - }; + const obj = createBaseVote(); + if (isSet(object.proposalId)) obj.proposalId = BigInt(object.proposalId.toString()); + if (isSet(object.voter)) obj.voter = String(object.voter); + if (isSet(object.option)) obj.option = voteOptionFromJSON(object.option); + if (isSet(object.metadata)) obj.metadata = String(object.metadata); + if (isSet(object.submitTime)) obj.submitTime = new Date(object.submitTime); + return obj; }, toJSON(message: Vote): unknown { const obj: any = {}; - message.proposalId !== undefined && (obj.proposalId = (message.proposalId || Long.UZERO).toString()); + message.proposalId !== undefined && (obj.proposalId = (message.proposalId || BigInt(0)).toString()); message.voter !== undefined && (obj.voter = message.voter); message.option !== undefined && (obj.option = voteOptionToJSON(message.option)); message.metadata !== undefined && (obj.metadata = message.metadata); @@ -2214,7 +2250,9 @@ export const Vote = { }, fromPartial(object: DeepPartial): Vote { const message = createBaseVote(); - message.proposalId = object.proposalId !== undefined && object.proposalId !== null ? Long.fromValue(object.proposalId) : Long.UZERO; + if (object.proposalId !== undefined && object.proposalId !== null) { + message.proposalId = BigInt(object.proposalId.toString()); + } message.voter = object.voter ?? ""; message.option = object.option ?? 0; message.metadata = object.metadata ?? ""; @@ -2241,7 +2279,7 @@ export const Vote = { }, fromAmino(object: VoteAmino): Vote { return { - proposalId: Long.fromString(object.proposal_id), + proposalId: BigInt(object.proposal_id), voter: object.voter, option: isSet(object.option) ? voteOptionFromJSON(object.option) : -1, metadata: object.metadata, @@ -2279,8 +2317,8 @@ export const Vote = { }; } }; -export const DecisionPolicy_InterfaceDecoder = (input: _m0.Reader | Uint8Array): ThresholdDecisionPolicy | PercentageDecisionPolicy | Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const DecisionPolicy_InterfaceDecoder = (input: BinaryReader | Uint8Array): ThresholdDecisionPolicy | PercentageDecisionPolicy | Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { case "/cosmos.group.v1.ThresholdDecisionPolicy": diff --git a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/genesis.ts index c6a0c8c851..d1f4a311d6 100644 --- a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Minter, MinterAmino, MinterSDKType, Params, ParamsAmino, ParamsSDKType } from "./mint"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.mint.v1beta1"; /** GenesisState defines the mint module's genesis state. */ @@ -38,7 +38,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.mint.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.minter !== undefined) { Minter.encode(message.minter, writer.uint32(10).fork()).ldelim(); } @@ -47,8 +47,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -68,10 +68,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - minter: isSet(object.minter) ? Minter.fromJSON(object.minter) : undefined, - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseGenesisState(); + if (isSet(object.minter)) obj.minter = Minter.fromJSON(object.minter); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -81,8 +81,12 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.minter = object.minter !== undefined && object.minter !== null ? Minter.fromPartial(object.minter) : undefined; - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.minter !== undefined && object.minter !== null) { + message.minter = Minter.fromPartial(object.minter); + } + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { diff --git a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts index 34d84112ea..4ae7e90b3a 100644 --- a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts +++ b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/mint.ts @@ -1,5 +1,6 @@ -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { Decimal } from "@cosmjs/math"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.mint.v1beta1"; /** Minter represents the minting state. */ export interface Minter { @@ -41,7 +42,7 @@ export interface Params { /** goal of percent bonded atoms */ goalBonded: string; /** expected blocks per year */ - blocksPerYear: Long; + blocksPerYear: bigint; } export interface ParamsProtoMsg { typeUrl: "/cosmos.mint.v1beta1.Params"; @@ -73,7 +74,7 @@ export interface ParamsSDKType { inflation_max: string; inflation_min: string; goal_bonded: string; - blocks_per_year: Long; + blocks_per_year: bigint; } function createBaseMinter(): Minter { return { @@ -84,27 +85,27 @@ function createBaseMinter(): Minter { export const Minter = { typeUrl: "/cosmos.mint.v1beta1.Minter", aminoType: "cosmos-sdk/Minter", - encode(message: Minter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Minter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflation !== "") { - writer.uint32(10).string(message.inflation); + writer.uint32(10).string(Decimal.fromUserInput(message.inflation, 18).atomics); } if (message.annualProvisions !== "") { - writer.uint32(18).string(message.annualProvisions); + writer.uint32(18).string(Decimal.fromUserInput(message.annualProvisions, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Minter { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Minter { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMinter(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.inflation = reader.string(); + message.inflation = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 2: - message.annualProvisions = reader.string(); + message.annualProvisions = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -114,10 +115,10 @@ export const Minter = { return message; }, fromJSON(object: any): Minter { - return { - inflation: isSet(object.inflation) ? String(object.inflation) : "", - annualProvisions: isSet(object.annualProvisions) ? String(object.annualProvisions) : "" - }; + const obj = createBaseMinter(); + if (isSet(object.inflation)) obj.inflation = String(object.inflation); + if (isSet(object.annualProvisions)) obj.annualProvisions = String(object.annualProvisions); + return obj; }, toJSON(message: Minter): unknown { const obj: any = {}; @@ -184,35 +185,35 @@ function createBaseParams(): Params { inflationMax: "", inflationMin: "", goalBonded: "", - blocksPerYear: Long.UZERO + blocksPerYear: BigInt(0) }; } export const Params = { typeUrl: "/cosmos.mint.v1beta1.Params", aminoType: "cosmos-sdk/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mintDenom !== "") { writer.uint32(10).string(message.mintDenom); } if (message.inflationRateChange !== "") { - writer.uint32(18).string(message.inflationRateChange); + writer.uint32(18).string(Decimal.fromUserInput(message.inflationRateChange, 18).atomics); } if (message.inflationMax !== "") { - writer.uint32(26).string(message.inflationMax); + writer.uint32(26).string(Decimal.fromUserInput(message.inflationMax, 18).atomics); } if (message.inflationMin !== "") { - writer.uint32(34).string(message.inflationMin); + writer.uint32(34).string(Decimal.fromUserInput(message.inflationMin, 18).atomics); } if (message.goalBonded !== "") { - writer.uint32(42).string(message.goalBonded); + writer.uint32(42).string(Decimal.fromUserInput(message.goalBonded, 18).atomics); } - if (!message.blocksPerYear.isZero()) { + if (message.blocksPerYear !== BigInt(0)) { writer.uint32(48).uint64(message.blocksPerYear); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -222,19 +223,19 @@ export const Params = { message.mintDenom = reader.string(); break; case 2: - message.inflationRateChange = reader.string(); + message.inflationRateChange = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.inflationMax = reader.string(); + message.inflationMax = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 4: - message.inflationMin = reader.string(); + message.inflationMin = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 5: - message.goalBonded = reader.string(); + message.goalBonded = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 6: - message.blocksPerYear = (reader.uint64() as Long); + message.blocksPerYear = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -244,14 +245,14 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - mintDenom: isSet(object.mintDenom) ? String(object.mintDenom) : "", - inflationRateChange: isSet(object.inflationRateChange) ? String(object.inflationRateChange) : "", - inflationMax: isSet(object.inflationMax) ? String(object.inflationMax) : "", - inflationMin: isSet(object.inflationMin) ? String(object.inflationMin) : "", - goalBonded: isSet(object.goalBonded) ? String(object.goalBonded) : "", - blocksPerYear: isSet(object.blocksPerYear) ? Long.fromValue(object.blocksPerYear) : Long.UZERO - }; + const obj = createBaseParams(); + if (isSet(object.mintDenom)) obj.mintDenom = String(object.mintDenom); + if (isSet(object.inflationRateChange)) obj.inflationRateChange = String(object.inflationRateChange); + if (isSet(object.inflationMax)) obj.inflationMax = String(object.inflationMax); + if (isSet(object.inflationMin)) obj.inflationMin = String(object.inflationMin); + if (isSet(object.goalBonded)) obj.goalBonded = String(object.goalBonded); + if (isSet(object.blocksPerYear)) obj.blocksPerYear = BigInt(object.blocksPerYear.toString()); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -260,7 +261,7 @@ export const Params = { message.inflationMax !== undefined && (obj.inflationMax = message.inflationMax); message.inflationMin !== undefined && (obj.inflationMin = message.inflationMin); message.goalBonded !== undefined && (obj.goalBonded = message.goalBonded); - message.blocksPerYear !== undefined && (obj.blocksPerYear = (message.blocksPerYear || Long.UZERO).toString()); + message.blocksPerYear !== undefined && (obj.blocksPerYear = (message.blocksPerYear || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Params { @@ -270,7 +271,9 @@ export const Params = { message.inflationMax = object.inflationMax ?? ""; message.inflationMin = object.inflationMin ?? ""; message.goalBonded = object.goalBonded ?? ""; - message.blocksPerYear = object.blocksPerYear !== undefined && object.blocksPerYear !== null ? Long.fromValue(object.blocksPerYear) : Long.UZERO; + if (object.blocksPerYear !== undefined && object.blocksPerYear !== null) { + message.blocksPerYear = BigInt(object.blocksPerYear.toString()); + } return message; }, fromSDK(object: ParamsSDKType): Params { @@ -300,7 +303,7 @@ export const Params = { inflationMax: object.inflation_max, inflationMin: object.inflation_min, goalBonded: object.goal_bonded, - blocksPerYear: Long.fromString(object.blocks_per_year) + blocksPerYear: BigInt(object.blocks_per_year) }; }, toAmino(message: Params): ParamsAmino { diff --git a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/query.ts index ca41af502d..6b1a15861d 100644 --- a/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/mint/v1beta1/query.ts @@ -1,5 +1,5 @@ import { Params, ParamsAmino, ParamsSDKType } from "./mint"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.mint.v1beta1"; /** QueryParamsRequest is the request type for the Query/Params RPC method. */ @@ -143,11 +143,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.mint.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -161,7 +161,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -215,14 +216,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.mint.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -239,9 +240,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -250,7 +251,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -301,11 +304,11 @@ function createBaseQueryInflationRequest(): QueryInflationRequest { export const QueryInflationRequest = { typeUrl: "/cosmos.mint.v1beta1.QueryInflationRequest", aminoType: "cosmos-sdk/QueryInflationRequest", - encode(_: QueryInflationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryInflationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryInflationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryInflationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryInflationRequest(); while (reader.pos < end) { @@ -319,7 +322,8 @@ export const QueryInflationRequest = { return message; }, fromJSON(_: any): QueryInflationRequest { - return {}; + const obj = createBaseQueryInflationRequest(); + return obj; }, toJSON(_: QueryInflationRequest): unknown { const obj: any = {}; @@ -373,14 +377,14 @@ function createBaseQueryInflationResponse(): QueryInflationResponse { export const QueryInflationResponse = { typeUrl: "/cosmos.mint.v1beta1.QueryInflationResponse", aminoType: "cosmos-sdk/QueryInflationResponse", - encode(message: QueryInflationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryInflationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflation.length !== 0) { writer.uint32(10).bytes(message.inflation); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryInflationResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryInflationResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryInflationResponse(); while (reader.pos < end) { @@ -397,9 +401,9 @@ export const QueryInflationResponse = { return message; }, fromJSON(object: any): QueryInflationResponse { - return { - inflation: isSet(object.inflation) ? bytesFromBase64(object.inflation) : new Uint8Array() - }; + const obj = createBaseQueryInflationResponse(); + if (isSet(object.inflation)) obj.inflation = bytesFromBase64(object.inflation); + return obj; }, toJSON(message: QueryInflationResponse): unknown { const obj: any = {}; @@ -459,11 +463,11 @@ function createBaseQueryAnnualProvisionsRequest(): QueryAnnualProvisionsRequest export const QueryAnnualProvisionsRequest = { typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsRequest", aminoType: "cosmos-sdk/QueryAnnualProvisionsRequest", - encode(_: QueryAnnualProvisionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryAnnualProvisionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAnnualProvisionsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAnnualProvisionsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAnnualProvisionsRequest(); while (reader.pos < end) { @@ -477,7 +481,8 @@ export const QueryAnnualProvisionsRequest = { return message; }, fromJSON(_: any): QueryAnnualProvisionsRequest { - return {}; + const obj = createBaseQueryAnnualProvisionsRequest(); + return obj; }, toJSON(_: QueryAnnualProvisionsRequest): unknown { const obj: any = {}; @@ -531,14 +536,14 @@ function createBaseQueryAnnualProvisionsResponse(): QueryAnnualProvisionsRespons export const QueryAnnualProvisionsResponse = { typeUrl: "/cosmos.mint.v1beta1.QueryAnnualProvisionsResponse", aminoType: "cosmos-sdk/QueryAnnualProvisionsResponse", - encode(message: QueryAnnualProvisionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAnnualProvisionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.annualProvisions.length !== 0) { writer.uint32(10).bytes(message.annualProvisions); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAnnualProvisionsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAnnualProvisionsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAnnualProvisionsResponse(); while (reader.pos < end) { @@ -555,9 +560,9 @@ export const QueryAnnualProvisionsResponse = { return message; }, fromJSON(object: any): QueryAnnualProvisionsResponse { - return { - annualProvisions: isSet(object.annualProvisions) ? bytesFromBase64(object.annualProvisions) : new Uint8Array() - }; + const obj = createBaseQueryAnnualProvisionsResponse(); + if (isSet(object.annualProvisions)) obj.annualProvisions = bytesFromBase64(object.annualProvisions); + return obj; }, toJSON(message: QueryAnnualProvisionsResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts index 15cbfe0576..20fe0a6317 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/event.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.nft.v1beta1"; /** EventSend is emitted on Msg/Send */ @@ -93,7 +93,7 @@ function createBaseEventSend(): EventSend { export const EventSend = { typeUrl: "/cosmos.nft.v1beta1.EventSend", aminoType: "cosmos-sdk/EventSend", - encode(message: EventSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EventSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -108,8 +108,8 @@ export const EventSend = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventSend { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventSend { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventSend(); while (reader.pos < end) { @@ -135,12 +135,12 @@ export const EventSend = { return message; }, fromJSON(object: any): EventSend { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "", - sender: isSet(object.sender) ? String(object.sender) : "", - receiver: isSet(object.receiver) ? String(object.receiver) : "" - }; + const obj = createBaseEventSend(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.receiver)) obj.receiver = String(object.receiver); + return obj; }, toJSON(message: EventSend): unknown { const obj: any = {}; @@ -222,7 +222,7 @@ function createBaseEventMint(): EventMint { export const EventMint = { typeUrl: "/cosmos.nft.v1beta1.EventMint", aminoType: "cosmos-sdk/EventMint", - encode(message: EventMint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EventMint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -234,8 +234,8 @@ export const EventMint = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventMint { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventMint { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventMint(); while (reader.pos < end) { @@ -258,11 +258,11 @@ export const EventMint = { return message; }, fromJSON(object: any): EventMint { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "", - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseEventMint(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: EventMint): unknown { const obj: any = {}; @@ -338,7 +338,7 @@ function createBaseEventBurn(): EventBurn { export const EventBurn = { typeUrl: "/cosmos.nft.v1beta1.EventBurn", aminoType: "cosmos-sdk/EventBurn", - encode(message: EventBurn, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EventBurn, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -350,8 +350,8 @@ export const EventBurn = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EventBurn { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EventBurn { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEventBurn(); while (reader.pos < end) { @@ -374,11 +374,11 @@ export const EventBurn = { return message; }, fromJSON(object: any): EventBurn { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "", - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseEventBurn(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: EventBurn): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts index c863d4b83e..30965b4368 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/genesis.ts @@ -1,5 +1,5 @@ import { Class, ClassAmino, ClassSDKType, NFT, NFTAmino, NFTSDKType } from "./nft"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "cosmos.nft.v1beta1"; /** GenesisState defines the nft module's genesis state. */ @@ -63,7 +63,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.nft.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.classes) { Class.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -72,8 +72,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -93,10 +93,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - classes: Array.isArray(object?.classes) ? object.classes.map((e: any) => Class.fromJSON(e)) : [], - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => Entry.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.classes)) object.classes.map((e: any) => Class.fromJSON(e)); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => Entry.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -189,7 +189,7 @@ function createBaseEntry(): Entry { export const Entry = { typeUrl: "/cosmos.nft.v1beta1.Entry", aminoType: "cosmos-sdk/Entry", - encode(message: Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } @@ -198,8 +198,8 @@ export const Entry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Entry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Entry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEntry(); while (reader.pos < end) { @@ -219,10 +219,10 @@ export const Entry = { return message; }, fromJSON(object: any): Entry { - return { - owner: isSet(object.owner) ? String(object.owner) : "", - nfts: Array.isArray(object?.nfts) ? object.nfts.map((e: any) => NFT.fromJSON(e)) : [] - }; + const obj = createBaseEntry(); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (Array.isArray(object?.nfts)) object.nfts.map((e: any) => NFT.fromJSON(e)); + return obj; }, toJSON(message: Entry): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts index b9925f70c6..f6dc921577 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/nft.ts @@ -1,5 +1,5 @@ import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.nft.v1beta1"; /** Class defines the class of the nft type. */ @@ -110,7 +110,7 @@ function createBaseClass(): Class { export const Class = { typeUrl: "/cosmos.nft.v1beta1.Class", aminoType: "cosmos-sdk/Class", - encode(message: Class, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Class, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); } @@ -134,8 +134,8 @@ export const Class = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Class { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Class { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseClass(); while (reader.pos < end) { @@ -170,15 +170,15 @@ export const Class = { return message; }, fromJSON(object: any): Class { - return { - id: isSet(object.id) ? String(object.id) : "", - name: isSet(object.name) ? String(object.name) : "", - symbol: isSet(object.symbol) ? String(object.symbol) : "", - description: isSet(object.description) ? String(object.description) : "", - uri: isSet(object.uri) ? String(object.uri) : "", - uriHash: isSet(object.uriHash) ? String(object.uriHash) : "", - data: isSet(object.data) ? Any.fromJSON(object.data) : undefined - }; + const obj = createBaseClass(); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.symbol)) obj.symbol = String(object.symbol); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.uri)) obj.uri = String(object.uri); + if (isSet(object.uriHash)) obj.uriHash = String(object.uriHash); + if (isSet(object.data)) obj.data = Any.fromJSON(object.data); + return obj; }, toJSON(message: Class): unknown { const obj: any = {}; @@ -199,7 +199,9 @@ export const Class = { message.description = object.description ?? ""; message.uri = object.uri ?? ""; message.uriHash = object.uriHash ?? ""; - message.data = object.data !== undefined && object.data !== null ? Any.fromPartial(object.data) : undefined; + if (object.data !== undefined && object.data !== null) { + message.data = Any.fromPartial(object.data); + } return message; }, fromSDK(object: ClassSDKType): Class { @@ -280,7 +282,7 @@ function createBaseNFT(): NFT { export const NFT = { typeUrl: "/cosmos.nft.v1beta1.NFT", aminoType: "cosmos-sdk/NFT", - encode(message: NFT, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: NFT, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -298,8 +300,8 @@ export const NFT = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): NFT { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): NFT { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseNFT(); while (reader.pos < end) { @@ -328,13 +330,13 @@ export const NFT = { return message; }, fromJSON(object: any): NFT { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "", - uri: isSet(object.uri) ? String(object.uri) : "", - uriHash: isSet(object.uriHash) ? String(object.uriHash) : "", - data: isSet(object.data) ? Any.fromJSON(object.data) : undefined - }; + const obj = createBaseNFT(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.uri)) obj.uri = String(object.uri); + if (isSet(object.uriHash)) obj.uriHash = String(object.uriHash); + if (isSet(object.data)) obj.data = Any.fromJSON(object.data); + return obj; }, toJSON(message: NFT): unknown { const obj: any = {}; @@ -351,7 +353,9 @@ export const NFT = { message.id = object.id ?? ""; message.uri = object.uri ?? ""; message.uriHash = object.uriHash ?? ""; - message.data = object.data !== undefined && object.data !== null ? Any.fromPartial(object.data) : undefined; + if (object.data !== undefined && object.data !== null) { + message.data = Any.fromPartial(object.data); + } return message; }, fromSDK(object: NFTSDKType): NFT { diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts index 38803dc454..954d3a5520 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { NFT, NFTAmino, NFTSDKType, Class, ClassAmino, ClassSDKType } from "./nft"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.nft.v1beta1"; /** QueryBalanceRequest is the request type for the Query/Balance RPC method */ export interface QueryBalanceRequest { @@ -28,7 +28,7 @@ export interface QueryBalanceRequestSDKType { } /** QueryBalanceResponse is the response type for the Query/Balance RPC method */ export interface QueryBalanceResponse { - amount: Long; + amount: bigint; } export interface QueryBalanceResponseProtoMsg { typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse"; @@ -44,7 +44,7 @@ export interface QueryBalanceResponseAminoMsg { } /** QueryBalanceResponse is the response type for the Query/Balance RPC method */ export interface QueryBalanceResponseSDKType { - amount: Long; + amount: bigint; } /** QueryOwnerRequest is the request type for the Query/Owner RPC method */ export interface QueryOwnerRequest { @@ -111,7 +111,7 @@ export interface QuerySupplyRequestSDKType { } /** QuerySupplyResponse is the response type for the Query/Supply RPC method */ export interface QuerySupplyResponse { - amount: Long; + amount: bigint; } export interface QuerySupplyResponseProtoMsg { typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse"; @@ -127,7 +127,7 @@ export interface QuerySupplyResponseAminoMsg { } /** QuerySupplyResponse is the response type for the Query/Supply RPC method */ export interface QuerySupplyResponseSDKType { - amount: Long; + amount: bigint; } /** QueryNFTstRequest is the request type for the Query/NFTs RPC method */ export interface QueryNFTsRequest { @@ -315,7 +315,7 @@ function createBaseQueryBalanceRequest(): QueryBalanceRequest { export const QueryBalanceRequest = { typeUrl: "/cosmos.nft.v1beta1.QueryBalanceRequest", aminoType: "cosmos-sdk/QueryBalanceRequest", - encode(message: QueryBalanceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBalanceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -324,8 +324,8 @@ export const QueryBalanceRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalanceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBalanceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBalanceRequest(); while (reader.pos < end) { @@ -345,10 +345,10 @@ export const QueryBalanceRequest = { return message; }, fromJSON(object: any): QueryBalanceRequest { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseQueryBalanceRequest(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: QueryBalanceRequest): unknown { const obj: any = {}; @@ -410,27 +410,27 @@ export const QueryBalanceRequest = { }; function createBaseQueryBalanceResponse(): QueryBalanceResponse { return { - amount: Long.UZERO + amount: BigInt(0) }; } export const QueryBalanceResponse = { typeUrl: "/cosmos.nft.v1beta1.QueryBalanceResponse", aminoType: "cosmos-sdk/QueryBalanceResponse", - encode(message: QueryBalanceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.amount.isZero()) { + encode(message: QueryBalanceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.amount !== BigInt(0)) { writer.uint32(8).uint64(message.amount); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalanceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBalanceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBalanceResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.amount = (reader.uint64() as Long); + message.amount = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -440,18 +440,20 @@ export const QueryBalanceResponse = { return message; }, fromJSON(object: any): QueryBalanceResponse { - return { - amount: isSet(object.amount) ? Long.fromValue(object.amount) : Long.UZERO - }; + const obj = createBaseQueryBalanceResponse(); + if (isSet(object.amount)) obj.amount = BigInt(object.amount.toString()); + return obj; }, toJSON(message: QueryBalanceResponse): unknown { const obj: any = {}; - message.amount !== undefined && (obj.amount = (message.amount || Long.UZERO).toString()); + message.amount !== undefined && (obj.amount = (message.amount || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryBalanceResponse { const message = createBaseQueryBalanceResponse(); - message.amount = object.amount !== undefined && object.amount !== null ? Long.fromValue(object.amount) : Long.UZERO; + if (object.amount !== undefined && object.amount !== null) { + message.amount = BigInt(object.amount.toString()); + } return message; }, fromSDK(object: QueryBalanceResponseSDKType): QueryBalanceResponse { @@ -466,7 +468,7 @@ export const QueryBalanceResponse = { }, fromAmino(object: QueryBalanceResponseAmino): QueryBalanceResponse { return { - amount: Long.fromString(object.amount) + amount: BigInt(object.amount) }; }, toAmino(message: QueryBalanceResponse): QueryBalanceResponseAmino { @@ -505,7 +507,7 @@ function createBaseQueryOwnerRequest(): QueryOwnerRequest { export const QueryOwnerRequest = { typeUrl: "/cosmos.nft.v1beta1.QueryOwnerRequest", aminoType: "cosmos-sdk/QueryOwnerRequest", - encode(message: QueryOwnerRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryOwnerRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -514,8 +516,8 @@ export const QueryOwnerRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryOwnerRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryOwnerRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryOwnerRequest(); while (reader.pos < end) { @@ -535,10 +537,10 @@ export const QueryOwnerRequest = { return message; }, fromJSON(object: any): QueryOwnerRequest { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "" - }; + const obj = createBaseQueryOwnerRequest(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + return obj; }, toJSON(message: QueryOwnerRequest): unknown { const obj: any = {}; @@ -606,14 +608,14 @@ function createBaseQueryOwnerResponse(): QueryOwnerResponse { export const QueryOwnerResponse = { typeUrl: "/cosmos.nft.v1beta1.QueryOwnerResponse", aminoType: "cosmos-sdk/QueryOwnerResponse", - encode(message: QueryOwnerResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryOwnerResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.owner !== "") { writer.uint32(10).string(message.owner); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryOwnerResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryOwnerResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryOwnerResponse(); while (reader.pos < end) { @@ -630,9 +632,9 @@ export const QueryOwnerResponse = { return message; }, fromJSON(object: any): QueryOwnerResponse { - return { - owner: isSet(object.owner) ? String(object.owner) : "" - }; + const obj = createBaseQueryOwnerResponse(); + if (isSet(object.owner)) obj.owner = String(object.owner); + return obj; }, toJSON(message: QueryOwnerResponse): unknown { const obj: any = {}; @@ -694,14 +696,14 @@ function createBaseQuerySupplyRequest(): QuerySupplyRequest { export const QuerySupplyRequest = { typeUrl: "/cosmos.nft.v1beta1.QuerySupplyRequest", aminoType: "cosmos-sdk/QuerySupplyRequest", - encode(message: QuerySupplyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySupplyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySupplyRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySupplyRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySupplyRequest(); while (reader.pos < end) { @@ -718,9 +720,9 @@ export const QuerySupplyRequest = { return message; }, fromJSON(object: any): QuerySupplyRequest { - return { - classId: isSet(object.classId) ? String(object.classId) : "" - }; + const obj = createBaseQuerySupplyRequest(); + if (isSet(object.classId)) obj.classId = String(object.classId); + return obj; }, toJSON(message: QuerySupplyRequest): unknown { const obj: any = {}; @@ -776,27 +778,27 @@ export const QuerySupplyRequest = { }; function createBaseQuerySupplyResponse(): QuerySupplyResponse { return { - amount: Long.UZERO + amount: BigInt(0) }; } export const QuerySupplyResponse = { typeUrl: "/cosmos.nft.v1beta1.QuerySupplyResponse", aminoType: "cosmos-sdk/QuerySupplyResponse", - encode(message: QuerySupplyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.amount.isZero()) { + encode(message: QuerySupplyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.amount !== BigInt(0)) { writer.uint32(8).uint64(message.amount); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySupplyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySupplyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySupplyResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.amount = (reader.uint64() as Long); + message.amount = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -806,18 +808,20 @@ export const QuerySupplyResponse = { return message; }, fromJSON(object: any): QuerySupplyResponse { - return { - amount: isSet(object.amount) ? Long.fromValue(object.amount) : Long.UZERO - }; + const obj = createBaseQuerySupplyResponse(); + if (isSet(object.amount)) obj.amount = BigInt(object.amount.toString()); + return obj; }, toJSON(message: QuerySupplyResponse): unknown { const obj: any = {}; - message.amount !== undefined && (obj.amount = (message.amount || Long.UZERO).toString()); + message.amount !== undefined && (obj.amount = (message.amount || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QuerySupplyResponse { const message = createBaseQuerySupplyResponse(); - message.amount = object.amount !== undefined && object.amount !== null ? Long.fromValue(object.amount) : Long.UZERO; + if (object.amount !== undefined && object.amount !== null) { + message.amount = BigInt(object.amount.toString()); + } return message; }, fromSDK(object: QuerySupplyResponseSDKType): QuerySupplyResponse { @@ -832,7 +836,7 @@ export const QuerySupplyResponse = { }, fromAmino(object: QuerySupplyResponseAmino): QuerySupplyResponse { return { - amount: Long.fromString(object.amount) + amount: BigInt(object.amount) }; }, toAmino(message: QuerySupplyResponse): QuerySupplyResponseAmino { @@ -872,7 +876,7 @@ function createBaseQueryNFTsRequest(): QueryNFTsRequest { export const QueryNFTsRequest = { typeUrl: "/cosmos.nft.v1beta1.QueryNFTsRequest", aminoType: "cosmos-sdk/QueryNFTsRequest", - encode(message: QueryNFTsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryNFTsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -884,8 +888,8 @@ export const QueryNFTsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryNFTsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryNFTsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryNFTsRequest(); while (reader.pos < end) { @@ -908,11 +912,11 @@ export const QueryNFTsRequest = { return message; }, fromJSON(object: any): QueryNFTsRequest { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - owner: isSet(object.owner) ? String(object.owner) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryNFTsRequest(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.owner)) obj.owner = String(object.owner); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryNFTsRequest): unknown { const obj: any = {}; @@ -925,7 +929,9 @@ export const QueryNFTsRequest = { const message = createBaseQueryNFTsRequest(); message.classId = object.classId ?? ""; message.owner = object.owner ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryNFTsRequestSDKType): QueryNFTsRequest { @@ -987,7 +993,7 @@ function createBaseQueryNFTsResponse(): QueryNFTsResponse { export const QueryNFTsResponse = { typeUrl: "/cosmos.nft.v1beta1.QueryNFTsResponse", aminoType: "cosmos-sdk/QueryNFTsResponse", - encode(message: QueryNFTsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryNFTsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.nfts) { NFT.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -996,8 +1002,8 @@ export const QueryNFTsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryNFTsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryNFTsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryNFTsResponse(); while (reader.pos < end) { @@ -1017,10 +1023,10 @@ export const QueryNFTsResponse = { return message; }, fromJSON(object: any): QueryNFTsResponse { - return { - nfts: Array.isArray(object?.nfts) ? object.nfts.map((e: any) => NFT.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryNFTsResponse(); + if (Array.isArray(object?.nfts)) object.nfts.map((e: any) => NFT.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryNFTsResponse): unknown { const obj: any = {}; @@ -1035,7 +1041,9 @@ export const QueryNFTsResponse = { fromPartial(object: DeepPartial): QueryNFTsResponse { const message = createBaseQueryNFTsResponse(); message.nfts = object.nfts?.map(e => NFT.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryNFTsResponseSDKType): QueryNFTsResponse { @@ -1101,7 +1109,7 @@ function createBaseQueryNFTRequest(): QueryNFTRequest { export const QueryNFTRequest = { typeUrl: "/cosmos.nft.v1beta1.QueryNFTRequest", aminoType: "cosmos-sdk/QueryNFTRequest", - encode(message: QueryNFTRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryNFTRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -1110,8 +1118,8 @@ export const QueryNFTRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryNFTRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryNFTRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryNFTRequest(); while (reader.pos < end) { @@ -1131,10 +1139,10 @@ export const QueryNFTRequest = { return message; }, fromJSON(object: any): QueryNFTRequest { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "" - }; + const obj = createBaseQueryNFTRequest(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + return obj; }, toJSON(message: QueryNFTRequest): unknown { const obj: any = {}; @@ -1202,14 +1210,14 @@ function createBaseQueryNFTResponse(): QueryNFTResponse { export const QueryNFTResponse = { typeUrl: "/cosmos.nft.v1beta1.QueryNFTResponse", aminoType: "cosmos-sdk/QueryNFTResponse", - encode(message: QueryNFTResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryNFTResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nft !== undefined) { NFT.encode(message.nft, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryNFTResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryNFTResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryNFTResponse(); while (reader.pos < end) { @@ -1226,9 +1234,9 @@ export const QueryNFTResponse = { return message; }, fromJSON(object: any): QueryNFTResponse { - return { - nft: isSet(object.nft) ? NFT.fromJSON(object.nft) : undefined - }; + const obj = createBaseQueryNFTResponse(); + if (isSet(object.nft)) obj.nft = NFT.fromJSON(object.nft); + return obj; }, toJSON(message: QueryNFTResponse): unknown { const obj: any = {}; @@ -1237,7 +1245,9 @@ export const QueryNFTResponse = { }, fromPartial(object: DeepPartial): QueryNFTResponse { const message = createBaseQueryNFTResponse(); - message.nft = object.nft !== undefined && object.nft !== null ? NFT.fromPartial(object.nft) : undefined; + if (object.nft !== undefined && object.nft !== null) { + message.nft = NFT.fromPartial(object.nft); + } return message; }, fromSDK(object: QueryNFTResponseSDKType): QueryNFTResponse { @@ -1290,14 +1300,14 @@ function createBaseQueryClassRequest(): QueryClassRequest { export const QueryClassRequest = { typeUrl: "/cosmos.nft.v1beta1.QueryClassRequest", aminoType: "cosmos-sdk/QueryClassRequest", - encode(message: QueryClassRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClassRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClassRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClassRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClassRequest(); while (reader.pos < end) { @@ -1314,9 +1324,9 @@ export const QueryClassRequest = { return message; }, fromJSON(object: any): QueryClassRequest { - return { - classId: isSet(object.classId) ? String(object.classId) : "" - }; + const obj = createBaseQueryClassRequest(); + if (isSet(object.classId)) obj.classId = String(object.classId); + return obj; }, toJSON(message: QueryClassRequest): unknown { const obj: any = {}; @@ -1378,14 +1388,14 @@ function createBaseQueryClassResponse(): QueryClassResponse { export const QueryClassResponse = { typeUrl: "/cosmos.nft.v1beta1.QueryClassResponse", aminoType: "cosmos-sdk/QueryClassResponse", - encode(message: QueryClassResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClassResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.class !== undefined) { Class.encode(message.class, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClassResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClassResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClassResponse(); while (reader.pos < end) { @@ -1402,9 +1412,9 @@ export const QueryClassResponse = { return message; }, fromJSON(object: any): QueryClassResponse { - return { - class: isSet(object.class) ? Class.fromJSON(object.class) : undefined - }; + const obj = createBaseQueryClassResponse(); + if (isSet(object.class)) obj.class = Class.fromJSON(object.class); + return obj; }, toJSON(message: QueryClassResponse): unknown { const obj: any = {}; @@ -1413,7 +1423,9 @@ export const QueryClassResponse = { }, fromPartial(object: DeepPartial): QueryClassResponse { const message = createBaseQueryClassResponse(); - message.class = object.class !== undefined && object.class !== null ? Class.fromPartial(object.class) : undefined; + if (object.class !== undefined && object.class !== null) { + message.class = Class.fromPartial(object.class); + } return message; }, fromSDK(object: QueryClassResponseSDKType): QueryClassResponse { @@ -1466,14 +1478,14 @@ function createBaseQueryClassesRequest(): QueryClassesRequest { export const QueryClassesRequest = { typeUrl: "/cosmos.nft.v1beta1.QueryClassesRequest", aminoType: "cosmos-sdk/QueryClassesRequest", - encode(message: QueryClassesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClassesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClassesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClassesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClassesRequest(); while (reader.pos < end) { @@ -1490,9 +1502,9 @@ export const QueryClassesRequest = { return message; }, fromJSON(object: any): QueryClassesRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryClassesRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryClassesRequest): unknown { const obj: any = {}; @@ -1501,7 +1513,9 @@ export const QueryClassesRequest = { }, fromPartial(object: DeepPartial): QueryClassesRequest { const message = createBaseQueryClassesRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryClassesRequestSDKType): QueryClassesRequest { @@ -1555,7 +1569,7 @@ function createBaseQueryClassesResponse(): QueryClassesResponse { export const QueryClassesResponse = { typeUrl: "/cosmos.nft.v1beta1.QueryClassesResponse", aminoType: "cosmos-sdk/QueryClassesResponse", - encode(message: QueryClassesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClassesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.classes) { Class.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1564,8 +1578,8 @@ export const QueryClassesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClassesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClassesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClassesResponse(); while (reader.pos < end) { @@ -1585,10 +1599,10 @@ export const QueryClassesResponse = { return message; }, fromJSON(object: any): QueryClassesResponse { - return { - classes: Array.isArray(object?.classes) ? object.classes.map((e: any) => Class.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryClassesResponse(); + if (Array.isArray(object?.classes)) object.classes.map((e: any) => Class.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryClassesResponse): unknown { const obj: any = {}; @@ -1603,7 +1617,9 @@ export const QueryClassesResponse = { fromPartial(object: DeepPartial): QueryClassesResponse { const message = createBaseQueryClassesResponse(); message.classes = object.classes?.map(e => Class.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryClassesResponseSDKType): QueryClassesResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts index f39b20b8cd..1d2a04b9da 100644 --- a/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/nft/v1beta1/tx.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.nft.v1beta1"; /** MsgSend represents a message to send a nft from one account to another account. */ @@ -63,7 +63,7 @@ function createBaseMsgSend(): MsgSend { export const MsgSend = { typeUrl: "/cosmos.nft.v1beta1.MsgSend", aminoType: "cosmos-sdk/MsgNFTSend", - encode(message: MsgSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.classId !== "") { writer.uint32(10).string(message.classId); } @@ -78,8 +78,8 @@ export const MsgSend = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSend { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSend { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSend(); while (reader.pos < end) { @@ -105,12 +105,12 @@ export const MsgSend = { return message; }, fromJSON(object: any): MsgSend { - return { - classId: isSet(object.classId) ? String(object.classId) : "", - id: isSet(object.id) ? String(object.id) : "", - sender: isSet(object.sender) ? String(object.sender) : "", - receiver: isSet(object.receiver) ? String(object.receiver) : "" - }; + const obj = createBaseMsgSend(); + if (isSet(object.classId)) obj.classId = String(object.classId); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.receiver)) obj.receiver = String(object.receiver); + return obj; }, toJSON(message: MsgSend): unknown { const obj: any = {}; @@ -188,11 +188,11 @@ function createBaseMsgSendResponse(): MsgSendResponse { export const MsgSendResponse = { typeUrl: "/cosmos.nft.v1beta1.MsgSendResponse", aminoType: "cosmos-sdk/MsgSendResponse", - encode(_: MsgSendResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgSendResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSendResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSendResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSendResponse(); while (reader.pos < end) { @@ -206,7 +206,8 @@ export const MsgSendResponse = { return message; }, fromJSON(_: any): MsgSendResponse { - return {}; + const obj = createBaseMsgSendResponse(); + return obj; }, toJSON(_: MsgSendResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/orm/module/v1alpha1/module.ts b/__fixtures__/v-next/outputv2/cosmos/orm/module/v1alpha1/module.ts index 31163e4d59..04778e8c9c 100644 --- a/__fixtures__/v-next/outputv2/cosmos/orm/module/v1alpha1/module.ts +++ b/__fixtures__/v-next/outputv2/cosmos/orm/module/v1alpha1/module.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial } from "../../../../helpers"; export const protobufPackage = "cosmos.orm.module.v1alpha1"; /** @@ -33,11 +33,11 @@ function createBaseModule(): Module { export const Module = { typeUrl: "/cosmos.orm.module.v1alpha1.Module", aminoType: "cosmos-sdk/Module", - encode(_: Module, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: Module, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Module { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Module { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModule(); while (reader.pos < end) { @@ -51,7 +51,8 @@ export const Module = { return message; }, fromJSON(_: any): Module { - return {}; + const obj = createBaseModule(); + return obj; }, toJSON(_: Module): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts b/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts index 725700a480..a359e74b3b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts +++ b/__fixtures__/v-next/outputv2/cosmos/orm/v1/orm.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.orm.v1"; /** TableDescriptor describes an ORM table. */ @@ -238,7 +238,7 @@ function createBaseTableDescriptor(): TableDescriptor { export const TableDescriptor = { typeUrl: "/cosmos.orm.v1.TableDescriptor", aminoType: "cosmos-sdk/TableDescriptor", - encode(message: TableDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TableDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.primaryKey !== undefined) { PrimaryKeyDescriptor.encode(message.primaryKey, writer.uint32(10).fork()).ldelim(); } @@ -250,8 +250,8 @@ export const TableDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TableDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TableDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTableDescriptor(); while (reader.pos < end) { @@ -274,11 +274,11 @@ export const TableDescriptor = { return message; }, fromJSON(object: any): TableDescriptor { - return { - primaryKey: isSet(object.primaryKey) ? PrimaryKeyDescriptor.fromJSON(object.primaryKey) : undefined, - index: Array.isArray(object?.index) ? object.index.map((e: any) => SecondaryIndexDescriptor.fromJSON(e)) : [], - id: isSet(object.id) ? Number(object.id) : 0 - }; + const obj = createBaseTableDescriptor(); + if (isSet(object.primaryKey)) obj.primaryKey = PrimaryKeyDescriptor.fromJSON(object.primaryKey); + if (Array.isArray(object?.index)) object.index.map((e: any) => SecondaryIndexDescriptor.fromJSON(e)); + if (isSet(object.id)) obj.id = Number(object.id); + return obj; }, toJSON(message: TableDescriptor): unknown { const obj: any = {}; @@ -293,7 +293,9 @@ export const TableDescriptor = { }, fromPartial(object: DeepPartial): TableDescriptor { const message = createBaseTableDescriptor(); - message.primaryKey = object.primaryKey !== undefined && object.primaryKey !== null ? PrimaryKeyDescriptor.fromPartial(object.primaryKey) : undefined; + if (object.primaryKey !== undefined && object.primaryKey !== null) { + message.primaryKey = PrimaryKeyDescriptor.fromPartial(object.primaryKey); + } message.index = object.index?.map(e => SecondaryIndexDescriptor.fromPartial(e)) || []; message.id = object.id ?? 0; return message; @@ -365,7 +367,7 @@ function createBasePrimaryKeyDescriptor(): PrimaryKeyDescriptor { export const PrimaryKeyDescriptor = { typeUrl: "/cosmos.orm.v1.PrimaryKeyDescriptor", aminoType: "cosmos-sdk/PrimaryKeyDescriptor", - encode(message: PrimaryKeyDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PrimaryKeyDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fields !== "") { writer.uint32(10).string(message.fields); } @@ -374,8 +376,8 @@ export const PrimaryKeyDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PrimaryKeyDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PrimaryKeyDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePrimaryKeyDescriptor(); while (reader.pos < end) { @@ -395,10 +397,10 @@ export const PrimaryKeyDescriptor = { return message; }, fromJSON(object: any): PrimaryKeyDescriptor { - return { - fields: isSet(object.fields) ? String(object.fields) : "", - autoIncrement: isSet(object.autoIncrement) ? Boolean(object.autoIncrement) : false - }; + const obj = createBasePrimaryKeyDescriptor(); + if (isSet(object.fields)) obj.fields = String(object.fields); + if (isSet(object.autoIncrement)) obj.autoIncrement = Boolean(object.autoIncrement); + return obj; }, toJSON(message: PrimaryKeyDescriptor): unknown { const obj: any = {}; @@ -468,7 +470,7 @@ function createBaseSecondaryIndexDescriptor(): SecondaryIndexDescriptor { export const SecondaryIndexDescriptor = { typeUrl: "/cosmos.orm.v1.SecondaryIndexDescriptor", aminoType: "cosmos-sdk/SecondaryIndexDescriptor", - encode(message: SecondaryIndexDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SecondaryIndexDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fields !== "") { writer.uint32(10).string(message.fields); } @@ -480,8 +482,8 @@ export const SecondaryIndexDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SecondaryIndexDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SecondaryIndexDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSecondaryIndexDescriptor(); while (reader.pos < end) { @@ -504,11 +506,11 @@ export const SecondaryIndexDescriptor = { return message; }, fromJSON(object: any): SecondaryIndexDescriptor { - return { - fields: isSet(object.fields) ? String(object.fields) : "", - id: isSet(object.id) ? Number(object.id) : 0, - unique: isSet(object.unique) ? Boolean(object.unique) : false - }; + const obj = createBaseSecondaryIndexDescriptor(); + if (isSet(object.fields)) obj.fields = String(object.fields); + if (isSet(object.id)) obj.id = Number(object.id); + if (isSet(object.unique)) obj.unique = Boolean(object.unique); + return obj; }, toJSON(message: SecondaryIndexDescriptor): unknown { const obj: any = {}; @@ -582,14 +584,14 @@ function createBaseSingletonDescriptor(): SingletonDescriptor { export const SingletonDescriptor = { typeUrl: "/cosmos.orm.v1.SingletonDescriptor", aminoType: "cosmos-sdk/SingletonDescriptor", - encode(message: SingletonDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SingletonDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).uint32(message.id); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SingletonDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SingletonDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSingletonDescriptor(); while (reader.pos < end) { @@ -606,9 +608,9 @@ export const SingletonDescriptor = { return message; }, fromJSON(object: any): SingletonDescriptor { - return { - id: isSet(object.id) ? Number(object.id) : 0 - }; + const obj = createBaseSingletonDescriptor(); + if (isSet(object.id)) obj.id = Number(object.id); + return obj; }, toJSON(message: SingletonDescriptor): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts b/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts index d9a4f10c54..96bb2a1076 100644 --- a/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts +++ b/__fixtures__/v-next/outputv2/cosmos/orm/v1alpha1/schema.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.orm.v1alpha1"; /** StorageType */ @@ -180,7 +180,7 @@ function createBaseModuleSchemaDescriptor(): ModuleSchemaDescriptor { export const ModuleSchemaDescriptor = { typeUrl: "/cosmos.orm.v1alpha1.ModuleSchemaDescriptor", aminoType: "cosmos-sdk/ModuleSchemaDescriptor", - encode(message: ModuleSchemaDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModuleSchemaDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.schemaFile) { ModuleSchemaDescriptor_FileEntry.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -189,8 +189,8 @@ export const ModuleSchemaDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleSchemaDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModuleSchemaDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModuleSchemaDescriptor(); while (reader.pos < end) { @@ -210,10 +210,10 @@ export const ModuleSchemaDescriptor = { return message; }, fromJSON(object: any): ModuleSchemaDescriptor { - return { - schemaFile: Array.isArray(object?.schemaFile) ? object.schemaFile.map((e: any) => ModuleSchemaDescriptor_FileEntry.fromJSON(e)) : [], - prefix: isSet(object.prefix) ? bytesFromBase64(object.prefix) : new Uint8Array() - }; + const obj = createBaseModuleSchemaDescriptor(); + if (Array.isArray(object?.schemaFile)) object.schemaFile.map((e: any) => ModuleSchemaDescriptor_FileEntry.fromJSON(e)); + if (isSet(object.prefix)) obj.prefix = bytesFromBase64(object.prefix); + return obj; }, toJSON(message: ModuleSchemaDescriptor): unknown { const obj: any = {}; @@ -295,7 +295,7 @@ function createBaseModuleSchemaDescriptor_FileEntry(): ModuleSchemaDescriptor_Fi export const ModuleSchemaDescriptor_FileEntry = { typeUrl: "/cosmos.orm.v1alpha1.FileEntry", aminoType: "cosmos-sdk/FileEntry", - encode(message: ModuleSchemaDescriptor_FileEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModuleSchemaDescriptor_FileEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).uint32(message.id); } @@ -307,8 +307,8 @@ export const ModuleSchemaDescriptor_FileEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleSchemaDescriptor_FileEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModuleSchemaDescriptor_FileEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModuleSchemaDescriptor_FileEntry(); while (reader.pos < end) { @@ -331,11 +331,11 @@ export const ModuleSchemaDescriptor_FileEntry = { return message; }, fromJSON(object: any): ModuleSchemaDescriptor_FileEntry { - return { - id: isSet(object.id) ? Number(object.id) : 0, - protoFileName: isSet(object.protoFileName) ? String(object.protoFileName) : "", - storageType: isSet(object.storageType) ? storageTypeFromJSON(object.storageType) : -1 - }; + const obj = createBaseModuleSchemaDescriptor_FileEntry(); + if (isSet(object.id)) obj.id = Number(object.id); + if (isSet(object.protoFileName)) obj.protoFileName = String(object.protoFileName); + if (isSet(object.storageType)) obj.storageType = storageTypeFromJSON(object.storageType); + return obj; }, toJSON(message: ModuleSchemaDescriptor_FileEntry): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts index 2c888d6fc8..34fe1e79c7 100644 --- a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts +++ b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/params.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.params.v1beta1"; /** ParameterChangeProposal defines a proposal to change one or more parameters. */ @@ -72,7 +72,7 @@ function createBaseParameterChangeProposal(): ParameterChangeProposal { export const ParameterChangeProposal = { typeUrl: "/cosmos.params.v1beta1.ParameterChangeProposal", aminoType: "cosmos-sdk/ParameterChangeProposal", - encode(message: ParameterChangeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ParameterChangeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -84,8 +84,8 @@ export const ParameterChangeProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ParameterChangeProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ParameterChangeProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParameterChangeProposal(); while (reader.pos < end) { @@ -108,11 +108,11 @@ export const ParameterChangeProposal = { return message; }, fromJSON(object: any): ParameterChangeProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - changes: Array.isArray(object?.changes) ? object.changes.map((e: any) => ParamChange.fromJSON(e)) : [] - }; + const obj = createBaseParameterChangeProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (Array.isArray(object?.changes)) object.changes.map((e: any) => ParamChange.fromJSON(e)); + return obj; }, toJSON(message: ParameterChangeProposal): unknown { const obj: any = {}; @@ -200,7 +200,7 @@ function createBaseParamChange(): ParamChange { export const ParamChange = { typeUrl: "/cosmos.params.v1beta1.ParamChange", aminoType: "cosmos-sdk/ParamChange", - encode(message: ParamChange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ParamChange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subspace !== "") { writer.uint32(10).string(message.subspace); } @@ -212,8 +212,8 @@ export const ParamChange = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ParamChange { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ParamChange { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParamChange(); while (reader.pos < end) { @@ -236,11 +236,11 @@ export const ParamChange = { return message; }, fromJSON(object: any): ParamChange { - return { - subspace: isSet(object.subspace) ? String(object.subspace) : "", - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseParamChange(); + if (isSet(object.subspace)) obj.subspace = String(object.subspace); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: ParamChange): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts index 69e7614870..28a3c73963 100644 --- a/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/params/v1beta1/query.ts @@ -1,5 +1,5 @@ import { ParamChange, ParamChangeAmino, ParamChangeSDKType } from "./params"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.params.v1beta1"; /** QueryParamsRequest is request type for the Query/Params RPC method. */ @@ -144,7 +144,7 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.params.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(message: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subspace !== "") { writer.uint32(10).string(message.subspace); } @@ -153,8 +153,8 @@ export const QueryParamsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -174,10 +174,10 @@ export const QueryParamsRequest = { return message; }, fromJSON(object: any): QueryParamsRequest { - return { - subspace: isSet(object.subspace) ? String(object.subspace) : "", - key: isSet(object.key) ? String(object.key) : "" - }; + const obj = createBaseQueryParamsRequest(); + if (isSet(object.subspace)) obj.subspace = String(object.subspace); + if (isSet(object.key)) obj.key = String(object.key); + return obj; }, toJSON(message: QueryParamsRequest): unknown { const obj: any = {}; @@ -245,14 +245,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.params.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.param !== undefined) { ParamChange.encode(message.param, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -269,9 +269,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - param: isSet(object.param) ? ParamChange.fromJSON(object.param) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.param)) obj.param = ParamChange.fromJSON(object.param); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -280,7 +280,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.param = object.param !== undefined && object.param !== null ? ParamChange.fromPartial(object.param) : undefined; + if (object.param !== undefined && object.param !== null) { + message.param = ParamChange.fromPartial(object.param); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -331,11 +333,11 @@ function createBaseQuerySubspacesRequest(): QuerySubspacesRequest { export const QuerySubspacesRequest = { typeUrl: "/cosmos.params.v1beta1.QuerySubspacesRequest", aminoType: "cosmos-sdk/QuerySubspacesRequest", - encode(_: QuerySubspacesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QuerySubspacesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySubspacesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySubspacesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySubspacesRequest(); while (reader.pos < end) { @@ -349,7 +351,8 @@ export const QuerySubspacesRequest = { return message; }, fromJSON(_: any): QuerySubspacesRequest { - return {}; + const obj = createBaseQuerySubspacesRequest(); + return obj; }, toJSON(_: QuerySubspacesRequest): unknown { const obj: any = {}; @@ -403,14 +406,14 @@ function createBaseQuerySubspacesResponse(): QuerySubspacesResponse { export const QuerySubspacesResponse = { typeUrl: "/cosmos.params.v1beta1.QuerySubspacesResponse", aminoType: "cosmos-sdk/QuerySubspacesResponse", - encode(message: QuerySubspacesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySubspacesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.subspaces) { Subspace.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySubspacesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySubspacesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySubspacesResponse(); while (reader.pos < end) { @@ -427,9 +430,9 @@ export const QuerySubspacesResponse = { return message; }, fromJSON(object: any): QuerySubspacesResponse { - return { - subspaces: Array.isArray(object?.subspaces) ? object.subspaces.map((e: any) => Subspace.fromJSON(e)) : [] - }; + const obj = createBaseQuerySubspacesResponse(); + if (Array.isArray(object?.subspaces)) object.subspaces.map((e: any) => Subspace.fromJSON(e)); + return obj; }, toJSON(message: QuerySubspacesResponse): unknown { const obj: any = {}; @@ -504,7 +507,7 @@ function createBaseSubspace(): Subspace { export const Subspace = { typeUrl: "/cosmos.params.v1beta1.Subspace", aminoType: "cosmos-sdk/Subspace", - encode(message: Subspace, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Subspace, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.subspace !== "") { writer.uint32(10).string(message.subspace); } @@ -513,8 +516,8 @@ export const Subspace = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Subspace { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Subspace { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSubspace(); while (reader.pos < end) { @@ -534,10 +537,10 @@ export const Subspace = { return message; }, fromJSON(object: any): Subspace { - return { - subspace: isSet(object.subspace) ? String(object.subspace) : "", - keys: Array.isArray(object?.keys) ? object.keys.map((e: any) => String(e)) : [] - }; + const obj = createBaseSubspace(); + if (isSet(object.subspace)) obj.subspace = String(object.subspace); + if (Array.isArray(object?.keys)) object.keys.map((e: any) => String(e)); + return obj; }, toJSON(message: Subspace): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts index 5f0d99ab7a..2c83b1bbf6 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/genesis.ts @@ -1,6 +1,6 @@ import { Params, ParamsAmino, ParamsSDKType, ValidatorSigningInfo, ValidatorSigningInfoAmino, ValidatorSigningInfoSDKType } from "./slashing"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.slashing.v1beta1"; /** GenesisState defines the slashing module's genesis state. */ export interface GenesisState { @@ -112,7 +112,7 @@ export interface ValidatorMissedBlocksSDKType { /** MissedBlock contains height and missed status as boolean. */ export interface MissedBlock { /** index is the height at which the block was missed. */ - index: Long; + index: bigint; /** missed is the missed status. */ missed: boolean; } @@ -133,7 +133,7 @@ export interface MissedBlockAminoMsg { } /** MissedBlock contains height and missed status as boolean. */ export interface MissedBlockSDKType { - index: Long; + index: bigint; missed: boolean; } function createBaseGenesisState(): GenesisState { @@ -146,7 +146,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.slashing.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -158,8 +158,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -182,11 +182,11 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - signingInfos: Array.isArray(object?.signingInfos) ? object.signingInfos.map((e: any) => SigningInfo.fromJSON(e)) : [], - missedBlocks: Array.isArray(object?.missedBlocks) ? object.missedBlocks.map((e: any) => ValidatorMissedBlocks.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.signingInfos)) object.signingInfos.map((e: any) => SigningInfo.fromJSON(e)); + if (Array.isArray(object?.missedBlocks)) object.missedBlocks.map((e: any) => ValidatorMissedBlocks.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -205,7 +205,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.signingInfos = object.signingInfos?.map(e => SigningInfo.fromPartial(e)) || []; message.missedBlocks = object.missedBlocks?.map(e => ValidatorMissedBlocks.fromPartial(e)) || []; return message; @@ -285,7 +287,7 @@ function createBaseSigningInfo(): SigningInfo { export const SigningInfo = { typeUrl: "/cosmos.slashing.v1beta1.SigningInfo", aminoType: "cosmos-sdk/SigningInfo", - encode(message: SigningInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SigningInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -294,8 +296,8 @@ export const SigningInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SigningInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SigningInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSigningInfo(); while (reader.pos < end) { @@ -315,10 +317,10 @@ export const SigningInfo = { return message; }, fromJSON(object: any): SigningInfo { - return { - address: isSet(object.address) ? String(object.address) : "", - validatorSigningInfo: isSet(object.validatorSigningInfo) ? ValidatorSigningInfo.fromJSON(object.validatorSigningInfo) : undefined - }; + const obj = createBaseSigningInfo(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.validatorSigningInfo)) obj.validatorSigningInfo = ValidatorSigningInfo.fromJSON(object.validatorSigningInfo); + return obj; }, toJSON(message: SigningInfo): unknown { const obj: any = {}; @@ -329,7 +331,9 @@ export const SigningInfo = { fromPartial(object: DeepPartial): SigningInfo { const message = createBaseSigningInfo(); message.address = object.address ?? ""; - message.validatorSigningInfo = object.validatorSigningInfo !== undefined && object.validatorSigningInfo !== null ? ValidatorSigningInfo.fromPartial(object.validatorSigningInfo) : undefined; + if (object.validatorSigningInfo !== undefined && object.validatorSigningInfo !== null) { + message.validatorSigningInfo = ValidatorSigningInfo.fromPartial(object.validatorSigningInfo); + } return message; }, fromSDK(object: SigningInfoSDKType): SigningInfo { @@ -387,7 +391,7 @@ function createBaseValidatorMissedBlocks(): ValidatorMissedBlocks { export const ValidatorMissedBlocks = { typeUrl: "/cosmos.slashing.v1beta1.ValidatorMissedBlocks", aminoType: "cosmos-sdk/ValidatorMissedBlocks", - encode(message: ValidatorMissedBlocks, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorMissedBlocks, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -396,8 +400,8 @@ export const ValidatorMissedBlocks = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorMissedBlocks { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorMissedBlocks { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorMissedBlocks(); while (reader.pos < end) { @@ -417,10 +421,10 @@ export const ValidatorMissedBlocks = { return message; }, fromJSON(object: any): ValidatorMissedBlocks { - return { - address: isSet(object.address) ? String(object.address) : "", - missedBlocks: Array.isArray(object?.missedBlocks) ? object.missedBlocks.map((e: any) => MissedBlock.fromJSON(e)) : [] - }; + const obj = createBaseValidatorMissedBlocks(); + if (isSet(object.address)) obj.address = String(object.address); + if (Array.isArray(object?.missedBlocks)) object.missedBlocks.map((e: any) => MissedBlock.fromJSON(e)); + return obj; }, toJSON(message: ValidatorMissedBlocks): unknown { const obj: any = {}; @@ -494,15 +498,15 @@ export const ValidatorMissedBlocks = { }; function createBaseMissedBlock(): MissedBlock { return { - index: Long.ZERO, + index: BigInt(0), missed: false }; } export const MissedBlock = { typeUrl: "/cosmos.slashing.v1beta1.MissedBlock", aminoType: "cosmos-sdk/MissedBlock", - encode(message: MissedBlock, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.index.isZero()) { + encode(message: MissedBlock, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.index !== BigInt(0)) { writer.uint32(8).int64(message.index); } if (message.missed === true) { @@ -510,15 +514,15 @@ export const MissedBlock = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MissedBlock { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MissedBlock { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMissedBlock(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.index = (reader.int64() as Long); + message.index = reader.int64(); break; case 2: message.missed = reader.bool(); @@ -531,20 +535,22 @@ export const MissedBlock = { return message; }, fromJSON(object: any): MissedBlock { - return { - index: isSet(object.index) ? Long.fromValue(object.index) : Long.ZERO, - missed: isSet(object.missed) ? Boolean(object.missed) : false - }; + const obj = createBaseMissedBlock(); + if (isSet(object.index)) obj.index = BigInt(object.index.toString()); + if (isSet(object.missed)) obj.missed = Boolean(object.missed); + return obj; }, toJSON(message: MissedBlock): unknown { const obj: any = {}; - message.index !== undefined && (obj.index = (message.index || Long.ZERO).toString()); + message.index !== undefined && (obj.index = (message.index || BigInt(0)).toString()); message.missed !== undefined && (obj.missed = message.missed); return obj; }, fromPartial(object: DeepPartial): MissedBlock { const message = createBaseMissedBlock(); - message.index = object.index !== undefined && object.index !== null ? Long.fromValue(object.index) : Long.ZERO; + if (object.index !== undefined && object.index !== null) { + message.index = BigInt(object.index.toString()); + } message.missed = object.missed ?? false; return message; }, @@ -562,7 +568,7 @@ export const MissedBlock = { }, fromAmino(object: MissedBlockAmino): MissedBlock { return { - index: Long.fromString(object.index), + index: BigInt(object.index), missed: object.missed }; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts index a9f1247315..8807501896 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/query.ts @@ -1,6 +1,6 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Params, ParamsAmino, ParamsSDKType, ValidatorSigningInfo, ValidatorSigningInfoAmino, ValidatorSigningInfoSDKType } from "./slashing"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "cosmos.slashing.v1beta1"; /** QueryParamsRequest is the request type for the Query/Params RPC method */ @@ -168,11 +168,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.slashing.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -186,7 +186,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -240,14 +241,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.slashing.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -264,9 +265,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -275,7 +276,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -328,14 +331,14 @@ function createBaseQuerySigningInfoRequest(): QuerySigningInfoRequest { export const QuerySigningInfoRequest = { typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoRequest", aminoType: "cosmos-sdk/QuerySigningInfoRequest", - encode(message: QuerySigningInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySigningInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.consAddress !== "") { writer.uint32(10).string(message.consAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySigningInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySigningInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySigningInfoRequest(); while (reader.pos < end) { @@ -352,9 +355,9 @@ export const QuerySigningInfoRequest = { return message; }, fromJSON(object: any): QuerySigningInfoRequest { - return { - consAddress: isSet(object.consAddress) ? String(object.consAddress) : "" - }; + const obj = createBaseQuerySigningInfoRequest(); + if (isSet(object.consAddress)) obj.consAddress = String(object.consAddress); + return obj; }, toJSON(message: QuerySigningInfoRequest): unknown { const obj: any = {}; @@ -416,14 +419,14 @@ function createBaseQuerySigningInfoResponse(): QuerySigningInfoResponse { export const QuerySigningInfoResponse = { typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfoResponse", aminoType: "cosmos-sdk/QuerySigningInfoResponse", - encode(message: QuerySigningInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySigningInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.valSigningInfo !== undefined) { ValidatorSigningInfo.encode(message.valSigningInfo, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySigningInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySigningInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySigningInfoResponse(); while (reader.pos < end) { @@ -440,9 +443,9 @@ export const QuerySigningInfoResponse = { return message; }, fromJSON(object: any): QuerySigningInfoResponse { - return { - valSigningInfo: isSet(object.valSigningInfo) ? ValidatorSigningInfo.fromJSON(object.valSigningInfo) : undefined - }; + const obj = createBaseQuerySigningInfoResponse(); + if (isSet(object.valSigningInfo)) obj.valSigningInfo = ValidatorSigningInfo.fromJSON(object.valSigningInfo); + return obj; }, toJSON(message: QuerySigningInfoResponse): unknown { const obj: any = {}; @@ -451,7 +454,9 @@ export const QuerySigningInfoResponse = { }, fromPartial(object: DeepPartial): QuerySigningInfoResponse { const message = createBaseQuerySigningInfoResponse(); - message.valSigningInfo = object.valSigningInfo !== undefined && object.valSigningInfo !== null ? ValidatorSigningInfo.fromPartial(object.valSigningInfo) : undefined; + if (object.valSigningInfo !== undefined && object.valSigningInfo !== null) { + message.valSigningInfo = ValidatorSigningInfo.fromPartial(object.valSigningInfo); + } return message; }, fromSDK(object: QuerySigningInfoResponseSDKType): QuerySigningInfoResponse { @@ -504,14 +509,14 @@ function createBaseQuerySigningInfosRequest(): QuerySigningInfosRequest { export const QuerySigningInfosRequest = { typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosRequest", aminoType: "cosmos-sdk/QuerySigningInfosRequest", - encode(message: QuerySigningInfosRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySigningInfosRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySigningInfosRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySigningInfosRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySigningInfosRequest(); while (reader.pos < end) { @@ -528,9 +533,9 @@ export const QuerySigningInfosRequest = { return message; }, fromJSON(object: any): QuerySigningInfosRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQuerySigningInfosRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QuerySigningInfosRequest): unknown { const obj: any = {}; @@ -539,7 +544,9 @@ export const QuerySigningInfosRequest = { }, fromPartial(object: DeepPartial): QuerySigningInfosRequest { const message = createBaseQuerySigningInfosRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QuerySigningInfosRequestSDKType): QuerySigningInfosRequest { @@ -593,7 +600,7 @@ function createBaseQuerySigningInfosResponse(): QuerySigningInfosResponse { export const QuerySigningInfosResponse = { typeUrl: "/cosmos.slashing.v1beta1.QuerySigningInfosResponse", aminoType: "cosmos-sdk/QuerySigningInfosResponse", - encode(message: QuerySigningInfosResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySigningInfosResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.info) { ValidatorSigningInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -602,8 +609,8 @@ export const QuerySigningInfosResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySigningInfosResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySigningInfosResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySigningInfosResponse(); while (reader.pos < end) { @@ -623,10 +630,10 @@ export const QuerySigningInfosResponse = { return message; }, fromJSON(object: any): QuerySigningInfosResponse { - return { - info: Array.isArray(object?.info) ? object.info.map((e: any) => ValidatorSigningInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQuerySigningInfosResponse(); + if (Array.isArray(object?.info)) object.info.map((e: any) => ValidatorSigningInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QuerySigningInfosResponse): unknown { const obj: any = {}; @@ -641,7 +648,9 @@ export const QuerySigningInfosResponse = { fromPartial(object: DeepPartial): QuerySigningInfosResponse { const message = createBaseQuerySigningInfosResponse(); message.info = object.info?.map(e => ValidatorSigningInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QuerySigningInfosResponseSDKType): QuerySigningInfosResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts index 36b41c3ade..597086b4a8 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/slashing.ts @@ -1,7 +1,7 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.slashing.v1beta1"; /** * ValidatorSigningInfo defines a validator's signing info for monitoring their @@ -10,13 +10,13 @@ export const protobufPackage = "cosmos.slashing.v1beta1"; export interface ValidatorSigningInfo { address: string; /** Height at which validator was first a candidate OR was unjailed */ - startHeight: Long; + startHeight: bigint; /** * Index which is incremented each time the validator was a bonded * in a block and may have signed a precommit or not. This in conjunction with the * `SignedBlocksWindow` param determines the index in the `MissedBlocksBitArray`. */ - indexOffset: Long; + indexOffset: bigint; /** Timestamp until which the validator is jailed due to liveness downtime. */ jailedUntil: Date; /** @@ -28,7 +28,7 @@ export interface ValidatorSigningInfo { * A counter kept to avoid unnecessary array reads. * Note that `Sum(MissedBlocksBitArray)` always equals `MissedBlocksCounter`. */ - missedBlocksCounter: Long; + missedBlocksCounter: bigint; } export interface ValidatorSigningInfoProtoMsg { typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo"; @@ -71,15 +71,15 @@ export interface ValidatorSigningInfoAminoMsg { */ export interface ValidatorSigningInfoSDKType { address: string; - start_height: Long; - index_offset: Long; + start_height: bigint; + index_offset: bigint; jailed_until: Date; tombstoned: boolean; - missed_blocks_counter: Long; + missed_blocks_counter: bigint; } /** Params represents the parameters used for by the slashing module. */ export interface Params { - signedBlocksWindow: Long; + signedBlocksWindow: bigint; minSignedPerWindow: Uint8Array; downtimeJailDuration: Duration; slashFractionDoubleSign: Uint8Array; @@ -103,7 +103,7 @@ export interface ParamsAminoMsg { } /** Params represents the parameters used for by the slashing module. */ export interface ParamsSDKType { - signed_blocks_window: Long; + signed_blocks_window: bigint; min_signed_per_window: Uint8Array; downtime_jail_duration: DurationSDKType; slash_fraction_double_sign: Uint8Array; @@ -112,24 +112,24 @@ export interface ParamsSDKType { function createBaseValidatorSigningInfo(): ValidatorSigningInfo { return { address: "", - startHeight: Long.ZERO, - indexOffset: Long.ZERO, + startHeight: BigInt(0), + indexOffset: BigInt(0), jailedUntil: new Date(), tombstoned: false, - missedBlocksCounter: Long.ZERO + missedBlocksCounter: BigInt(0) }; } export const ValidatorSigningInfo = { typeUrl: "/cosmos.slashing.v1beta1.ValidatorSigningInfo", aminoType: "cosmos-sdk/ValidatorSigningInfo", - encode(message: ValidatorSigningInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValidatorSigningInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } - if (!message.startHeight.isZero()) { + if (message.startHeight !== BigInt(0)) { writer.uint32(16).int64(message.startHeight); } - if (!message.indexOffset.isZero()) { + if (message.indexOffset !== BigInt(0)) { writer.uint32(24).int64(message.indexOffset); } if (message.jailedUntil !== undefined) { @@ -138,13 +138,13 @@ export const ValidatorSigningInfo = { if (message.tombstoned === true) { writer.uint32(40).bool(message.tombstoned); } - if (!message.missedBlocksCounter.isZero()) { + if (message.missedBlocksCounter !== BigInt(0)) { writer.uint32(48).int64(message.missedBlocksCounter); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValidatorSigningInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValidatorSigningInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidatorSigningInfo(); while (reader.pos < end) { @@ -154,10 +154,10 @@ export const ValidatorSigningInfo = { message.address = reader.string(); break; case 2: - message.startHeight = (reader.int64() as Long); + message.startHeight = reader.int64(); break; case 3: - message.indexOffset = (reader.int64() as Long); + message.indexOffset = reader.int64(); break; case 4: message.jailedUntil = fromTimestamp(Timestamp.decode(reader, reader.uint32())); @@ -166,7 +166,7 @@ export const ValidatorSigningInfo = { message.tombstoned = reader.bool(); break; case 6: - message.missedBlocksCounter = (reader.int64() as Long); + message.missedBlocksCounter = reader.int64(); break; default: reader.skipType(tag & 7); @@ -176,33 +176,39 @@ export const ValidatorSigningInfo = { return message; }, fromJSON(object: any): ValidatorSigningInfo { - return { - address: isSet(object.address) ? String(object.address) : "", - startHeight: isSet(object.startHeight) ? Long.fromValue(object.startHeight) : Long.ZERO, - indexOffset: isSet(object.indexOffset) ? Long.fromValue(object.indexOffset) : Long.ZERO, - jailedUntil: isSet(object.jailedUntil) ? new Date(object.jailedUntil) : undefined, - tombstoned: isSet(object.tombstoned) ? Boolean(object.tombstoned) : false, - missedBlocksCounter: isSet(object.missedBlocksCounter) ? Long.fromValue(object.missedBlocksCounter) : Long.ZERO - }; + const obj = createBaseValidatorSigningInfo(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.startHeight)) obj.startHeight = BigInt(object.startHeight.toString()); + if (isSet(object.indexOffset)) obj.indexOffset = BigInt(object.indexOffset.toString()); + if (isSet(object.jailedUntil)) obj.jailedUntil = new Date(object.jailedUntil); + if (isSet(object.tombstoned)) obj.tombstoned = Boolean(object.tombstoned); + if (isSet(object.missedBlocksCounter)) obj.missedBlocksCounter = BigInt(object.missedBlocksCounter.toString()); + return obj; }, toJSON(message: ValidatorSigningInfo): unknown { const obj: any = {}; message.address !== undefined && (obj.address = message.address); - message.startHeight !== undefined && (obj.startHeight = (message.startHeight || Long.ZERO).toString()); - message.indexOffset !== undefined && (obj.indexOffset = (message.indexOffset || Long.ZERO).toString()); + message.startHeight !== undefined && (obj.startHeight = (message.startHeight || BigInt(0)).toString()); + message.indexOffset !== undefined && (obj.indexOffset = (message.indexOffset || BigInt(0)).toString()); message.jailedUntil !== undefined && (obj.jailedUntil = message.jailedUntil.toISOString()); message.tombstoned !== undefined && (obj.tombstoned = message.tombstoned); - message.missedBlocksCounter !== undefined && (obj.missedBlocksCounter = (message.missedBlocksCounter || Long.ZERO).toString()); + message.missedBlocksCounter !== undefined && (obj.missedBlocksCounter = (message.missedBlocksCounter || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): ValidatorSigningInfo { const message = createBaseValidatorSigningInfo(); message.address = object.address ?? ""; - message.startHeight = object.startHeight !== undefined && object.startHeight !== null ? Long.fromValue(object.startHeight) : Long.ZERO; - message.indexOffset = object.indexOffset !== undefined && object.indexOffset !== null ? Long.fromValue(object.indexOffset) : Long.ZERO; + if (object.startHeight !== undefined && object.startHeight !== null) { + message.startHeight = BigInt(object.startHeight.toString()); + } + if (object.indexOffset !== undefined && object.indexOffset !== null) { + message.indexOffset = BigInt(object.indexOffset.toString()); + } message.jailedUntil = object.jailedUntil ?? undefined; message.tombstoned = object.tombstoned ?? false; - message.missedBlocksCounter = object.missedBlocksCounter !== undefined && object.missedBlocksCounter !== null ? Long.fromValue(object.missedBlocksCounter) : Long.ZERO; + if (object.missedBlocksCounter !== undefined && object.missedBlocksCounter !== null) { + message.missedBlocksCounter = BigInt(object.missedBlocksCounter.toString()); + } return message; }, fromSDK(object: ValidatorSigningInfoSDKType): ValidatorSigningInfo { @@ -228,11 +234,11 @@ export const ValidatorSigningInfo = { fromAmino(object: ValidatorSigningInfoAmino): ValidatorSigningInfo { return { address: object.address, - startHeight: Long.fromString(object.start_height), - indexOffset: Long.fromString(object.index_offset), + startHeight: BigInt(object.start_height), + indexOffset: BigInt(object.index_offset), jailedUntil: object.jailed_until, tombstoned: object.tombstoned, - missedBlocksCounter: Long.fromString(object.missed_blocks_counter) + missedBlocksCounter: BigInt(object.missed_blocks_counter) }; }, toAmino(message: ValidatorSigningInfo): ValidatorSigningInfoAmino { @@ -269,7 +275,7 @@ export const ValidatorSigningInfo = { }; function createBaseParams(): Params { return { - signedBlocksWindow: Long.ZERO, + signedBlocksWindow: BigInt(0), minSignedPerWindow: new Uint8Array(), downtimeJailDuration: Duration.fromPartial({}), slashFractionDoubleSign: new Uint8Array(), @@ -279,8 +285,8 @@ function createBaseParams(): Params { export const Params = { typeUrl: "/cosmos.slashing.v1beta1.Params", aminoType: "cosmos-sdk/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.signedBlocksWindow.isZero()) { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.signedBlocksWindow !== BigInt(0)) { writer.uint32(8).int64(message.signedBlocksWindow); } if (message.minSignedPerWindow.length !== 0) { @@ -297,15 +303,15 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.signedBlocksWindow = (reader.int64() as Long); + message.signedBlocksWindow = reader.int64(); break; case 2: message.minSignedPerWindow = reader.bytes(); @@ -327,17 +333,17 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - signedBlocksWindow: isSet(object.signedBlocksWindow) ? Long.fromValue(object.signedBlocksWindow) : Long.ZERO, - minSignedPerWindow: isSet(object.minSignedPerWindow) ? bytesFromBase64(object.minSignedPerWindow) : new Uint8Array(), - downtimeJailDuration: isSet(object.downtimeJailDuration) ? Duration.fromJSON(object.downtimeJailDuration) : undefined, - slashFractionDoubleSign: isSet(object.slashFractionDoubleSign) ? bytesFromBase64(object.slashFractionDoubleSign) : new Uint8Array(), - slashFractionDowntime: isSet(object.slashFractionDowntime) ? bytesFromBase64(object.slashFractionDowntime) : new Uint8Array() - }; + const obj = createBaseParams(); + if (isSet(object.signedBlocksWindow)) obj.signedBlocksWindow = BigInt(object.signedBlocksWindow.toString()); + if (isSet(object.minSignedPerWindow)) obj.minSignedPerWindow = bytesFromBase64(object.minSignedPerWindow); + if (isSet(object.downtimeJailDuration)) obj.downtimeJailDuration = Duration.fromJSON(object.downtimeJailDuration); + if (isSet(object.slashFractionDoubleSign)) obj.slashFractionDoubleSign = bytesFromBase64(object.slashFractionDoubleSign); + if (isSet(object.slashFractionDowntime)) obj.slashFractionDowntime = bytesFromBase64(object.slashFractionDowntime); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; - message.signedBlocksWindow !== undefined && (obj.signedBlocksWindow = (message.signedBlocksWindow || Long.ZERO).toString()); + message.signedBlocksWindow !== undefined && (obj.signedBlocksWindow = (message.signedBlocksWindow || BigInt(0)).toString()); message.minSignedPerWindow !== undefined && (obj.minSignedPerWindow = base64FromBytes(message.minSignedPerWindow !== undefined ? message.minSignedPerWindow : new Uint8Array())); message.downtimeJailDuration !== undefined && (obj.downtimeJailDuration = message.downtimeJailDuration ? Duration.toJSON(message.downtimeJailDuration) : undefined); message.slashFractionDoubleSign !== undefined && (obj.slashFractionDoubleSign = base64FromBytes(message.slashFractionDoubleSign !== undefined ? message.slashFractionDoubleSign : new Uint8Array())); @@ -346,9 +352,13 @@ export const Params = { }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.signedBlocksWindow = object.signedBlocksWindow !== undefined && object.signedBlocksWindow !== null ? Long.fromValue(object.signedBlocksWindow) : Long.ZERO; + if (object.signedBlocksWindow !== undefined && object.signedBlocksWindow !== null) { + message.signedBlocksWindow = BigInt(object.signedBlocksWindow.toString()); + } message.minSignedPerWindow = object.minSignedPerWindow ?? new Uint8Array(); - message.downtimeJailDuration = object.downtimeJailDuration !== undefined && object.downtimeJailDuration !== null ? Duration.fromPartial(object.downtimeJailDuration) : undefined; + if (object.downtimeJailDuration !== undefined && object.downtimeJailDuration !== null) { + message.downtimeJailDuration = Duration.fromPartial(object.downtimeJailDuration); + } message.slashFractionDoubleSign = object.slashFractionDoubleSign ?? new Uint8Array(); message.slashFractionDowntime = object.slashFractionDowntime ?? new Uint8Array(); return message; @@ -373,7 +383,7 @@ export const Params = { }, fromAmino(object: ParamsAmino): Params { return { - signedBlocksWindow: Long.fromString(object.signed_blocks_window), + signedBlocksWindow: BigInt(object.signed_blocks_window), minSignedPerWindow: object.min_signed_per_window, downtimeJailDuration: object?.downtime_jail_duration ? Duration.fromAmino(object.downtime_jail_duration) : undefined, slashFractionDoubleSign: object.slash_fraction_double_sign, diff --git a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts index d972132ac0..a82f7cd75f 100644 --- a/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/slashing/v1beta1/tx.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.slashing.v1beta1"; /** MsgUnjail defines the Msg/Unjail request type */ @@ -43,14 +43,14 @@ function createBaseMsgUnjail(): MsgUnjail { export const MsgUnjail = { typeUrl: "/cosmos.slashing.v1beta1.MsgUnjail", aminoType: "cosmos-sdk/MsgUnjail", - encode(message: MsgUnjail, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUnjail, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUnjail { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUnjail { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUnjail(); while (reader.pos < end) { @@ -67,9 +67,9 @@ export const MsgUnjail = { return message; }, fromJSON(object: any): MsgUnjail { - return { - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "" - }; + const obj = createBaseMsgUnjail(); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + return obj; }, toJSON(message: MsgUnjail): unknown { const obj: any = {}; @@ -129,11 +129,11 @@ function createBaseMsgUnjailResponse(): MsgUnjailResponse { export const MsgUnjailResponse = { typeUrl: "/cosmos.slashing.v1beta1.MsgUnjailResponse", aminoType: "cosmos-sdk/MsgUnjailResponse", - encode(_: MsgUnjailResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUnjailResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUnjailResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUnjailResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUnjailResponse(); while (reader.pos < end) { @@ -147,7 +147,8 @@ export const MsgUnjailResponse = { return message; }, fromJSON(_: any): MsgUnjailResponse { - return {}; + const obj = createBaseMsgUnjailResponse(); + return obj; }, toJSON(_: MsgUnjailResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts index afa0819164..0ab6911789 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/authz.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.staking.v1beta1"; /** @@ -61,6 +61,7 @@ export function authorizationTypeToJSON(object: AuthorizationType): string { * Since: cosmos-sdk 0.43 */ export interface StakeAuthorization { + $typeUrl?: string; /** * max_tokens specifies the maximum amount of tokens can be delegate to a validator. If it is * empty, there is no spend limit and any amount of coins can be delegated. @@ -111,6 +112,7 @@ export interface StakeAuthorizationAminoMsg { * Since: cosmos-sdk 0.43 */ export interface StakeAuthorizationSDKType { + $typeUrl?: string; max_tokens: CoinSDKType; allow_list?: StakeAuthorization_ValidatorsSDKType; deny_list?: StakeAuthorization_ValidatorsSDKType; @@ -138,6 +140,7 @@ export interface StakeAuthorization_ValidatorsSDKType { } function createBaseStakeAuthorization(): StakeAuthorization { return { + $typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization", maxTokens: Coin.fromPartial({}), allowList: undefined, denyList: undefined, @@ -147,7 +150,7 @@ function createBaseStakeAuthorization(): StakeAuthorization { export const StakeAuthorization = { typeUrl: "/cosmos.staking.v1beta1.StakeAuthorization", aminoType: "cosmos-sdk/StakeAuthorization", - encode(message: StakeAuthorization, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: StakeAuthorization, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.maxTokens !== undefined) { Coin.encode(message.maxTokens, writer.uint32(10).fork()).ldelim(); } @@ -162,8 +165,8 @@ export const StakeAuthorization = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): StakeAuthorization { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): StakeAuthorization { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStakeAuthorization(); while (reader.pos < end) { @@ -189,12 +192,12 @@ export const StakeAuthorization = { return message; }, fromJSON(object: any): StakeAuthorization { - return { - maxTokens: isSet(object.maxTokens) ? Coin.fromJSON(object.maxTokens) : undefined, - allowList: isSet(object.allowList) ? StakeAuthorization_Validators.fromJSON(object.allowList) : undefined, - denyList: isSet(object.denyList) ? StakeAuthorization_Validators.fromJSON(object.denyList) : undefined, - authorizationType: isSet(object.authorizationType) ? authorizationTypeFromJSON(object.authorizationType) : -1 - }; + const obj = createBaseStakeAuthorization(); + if (isSet(object.maxTokens)) obj.maxTokens = Coin.fromJSON(object.maxTokens); + if (isSet(object.allowList)) obj.allowList = StakeAuthorization_Validators.fromJSON(object.allowList); + if (isSet(object.denyList)) obj.denyList = StakeAuthorization_Validators.fromJSON(object.denyList); + if (isSet(object.authorizationType)) obj.authorizationType = authorizationTypeFromJSON(object.authorizationType); + return obj; }, toJSON(message: StakeAuthorization): unknown { const obj: any = {}; @@ -206,9 +209,15 @@ export const StakeAuthorization = { }, fromPartial(object: DeepPartial): StakeAuthorization { const message = createBaseStakeAuthorization(); - message.maxTokens = object.maxTokens !== undefined && object.maxTokens !== null ? Coin.fromPartial(object.maxTokens) : undefined; - message.allowList = object.allowList !== undefined && object.allowList !== null ? StakeAuthorization_Validators.fromPartial(object.allowList) : undefined; - message.denyList = object.denyList !== undefined && object.denyList !== null ? StakeAuthorization_Validators.fromPartial(object.denyList) : undefined; + if (object.maxTokens !== undefined && object.maxTokens !== null) { + message.maxTokens = Coin.fromPartial(object.maxTokens); + } + if (object.allowList !== undefined && object.allowList !== null) { + message.allowList = StakeAuthorization_Validators.fromPartial(object.allowList); + } + if (object.denyList !== undefined && object.denyList !== null) { + message.denyList = StakeAuthorization_Validators.fromPartial(object.denyList); + } message.authorizationType = object.authorizationType ?? 0; return message; }, @@ -274,14 +283,14 @@ function createBaseStakeAuthorization_Validators(): StakeAuthorization_Validator export const StakeAuthorization_Validators = { typeUrl: "/cosmos.staking.v1beta1.Validators", aminoType: "cosmos-sdk/Validators", - encode(message: StakeAuthorization_Validators, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: StakeAuthorization_Validators, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.address) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): StakeAuthorization_Validators { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): StakeAuthorization_Validators { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStakeAuthorization_Validators(); while (reader.pos < end) { @@ -298,9 +307,9 @@ export const StakeAuthorization_Validators = { return message; }, fromJSON(object: any): StakeAuthorization_Validators { - return { - address: Array.isArray(object?.address) ? object.address.map((e: any) => String(e)) : [] - }; + const obj = createBaseStakeAuthorization_Validators(); + if (Array.isArray(object?.address)) object.address.map((e: any) => String(e)); + return obj; }, toJSON(message: StakeAuthorization_Validators): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts index eac9df2fe8..09f8231ca8 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/genesis.ts @@ -1,6 +1,6 @@ import { Params, ParamsAmino, ParamsSDKType, Validator, ValidatorAmino, ValidatorSDKType, Delegation, DelegationAmino, DelegationSDKType, UnbondingDelegation, UnbondingDelegationAmino, UnbondingDelegationSDKType, Redelegation, RedelegationAmino, RedelegationSDKType } from "./staking"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.staking.v1beta1"; /** GenesisState defines the staking module's genesis state. */ export interface GenesisState { @@ -74,7 +74,7 @@ export interface LastValidatorPower { /** address is the address of the validator. */ address: string; /** power defines the power of the validator. */ - power: Long; + power: bigint; } export interface LastValidatorPowerProtoMsg { typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower"; @@ -94,7 +94,7 @@ export interface LastValidatorPowerAminoMsg { /** LastValidatorPower required for validator set update logic. */ export interface LastValidatorPowerSDKType { address: string; - power: Long; + power: bigint; } function createBaseGenesisState(): GenesisState { return { @@ -111,7 +111,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmos.staking.v1beta1.GenesisState", aminoType: "cosmos-sdk/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -138,8 +138,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -177,16 +177,16 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - lastTotalPower: isSet(object.lastTotalPower) ? bytesFromBase64(object.lastTotalPower) : new Uint8Array(), - lastValidatorPowers: Array.isArray(object?.lastValidatorPowers) ? object.lastValidatorPowers.map((e: any) => LastValidatorPower.fromJSON(e)) : [], - validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromJSON(e)) : [], - delegations: Array.isArray(object?.delegations) ? object.delegations.map((e: any) => Delegation.fromJSON(e)) : [], - unbondingDelegations: Array.isArray(object?.unbondingDelegations) ? object.unbondingDelegations.map((e: any) => UnbondingDelegation.fromJSON(e)) : [], - redelegations: Array.isArray(object?.redelegations) ? object.redelegations.map((e: any) => Redelegation.fromJSON(e)) : [], - exported: isSet(object.exported) ? Boolean(object.exported) : false - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (isSet(object.lastTotalPower)) obj.lastTotalPower = bytesFromBase64(object.lastTotalPower); + if (Array.isArray(object?.lastValidatorPowers)) object.lastValidatorPowers.map((e: any) => LastValidatorPower.fromJSON(e)); + if (Array.isArray(object?.validators)) object.validators.map((e: any) => Validator.fromJSON(e)); + if (Array.isArray(object?.delegations)) object.delegations.map((e: any) => Delegation.fromJSON(e)); + if (Array.isArray(object?.unbondingDelegations)) object.unbondingDelegations.map((e: any) => UnbondingDelegation.fromJSON(e)); + if (Array.isArray(object?.redelegations)) object.redelegations.map((e: any) => Redelegation.fromJSON(e)); + if (isSet(object.exported)) obj.exported = Boolean(object.exported); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -222,7 +222,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.lastTotalPower = object.lastTotalPower ?? new Uint8Array(); message.lastValidatorPowers = object.lastValidatorPowers?.map(e => LastValidatorPower.fromPartial(e)) || []; message.validators = object.validators?.map(e => Validator.fromPartial(e)) || []; @@ -345,23 +347,23 @@ export const GenesisState = { function createBaseLastValidatorPower(): LastValidatorPower { return { address: "", - power: Long.ZERO + power: BigInt(0) }; } export const LastValidatorPower = { typeUrl: "/cosmos.staking.v1beta1.LastValidatorPower", aminoType: "cosmos-sdk/LastValidatorPower", - encode(message: LastValidatorPower, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LastValidatorPower, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } - if (!message.power.isZero()) { + if (message.power !== BigInt(0)) { writer.uint32(16).int64(message.power); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LastValidatorPower { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LastValidatorPower { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLastValidatorPower(); while (reader.pos < end) { @@ -371,7 +373,7 @@ export const LastValidatorPower = { message.address = reader.string(); break; case 2: - message.power = (reader.int64() as Long); + message.power = reader.int64(); break; default: reader.skipType(tag & 7); @@ -381,21 +383,23 @@ export const LastValidatorPower = { return message; }, fromJSON(object: any): LastValidatorPower { - return { - address: isSet(object.address) ? String(object.address) : "", - power: isSet(object.power) ? Long.fromValue(object.power) : Long.ZERO - }; + const obj = createBaseLastValidatorPower(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.power)) obj.power = BigInt(object.power.toString()); + return obj; }, toJSON(message: LastValidatorPower): unknown { const obj: any = {}; message.address !== undefined && (obj.address = message.address); - message.power !== undefined && (obj.power = (message.power || Long.ZERO).toString()); + message.power !== undefined && (obj.power = (message.power || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): LastValidatorPower { const message = createBaseLastValidatorPower(); message.address = object.address ?? ""; - message.power = object.power !== undefined && object.power !== null ? Long.fromValue(object.power) : Long.ZERO; + if (object.power !== undefined && object.power !== null) { + message.power = BigInt(object.power.toString()); + } return message; }, fromSDK(object: LastValidatorPowerSDKType): LastValidatorPower { @@ -413,7 +417,7 @@ export const LastValidatorPower = { fromAmino(object: LastValidatorPowerAmino): LastValidatorPower { return { address: object.address, - power: Long.fromString(object.power) + power: BigInt(object.power) }; }, toAmino(message: LastValidatorPower): LastValidatorPowerAmino { diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts index 9ae2d1a4dd..636b101147 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../base/query/v1beta1/pagination"; import { Validator, ValidatorAmino, ValidatorSDKType, DelegationResponse, DelegationResponseAmino, DelegationResponseSDKType, UnbondingDelegation, UnbondingDelegationAmino, UnbondingDelegationSDKType, RedelegationResponse, RedelegationResponseAmino, RedelegationResponseSDKType, HistoricalInfo, HistoricalInfoAmino, HistoricalInfoSDKType, Pool, PoolAmino, PoolSDKType, Params, ParamsAmino, ParamsSDKType } from "./staking"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.staking.v1beta1"; /** QueryValidatorsRequest is request type for Query/Validators RPC method. */ export interface QueryValidatorsRequest { @@ -724,7 +724,7 @@ export interface QueryDelegatorValidatorResponseSDKType { */ export interface QueryHistoricalInfoRequest { /** height defines at which height to query the historical info. */ - height: Long; + height: bigint; } export interface QueryHistoricalInfoRequestProtoMsg { typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest"; @@ -747,7 +747,7 @@ export interface QueryHistoricalInfoRequestAminoMsg { * method. */ export interface QueryHistoricalInfoRequestSDKType { - height: Long; + height: bigint; } /** * QueryHistoricalInfoResponse is response type for the Query/HistoricalInfo RPC @@ -861,7 +861,7 @@ function createBaseQueryValidatorsRequest(): QueryValidatorsRequest { export const QueryValidatorsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsRequest", aminoType: "cosmos-sdk/QueryValidatorsRequest", - encode(message: QueryValidatorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.status !== "") { writer.uint32(10).string(message.status); } @@ -870,8 +870,8 @@ export const QueryValidatorsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorsRequest(); while (reader.pos < end) { @@ -891,10 +891,10 @@ export const QueryValidatorsRequest = { return message; }, fromJSON(object: any): QueryValidatorsRequest { - return { - status: isSet(object.status) ? String(object.status) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorsRequest(); + if (isSet(object.status)) obj.status = String(object.status); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorsRequest): unknown { const obj: any = {}; @@ -905,7 +905,9 @@ export const QueryValidatorsRequest = { fromPartial(object: DeepPartial): QueryValidatorsRequest { const message = createBaseQueryValidatorsRequest(); message.status = object.status ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorsRequestSDKType): QueryValidatorsRequest { @@ -963,7 +965,7 @@ function createBaseQueryValidatorsResponse(): QueryValidatorsResponse { export const QueryValidatorsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorsResponse", aminoType: "cosmos-sdk/QueryValidatorsResponse", - encode(message: QueryValidatorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { Validator.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -972,8 +974,8 @@ export const QueryValidatorsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorsResponse(); while (reader.pos < end) { @@ -993,10 +995,10 @@ export const QueryValidatorsResponse = { return message; }, fromJSON(object: any): QueryValidatorsResponse { - return { - validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorsResponse(); + if (Array.isArray(object?.validators)) object.validators.map((e: any) => Validator.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorsResponse): unknown { const obj: any = {}; @@ -1011,7 +1013,9 @@ export const QueryValidatorsResponse = { fromPartial(object: DeepPartial): QueryValidatorsResponse { const message = createBaseQueryValidatorsResponse(); message.validators = object.validators?.map(e => Validator.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorsResponseSDKType): QueryValidatorsResponse { @@ -1076,14 +1080,14 @@ function createBaseQueryValidatorRequest(): QueryValidatorRequest { export const QueryValidatorRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorRequest", aminoType: "cosmos-sdk/QueryValidatorRequest", - encode(message: QueryValidatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorRequest(); while (reader.pos < end) { @@ -1100,9 +1104,9 @@ export const QueryValidatorRequest = { return message; }, fromJSON(object: any): QueryValidatorRequest { - return { - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "" - }; + const obj = createBaseQueryValidatorRequest(); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + return obj; }, toJSON(message: QueryValidatorRequest): unknown { const obj: any = {}; @@ -1164,14 +1168,14 @@ function createBaseQueryValidatorResponse(): QueryValidatorResponse { export const QueryValidatorResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorResponse", aminoType: "cosmos-sdk/QueryValidatorResponse", - encode(message: QueryValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validator !== undefined) { Validator.encode(message.validator, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorResponse(); while (reader.pos < end) { @@ -1188,9 +1192,9 @@ export const QueryValidatorResponse = { return message; }, fromJSON(object: any): QueryValidatorResponse { - return { - validator: isSet(object.validator) ? Validator.fromJSON(object.validator) : undefined - }; + const obj = createBaseQueryValidatorResponse(); + if (isSet(object.validator)) obj.validator = Validator.fromJSON(object.validator); + return obj; }, toJSON(message: QueryValidatorResponse): unknown { const obj: any = {}; @@ -1199,7 +1203,9 @@ export const QueryValidatorResponse = { }, fromPartial(object: DeepPartial): QueryValidatorResponse { const message = createBaseQueryValidatorResponse(); - message.validator = object.validator !== undefined && object.validator !== null ? Validator.fromPartial(object.validator) : undefined; + if (object.validator !== undefined && object.validator !== null) { + message.validator = Validator.fromPartial(object.validator); + } return message; }, fromSDK(object: QueryValidatorResponseSDKType): QueryValidatorResponse { @@ -1253,7 +1259,7 @@ function createBaseQueryValidatorDelegationsRequest(): QueryValidatorDelegations export const QueryValidatorDelegationsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsRequest", aminoType: "cosmos-sdk/QueryValidatorDelegationsRequest", - encode(message: QueryValidatorDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); } @@ -1262,8 +1268,8 @@ export const QueryValidatorDelegationsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorDelegationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorDelegationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorDelegationsRequest(); while (reader.pos < end) { @@ -1283,10 +1289,10 @@ export const QueryValidatorDelegationsRequest = { return message; }, fromJSON(object: any): QueryValidatorDelegationsRequest { - return { - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorDelegationsRequest(); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorDelegationsRequest): unknown { const obj: any = {}; @@ -1297,7 +1303,9 @@ export const QueryValidatorDelegationsRequest = { fromPartial(object: DeepPartial): QueryValidatorDelegationsRequest { const message = createBaseQueryValidatorDelegationsRequest(); message.validatorAddr = object.validatorAddr ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorDelegationsRequestSDKType): QueryValidatorDelegationsRequest { @@ -1355,7 +1363,7 @@ function createBaseQueryValidatorDelegationsResponse(): QueryValidatorDelegation export const QueryValidatorDelegationsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorDelegationsResponse", aminoType: "cosmos-sdk/QueryValidatorDelegationsResponse", - encode(message: QueryValidatorDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.delegationResponses) { DelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1364,8 +1372,8 @@ export const QueryValidatorDelegationsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorDelegationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorDelegationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorDelegationsResponse(); while (reader.pos < end) { @@ -1385,10 +1393,10 @@ export const QueryValidatorDelegationsResponse = { return message; }, fromJSON(object: any): QueryValidatorDelegationsResponse { - return { - delegationResponses: Array.isArray(object?.delegationResponses) ? object.delegationResponses.map((e: any) => DelegationResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorDelegationsResponse(); + if (Array.isArray(object?.delegationResponses)) object.delegationResponses.map((e: any) => DelegationResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorDelegationsResponse): unknown { const obj: any = {}; @@ -1403,7 +1411,9 @@ export const QueryValidatorDelegationsResponse = { fromPartial(object: DeepPartial): QueryValidatorDelegationsResponse { const message = createBaseQueryValidatorDelegationsResponse(); message.delegationResponses = object.delegationResponses?.map(e => DelegationResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorDelegationsResponseSDKType): QueryValidatorDelegationsResponse { @@ -1469,7 +1479,7 @@ function createBaseQueryValidatorUnbondingDelegationsRequest(): QueryValidatorUn export const QueryValidatorUnbondingDelegationsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsRequest", aminoType: "cosmos-sdk/QueryValidatorUnbondingDelegationsRequest", - encode(message: QueryValidatorUnbondingDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorUnbondingDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validatorAddr !== "") { writer.uint32(10).string(message.validatorAddr); } @@ -1478,8 +1488,8 @@ export const QueryValidatorUnbondingDelegationsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorUnbondingDelegationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorUnbondingDelegationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorUnbondingDelegationsRequest(); while (reader.pos < end) { @@ -1499,10 +1509,10 @@ export const QueryValidatorUnbondingDelegationsRequest = { return message; }, fromJSON(object: any): QueryValidatorUnbondingDelegationsRequest { - return { - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorUnbondingDelegationsRequest(); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorUnbondingDelegationsRequest): unknown { const obj: any = {}; @@ -1513,7 +1523,9 @@ export const QueryValidatorUnbondingDelegationsRequest = { fromPartial(object: DeepPartial): QueryValidatorUnbondingDelegationsRequest { const message = createBaseQueryValidatorUnbondingDelegationsRequest(); message.validatorAddr = object.validatorAddr ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorUnbondingDelegationsRequestSDKType): QueryValidatorUnbondingDelegationsRequest { @@ -1571,7 +1583,7 @@ function createBaseQueryValidatorUnbondingDelegationsResponse(): QueryValidatorU export const QueryValidatorUnbondingDelegationsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryValidatorUnbondingDelegationsResponse", aminoType: "cosmos-sdk/QueryValidatorUnbondingDelegationsResponse", - encode(message: QueryValidatorUnbondingDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryValidatorUnbondingDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unbondingResponses) { UnbondingDelegation.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1580,8 +1592,8 @@ export const QueryValidatorUnbondingDelegationsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryValidatorUnbondingDelegationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryValidatorUnbondingDelegationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryValidatorUnbondingDelegationsResponse(); while (reader.pos < end) { @@ -1601,10 +1613,10 @@ export const QueryValidatorUnbondingDelegationsResponse = { return message; }, fromJSON(object: any): QueryValidatorUnbondingDelegationsResponse { - return { - unbondingResponses: Array.isArray(object?.unbondingResponses) ? object.unbondingResponses.map((e: any) => UnbondingDelegation.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryValidatorUnbondingDelegationsResponse(); + if (Array.isArray(object?.unbondingResponses)) object.unbondingResponses.map((e: any) => UnbondingDelegation.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryValidatorUnbondingDelegationsResponse): unknown { const obj: any = {}; @@ -1619,7 +1631,9 @@ export const QueryValidatorUnbondingDelegationsResponse = { fromPartial(object: DeepPartial): QueryValidatorUnbondingDelegationsResponse { const message = createBaseQueryValidatorUnbondingDelegationsResponse(); message.unbondingResponses = object.unbondingResponses?.map(e => UnbondingDelegation.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryValidatorUnbondingDelegationsResponseSDKType): QueryValidatorUnbondingDelegationsResponse { @@ -1685,7 +1699,7 @@ function createBaseQueryDelegationRequest(): QueryDelegationRequest { export const QueryDelegationRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegationRequest", aminoType: "cosmos-sdk/QueryDelegationRequest", - encode(message: QueryDelegationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -1694,8 +1708,8 @@ export const QueryDelegationRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegationRequest(); while (reader.pos < end) { @@ -1715,10 +1729,10 @@ export const QueryDelegationRequest = { return message; }, fromJSON(object: any): QueryDelegationRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "" - }; + const obj = createBaseQueryDelegationRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + return obj; }, toJSON(message: QueryDelegationRequest): unknown { const obj: any = {}; @@ -1786,14 +1800,14 @@ function createBaseQueryDelegationResponse(): QueryDelegationResponse { export const QueryDelegationResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegationResponse", aminoType: "cosmos-sdk/QueryDelegationResponse", - encode(message: QueryDelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegationResponse !== undefined) { DelegationResponse.encode(message.delegationResponse, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegationResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegationResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegationResponse(); while (reader.pos < end) { @@ -1810,9 +1824,9 @@ export const QueryDelegationResponse = { return message; }, fromJSON(object: any): QueryDelegationResponse { - return { - delegationResponse: isSet(object.delegationResponse) ? DelegationResponse.fromJSON(object.delegationResponse) : undefined - }; + const obj = createBaseQueryDelegationResponse(); + if (isSet(object.delegationResponse)) obj.delegationResponse = DelegationResponse.fromJSON(object.delegationResponse); + return obj; }, toJSON(message: QueryDelegationResponse): unknown { const obj: any = {}; @@ -1821,7 +1835,9 @@ export const QueryDelegationResponse = { }, fromPartial(object: DeepPartial): QueryDelegationResponse { const message = createBaseQueryDelegationResponse(); - message.delegationResponse = object.delegationResponse !== undefined && object.delegationResponse !== null ? DelegationResponse.fromPartial(object.delegationResponse) : undefined; + if (object.delegationResponse !== undefined && object.delegationResponse !== null) { + message.delegationResponse = DelegationResponse.fromPartial(object.delegationResponse); + } return message; }, fromSDK(object: QueryDelegationResponseSDKType): QueryDelegationResponse { @@ -1875,7 +1891,7 @@ function createBaseQueryUnbondingDelegationRequest(): QueryUnbondingDelegationRe export const QueryUnbondingDelegationRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationRequest", aminoType: "cosmos-sdk/QueryUnbondingDelegationRequest", - encode(message: QueryUnbondingDelegationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryUnbondingDelegationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -1884,8 +1900,8 @@ export const QueryUnbondingDelegationRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnbondingDelegationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryUnbondingDelegationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryUnbondingDelegationRequest(); while (reader.pos < end) { @@ -1905,10 +1921,10 @@ export const QueryUnbondingDelegationRequest = { return message; }, fromJSON(object: any): QueryUnbondingDelegationRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "" - }; + const obj = createBaseQueryUnbondingDelegationRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + return obj; }, toJSON(message: QueryUnbondingDelegationRequest): unknown { const obj: any = {}; @@ -1976,14 +1992,14 @@ function createBaseQueryUnbondingDelegationResponse(): QueryUnbondingDelegationR export const QueryUnbondingDelegationResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryUnbondingDelegationResponse", aminoType: "cosmos-sdk/QueryUnbondingDelegationResponse", - encode(message: QueryUnbondingDelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryUnbondingDelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.unbond !== undefined) { UnbondingDelegation.encode(message.unbond, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryUnbondingDelegationResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryUnbondingDelegationResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryUnbondingDelegationResponse(); while (reader.pos < end) { @@ -2000,9 +2016,9 @@ export const QueryUnbondingDelegationResponse = { return message; }, fromJSON(object: any): QueryUnbondingDelegationResponse { - return { - unbond: isSet(object.unbond) ? UnbondingDelegation.fromJSON(object.unbond) : undefined - }; + const obj = createBaseQueryUnbondingDelegationResponse(); + if (isSet(object.unbond)) obj.unbond = UnbondingDelegation.fromJSON(object.unbond); + return obj; }, toJSON(message: QueryUnbondingDelegationResponse): unknown { const obj: any = {}; @@ -2011,7 +2027,9 @@ export const QueryUnbondingDelegationResponse = { }, fromPartial(object: DeepPartial): QueryUnbondingDelegationResponse { const message = createBaseQueryUnbondingDelegationResponse(); - message.unbond = object.unbond !== undefined && object.unbond !== null ? UnbondingDelegation.fromPartial(object.unbond) : undefined; + if (object.unbond !== undefined && object.unbond !== null) { + message.unbond = UnbondingDelegation.fromPartial(object.unbond); + } return message; }, fromSDK(object: QueryUnbondingDelegationResponseSDKType): QueryUnbondingDelegationResponse { @@ -2065,7 +2083,7 @@ function createBaseQueryDelegatorDelegationsRequest(): QueryDelegatorDelegations export const QueryDelegatorDelegationsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsRequest", aminoType: "cosmos-sdk/QueryDelegatorDelegationsRequest", - encode(message: QueryDelegatorDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -2074,8 +2092,8 @@ export const QueryDelegatorDelegationsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorDelegationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorDelegationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorDelegationsRequest(); while (reader.pos < end) { @@ -2095,10 +2113,10 @@ export const QueryDelegatorDelegationsRequest = { return message; }, fromJSON(object: any): QueryDelegatorDelegationsRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDelegatorDelegationsRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDelegatorDelegationsRequest): unknown { const obj: any = {}; @@ -2109,7 +2127,9 @@ export const QueryDelegatorDelegationsRequest = { fromPartial(object: DeepPartial): QueryDelegatorDelegationsRequest { const message = createBaseQueryDelegatorDelegationsRequest(); message.delegatorAddr = object.delegatorAddr ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDelegatorDelegationsRequestSDKType): QueryDelegatorDelegationsRequest { @@ -2167,7 +2187,7 @@ function createBaseQueryDelegatorDelegationsResponse(): QueryDelegatorDelegation export const QueryDelegatorDelegationsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorDelegationsResponse", aminoType: "cosmos-sdk/QueryDelegatorDelegationsResponse", - encode(message: QueryDelegatorDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.delegationResponses) { DelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2176,8 +2196,8 @@ export const QueryDelegatorDelegationsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorDelegationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorDelegationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorDelegationsResponse(); while (reader.pos < end) { @@ -2197,10 +2217,10 @@ export const QueryDelegatorDelegationsResponse = { return message; }, fromJSON(object: any): QueryDelegatorDelegationsResponse { - return { - delegationResponses: Array.isArray(object?.delegationResponses) ? object.delegationResponses.map((e: any) => DelegationResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDelegatorDelegationsResponse(); + if (Array.isArray(object?.delegationResponses)) object.delegationResponses.map((e: any) => DelegationResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDelegatorDelegationsResponse): unknown { const obj: any = {}; @@ -2215,7 +2235,9 @@ export const QueryDelegatorDelegationsResponse = { fromPartial(object: DeepPartial): QueryDelegatorDelegationsResponse { const message = createBaseQueryDelegatorDelegationsResponse(); message.delegationResponses = object.delegationResponses?.map(e => DelegationResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDelegatorDelegationsResponseSDKType): QueryDelegatorDelegationsResponse { @@ -2281,7 +2303,7 @@ function createBaseQueryDelegatorUnbondingDelegationsRequest(): QueryDelegatorUn export const QueryDelegatorUnbondingDelegationsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsRequest", aminoType: "cosmos-sdk/QueryDelegatorUnbondingDelegationsRequest", - encode(message: QueryDelegatorUnbondingDelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorUnbondingDelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -2290,8 +2312,8 @@ export const QueryDelegatorUnbondingDelegationsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorUnbondingDelegationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorUnbondingDelegationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorUnbondingDelegationsRequest(); while (reader.pos < end) { @@ -2311,10 +2333,10 @@ export const QueryDelegatorUnbondingDelegationsRequest = { return message; }, fromJSON(object: any): QueryDelegatorUnbondingDelegationsRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDelegatorUnbondingDelegationsRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDelegatorUnbondingDelegationsRequest): unknown { const obj: any = {}; @@ -2325,7 +2347,9 @@ export const QueryDelegatorUnbondingDelegationsRequest = { fromPartial(object: DeepPartial): QueryDelegatorUnbondingDelegationsRequest { const message = createBaseQueryDelegatorUnbondingDelegationsRequest(); message.delegatorAddr = object.delegatorAddr ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDelegatorUnbondingDelegationsRequestSDKType): QueryDelegatorUnbondingDelegationsRequest { @@ -2383,7 +2407,7 @@ function createBaseQueryDelegatorUnbondingDelegationsResponse(): QueryDelegatorU export const QueryDelegatorUnbondingDelegationsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorUnbondingDelegationsResponse", aminoType: "cosmos-sdk/QueryDelegatorUnbondingDelegationsResponse", - encode(message: QueryDelegatorUnbondingDelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorUnbondingDelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unbondingResponses) { UnbondingDelegation.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2392,8 +2416,8 @@ export const QueryDelegatorUnbondingDelegationsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorUnbondingDelegationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorUnbondingDelegationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorUnbondingDelegationsResponse(); while (reader.pos < end) { @@ -2413,10 +2437,10 @@ export const QueryDelegatorUnbondingDelegationsResponse = { return message; }, fromJSON(object: any): QueryDelegatorUnbondingDelegationsResponse { - return { - unbondingResponses: Array.isArray(object?.unbondingResponses) ? object.unbondingResponses.map((e: any) => UnbondingDelegation.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDelegatorUnbondingDelegationsResponse(); + if (Array.isArray(object?.unbondingResponses)) object.unbondingResponses.map((e: any) => UnbondingDelegation.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDelegatorUnbondingDelegationsResponse): unknown { const obj: any = {}; @@ -2431,7 +2455,9 @@ export const QueryDelegatorUnbondingDelegationsResponse = { fromPartial(object: DeepPartial): QueryDelegatorUnbondingDelegationsResponse { const message = createBaseQueryDelegatorUnbondingDelegationsResponse(); message.unbondingResponses = object.unbondingResponses?.map(e => UnbondingDelegation.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDelegatorUnbondingDelegationsResponseSDKType): QueryDelegatorUnbondingDelegationsResponse { @@ -2499,7 +2525,7 @@ function createBaseQueryRedelegationsRequest(): QueryRedelegationsRequest { export const QueryRedelegationsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsRequest", aminoType: "cosmos-sdk/QueryRedelegationsRequest", - encode(message: QueryRedelegationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryRedelegationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -2514,8 +2540,8 @@ export const QueryRedelegationsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryRedelegationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryRedelegationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryRedelegationsRequest(); while (reader.pos < end) { @@ -2541,12 +2567,12 @@ export const QueryRedelegationsRequest = { return message; }, fromJSON(object: any): QueryRedelegationsRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - srcValidatorAddr: isSet(object.srcValidatorAddr) ? String(object.srcValidatorAddr) : "", - dstValidatorAddr: isSet(object.dstValidatorAddr) ? String(object.dstValidatorAddr) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryRedelegationsRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.srcValidatorAddr)) obj.srcValidatorAddr = String(object.srcValidatorAddr); + if (isSet(object.dstValidatorAddr)) obj.dstValidatorAddr = String(object.dstValidatorAddr); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryRedelegationsRequest): unknown { const obj: any = {}; @@ -2561,7 +2587,9 @@ export const QueryRedelegationsRequest = { message.delegatorAddr = object.delegatorAddr ?? ""; message.srcValidatorAddr = object.srcValidatorAddr ?? ""; message.dstValidatorAddr = object.dstValidatorAddr ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryRedelegationsRequestSDKType): QueryRedelegationsRequest { @@ -2627,7 +2655,7 @@ function createBaseQueryRedelegationsResponse(): QueryRedelegationsResponse { export const QueryRedelegationsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryRedelegationsResponse", aminoType: "cosmos-sdk/QueryRedelegationsResponse", - encode(message: QueryRedelegationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryRedelegationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.redelegationResponses) { RedelegationResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2636,8 +2664,8 @@ export const QueryRedelegationsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryRedelegationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryRedelegationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryRedelegationsResponse(); while (reader.pos < end) { @@ -2657,10 +2685,10 @@ export const QueryRedelegationsResponse = { return message; }, fromJSON(object: any): QueryRedelegationsResponse { - return { - redelegationResponses: Array.isArray(object?.redelegationResponses) ? object.redelegationResponses.map((e: any) => RedelegationResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryRedelegationsResponse(); + if (Array.isArray(object?.redelegationResponses)) object.redelegationResponses.map((e: any) => RedelegationResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryRedelegationsResponse): unknown { const obj: any = {}; @@ -2675,7 +2703,9 @@ export const QueryRedelegationsResponse = { fromPartial(object: DeepPartial): QueryRedelegationsResponse { const message = createBaseQueryRedelegationsResponse(); message.redelegationResponses = object.redelegationResponses?.map(e => RedelegationResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryRedelegationsResponseSDKType): QueryRedelegationsResponse { @@ -2741,7 +2771,7 @@ function createBaseQueryDelegatorValidatorsRequest(): QueryDelegatorValidatorsRe export const QueryDelegatorValidatorsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsRequest", aminoType: "cosmos-sdk/QueryDelegatorValidatorsRequest", - encode(message: QueryDelegatorValidatorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorValidatorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -2750,8 +2780,8 @@ export const QueryDelegatorValidatorsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorValidatorsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorValidatorsRequest(); while (reader.pos < end) { @@ -2771,10 +2801,10 @@ export const QueryDelegatorValidatorsRequest = { return message; }, fromJSON(object: any): QueryDelegatorValidatorsRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDelegatorValidatorsRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDelegatorValidatorsRequest): unknown { const obj: any = {}; @@ -2785,7 +2815,9 @@ export const QueryDelegatorValidatorsRequest = { fromPartial(object: DeepPartial): QueryDelegatorValidatorsRequest { const message = createBaseQueryDelegatorValidatorsRequest(); message.delegatorAddr = object.delegatorAddr ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDelegatorValidatorsRequestSDKType): QueryDelegatorValidatorsRequest { @@ -2843,7 +2875,7 @@ function createBaseQueryDelegatorValidatorsResponse(): QueryDelegatorValidatorsR export const QueryDelegatorValidatorsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorsResponse", aminoType: "cosmos-sdk/QueryDelegatorValidatorsResponse", - encode(message: QueryDelegatorValidatorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorValidatorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.validators) { Validator.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2852,8 +2884,8 @@ export const QueryDelegatorValidatorsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorValidatorsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorValidatorsResponse(); while (reader.pos < end) { @@ -2873,10 +2905,10 @@ export const QueryDelegatorValidatorsResponse = { return message; }, fromJSON(object: any): QueryDelegatorValidatorsResponse { - return { - validators: Array.isArray(object?.validators) ? object.validators.map((e: any) => Validator.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDelegatorValidatorsResponse(); + if (Array.isArray(object?.validators)) object.validators.map((e: any) => Validator.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDelegatorValidatorsResponse): unknown { const obj: any = {}; @@ -2891,7 +2923,9 @@ export const QueryDelegatorValidatorsResponse = { fromPartial(object: DeepPartial): QueryDelegatorValidatorsResponse { const message = createBaseQueryDelegatorValidatorsResponse(); message.validators = object.validators?.map(e => Validator.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDelegatorValidatorsResponseSDKType): QueryDelegatorValidatorsResponse { @@ -2957,7 +2991,7 @@ function createBaseQueryDelegatorValidatorRequest(): QueryDelegatorValidatorRequ export const QueryDelegatorValidatorRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorRequest", aminoType: "cosmos-sdk/QueryDelegatorValidatorRequest", - encode(message: QueryDelegatorValidatorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorValidatorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddr !== "") { writer.uint32(10).string(message.delegatorAddr); } @@ -2966,8 +3000,8 @@ export const QueryDelegatorValidatorRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorValidatorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorValidatorRequest(); while (reader.pos < end) { @@ -2987,10 +3021,10 @@ export const QueryDelegatorValidatorRequest = { return message; }, fromJSON(object: any): QueryDelegatorValidatorRequest { - return { - delegatorAddr: isSet(object.delegatorAddr) ? String(object.delegatorAddr) : "", - validatorAddr: isSet(object.validatorAddr) ? String(object.validatorAddr) : "" - }; + const obj = createBaseQueryDelegatorValidatorRequest(); + if (isSet(object.delegatorAddr)) obj.delegatorAddr = String(object.delegatorAddr); + if (isSet(object.validatorAddr)) obj.validatorAddr = String(object.validatorAddr); + return obj; }, toJSON(message: QueryDelegatorValidatorRequest): unknown { const obj: any = {}; @@ -3058,14 +3092,14 @@ function createBaseQueryDelegatorValidatorResponse(): QueryDelegatorValidatorRes export const QueryDelegatorValidatorResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryDelegatorValidatorResponse", aminoType: "cosmos-sdk/QueryDelegatorValidatorResponse", - encode(message: QueryDelegatorValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDelegatorValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.validator !== undefined) { Validator.encode(message.validator, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDelegatorValidatorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDelegatorValidatorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDelegatorValidatorResponse(); while (reader.pos < end) { @@ -3082,9 +3116,9 @@ export const QueryDelegatorValidatorResponse = { return message; }, fromJSON(object: any): QueryDelegatorValidatorResponse { - return { - validator: isSet(object.validator) ? Validator.fromJSON(object.validator) : undefined - }; + const obj = createBaseQueryDelegatorValidatorResponse(); + if (isSet(object.validator)) obj.validator = Validator.fromJSON(object.validator); + return obj; }, toJSON(message: QueryDelegatorValidatorResponse): unknown { const obj: any = {}; @@ -3093,7 +3127,9 @@ export const QueryDelegatorValidatorResponse = { }, fromPartial(object: DeepPartial): QueryDelegatorValidatorResponse { const message = createBaseQueryDelegatorValidatorResponse(); - message.validator = object.validator !== undefined && object.validator !== null ? Validator.fromPartial(object.validator) : undefined; + if (object.validator !== undefined && object.validator !== null) { + message.validator = Validator.fromPartial(object.validator); + } return message; }, fromSDK(object: QueryDelegatorValidatorResponseSDKType): QueryDelegatorValidatorResponse { @@ -3140,27 +3176,27 @@ export const QueryDelegatorValidatorResponse = { }; function createBaseQueryHistoricalInfoRequest(): QueryHistoricalInfoRequest { return { - height: Long.ZERO + height: BigInt(0) }; } export const QueryHistoricalInfoRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoRequest", aminoType: "cosmos-sdk/QueryHistoricalInfoRequest", - encode(message: QueryHistoricalInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: QueryHistoricalInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryHistoricalInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryHistoricalInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryHistoricalInfoRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; default: reader.skipType(tag & 7); @@ -3170,18 +3206,20 @@ export const QueryHistoricalInfoRequest = { return message; }, fromJSON(object: any): QueryHistoricalInfoRequest { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO - }; + const obj = createBaseQueryHistoricalInfoRequest(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + return obj; }, toJSON(message: QueryHistoricalInfoRequest): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryHistoricalInfoRequest { const message = createBaseQueryHistoricalInfoRequest(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } return message; }, fromSDK(object: QueryHistoricalInfoRequestSDKType): QueryHistoricalInfoRequest { @@ -3196,7 +3234,7 @@ export const QueryHistoricalInfoRequest = { }, fromAmino(object: QueryHistoricalInfoRequestAmino): QueryHistoricalInfoRequest { return { - height: Long.fromString(object.height) + height: BigInt(object.height) }; }, toAmino(message: QueryHistoricalInfoRequest): QueryHistoricalInfoRequestAmino { @@ -3234,14 +3272,14 @@ function createBaseQueryHistoricalInfoResponse(): QueryHistoricalInfoResponse { export const QueryHistoricalInfoResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryHistoricalInfoResponse", aminoType: "cosmos-sdk/QueryHistoricalInfoResponse", - encode(message: QueryHistoricalInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryHistoricalInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hist !== undefined) { HistoricalInfo.encode(message.hist, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryHistoricalInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryHistoricalInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryHistoricalInfoResponse(); while (reader.pos < end) { @@ -3258,9 +3296,9 @@ export const QueryHistoricalInfoResponse = { return message; }, fromJSON(object: any): QueryHistoricalInfoResponse { - return { - hist: isSet(object.hist) ? HistoricalInfo.fromJSON(object.hist) : undefined - }; + const obj = createBaseQueryHistoricalInfoResponse(); + if (isSet(object.hist)) obj.hist = HistoricalInfo.fromJSON(object.hist); + return obj; }, toJSON(message: QueryHistoricalInfoResponse): unknown { const obj: any = {}; @@ -3269,7 +3307,9 @@ export const QueryHistoricalInfoResponse = { }, fromPartial(object: DeepPartial): QueryHistoricalInfoResponse { const message = createBaseQueryHistoricalInfoResponse(); - message.hist = object.hist !== undefined && object.hist !== null ? HistoricalInfo.fromPartial(object.hist) : undefined; + if (object.hist !== undefined && object.hist !== null) { + message.hist = HistoricalInfo.fromPartial(object.hist); + } return message; }, fromSDK(object: QueryHistoricalInfoResponseSDKType): QueryHistoricalInfoResponse { @@ -3320,11 +3360,11 @@ function createBaseQueryPoolRequest(): QueryPoolRequest { export const QueryPoolRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryPoolRequest", aminoType: "cosmos-sdk/QueryPoolRequest", - encode(_: QueryPoolRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryPoolRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPoolRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPoolRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPoolRequest(); while (reader.pos < end) { @@ -3338,7 +3378,8 @@ export const QueryPoolRequest = { return message; }, fromJSON(_: any): QueryPoolRequest { - return {}; + const obj = createBaseQueryPoolRequest(); + return obj; }, toJSON(_: QueryPoolRequest): unknown { const obj: any = {}; @@ -3392,14 +3433,14 @@ function createBaseQueryPoolResponse(): QueryPoolResponse { export const QueryPoolResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryPoolResponse", aminoType: "cosmos-sdk/QueryPoolResponse", - encode(message: QueryPoolResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPoolResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pool !== undefined) { Pool.encode(message.pool, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPoolResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPoolResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPoolResponse(); while (reader.pos < end) { @@ -3416,9 +3457,9 @@ export const QueryPoolResponse = { return message; }, fromJSON(object: any): QueryPoolResponse { - return { - pool: isSet(object.pool) ? Pool.fromJSON(object.pool) : undefined - }; + const obj = createBaseQueryPoolResponse(); + if (isSet(object.pool)) obj.pool = Pool.fromJSON(object.pool); + return obj; }, toJSON(message: QueryPoolResponse): unknown { const obj: any = {}; @@ -3427,7 +3468,9 @@ export const QueryPoolResponse = { }, fromPartial(object: DeepPartial): QueryPoolResponse { const message = createBaseQueryPoolResponse(); - message.pool = object.pool !== undefined && object.pool !== null ? Pool.fromPartial(object.pool) : undefined; + if (object.pool !== undefined && object.pool !== null) { + message.pool = Pool.fromPartial(object.pool); + } return message; }, fromSDK(object: QueryPoolResponseSDKType): QueryPoolResponse { @@ -3478,11 +3521,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { export const QueryParamsRequest = { typeUrl: "/cosmos.staking.v1beta1.QueryParamsRequest", aminoType: "cosmos-sdk/QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -3496,7 +3539,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -3550,14 +3594,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { export const QueryParamsResponse = { typeUrl: "/cosmos.staking.v1beta1.QueryParamsResponse", aminoType: "cosmos-sdk/QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -3574,9 +3618,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -3585,7 +3629,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts index 19d63a2fdb..abaa74ef0b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/staking.ts @@ -3,8 +3,9 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; +import { Decimal } from "@cosmjs/math"; import { encodePubkey, decodePubkey } from "@cosmjs/proto-signing"; export const protobufPackage = "cosmos.staking.v1beta1"; /** BondStatus is the status of a validator. */ @@ -230,7 +231,7 @@ export interface Validator { /** description defines the description terms for the validator. */ description: Description; /** unbonding_height defines, if unbonding, the height at which this validator has begun unbonding. */ - unbondingHeight: Long; + unbondingHeight: bigint; /** unbonding_time defines, if unbonding, the min time for the validator to complete unbonding. */ unbondingTime: Date; /** commission defines the commission parameters. */ @@ -301,7 +302,7 @@ export interface ValidatorSDKType { tokens: string; delegator_shares: string; description: DescriptionSDKType; - unbonding_height: Long; + unbonding_height: bigint; unbonding_time: Date; commission: CommissionSDKType; min_self_delegation: string; @@ -530,7 +531,7 @@ export interface UnbondingDelegationSDKType { /** UnbondingDelegationEntry defines an unbonding object with relevant metadata. */ export interface UnbondingDelegationEntry { /** creation_height is the height which the unbonding took place. */ - creationHeight: Long; + creationHeight: bigint; /** completion_time is the unix time for unbonding completion. */ completionTime: Date; /** initial_balance defines the tokens initially scheduled to receive at completion. */ @@ -559,7 +560,7 @@ export interface UnbondingDelegationEntryAminoMsg { } /** UnbondingDelegationEntry defines an unbonding object with relevant metadata. */ export interface UnbondingDelegationEntrySDKType { - creation_height: Long; + creation_height: bigint; completion_time: Date; initial_balance: string; balance: string; @@ -567,7 +568,7 @@ export interface UnbondingDelegationEntrySDKType { /** RedelegationEntry defines a redelegation object with relevant metadata. */ export interface RedelegationEntry { /** creation_height defines the height which the redelegation took place. */ - creationHeight: Long; + creationHeight: bigint; /** completion_time defines the unix time for redelegation completion. */ completionTime: Date; /** initial_balance defines the initial balance when redelegation started. */ @@ -596,7 +597,7 @@ export interface RedelegationEntryAminoMsg { } /** RedelegationEntry defines a redelegation object with relevant metadata. */ export interface RedelegationEntrySDKType { - creation_height: Long; + creation_height: bigint; completion_time: Date; initial_balance: string; shares_dst: string; @@ -837,7 +838,7 @@ function createBaseHistoricalInfo(): HistoricalInfo { export const HistoricalInfo = { typeUrl: "/cosmos.staking.v1beta1.HistoricalInfo", aminoType: "cosmos-sdk/HistoricalInfo", - encode(message: HistoricalInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: HistoricalInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.header !== undefined) { Header.encode(message.header, writer.uint32(10).fork()).ldelim(); } @@ -846,8 +847,8 @@ export const HistoricalInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): HistoricalInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): HistoricalInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseHistoricalInfo(); while (reader.pos < end) { @@ -867,10 +868,10 @@ export const HistoricalInfo = { return message; }, fromJSON(object: any): HistoricalInfo { - return { - header: isSet(object.header) ? Header.fromJSON(object.header) : undefined, - valset: Array.isArray(object?.valset) ? object.valset.map((e: any) => Validator.fromJSON(e)) : [] - }; + const obj = createBaseHistoricalInfo(); + if (isSet(object.header)) obj.header = Header.fromJSON(object.header); + if (Array.isArray(object?.valset)) object.valset.map((e: any) => Validator.fromJSON(e)); + return obj; }, toJSON(message: HistoricalInfo): unknown { const obj: any = {}; @@ -884,7 +885,9 @@ export const HistoricalInfo = { }, fromPartial(object: DeepPartial): HistoricalInfo { const message = createBaseHistoricalInfo(); - message.header = object.header !== undefined && object.header !== null ? Header.fromPartial(object.header) : undefined; + if (object.header !== undefined && object.header !== null) { + message.header = Header.fromPartial(object.header); + } message.valset = object.valset?.map(e => Validator.fromPartial(e)) || []; return message; }, @@ -952,33 +955,33 @@ function createBaseCommissionRates(): CommissionRates { export const CommissionRates = { typeUrl: "/cosmos.staking.v1beta1.CommissionRates", aminoType: "cosmos-sdk/CommissionRates", - encode(message: CommissionRates, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CommissionRates, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rate !== "") { - writer.uint32(10).string(message.rate); + writer.uint32(10).string(Decimal.fromUserInput(message.rate, 18).atomics); } if (message.maxRate !== "") { - writer.uint32(18).string(message.maxRate); + writer.uint32(18).string(Decimal.fromUserInput(message.maxRate, 18).atomics); } if (message.maxChangeRate !== "") { - writer.uint32(26).string(message.maxChangeRate); + writer.uint32(26).string(Decimal.fromUserInput(message.maxChangeRate, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CommissionRates { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CommissionRates { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommissionRates(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.rate = reader.string(); + message.rate = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 2: - message.maxRate = reader.string(); + message.maxRate = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.maxChangeRate = reader.string(); + message.maxChangeRate = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -988,11 +991,11 @@ export const CommissionRates = { return message; }, fromJSON(object: any): CommissionRates { - return { - rate: isSet(object.rate) ? String(object.rate) : "", - maxRate: isSet(object.maxRate) ? String(object.maxRate) : "", - maxChangeRate: isSet(object.maxChangeRate) ? String(object.maxChangeRate) : "" - }; + const obj = createBaseCommissionRates(); + if (isSet(object.rate)) obj.rate = String(object.rate); + if (isSet(object.maxRate)) obj.maxRate = String(object.maxRate); + if (isSet(object.maxChangeRate)) obj.maxChangeRate = String(object.maxChangeRate); + return obj; }, toJSON(message: CommissionRates): unknown { const obj: any = {}; @@ -1067,7 +1070,7 @@ function createBaseCommission(): Commission { export const Commission = { typeUrl: "/cosmos.staking.v1beta1.Commission", aminoType: "cosmos-sdk/Commission", - encode(message: Commission, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Commission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.commissionRates !== undefined) { CommissionRates.encode(message.commissionRates, writer.uint32(10).fork()).ldelim(); } @@ -1076,8 +1079,8 @@ export const Commission = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Commission { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Commission { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCommission(); while (reader.pos < end) { @@ -1097,10 +1100,10 @@ export const Commission = { return message; }, fromJSON(object: any): Commission { - return { - commissionRates: isSet(object.commissionRates) ? CommissionRates.fromJSON(object.commissionRates) : undefined, - updateTime: isSet(object.updateTime) ? new Date(object.updateTime) : undefined - }; + const obj = createBaseCommission(); + if (isSet(object.commissionRates)) obj.commissionRates = CommissionRates.fromJSON(object.commissionRates); + if (isSet(object.updateTime)) obj.updateTime = new Date(object.updateTime); + return obj; }, toJSON(message: Commission): unknown { const obj: any = {}; @@ -1110,7 +1113,9 @@ export const Commission = { }, fromPartial(object: DeepPartial): Commission { const message = createBaseCommission(); - message.commissionRates = object.commissionRates !== undefined && object.commissionRates !== null ? CommissionRates.fromPartial(object.commissionRates) : undefined; + if (object.commissionRates !== undefined && object.commissionRates !== null) { + message.commissionRates = CommissionRates.fromPartial(object.commissionRates); + } message.updateTime = object.updateTime ?? undefined; return message; }, @@ -1172,7 +1177,7 @@ function createBaseDescription(): Description { export const Description = { typeUrl: "/cosmos.staking.v1beta1.Description", aminoType: "cosmos-sdk/Description", - encode(message: Description, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Description, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.moniker !== "") { writer.uint32(10).string(message.moniker); } @@ -1190,8 +1195,8 @@ export const Description = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Description { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Description { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDescription(); while (reader.pos < end) { @@ -1220,13 +1225,13 @@ export const Description = { return message; }, fromJSON(object: any): Description { - return { - moniker: isSet(object.moniker) ? String(object.moniker) : "", - identity: isSet(object.identity) ? String(object.identity) : "", - website: isSet(object.website) ? String(object.website) : "", - securityContact: isSet(object.securityContact) ? String(object.securityContact) : "", - details: isSet(object.details) ? String(object.details) : "" - }; + const obj = createBaseDescription(); + if (isSet(object.moniker)) obj.moniker = String(object.moniker); + if (isSet(object.identity)) obj.identity = String(object.identity); + if (isSet(object.website)) obj.website = String(object.website); + if (isSet(object.securityContact)) obj.securityContact = String(object.securityContact); + if (isSet(object.details)) obj.details = String(object.details); + return obj; }, toJSON(message: Description): unknown { const obj: any = {}; @@ -1313,7 +1318,7 @@ function createBaseValidator(): Validator { tokens: "", delegatorShares: "", description: Description.fromPartial({}), - unbondingHeight: Long.ZERO, + unbondingHeight: BigInt(0), unbondingTime: new Date(), commission: Commission.fromPartial({}), minSelfDelegation: "" @@ -1322,7 +1327,7 @@ function createBaseValidator(): Validator { export const Validator = { typeUrl: "/cosmos.staking.v1beta1.Validator", aminoType: "cosmos-sdk/Validator", - encode(message: Validator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Validator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operatorAddress !== "") { writer.uint32(10).string(message.operatorAddress); } @@ -1339,12 +1344,12 @@ export const Validator = { writer.uint32(42).string(message.tokens); } if (message.delegatorShares !== "") { - writer.uint32(50).string(message.delegatorShares); + writer.uint32(50).string(Decimal.fromUserInput(message.delegatorShares, 18).atomics); } if (message.description !== undefined) { Description.encode(message.description, writer.uint32(58).fork()).ldelim(); } - if (!message.unbondingHeight.isZero()) { + if (message.unbondingHeight !== BigInt(0)) { writer.uint32(64).int64(message.unbondingHeight); } if (message.unbondingTime !== undefined) { @@ -1358,8 +1363,8 @@ export const Validator = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Validator { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Validator { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValidator(); while (reader.pos < end) { @@ -1381,13 +1386,13 @@ export const Validator = { message.tokens = reader.string(); break; case 6: - message.delegatorShares = reader.string(); + message.delegatorShares = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 7: message.description = Description.decode(reader, reader.uint32()); break; case 8: - message.unbondingHeight = (reader.int64() as Long); + message.unbondingHeight = reader.int64(); break; case 9: message.unbondingTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); @@ -1406,19 +1411,19 @@ export const Validator = { return message; }, fromJSON(object: any): Validator { - return { - operatorAddress: isSet(object.operatorAddress) ? String(object.operatorAddress) : "", - consensusPubkey: isSet(object.consensusPubkey) ? Any.fromJSON(object.consensusPubkey) : undefined, - jailed: isSet(object.jailed) ? Boolean(object.jailed) : false, - status: isSet(object.status) ? bondStatusFromJSON(object.status) : -1, - tokens: isSet(object.tokens) ? String(object.tokens) : "", - delegatorShares: isSet(object.delegatorShares) ? String(object.delegatorShares) : "", - description: isSet(object.description) ? Description.fromJSON(object.description) : undefined, - unbondingHeight: isSet(object.unbondingHeight) ? Long.fromValue(object.unbondingHeight) : Long.ZERO, - unbondingTime: isSet(object.unbondingTime) ? new Date(object.unbondingTime) : undefined, - commission: isSet(object.commission) ? Commission.fromJSON(object.commission) : undefined, - minSelfDelegation: isSet(object.minSelfDelegation) ? String(object.minSelfDelegation) : "" - }; + const obj = createBaseValidator(); + if (isSet(object.operatorAddress)) obj.operatorAddress = String(object.operatorAddress); + if (isSet(object.consensusPubkey)) obj.consensusPubkey = Any.fromJSON(object.consensusPubkey); + if (isSet(object.jailed)) obj.jailed = Boolean(object.jailed); + if (isSet(object.status)) obj.status = bondStatusFromJSON(object.status); + if (isSet(object.tokens)) obj.tokens = String(object.tokens); + if (isSet(object.delegatorShares)) obj.delegatorShares = String(object.delegatorShares); + if (isSet(object.description)) obj.description = Description.fromJSON(object.description); + if (isSet(object.unbondingHeight)) obj.unbondingHeight = BigInt(object.unbondingHeight.toString()); + if (isSet(object.unbondingTime)) obj.unbondingTime = new Date(object.unbondingTime); + if (isSet(object.commission)) obj.commission = Commission.fromJSON(object.commission); + if (isSet(object.minSelfDelegation)) obj.minSelfDelegation = String(object.minSelfDelegation); + return obj; }, toJSON(message: Validator): unknown { const obj: any = {}; @@ -1429,7 +1434,7 @@ export const Validator = { message.tokens !== undefined && (obj.tokens = message.tokens); message.delegatorShares !== undefined && (obj.delegatorShares = message.delegatorShares); message.description !== undefined && (obj.description = message.description ? Description.toJSON(message.description) : undefined); - message.unbondingHeight !== undefined && (obj.unbondingHeight = (message.unbondingHeight || Long.ZERO).toString()); + message.unbondingHeight !== undefined && (obj.unbondingHeight = (message.unbondingHeight || BigInt(0)).toString()); message.unbondingTime !== undefined && (obj.unbondingTime = message.unbondingTime.toISOString()); message.commission !== undefined && (obj.commission = message.commission ? Commission.toJSON(message.commission) : undefined); message.minSelfDelegation !== undefined && (obj.minSelfDelegation = message.minSelfDelegation); @@ -1438,15 +1443,23 @@ export const Validator = { fromPartial(object: DeepPartial): Validator { const message = createBaseValidator(); message.operatorAddress = object.operatorAddress ?? ""; - message.consensusPubkey = object.consensusPubkey !== undefined && object.consensusPubkey !== null ? Any.fromPartial(object.consensusPubkey) : undefined; + if (object.consensusPubkey !== undefined && object.consensusPubkey !== null) { + message.consensusPubkey = Any.fromPartial(object.consensusPubkey); + } message.jailed = object.jailed ?? false; message.status = object.status ?? 0; message.tokens = object.tokens ?? ""; message.delegatorShares = object.delegatorShares ?? ""; - message.description = object.description !== undefined && object.description !== null ? Description.fromPartial(object.description) : undefined; - message.unbondingHeight = object.unbondingHeight !== undefined && object.unbondingHeight !== null ? Long.fromValue(object.unbondingHeight) : Long.ZERO; + if (object.description !== undefined && object.description !== null) { + message.description = Description.fromPartial(object.description); + } + if (object.unbondingHeight !== undefined && object.unbondingHeight !== null) { + message.unbondingHeight = BigInt(object.unbondingHeight.toString()); + } message.unbondingTime = object.unbondingTime ?? undefined; - message.commission = object.commission !== undefined && object.commission !== null ? Commission.fromPartial(object.commission) : undefined; + if (object.commission !== undefined && object.commission !== null) { + message.commission = Commission.fromPartial(object.commission); + } message.minSelfDelegation = object.minSelfDelegation ?? ""; return message; }, @@ -1489,7 +1502,7 @@ export const Validator = { tokens: object.tokens, delegatorShares: object.delegator_shares, description: object?.description ? Description.fromAmino(object.description) : undefined, - unbondingHeight: Long.fromString(object.unbonding_height), + unbondingHeight: BigInt(object.unbonding_height), unbondingTime: object.unbonding_time, commission: object?.commission ? Commission.fromAmino(object.commission) : undefined, minSelfDelegation: object.min_self_delegation @@ -1540,14 +1553,14 @@ function createBaseValAddresses(): ValAddresses { export const ValAddresses = { typeUrl: "/cosmos.staking.v1beta1.ValAddresses", aminoType: "cosmos-sdk/ValAddresses", - encode(message: ValAddresses, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ValAddresses, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.addresses) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ValAddresses { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ValAddresses { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValAddresses(); while (reader.pos < end) { @@ -1564,9 +1577,9 @@ export const ValAddresses = { return message; }, fromJSON(object: any): ValAddresses { - return { - addresses: Array.isArray(object?.addresses) ? object.addresses.map((e: any) => String(e)) : [] - }; + const obj = createBaseValAddresses(); + if (Array.isArray(object?.addresses)) object.addresses.map((e: any) => String(e)); + return obj; }, toJSON(message: ValAddresses): unknown { const obj: any = {}; @@ -1641,7 +1654,7 @@ function createBaseDVPair(): DVPair { export const DVPair = { typeUrl: "/cosmos.staking.v1beta1.DVPair", aminoType: "cosmos-sdk/DVPair", - encode(message: DVPair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DVPair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -1650,8 +1663,8 @@ export const DVPair = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DVPair { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DVPair { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDVPair(); while (reader.pos < end) { @@ -1671,10 +1684,10 @@ export const DVPair = { return message; }, fromJSON(object: any): DVPair { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "" - }; + const obj = createBaseDVPair(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + return obj; }, toJSON(message: DVPair): unknown { const obj: any = {}; @@ -1742,14 +1755,14 @@ function createBaseDVPairs(): DVPairs { export const DVPairs = { typeUrl: "/cosmos.staking.v1beta1.DVPairs", aminoType: "cosmos-sdk/DVPairs", - encode(message: DVPairs, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DVPairs, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.pairs) { DVPair.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DVPairs { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DVPairs { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDVPairs(); while (reader.pos < end) { @@ -1766,9 +1779,9 @@ export const DVPairs = { return message; }, fromJSON(object: any): DVPairs { - return { - pairs: Array.isArray(object?.pairs) ? object.pairs.map((e: any) => DVPair.fromJSON(e)) : [] - }; + const obj = createBaseDVPairs(); + if (Array.isArray(object?.pairs)) object.pairs.map((e: any) => DVPair.fromJSON(e)); + return obj; }, toJSON(message: DVPairs): unknown { const obj: any = {}; @@ -1844,7 +1857,7 @@ function createBaseDVVTriplet(): DVVTriplet { export const DVVTriplet = { typeUrl: "/cosmos.staking.v1beta1.DVVTriplet", aminoType: "cosmos-sdk/DVVTriplet", - encode(message: DVVTriplet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DVVTriplet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -1856,8 +1869,8 @@ export const DVVTriplet = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DVVTriplet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DVVTriplet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDVVTriplet(); while (reader.pos < end) { @@ -1880,11 +1893,11 @@ export const DVVTriplet = { return message; }, fromJSON(object: any): DVVTriplet { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorSrcAddress: isSet(object.validatorSrcAddress) ? String(object.validatorSrcAddress) : "", - validatorDstAddress: isSet(object.validatorDstAddress) ? String(object.validatorDstAddress) : "" - }; + const obj = createBaseDVVTriplet(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorSrcAddress)) obj.validatorSrcAddress = String(object.validatorSrcAddress); + if (isSet(object.validatorDstAddress)) obj.validatorDstAddress = String(object.validatorDstAddress); + return obj; }, toJSON(message: DVVTriplet): unknown { const obj: any = {}; @@ -1958,14 +1971,14 @@ function createBaseDVVTriplets(): DVVTriplets { export const DVVTriplets = { typeUrl: "/cosmos.staking.v1beta1.DVVTriplets", aminoType: "cosmos-sdk/DVVTriplets", - encode(message: DVVTriplets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DVVTriplets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.triplets) { DVVTriplet.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DVVTriplets { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DVVTriplets { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDVVTriplets(); while (reader.pos < end) { @@ -1982,9 +1995,9 @@ export const DVVTriplets = { return message; }, fromJSON(object: any): DVVTriplets { - return { - triplets: Array.isArray(object?.triplets) ? object.triplets.map((e: any) => DVVTriplet.fromJSON(e)) : [] - }; + const obj = createBaseDVVTriplets(); + if (Array.isArray(object?.triplets)) object.triplets.map((e: any) => DVVTriplet.fromJSON(e)); + return obj; }, toJSON(message: DVVTriplets): unknown { const obj: any = {}; @@ -2060,7 +2073,7 @@ function createBaseDelegation(): Delegation { export const Delegation = { typeUrl: "/cosmos.staking.v1beta1.Delegation", aminoType: "cosmos-sdk/Delegation", - encode(message: Delegation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Delegation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -2068,12 +2081,12 @@ export const Delegation = { writer.uint32(18).string(message.validatorAddress); } if (message.shares !== "") { - writer.uint32(26).string(message.shares); + writer.uint32(26).string(Decimal.fromUserInput(message.shares, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Delegation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Delegation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelegation(); while (reader.pos < end) { @@ -2086,7 +2099,7 @@ export const Delegation = { message.validatorAddress = reader.string(); break; case 3: - message.shares = reader.string(); + message.shares = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -2096,11 +2109,11 @@ export const Delegation = { return message; }, fromJSON(object: any): Delegation { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - shares: isSet(object.shares) ? String(object.shares) : "" - }; + const obj = createBaseDelegation(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.shares)) obj.shares = String(object.shares); + return obj; }, toJSON(message: Delegation): unknown { const obj: any = {}; @@ -2176,7 +2189,7 @@ function createBaseUnbondingDelegation(): UnbondingDelegation { export const UnbondingDelegation = { typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegation", aminoType: "cosmos-sdk/UnbondingDelegation", - encode(message: UnbondingDelegation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UnbondingDelegation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -2188,8 +2201,8 @@ export const UnbondingDelegation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UnbondingDelegation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UnbondingDelegation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUnbondingDelegation(); while (reader.pos < end) { @@ -2212,11 +2225,11 @@ export const UnbondingDelegation = { return message; }, fromJSON(object: any): UnbondingDelegation { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => UnbondingDelegationEntry.fromJSON(e)) : [] - }; + const obj = createBaseUnbondingDelegation(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => UnbondingDelegationEntry.fromJSON(e)); + return obj; }, toJSON(message: UnbondingDelegation): unknown { const obj: any = {}; @@ -2296,7 +2309,7 @@ export const UnbondingDelegation = { }; function createBaseUnbondingDelegationEntry(): UnbondingDelegationEntry { return { - creationHeight: Long.ZERO, + creationHeight: BigInt(0), completionTime: new Date(), initialBalance: "", balance: "" @@ -2305,8 +2318,8 @@ function createBaseUnbondingDelegationEntry(): UnbondingDelegationEntry { export const UnbondingDelegationEntry = { typeUrl: "/cosmos.staking.v1beta1.UnbondingDelegationEntry", aminoType: "cosmos-sdk/UnbondingDelegationEntry", - encode(message: UnbondingDelegationEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.creationHeight.isZero()) { + encode(message: UnbondingDelegationEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.creationHeight !== BigInt(0)) { writer.uint32(8).int64(message.creationHeight); } if (message.completionTime !== undefined) { @@ -2320,15 +2333,15 @@ export const UnbondingDelegationEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UnbondingDelegationEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UnbondingDelegationEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUnbondingDelegationEntry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.creationHeight = (reader.int64() as Long); + message.creationHeight = reader.int64(); break; case 2: message.completionTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); @@ -2347,16 +2360,16 @@ export const UnbondingDelegationEntry = { return message; }, fromJSON(object: any): UnbondingDelegationEntry { - return { - creationHeight: isSet(object.creationHeight) ? Long.fromValue(object.creationHeight) : Long.ZERO, - completionTime: isSet(object.completionTime) ? new Date(object.completionTime) : undefined, - initialBalance: isSet(object.initialBalance) ? String(object.initialBalance) : "", - balance: isSet(object.balance) ? String(object.balance) : "" - }; + const obj = createBaseUnbondingDelegationEntry(); + if (isSet(object.creationHeight)) obj.creationHeight = BigInt(object.creationHeight.toString()); + if (isSet(object.completionTime)) obj.completionTime = new Date(object.completionTime); + if (isSet(object.initialBalance)) obj.initialBalance = String(object.initialBalance); + if (isSet(object.balance)) obj.balance = String(object.balance); + return obj; }, toJSON(message: UnbondingDelegationEntry): unknown { const obj: any = {}; - message.creationHeight !== undefined && (obj.creationHeight = (message.creationHeight || Long.ZERO).toString()); + message.creationHeight !== undefined && (obj.creationHeight = (message.creationHeight || BigInt(0)).toString()); message.completionTime !== undefined && (obj.completionTime = message.completionTime.toISOString()); message.initialBalance !== undefined && (obj.initialBalance = message.initialBalance); message.balance !== undefined && (obj.balance = message.balance); @@ -2364,7 +2377,9 @@ export const UnbondingDelegationEntry = { }, fromPartial(object: DeepPartial): UnbondingDelegationEntry { const message = createBaseUnbondingDelegationEntry(); - message.creationHeight = object.creationHeight !== undefined && object.creationHeight !== null ? Long.fromValue(object.creationHeight) : Long.ZERO; + if (object.creationHeight !== undefined && object.creationHeight !== null) { + message.creationHeight = BigInt(object.creationHeight.toString()); + } message.completionTime = object.completionTime ?? undefined; message.initialBalance = object.initialBalance ?? ""; message.balance = object.balance ?? ""; @@ -2388,7 +2403,7 @@ export const UnbondingDelegationEntry = { }, fromAmino(object: UnbondingDelegationEntryAmino): UnbondingDelegationEntry { return { - creationHeight: Long.fromString(object.creation_height), + creationHeight: BigInt(object.creation_height), completionTime: object.completion_time, initialBalance: object.initial_balance, balance: object.balance @@ -2426,7 +2441,7 @@ export const UnbondingDelegationEntry = { }; function createBaseRedelegationEntry(): RedelegationEntry { return { - creationHeight: Long.ZERO, + creationHeight: BigInt(0), completionTime: new Date(), initialBalance: "", sharesDst: "" @@ -2435,8 +2450,8 @@ function createBaseRedelegationEntry(): RedelegationEntry { export const RedelegationEntry = { typeUrl: "/cosmos.staking.v1beta1.RedelegationEntry", aminoType: "cosmos-sdk/RedelegationEntry", - encode(message: RedelegationEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.creationHeight.isZero()) { + encode(message: RedelegationEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.creationHeight !== BigInt(0)) { writer.uint32(8).int64(message.creationHeight); } if (message.completionTime !== undefined) { @@ -2446,19 +2461,19 @@ export const RedelegationEntry = { writer.uint32(26).string(message.initialBalance); } if (message.sharesDst !== "") { - writer.uint32(34).string(message.sharesDst); + writer.uint32(34).string(Decimal.fromUserInput(message.sharesDst, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RedelegationEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RedelegationEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRedelegationEntry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.creationHeight = (reader.int64() as Long); + message.creationHeight = reader.int64(); break; case 2: message.completionTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); @@ -2467,7 +2482,7 @@ export const RedelegationEntry = { message.initialBalance = reader.string(); break; case 4: - message.sharesDst = reader.string(); + message.sharesDst = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -2477,16 +2492,16 @@ export const RedelegationEntry = { return message; }, fromJSON(object: any): RedelegationEntry { - return { - creationHeight: isSet(object.creationHeight) ? Long.fromValue(object.creationHeight) : Long.ZERO, - completionTime: isSet(object.completionTime) ? new Date(object.completionTime) : undefined, - initialBalance: isSet(object.initialBalance) ? String(object.initialBalance) : "", - sharesDst: isSet(object.sharesDst) ? String(object.sharesDst) : "" - }; + const obj = createBaseRedelegationEntry(); + if (isSet(object.creationHeight)) obj.creationHeight = BigInt(object.creationHeight.toString()); + if (isSet(object.completionTime)) obj.completionTime = new Date(object.completionTime); + if (isSet(object.initialBalance)) obj.initialBalance = String(object.initialBalance); + if (isSet(object.sharesDst)) obj.sharesDst = String(object.sharesDst); + return obj; }, toJSON(message: RedelegationEntry): unknown { const obj: any = {}; - message.creationHeight !== undefined && (obj.creationHeight = (message.creationHeight || Long.ZERO).toString()); + message.creationHeight !== undefined && (obj.creationHeight = (message.creationHeight || BigInt(0)).toString()); message.completionTime !== undefined && (obj.completionTime = message.completionTime.toISOString()); message.initialBalance !== undefined && (obj.initialBalance = message.initialBalance); message.sharesDst !== undefined && (obj.sharesDst = message.sharesDst); @@ -2494,7 +2509,9 @@ export const RedelegationEntry = { }, fromPartial(object: DeepPartial): RedelegationEntry { const message = createBaseRedelegationEntry(); - message.creationHeight = object.creationHeight !== undefined && object.creationHeight !== null ? Long.fromValue(object.creationHeight) : Long.ZERO; + if (object.creationHeight !== undefined && object.creationHeight !== null) { + message.creationHeight = BigInt(object.creationHeight.toString()); + } message.completionTime = object.completionTime ?? undefined; message.initialBalance = object.initialBalance ?? ""; message.sharesDst = object.sharesDst ?? ""; @@ -2518,7 +2535,7 @@ export const RedelegationEntry = { }, fromAmino(object: RedelegationEntryAmino): RedelegationEntry { return { - creationHeight: Long.fromString(object.creation_height), + creationHeight: BigInt(object.creation_height), completionTime: object.completion_time, initialBalance: object.initial_balance, sharesDst: object.shares_dst @@ -2565,7 +2582,7 @@ function createBaseRedelegation(): Redelegation { export const Redelegation = { typeUrl: "/cosmos.staking.v1beta1.Redelegation", aminoType: "cosmos-sdk/Redelegation", - encode(message: Redelegation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Redelegation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -2580,8 +2597,8 @@ export const Redelegation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Redelegation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Redelegation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRedelegation(); while (reader.pos < end) { @@ -2607,12 +2624,12 @@ export const Redelegation = { return message; }, fromJSON(object: any): Redelegation { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorSrcAddress: isSet(object.validatorSrcAddress) ? String(object.validatorSrcAddress) : "", - validatorDstAddress: isSet(object.validatorDstAddress) ? String(object.validatorDstAddress) : "", - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => RedelegationEntry.fromJSON(e)) : [] - }; + const obj = createBaseRedelegation(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorSrcAddress)) obj.validatorSrcAddress = String(object.validatorSrcAddress); + if (isSet(object.validatorDstAddress)) obj.validatorDstAddress = String(object.validatorDstAddress); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => RedelegationEntry.fromJSON(e)); + return obj; }, toJSON(message: Redelegation): unknown { const obj: any = {}; @@ -2709,7 +2726,7 @@ function createBaseParams(): Params { export const Params = { typeUrl: "/cosmos.staking.v1beta1.Params", aminoType: "cosmos-sdk/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.unbondingTime !== undefined) { Duration.encode(message.unbondingTime, writer.uint32(10).fork()).ldelim(); } @@ -2726,12 +2743,12 @@ export const Params = { writer.uint32(42).string(message.bondDenom); } if (message.minCommissionRate !== "") { - writer.uint32(50).string(message.minCommissionRate); + writer.uint32(50).string(Decimal.fromUserInput(message.minCommissionRate, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -2753,7 +2770,7 @@ export const Params = { message.bondDenom = reader.string(); break; case 6: - message.minCommissionRate = reader.string(); + message.minCommissionRate = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -2763,14 +2780,14 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - unbondingTime: isSet(object.unbondingTime) ? Duration.fromJSON(object.unbondingTime) : undefined, - maxValidators: isSet(object.maxValidators) ? Number(object.maxValidators) : 0, - maxEntries: isSet(object.maxEntries) ? Number(object.maxEntries) : 0, - historicalEntries: isSet(object.historicalEntries) ? Number(object.historicalEntries) : 0, - bondDenom: isSet(object.bondDenom) ? String(object.bondDenom) : "", - minCommissionRate: isSet(object.minCommissionRate) ? String(object.minCommissionRate) : "" - }; + const obj = createBaseParams(); + if (isSet(object.unbondingTime)) obj.unbondingTime = Duration.fromJSON(object.unbondingTime); + if (isSet(object.maxValidators)) obj.maxValidators = Number(object.maxValidators); + if (isSet(object.maxEntries)) obj.maxEntries = Number(object.maxEntries); + if (isSet(object.historicalEntries)) obj.historicalEntries = Number(object.historicalEntries); + if (isSet(object.bondDenom)) obj.bondDenom = String(object.bondDenom); + if (isSet(object.minCommissionRate)) obj.minCommissionRate = String(object.minCommissionRate); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -2784,7 +2801,9 @@ export const Params = { }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.unbondingTime = object.unbondingTime !== undefined && object.unbondingTime !== null ? Duration.fromPartial(object.unbondingTime) : undefined; + if (object.unbondingTime !== undefined && object.unbondingTime !== null) { + message.unbondingTime = Duration.fromPartial(object.unbondingTime); + } message.maxValidators = object.maxValidators ?? 0; message.maxEntries = object.maxEntries ?? 0; message.historicalEntries = object.historicalEntries ?? 0; @@ -2863,7 +2882,7 @@ function createBaseDelegationResponse(): DelegationResponse { export const DelegationResponse = { typeUrl: "/cosmos.staking.v1beta1.DelegationResponse", aminoType: "cosmos-sdk/DelegationResponse", - encode(message: DelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegation !== undefined) { Delegation.encode(message.delegation, writer.uint32(10).fork()).ldelim(); } @@ -2872,8 +2891,8 @@ export const DelegationResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DelegationResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DelegationResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelegationResponse(); while (reader.pos < end) { @@ -2893,10 +2912,10 @@ export const DelegationResponse = { return message; }, fromJSON(object: any): DelegationResponse { - return { - delegation: isSet(object.delegation) ? Delegation.fromJSON(object.delegation) : undefined, - balance: isSet(object.balance) ? Coin.fromJSON(object.balance) : undefined - }; + const obj = createBaseDelegationResponse(); + if (isSet(object.delegation)) obj.delegation = Delegation.fromJSON(object.delegation); + if (isSet(object.balance)) obj.balance = Coin.fromJSON(object.balance); + return obj; }, toJSON(message: DelegationResponse): unknown { const obj: any = {}; @@ -2906,8 +2925,12 @@ export const DelegationResponse = { }, fromPartial(object: DeepPartial): DelegationResponse { const message = createBaseDelegationResponse(); - message.delegation = object.delegation !== undefined && object.delegation !== null ? Delegation.fromPartial(object.delegation) : undefined; - message.balance = object.balance !== undefined && object.balance !== null ? Coin.fromPartial(object.balance) : undefined; + if (object.delegation !== undefined && object.delegation !== null) { + message.delegation = Delegation.fromPartial(object.delegation); + } + if (object.balance !== undefined && object.balance !== null) { + message.balance = Coin.fromPartial(object.balance); + } return message; }, fromSDK(object: DelegationResponseSDKType): DelegationResponse { @@ -2965,7 +2988,7 @@ function createBaseRedelegationEntryResponse(): RedelegationEntryResponse { export const RedelegationEntryResponse = { typeUrl: "/cosmos.staking.v1beta1.RedelegationEntryResponse", aminoType: "cosmos-sdk/RedelegationEntryResponse", - encode(message: RedelegationEntryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RedelegationEntryResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.redelegationEntry !== undefined) { RedelegationEntry.encode(message.redelegationEntry, writer.uint32(10).fork()).ldelim(); } @@ -2974,8 +2997,8 @@ export const RedelegationEntryResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RedelegationEntryResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RedelegationEntryResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRedelegationEntryResponse(); while (reader.pos < end) { @@ -2995,10 +3018,10 @@ export const RedelegationEntryResponse = { return message; }, fromJSON(object: any): RedelegationEntryResponse { - return { - redelegationEntry: isSet(object.redelegationEntry) ? RedelegationEntry.fromJSON(object.redelegationEntry) : undefined, - balance: isSet(object.balance) ? String(object.balance) : "" - }; + const obj = createBaseRedelegationEntryResponse(); + if (isSet(object.redelegationEntry)) obj.redelegationEntry = RedelegationEntry.fromJSON(object.redelegationEntry); + if (isSet(object.balance)) obj.balance = String(object.balance); + return obj; }, toJSON(message: RedelegationEntryResponse): unknown { const obj: any = {}; @@ -3008,7 +3031,9 @@ export const RedelegationEntryResponse = { }, fromPartial(object: DeepPartial): RedelegationEntryResponse { const message = createBaseRedelegationEntryResponse(); - message.redelegationEntry = object.redelegationEntry !== undefined && object.redelegationEntry !== null ? RedelegationEntry.fromPartial(object.redelegationEntry) : undefined; + if (object.redelegationEntry !== undefined && object.redelegationEntry !== null) { + message.redelegationEntry = RedelegationEntry.fromPartial(object.redelegationEntry); + } message.balance = object.balance ?? ""; return message; }, @@ -3067,7 +3092,7 @@ function createBaseRedelegationResponse(): RedelegationResponse { export const RedelegationResponse = { typeUrl: "/cosmos.staking.v1beta1.RedelegationResponse", aminoType: "cosmos-sdk/RedelegationResponse", - encode(message: RedelegationResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RedelegationResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.redelegation !== undefined) { Redelegation.encode(message.redelegation, writer.uint32(10).fork()).ldelim(); } @@ -3076,8 +3101,8 @@ export const RedelegationResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RedelegationResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RedelegationResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRedelegationResponse(); while (reader.pos < end) { @@ -3097,10 +3122,10 @@ export const RedelegationResponse = { return message; }, fromJSON(object: any): RedelegationResponse { - return { - redelegation: isSet(object.redelegation) ? Redelegation.fromJSON(object.redelegation) : undefined, - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => RedelegationEntryResponse.fromJSON(e)) : [] - }; + const obj = createBaseRedelegationResponse(); + if (isSet(object.redelegation)) obj.redelegation = Redelegation.fromJSON(object.redelegation); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => RedelegationEntryResponse.fromJSON(e)); + return obj; }, toJSON(message: RedelegationResponse): unknown { const obj: any = {}; @@ -3114,7 +3139,9 @@ export const RedelegationResponse = { }, fromPartial(object: DeepPartial): RedelegationResponse { const message = createBaseRedelegationResponse(); - message.redelegation = object.redelegation !== undefined && object.redelegation !== null ? Redelegation.fromPartial(object.redelegation) : undefined; + if (object.redelegation !== undefined && object.redelegation !== null) { + message.redelegation = Redelegation.fromPartial(object.redelegation); + } message.entries = object.entries?.map(e => RedelegationEntryResponse.fromPartial(e)) || []; return message; }, @@ -3181,7 +3208,7 @@ function createBasePool(): Pool { export const Pool = { typeUrl: "/cosmos.staking.v1beta1.Pool", aminoType: "cosmos-sdk/Pool", - encode(message: Pool, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Pool, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.notBondedTokens !== "") { writer.uint32(10).string(message.notBondedTokens); } @@ -3190,8 +3217,8 @@ export const Pool = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Pool { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Pool { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePool(); while (reader.pos < end) { @@ -3211,10 +3238,10 @@ export const Pool = { return message; }, fromJSON(object: any): Pool { - return { - notBondedTokens: isSet(object.notBondedTokens) ? String(object.notBondedTokens) : "", - bondedTokens: isSet(object.bondedTokens) ? String(object.bondedTokens) : "" - }; + const obj = createBasePool(); + if (isSet(object.notBondedTokens)) obj.notBondedTokens = String(object.notBondedTokens); + if (isSet(object.bondedTokens)) obj.bondedTokens = String(object.bondedTokens); + return obj; }, toJSON(message: Pool): unknown { const obj: any = {}; @@ -3274,8 +3301,8 @@ export const Pool = { }; } }; -export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: _m0.Reader | Uint8Array): Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { default: diff --git a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts index 91ed74b1db..a4e1051717 100644 --- a/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/staking/v1beta1/tx.ts @@ -2,9 +2,10 @@ import { Description, DescriptionAmino, DescriptionSDKType, CommissionRates, Com import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Timestamp } from "../../../google/protobuf/timestamp"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; import { encodePubkey, decodePubkey } from "@cosmjs/proto-signing"; +import { Decimal } from "@cosmjs/math"; export const protobufPackage = "cosmos.staking.v1beta1"; /** MsgCreateValidator defines a SDK message for creating a new validator. */ export interface MsgCreateValidator { @@ -292,7 +293,7 @@ function createBaseMsgCreateValidator(): MsgCreateValidator { export const MsgCreateValidator = { typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidator", aminoType: "cosmos-sdk/MsgCreateValidator", - encode(message: MsgCreateValidator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateValidator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== undefined) { Description.encode(message.description, writer.uint32(10).fork()).ldelim(); } @@ -316,8 +317,8 @@ export const MsgCreateValidator = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateValidator { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateValidator { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateValidator(); while (reader.pos < end) { @@ -352,15 +353,15 @@ export const MsgCreateValidator = { return message; }, fromJSON(object: any): MsgCreateValidator { - return { - description: isSet(object.description) ? Description.fromJSON(object.description) : undefined, - commission: isSet(object.commission) ? CommissionRates.fromJSON(object.commission) : undefined, - minSelfDelegation: isSet(object.minSelfDelegation) ? String(object.minSelfDelegation) : "", - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - pubkey: isSet(object.pubkey) ? Any.fromJSON(object.pubkey) : undefined, - value: isSet(object.value) ? Coin.fromJSON(object.value) : undefined - }; + const obj = createBaseMsgCreateValidator(); + if (isSet(object.description)) obj.description = Description.fromJSON(object.description); + if (isSet(object.commission)) obj.commission = CommissionRates.fromJSON(object.commission); + if (isSet(object.minSelfDelegation)) obj.minSelfDelegation = String(object.minSelfDelegation); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.pubkey)) obj.pubkey = Any.fromJSON(object.pubkey); + if (isSet(object.value)) obj.value = Coin.fromJSON(object.value); + return obj; }, toJSON(message: MsgCreateValidator): unknown { const obj: any = {}; @@ -375,13 +376,21 @@ export const MsgCreateValidator = { }, fromPartial(object: DeepPartial): MsgCreateValidator { const message = createBaseMsgCreateValidator(); - message.description = object.description !== undefined && object.description !== null ? Description.fromPartial(object.description) : undefined; - message.commission = object.commission !== undefined && object.commission !== null ? CommissionRates.fromPartial(object.commission) : undefined; + if (object.description !== undefined && object.description !== null) { + message.description = Description.fromPartial(object.description); + } + if (object.commission !== undefined && object.commission !== null) { + message.commission = CommissionRates.fromPartial(object.commission); + } message.minSelfDelegation = object.minSelfDelegation ?? ""; message.delegatorAddress = object.delegatorAddress ?? ""; message.validatorAddress = object.validatorAddress ?? ""; - message.pubkey = object.pubkey !== undefined && object.pubkey !== null ? Any.fromPartial(object.pubkey) : undefined; - message.value = object.value !== undefined && object.value !== null ? Coin.fromPartial(object.value) : undefined; + if (object.pubkey !== undefined && object.pubkey !== null) { + message.pubkey = Any.fromPartial(object.pubkey); + } + if (object.value !== undefined && object.value !== null) { + message.value = Coin.fromPartial(object.value); + } return message; }, fromSDK(object: MsgCreateValidatorSDKType): MsgCreateValidator { @@ -456,11 +465,11 @@ function createBaseMsgCreateValidatorResponse(): MsgCreateValidatorResponse { export const MsgCreateValidatorResponse = { typeUrl: "/cosmos.staking.v1beta1.MsgCreateValidatorResponse", aminoType: "cosmos-sdk/MsgCreateValidatorResponse", - encode(_: MsgCreateValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateValidatorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateValidatorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateValidatorResponse(); while (reader.pos < end) { @@ -474,7 +483,8 @@ export const MsgCreateValidatorResponse = { return message; }, fromJSON(_: any): MsgCreateValidatorResponse { - return {}; + const obj = createBaseMsgCreateValidatorResponse(); + return obj; }, toJSON(_: MsgCreateValidatorResponse): unknown { const obj: any = {}; @@ -531,7 +541,7 @@ function createBaseMsgEditValidator(): MsgEditValidator { export const MsgEditValidator = { typeUrl: "/cosmos.staking.v1beta1.MsgEditValidator", aminoType: "cosmos-sdk/MsgEditValidator", - encode(message: MsgEditValidator, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgEditValidator, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== undefined) { Description.encode(message.description, writer.uint32(10).fork()).ldelim(); } @@ -539,15 +549,15 @@ export const MsgEditValidator = { writer.uint32(18).string(message.validatorAddress); } if (message.commissionRate !== "") { - writer.uint32(26).string(message.commissionRate); + writer.uint32(26).string(Decimal.fromUserInput(message.commissionRate, 18).atomics); } if (message.minSelfDelegation !== "") { writer.uint32(34).string(message.minSelfDelegation); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgEditValidator { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgEditValidator { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgEditValidator(); while (reader.pos < end) { @@ -560,7 +570,7 @@ export const MsgEditValidator = { message.validatorAddress = reader.string(); break; case 3: - message.commissionRate = reader.string(); + message.commissionRate = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 4: message.minSelfDelegation = reader.string(); @@ -573,12 +583,12 @@ export const MsgEditValidator = { return message; }, fromJSON(object: any): MsgEditValidator { - return { - description: isSet(object.description) ? Description.fromJSON(object.description) : undefined, - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - commissionRate: isSet(object.commissionRate) ? String(object.commissionRate) : "", - minSelfDelegation: isSet(object.minSelfDelegation) ? String(object.minSelfDelegation) : "" - }; + const obj = createBaseMsgEditValidator(); + if (isSet(object.description)) obj.description = Description.fromJSON(object.description); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.commissionRate)) obj.commissionRate = String(object.commissionRate); + if (isSet(object.minSelfDelegation)) obj.minSelfDelegation = String(object.minSelfDelegation); + return obj; }, toJSON(message: MsgEditValidator): unknown { const obj: any = {}; @@ -590,7 +600,9 @@ export const MsgEditValidator = { }, fromPartial(object: DeepPartial): MsgEditValidator { const message = createBaseMsgEditValidator(); - message.description = object.description !== undefined && object.description !== null ? Description.fromPartial(object.description) : undefined; + if (object.description !== undefined && object.description !== null) { + message.description = Description.fromPartial(object.description); + } message.validatorAddress = object.validatorAddress ?? ""; message.commissionRate = object.commissionRate ?? ""; message.minSelfDelegation = object.minSelfDelegation ?? ""; @@ -656,11 +668,11 @@ function createBaseMsgEditValidatorResponse(): MsgEditValidatorResponse { export const MsgEditValidatorResponse = { typeUrl: "/cosmos.staking.v1beta1.MsgEditValidatorResponse", aminoType: "cosmos-sdk/MsgEditValidatorResponse", - encode(_: MsgEditValidatorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgEditValidatorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgEditValidatorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgEditValidatorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgEditValidatorResponse(); while (reader.pos < end) { @@ -674,7 +686,8 @@ export const MsgEditValidatorResponse = { return message; }, fromJSON(_: any): MsgEditValidatorResponse { - return {}; + const obj = createBaseMsgEditValidatorResponse(); + return obj; }, toJSON(_: MsgEditValidatorResponse): unknown { const obj: any = {}; @@ -730,7 +743,7 @@ function createBaseMsgDelegate(): MsgDelegate { export const MsgDelegate = { typeUrl: "/cosmos.staking.v1beta1.MsgDelegate", aminoType: "cosmos-sdk/MsgDelegate", - encode(message: MsgDelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgDelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -742,8 +755,8 @@ export const MsgDelegate = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDelegate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDelegate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDelegate(); while (reader.pos < end) { @@ -766,11 +779,11 @@ export const MsgDelegate = { return message; }, fromJSON(object: any): MsgDelegate { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - amount: isSet(object.amount) ? Coin.fromJSON(object.amount) : undefined - }; + const obj = createBaseMsgDelegate(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.amount)) obj.amount = Coin.fromJSON(object.amount); + return obj; }, toJSON(message: MsgDelegate): unknown { const obj: any = {}; @@ -783,7 +796,9 @@ export const MsgDelegate = { const message = createBaseMsgDelegate(); message.delegatorAddress = object.delegatorAddress ?? ""; message.validatorAddress = object.validatorAddress ?? ""; - message.amount = object.amount !== undefined && object.amount !== null ? Coin.fromPartial(object.amount) : undefined; + if (object.amount !== undefined && object.amount !== null) { + message.amount = Coin.fromPartial(object.amount); + } return message; }, fromSDK(object: MsgDelegateSDKType): MsgDelegate { @@ -842,11 +857,11 @@ function createBaseMsgDelegateResponse(): MsgDelegateResponse { export const MsgDelegateResponse = { typeUrl: "/cosmos.staking.v1beta1.MsgDelegateResponse", aminoType: "cosmos-sdk/MsgDelegateResponse", - encode(_: MsgDelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgDelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgDelegateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgDelegateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgDelegateResponse(); while (reader.pos < end) { @@ -860,7 +875,8 @@ export const MsgDelegateResponse = { return message; }, fromJSON(_: any): MsgDelegateResponse { - return {}; + const obj = createBaseMsgDelegateResponse(); + return obj; }, toJSON(_: MsgDelegateResponse): unknown { const obj: any = {}; @@ -917,7 +933,7 @@ function createBaseMsgBeginRedelegate(): MsgBeginRedelegate { export const MsgBeginRedelegate = { typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegate", aminoType: "cosmos-sdk/MsgBeginRedelegate", - encode(message: MsgBeginRedelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgBeginRedelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -932,8 +948,8 @@ export const MsgBeginRedelegate = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgBeginRedelegate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgBeginRedelegate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgBeginRedelegate(); while (reader.pos < end) { @@ -959,12 +975,12 @@ export const MsgBeginRedelegate = { return message; }, fromJSON(object: any): MsgBeginRedelegate { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorSrcAddress: isSet(object.validatorSrcAddress) ? String(object.validatorSrcAddress) : "", - validatorDstAddress: isSet(object.validatorDstAddress) ? String(object.validatorDstAddress) : "", - amount: isSet(object.amount) ? Coin.fromJSON(object.amount) : undefined - }; + const obj = createBaseMsgBeginRedelegate(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorSrcAddress)) obj.validatorSrcAddress = String(object.validatorSrcAddress); + if (isSet(object.validatorDstAddress)) obj.validatorDstAddress = String(object.validatorDstAddress); + if (isSet(object.amount)) obj.amount = Coin.fromJSON(object.amount); + return obj; }, toJSON(message: MsgBeginRedelegate): unknown { const obj: any = {}; @@ -979,7 +995,9 @@ export const MsgBeginRedelegate = { message.delegatorAddress = object.delegatorAddress ?? ""; message.validatorSrcAddress = object.validatorSrcAddress ?? ""; message.validatorDstAddress = object.validatorDstAddress ?? ""; - message.amount = object.amount !== undefined && object.amount !== null ? Coin.fromPartial(object.amount) : undefined; + if (object.amount !== undefined && object.amount !== null) { + message.amount = Coin.fromPartial(object.amount); + } return message; }, fromSDK(object: MsgBeginRedelegateSDKType): MsgBeginRedelegate { @@ -1044,14 +1062,14 @@ function createBaseMsgBeginRedelegateResponse(): MsgBeginRedelegateResponse { export const MsgBeginRedelegateResponse = { typeUrl: "/cosmos.staking.v1beta1.MsgBeginRedelegateResponse", aminoType: "cosmos-sdk/MsgBeginRedelegateResponse", - encode(message: MsgBeginRedelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgBeginRedelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.completionTime !== undefined) { Timestamp.encode(toTimestamp(message.completionTime), writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgBeginRedelegateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgBeginRedelegateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgBeginRedelegateResponse(); while (reader.pos < end) { @@ -1068,9 +1086,9 @@ export const MsgBeginRedelegateResponse = { return message; }, fromJSON(object: any): MsgBeginRedelegateResponse { - return { - completionTime: isSet(object.completionTime) ? new Date(object.completionTime) : undefined - }; + const obj = createBaseMsgBeginRedelegateResponse(); + if (isSet(object.completionTime)) obj.completionTime = new Date(object.completionTime); + return obj; }, toJSON(message: MsgBeginRedelegateResponse): unknown { const obj: any = {}; @@ -1134,7 +1152,7 @@ function createBaseMsgUndelegate(): MsgUndelegate { export const MsgUndelegate = { typeUrl: "/cosmos.staking.v1beta1.MsgUndelegate", aminoType: "cosmos-sdk/MsgUndelegate", - encode(message: MsgUndelegate, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUndelegate, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.delegatorAddress !== "") { writer.uint32(10).string(message.delegatorAddress); } @@ -1146,8 +1164,8 @@ export const MsgUndelegate = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUndelegate { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUndelegate { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUndelegate(); while (reader.pos < end) { @@ -1170,11 +1188,11 @@ export const MsgUndelegate = { return message; }, fromJSON(object: any): MsgUndelegate { - return { - delegatorAddress: isSet(object.delegatorAddress) ? String(object.delegatorAddress) : "", - validatorAddress: isSet(object.validatorAddress) ? String(object.validatorAddress) : "", - amount: isSet(object.amount) ? Coin.fromJSON(object.amount) : undefined - }; + const obj = createBaseMsgUndelegate(); + if (isSet(object.delegatorAddress)) obj.delegatorAddress = String(object.delegatorAddress); + if (isSet(object.validatorAddress)) obj.validatorAddress = String(object.validatorAddress); + if (isSet(object.amount)) obj.amount = Coin.fromJSON(object.amount); + return obj; }, toJSON(message: MsgUndelegate): unknown { const obj: any = {}; @@ -1187,7 +1205,9 @@ export const MsgUndelegate = { const message = createBaseMsgUndelegate(); message.delegatorAddress = object.delegatorAddress ?? ""; message.validatorAddress = object.validatorAddress ?? ""; - message.amount = object.amount !== undefined && object.amount !== null ? Coin.fromPartial(object.amount) : undefined; + if (object.amount !== undefined && object.amount !== null) { + message.amount = Coin.fromPartial(object.amount); + } return message; }, fromSDK(object: MsgUndelegateSDKType): MsgUndelegate { @@ -1248,14 +1268,14 @@ function createBaseMsgUndelegateResponse(): MsgUndelegateResponse { export const MsgUndelegateResponse = { typeUrl: "/cosmos.staking.v1beta1.MsgUndelegateResponse", aminoType: "cosmos-sdk/MsgUndelegateResponse", - encode(message: MsgUndelegateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUndelegateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.completionTime !== undefined) { Timestamp.encode(toTimestamp(message.completionTime), writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUndelegateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUndelegateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUndelegateResponse(); while (reader.pos < end) { @@ -1272,9 +1292,9 @@ export const MsgUndelegateResponse = { return message; }, fromJSON(object: any): MsgUndelegateResponse { - return { - completionTime: isSet(object.completionTime) ? new Date(object.completionTime) : undefined - }; + const obj = createBaseMsgUndelegateResponse(); + if (isSet(object.completionTime)) obj.completionTime = new Date(object.completionTime); + return obj; }, toJSON(message: MsgUndelegateResponse): unknown { const obj: any = {}; @@ -1328,8 +1348,8 @@ export const MsgUndelegateResponse = { }; } }; -export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: _m0.Reader | Uint8Array): Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const Cosmos_cryptoPubKey_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { default: diff --git a/__fixtures__/v-next/outputv2/cosmos/tx/signing/v1beta1/signing.ts b/__fixtures__/v-next/outputv2/cosmos/tx/signing/v1beta1/signing.ts index c464f5e7a8..6efcd97587 100644 --- a/__fixtures__/v-next/outputv2/cosmos/tx/signing/v1beta1/signing.ts +++ b/__fixtures__/v-next/outputv2/cosmos/tx/signing/v1beta1/signing.ts @@ -1,7 +1,7 @@ import { CompactBitArray, CompactBitArrayAmino, CompactBitArraySDKType } from "../../../crypto/multisig/v1beta1/multisig"; import { Any, AnyAmino, AnySDKType } from "../../../../google/protobuf/any"; -import { Long, DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "cosmos.tx.signing.v1beta1"; /** * SignMode represents a signing mode with its own security guarantees. @@ -125,7 +125,7 @@ export interface SignatureDescriptor { * number of committed transactions signed by a given address. It is used to prevent * replay attacks. */ - sequence: Long; + sequence: bigint; } export interface SignatureDescriptorProtoMsg { typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor"; @@ -161,7 +161,7 @@ export interface SignatureDescriptorAminoMsg { export interface SignatureDescriptorSDKType { public_key: AnySDKType; data: SignatureDescriptor_DataSDKType; - sequence: Long; + sequence: bigint; } /** Data represents signature data */ export interface SignatureDescriptor_Data { @@ -252,14 +252,14 @@ function createBaseSignatureDescriptors(): SignatureDescriptors { export const SignatureDescriptors = { typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptors", aminoType: "cosmos-sdk/SignatureDescriptors", - encode(message: SignatureDescriptors, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignatureDescriptors, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signatures) { SignatureDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptors { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignatureDescriptors { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignatureDescriptors(); while (reader.pos < end) { @@ -276,9 +276,9 @@ export const SignatureDescriptors = { return message; }, fromJSON(object: any): SignatureDescriptors { - return { - signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => SignatureDescriptor.fromJSON(e)) : [] - }; + const obj = createBaseSignatureDescriptors(); + if (Array.isArray(object?.signatures)) object.signatures.map((e: any) => SignatureDescriptor.fromJSON(e)); + return obj; }, toJSON(message: SignatureDescriptors): unknown { const obj: any = {}; @@ -348,26 +348,26 @@ function createBaseSignatureDescriptor(): SignatureDescriptor { return { publicKey: Any.fromPartial({}), data: SignatureDescriptor_Data.fromPartial({}), - sequence: Long.UZERO + sequence: BigInt(0) }; } export const SignatureDescriptor = { typeUrl: "/cosmos.tx.signing.v1beta1.SignatureDescriptor", aminoType: "cosmos-sdk/SignatureDescriptor", - encode(message: SignatureDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignatureDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); } if (message.data !== undefined) { SignatureDescriptor_Data.encode(message.data, writer.uint32(18).fork()).ldelim(); } - if (!message.sequence.isZero()) { + if (message.sequence !== BigInt(0)) { writer.uint32(24).uint64(message.sequence); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignatureDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignatureDescriptor(); while (reader.pos < end) { @@ -380,7 +380,7 @@ export const SignatureDescriptor = { message.data = SignatureDescriptor_Data.decode(reader, reader.uint32()); break; case 3: - message.sequence = (reader.uint64() as Long); + message.sequence = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -390,24 +390,30 @@ export const SignatureDescriptor = { return message; }, fromJSON(object: any): SignatureDescriptor { - return { - publicKey: isSet(object.publicKey) ? Any.fromJSON(object.publicKey) : undefined, - data: isSet(object.data) ? SignatureDescriptor_Data.fromJSON(object.data) : undefined, - sequence: isSet(object.sequence) ? Long.fromValue(object.sequence) : Long.UZERO - }; + const obj = createBaseSignatureDescriptor(); + if (isSet(object.publicKey)) obj.publicKey = Any.fromJSON(object.publicKey); + if (isSet(object.data)) obj.data = SignatureDescriptor_Data.fromJSON(object.data); + if (isSet(object.sequence)) obj.sequence = BigInt(object.sequence.toString()); + return obj; }, toJSON(message: SignatureDescriptor): unknown { const obj: any = {}; message.publicKey !== undefined && (obj.publicKey = message.publicKey ? Any.toJSON(message.publicKey) : undefined); message.data !== undefined && (obj.data = message.data ? SignatureDescriptor_Data.toJSON(message.data) : undefined); - message.sequence !== undefined && (obj.sequence = (message.sequence || Long.UZERO).toString()); + message.sequence !== undefined && (obj.sequence = (message.sequence || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): SignatureDescriptor { const message = createBaseSignatureDescriptor(); - message.publicKey = object.publicKey !== undefined && object.publicKey !== null ? Any.fromPartial(object.publicKey) : undefined; - message.data = object.data !== undefined && object.data !== null ? SignatureDescriptor_Data.fromPartial(object.data) : undefined; - message.sequence = object.sequence !== undefined && object.sequence !== null ? Long.fromValue(object.sequence) : Long.UZERO; + if (object.publicKey !== undefined && object.publicKey !== null) { + message.publicKey = Any.fromPartial(object.publicKey); + } + if (object.data !== undefined && object.data !== null) { + message.data = SignatureDescriptor_Data.fromPartial(object.data); + } + if (object.sequence !== undefined && object.sequence !== null) { + message.sequence = BigInt(object.sequence.toString()); + } return message; }, fromSDK(object: SignatureDescriptorSDKType): SignatureDescriptor { @@ -428,7 +434,7 @@ export const SignatureDescriptor = { return { publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, data: object?.data ? SignatureDescriptor_Data.fromAmino(object.data) : undefined, - sequence: Long.fromString(object.sequence) + sequence: BigInt(object.sequence) }; }, toAmino(message: SignatureDescriptor): SignatureDescriptorAmino { @@ -469,7 +475,7 @@ function createBaseSignatureDescriptor_Data(): SignatureDescriptor_Data { export const SignatureDescriptor_Data = { typeUrl: "/cosmos.tx.signing.v1beta1.Data", aminoType: "cosmos-sdk/Data", - encode(message: SignatureDescriptor_Data, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignatureDescriptor_Data, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.single !== undefined) { SignatureDescriptor_Data_Single.encode(message.single, writer.uint32(10).fork()).ldelim(); } @@ -478,8 +484,8 @@ export const SignatureDescriptor_Data = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor_Data { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignatureDescriptor_Data { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignatureDescriptor_Data(); while (reader.pos < end) { @@ -499,10 +505,10 @@ export const SignatureDescriptor_Data = { return message; }, fromJSON(object: any): SignatureDescriptor_Data { - return { - single: isSet(object.single) ? SignatureDescriptor_Data_Single.fromJSON(object.single) : undefined, - multi: isSet(object.multi) ? SignatureDescriptor_Data_Multi.fromJSON(object.multi) : undefined - }; + const obj = createBaseSignatureDescriptor_Data(); + if (isSet(object.single)) obj.single = SignatureDescriptor_Data_Single.fromJSON(object.single); + if (isSet(object.multi)) obj.multi = SignatureDescriptor_Data_Multi.fromJSON(object.multi); + return obj; }, toJSON(message: SignatureDescriptor_Data): unknown { const obj: any = {}; @@ -512,8 +518,12 @@ export const SignatureDescriptor_Data = { }, fromPartial(object: DeepPartial): SignatureDescriptor_Data { const message = createBaseSignatureDescriptor_Data(); - message.single = object.single !== undefined && object.single !== null ? SignatureDescriptor_Data_Single.fromPartial(object.single) : undefined; - message.multi = object.multi !== undefined && object.multi !== null ? SignatureDescriptor_Data_Multi.fromPartial(object.multi) : undefined; + if (object.single !== undefined && object.single !== null) { + message.single = SignatureDescriptor_Data_Single.fromPartial(object.single); + } + if (object.multi !== undefined && object.multi !== null) { + message.multi = SignatureDescriptor_Data_Multi.fromPartial(object.multi); + } return message; }, fromSDK(object: SignatureDescriptor_DataSDKType): SignatureDescriptor_Data { @@ -571,7 +581,7 @@ function createBaseSignatureDescriptor_Data_Single(): SignatureDescriptor_Data_S export const SignatureDescriptor_Data_Single = { typeUrl: "/cosmos.tx.signing.v1beta1.Single", aminoType: "cosmos-sdk/Single", - encode(message: SignatureDescriptor_Data_Single, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignatureDescriptor_Data_Single, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mode !== 0) { writer.uint32(8).int32(message.mode); } @@ -580,8 +590,8 @@ export const SignatureDescriptor_Data_Single = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor_Data_Single { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignatureDescriptor_Data_Single { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignatureDescriptor_Data_Single(); while (reader.pos < end) { @@ -601,10 +611,10 @@ export const SignatureDescriptor_Data_Single = { return message; }, fromJSON(object: any): SignatureDescriptor_Data_Single { - return { - mode: isSet(object.mode) ? signModeFromJSON(object.mode) : -1, - signature: isSet(object.signature) ? bytesFromBase64(object.signature) : new Uint8Array() - }; + const obj = createBaseSignatureDescriptor_Data_Single(); + if (isSet(object.mode)) obj.mode = signModeFromJSON(object.mode); + if (isSet(object.signature)) obj.signature = bytesFromBase64(object.signature); + return obj; }, toJSON(message: SignatureDescriptor_Data_Single): unknown { const obj: any = {}; @@ -673,7 +683,7 @@ function createBaseSignatureDescriptor_Data_Multi(): SignatureDescriptor_Data_Mu export const SignatureDescriptor_Data_Multi = { typeUrl: "/cosmos.tx.signing.v1beta1.Multi", aminoType: "cosmos-sdk/Multi", - encode(message: SignatureDescriptor_Data_Multi, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignatureDescriptor_Data_Multi, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bitarray !== undefined) { CompactBitArray.encode(message.bitarray, writer.uint32(10).fork()).ldelim(); } @@ -682,8 +692,8 @@ export const SignatureDescriptor_Data_Multi = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignatureDescriptor_Data_Multi { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignatureDescriptor_Data_Multi { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignatureDescriptor_Data_Multi(); while (reader.pos < end) { @@ -703,10 +713,10 @@ export const SignatureDescriptor_Data_Multi = { return message; }, fromJSON(object: any): SignatureDescriptor_Data_Multi { - return { - bitarray: isSet(object.bitarray) ? CompactBitArray.fromJSON(object.bitarray) : undefined, - signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => SignatureDescriptor_Data.fromJSON(e)) : [] - }; + const obj = createBaseSignatureDescriptor_Data_Multi(); + if (isSet(object.bitarray)) obj.bitarray = CompactBitArray.fromJSON(object.bitarray); + if (Array.isArray(object?.signatures)) object.signatures.map((e: any) => SignatureDescriptor_Data.fromJSON(e)); + return obj; }, toJSON(message: SignatureDescriptor_Data_Multi): unknown { const obj: any = {}; @@ -720,7 +730,9 @@ export const SignatureDescriptor_Data_Multi = { }, fromPartial(object: DeepPartial): SignatureDescriptor_Data_Multi { const message = createBaseSignatureDescriptor_Data_Multi(); - message.bitarray = object.bitarray !== undefined && object.bitarray !== null ? CompactBitArray.fromPartial(object.bitarray) : undefined; + if (object.bitarray !== undefined && object.bitarray !== null) { + message.bitarray = CompactBitArray.fromPartial(object.bitarray); + } message.signatures = object.signatures?.map(e => SignatureDescriptor_Data.fromPartial(e)) || []; return message; }, diff --git a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts index 7fd71fb04a..10a57b1df1 100644 --- a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts +++ b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/service.ts @@ -3,8 +3,8 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageRe import { TxResponse, TxResponseAmino, TxResponseSDKType, GasInfo, GasInfoAmino, GasInfoSDKType, Result, ResultAmino, ResultSDKType } from "../../base/abci/v1beta1/abci"; import { BlockID, BlockIDAmino, BlockIDSDKType } from "../../../tendermint/types/types"; import { Block, BlockAmino, BlockSDKType } from "../../../tendermint/types/block"; -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.tx.v1beta1"; /** OrderBy defines the sorting order */ export enum OrderBy { @@ -406,7 +406,7 @@ export interface GetTxResponseSDKType { */ export interface GetBlockWithTxsRequest { /** height is the height of the block to query. */ - height: Long; + height: bigint; /** pagination defines a pagination for the request. */ pagination: PageRequest; } @@ -437,7 +437,7 @@ export interface GetBlockWithTxsRequestAminoMsg { * Since: cosmos-sdk 0.45.2 */ export interface GetBlockWithTxsRequestSDKType { - height: Long; + height: bigint; pagination: PageRequestSDKType; } /** @@ -495,7 +495,7 @@ function createBaseGetTxsEventRequest(): GetTxsEventRequest { export const GetTxsEventRequest = { typeUrl: "/cosmos.tx.v1beta1.GetTxsEventRequest", aminoType: "cosmos-sdk/GetTxsEventRequest", - encode(message: GetTxsEventRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetTxsEventRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.events) { writer.uint32(10).string(v!); } @@ -507,8 +507,8 @@ export const GetTxsEventRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetTxsEventRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetTxsEventRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetTxsEventRequest(); while (reader.pos < end) { @@ -531,11 +531,11 @@ export const GetTxsEventRequest = { return message; }, fromJSON(object: any): GetTxsEventRequest { - return { - events: Array.isArray(object?.events) ? object.events.map((e: any) => String(e)) : [], - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined, - orderBy: isSet(object.orderBy) ? orderByFromJSON(object.orderBy) : -1 - }; + const obj = createBaseGetTxsEventRequest(); + if (Array.isArray(object?.events)) object.events.map((e: any) => String(e)); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + if (isSet(object.orderBy)) obj.orderBy = orderByFromJSON(object.orderBy); + return obj; }, toJSON(message: GetTxsEventRequest): unknown { const obj: any = {}; @@ -551,7 +551,9 @@ export const GetTxsEventRequest = { fromPartial(object: DeepPartial): GetTxsEventRequest { const message = createBaseGetTxsEventRequest(); message.events = object.events?.map(e => e) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } message.orderBy = object.orderBy ?? 0; return message; }, @@ -623,7 +625,7 @@ function createBaseGetTxsEventResponse(): GetTxsEventResponse { export const GetTxsEventResponse = { typeUrl: "/cosmos.tx.v1beta1.GetTxsEventResponse", aminoType: "cosmos-sdk/GetTxsEventResponse", - encode(message: GetTxsEventResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetTxsEventResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.txs) { Tx.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -635,8 +637,8 @@ export const GetTxsEventResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetTxsEventResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetTxsEventResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetTxsEventResponse(); while (reader.pos < end) { @@ -659,11 +661,11 @@ export const GetTxsEventResponse = { return message; }, fromJSON(object: any): GetTxsEventResponse { - return { - txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => Tx.fromJSON(e)) : [], - txResponses: Array.isArray(object?.txResponses) ? object.txResponses.map((e: any) => TxResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetTxsEventResponse(); + if (Array.isArray(object?.txs)) object.txs.map((e: any) => Tx.fromJSON(e)); + if (Array.isArray(object?.txResponses)) object.txResponses.map((e: any) => TxResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: GetTxsEventResponse): unknown { const obj: any = {}; @@ -684,7 +686,9 @@ export const GetTxsEventResponse = { const message = createBaseGetTxsEventResponse(); message.txs = object.txs?.map(e => Tx.fromPartial(e)) || []; message.txResponses = object.txResponses?.map(e => TxResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetTxsEventResponseSDKType): GetTxsEventResponse { @@ -762,7 +766,7 @@ function createBaseBroadcastTxRequest(): BroadcastTxRequest { export const BroadcastTxRequest = { typeUrl: "/cosmos.tx.v1beta1.BroadcastTxRequest", aminoType: "cosmos-sdk/BroadcastTxRequest", - encode(message: BroadcastTxRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BroadcastTxRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.txBytes.length !== 0) { writer.uint32(10).bytes(message.txBytes); } @@ -771,8 +775,8 @@ export const BroadcastTxRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BroadcastTxRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BroadcastTxRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBroadcastTxRequest(); while (reader.pos < end) { @@ -792,10 +796,10 @@ export const BroadcastTxRequest = { return message; }, fromJSON(object: any): BroadcastTxRequest { - return { - txBytes: isSet(object.txBytes) ? bytesFromBase64(object.txBytes) : new Uint8Array(), - mode: isSet(object.mode) ? broadcastModeFromJSON(object.mode) : -1 - }; + const obj = createBaseBroadcastTxRequest(); + if (isSet(object.txBytes)) obj.txBytes = bytesFromBase64(object.txBytes); + if (isSet(object.mode)) obj.mode = broadcastModeFromJSON(object.mode); + return obj; }, toJSON(message: BroadcastTxRequest): unknown { const obj: any = {}; @@ -863,14 +867,14 @@ function createBaseBroadcastTxResponse(): BroadcastTxResponse { export const BroadcastTxResponse = { typeUrl: "/cosmos.tx.v1beta1.BroadcastTxResponse", aminoType: "cosmos-sdk/BroadcastTxResponse", - encode(message: BroadcastTxResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BroadcastTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.txResponse !== undefined) { TxResponse.encode(message.txResponse, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BroadcastTxResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BroadcastTxResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBroadcastTxResponse(); while (reader.pos < end) { @@ -887,9 +891,9 @@ export const BroadcastTxResponse = { return message; }, fromJSON(object: any): BroadcastTxResponse { - return { - txResponse: isSet(object.txResponse) ? TxResponse.fromJSON(object.txResponse) : undefined - }; + const obj = createBaseBroadcastTxResponse(); + if (isSet(object.txResponse)) obj.txResponse = TxResponse.fromJSON(object.txResponse); + return obj; }, toJSON(message: BroadcastTxResponse): unknown { const obj: any = {}; @@ -898,7 +902,9 @@ export const BroadcastTxResponse = { }, fromPartial(object: DeepPartial): BroadcastTxResponse { const message = createBaseBroadcastTxResponse(); - message.txResponse = object.txResponse !== undefined && object.txResponse !== null ? TxResponse.fromPartial(object.txResponse) : undefined; + if (object.txResponse !== undefined && object.txResponse !== null) { + message.txResponse = TxResponse.fromPartial(object.txResponse); + } return message; }, fromSDK(object: BroadcastTxResponseSDKType): BroadcastTxResponse { @@ -952,7 +958,7 @@ function createBaseSimulateRequest(): SimulateRequest { export const SimulateRequest = { typeUrl: "/cosmos.tx.v1beta1.SimulateRequest", aminoType: "cosmos-sdk/SimulateRequest", - encode(message: SimulateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SimulateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx !== undefined) { Tx.encode(message.tx, writer.uint32(10).fork()).ldelim(); } @@ -961,8 +967,8 @@ export const SimulateRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SimulateRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SimulateRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSimulateRequest(); while (reader.pos < end) { @@ -982,10 +988,10 @@ export const SimulateRequest = { return message; }, fromJSON(object: any): SimulateRequest { - return { - tx: isSet(object.tx) ? Tx.fromJSON(object.tx) : undefined, - txBytes: isSet(object.txBytes) ? bytesFromBase64(object.txBytes) : new Uint8Array() - }; + const obj = createBaseSimulateRequest(); + if (isSet(object.tx)) obj.tx = Tx.fromJSON(object.tx); + if (isSet(object.txBytes)) obj.txBytes = bytesFromBase64(object.txBytes); + return obj; }, toJSON(message: SimulateRequest): unknown { const obj: any = {}; @@ -995,7 +1001,9 @@ export const SimulateRequest = { }, fromPartial(object: DeepPartial): SimulateRequest { const message = createBaseSimulateRequest(); - message.tx = object.tx !== undefined && object.tx !== null ? Tx.fromPartial(object.tx) : undefined; + if (object.tx !== undefined && object.tx !== null) { + message.tx = Tx.fromPartial(object.tx); + } message.txBytes = object.txBytes ?? new Uint8Array(); return message; }, @@ -1054,7 +1062,7 @@ function createBaseSimulateResponse(): SimulateResponse { export const SimulateResponse = { typeUrl: "/cosmos.tx.v1beta1.SimulateResponse", aminoType: "cosmos-sdk/SimulateResponse", - encode(message: SimulateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SimulateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.gasInfo !== undefined) { GasInfo.encode(message.gasInfo, writer.uint32(10).fork()).ldelim(); } @@ -1063,8 +1071,8 @@ export const SimulateResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SimulateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SimulateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSimulateResponse(); while (reader.pos < end) { @@ -1084,10 +1092,10 @@ export const SimulateResponse = { return message; }, fromJSON(object: any): SimulateResponse { - return { - gasInfo: isSet(object.gasInfo) ? GasInfo.fromJSON(object.gasInfo) : undefined, - result: isSet(object.result) ? Result.fromJSON(object.result) : undefined - }; + const obj = createBaseSimulateResponse(); + if (isSet(object.gasInfo)) obj.gasInfo = GasInfo.fromJSON(object.gasInfo); + if (isSet(object.result)) obj.result = Result.fromJSON(object.result); + return obj; }, toJSON(message: SimulateResponse): unknown { const obj: any = {}; @@ -1097,8 +1105,12 @@ export const SimulateResponse = { }, fromPartial(object: DeepPartial): SimulateResponse { const message = createBaseSimulateResponse(); - message.gasInfo = object.gasInfo !== undefined && object.gasInfo !== null ? GasInfo.fromPartial(object.gasInfo) : undefined; - message.result = object.result !== undefined && object.result !== null ? Result.fromPartial(object.result) : undefined; + if (object.gasInfo !== undefined && object.gasInfo !== null) { + message.gasInfo = GasInfo.fromPartial(object.gasInfo); + } + if (object.result !== undefined && object.result !== null) { + message.result = Result.fromPartial(object.result); + } return message; }, fromSDK(object: SimulateResponseSDKType): SimulateResponse { @@ -1155,14 +1167,14 @@ function createBaseGetTxRequest(): GetTxRequest { export const GetTxRequest = { typeUrl: "/cosmos.tx.v1beta1.GetTxRequest", aminoType: "cosmos-sdk/GetTxRequest", - encode(message: GetTxRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetTxRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.hash !== "") { writer.uint32(10).string(message.hash); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetTxRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetTxRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetTxRequest(); while (reader.pos < end) { @@ -1179,9 +1191,9 @@ export const GetTxRequest = { return message; }, fromJSON(object: any): GetTxRequest { - return { - hash: isSet(object.hash) ? String(object.hash) : "" - }; + const obj = createBaseGetTxRequest(); + if (isSet(object.hash)) obj.hash = String(object.hash); + return obj; }, toJSON(message: GetTxRequest): unknown { const obj: any = {}; @@ -1244,7 +1256,7 @@ function createBaseGetTxResponse(): GetTxResponse { export const GetTxResponse = { typeUrl: "/cosmos.tx.v1beta1.GetTxResponse", aminoType: "cosmos-sdk/GetTxResponse", - encode(message: GetTxResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetTxResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tx !== undefined) { Tx.encode(message.tx, writer.uint32(10).fork()).ldelim(); } @@ -1253,8 +1265,8 @@ export const GetTxResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetTxResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetTxResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetTxResponse(); while (reader.pos < end) { @@ -1274,10 +1286,10 @@ export const GetTxResponse = { return message; }, fromJSON(object: any): GetTxResponse { - return { - tx: isSet(object.tx) ? Tx.fromJSON(object.tx) : undefined, - txResponse: isSet(object.txResponse) ? TxResponse.fromJSON(object.txResponse) : undefined - }; + const obj = createBaseGetTxResponse(); + if (isSet(object.tx)) obj.tx = Tx.fromJSON(object.tx); + if (isSet(object.txResponse)) obj.txResponse = TxResponse.fromJSON(object.txResponse); + return obj; }, toJSON(message: GetTxResponse): unknown { const obj: any = {}; @@ -1287,8 +1299,12 @@ export const GetTxResponse = { }, fromPartial(object: DeepPartial): GetTxResponse { const message = createBaseGetTxResponse(); - message.tx = object.tx !== undefined && object.tx !== null ? Tx.fromPartial(object.tx) : undefined; - message.txResponse = object.txResponse !== undefined && object.txResponse !== null ? TxResponse.fromPartial(object.txResponse) : undefined; + if (object.tx !== undefined && object.tx !== null) { + message.tx = Tx.fromPartial(object.tx); + } + if (object.txResponse !== undefined && object.txResponse !== null) { + message.txResponse = TxResponse.fromPartial(object.txResponse); + } return message; }, fromSDK(object: GetTxResponseSDKType): GetTxResponse { @@ -1339,15 +1355,15 @@ export const GetTxResponse = { }; function createBaseGetBlockWithTxsRequest(): GetBlockWithTxsRequest { return { - height: Long.ZERO, + height: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const GetBlockWithTxsRequest = { typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsRequest", aminoType: "cosmos-sdk/GetBlockWithTxsRequest", - encode(message: GetBlockWithTxsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: GetBlockWithTxsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } if (message.pagination !== undefined) { @@ -1355,15 +1371,15 @@ export const GetBlockWithTxsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetBlockWithTxsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetBlockWithTxsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetBlockWithTxsRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1376,21 +1392,25 @@ export const GetBlockWithTxsRequest = { return message; }, fromJSON(object: any): GetBlockWithTxsRequest { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetBlockWithTxsRequest(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: GetBlockWithTxsRequest): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): GetBlockWithTxsRequest { const message = createBaseGetBlockWithTxsRequest(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetBlockWithTxsRequestSDKType): GetBlockWithTxsRequest { @@ -1407,7 +1427,7 @@ export const GetBlockWithTxsRequest = { }, fromAmino(object: GetBlockWithTxsRequestAmino): GetBlockWithTxsRequest { return { - height: Long.fromString(object.height), + height: BigInt(object.height), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1450,7 +1470,7 @@ function createBaseGetBlockWithTxsResponse(): GetBlockWithTxsResponse { export const GetBlockWithTxsResponse = { typeUrl: "/cosmos.tx.v1beta1.GetBlockWithTxsResponse", aminoType: "cosmos-sdk/GetBlockWithTxsResponse", - encode(message: GetBlockWithTxsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetBlockWithTxsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.txs) { Tx.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1465,8 +1485,8 @@ export const GetBlockWithTxsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetBlockWithTxsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetBlockWithTxsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetBlockWithTxsResponse(); while (reader.pos < end) { @@ -1492,12 +1512,12 @@ export const GetBlockWithTxsResponse = { return message; }, fromJSON(object: any): GetBlockWithTxsResponse { - return { - txs: Array.isArray(object?.txs) ? object.txs.map((e: any) => Tx.fromJSON(e)) : [], - blockId: isSet(object.blockId) ? BlockID.fromJSON(object.blockId) : undefined, - block: isSet(object.block) ? Block.fromJSON(object.block) : undefined, - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseGetBlockWithTxsResponse(); + if (Array.isArray(object?.txs)) object.txs.map((e: any) => Tx.fromJSON(e)); + if (isSet(object.blockId)) obj.blockId = BlockID.fromJSON(object.blockId); + if (isSet(object.block)) obj.block = Block.fromJSON(object.block); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: GetBlockWithTxsResponse): unknown { const obj: any = {}; @@ -1514,9 +1534,15 @@ export const GetBlockWithTxsResponse = { fromPartial(object: DeepPartial): GetBlockWithTxsResponse { const message = createBaseGetBlockWithTxsResponse(); message.txs = object.txs?.map(e => Tx.fromPartial(e)) || []; - message.blockId = object.blockId !== undefined && object.blockId !== null ? BlockID.fromPartial(object.blockId) : undefined; - message.block = object.block !== undefined && object.block !== null ? Block.fromPartial(object.block) : undefined; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.blockId !== undefined && object.blockId !== null) { + message.blockId = BlockID.fromPartial(object.blockId); + } + if (object.block !== undefined && object.block !== null) { + message.block = Block.fromPartial(object.block); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: GetBlockWithTxsResponseSDKType): GetBlockWithTxsResponse { diff --git a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts index eacada1224..9be32428d2 100644 --- a/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/tx/v1beta1/tx.ts @@ -2,8 +2,8 @@ import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; import { SignMode, signModeFromJSON, signModeToJSON } from "../signing/v1beta1/signing"; import { CompactBitArray, CompactBitArrayAmino, CompactBitArraySDKType } from "../../crypto/multisig/v1beta1/multisig"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.tx.v1beta1"; /** Tx is the standard type used for broadcasting transactions. */ export interface Tx { @@ -140,7 +140,7 @@ export interface SignDoc { */ chainId: string; /** account_number is the account number of the account in state */ - accountNumber: Long; + accountNumber: bigint; } export interface SignDocProtoMsg { typeUrl: "/cosmos.tx.v1beta1.SignDoc"; @@ -176,7 +176,7 @@ export interface SignDocSDKType { body_bytes: Uint8Array; auth_info_bytes: Uint8Array; chain_id: string; - account_number: Long; + account_number: bigint; } /** * SignDocDirectAux is the type used for generating sign bytes for @@ -199,9 +199,9 @@ export interface SignDocDirectAux { */ chainId: string; /** account_number is the account number of the account in state. */ - accountNumber: Long; + accountNumber: bigint; /** sequence is the sequence number of the signing account. */ - sequence: Long; + sequence: bigint; /** * Tip is the optional tip used for meta-transactions. It should be left * empty if the signer is not the tipper for this transaction. @@ -256,8 +256,8 @@ export interface SignDocDirectAuxSDKType { body_bytes: Uint8Array; public_key: AnySDKType; chain_id: string; - account_number: Long; - sequence: Long; + account_number: bigint; + sequence: bigint; tip: TipSDKType; } /** TxBody is the body of a transaction that all signers sign over. */ @@ -282,7 +282,7 @@ export interface TxBody { * timeout is the block height after which this transaction will not * be processed by the chain */ - timeoutHeight: Long; + timeoutHeight: bigint; /** * extension_options are arbitrary options that can be added by chains * when the default options are not sufficient. If any of these are present @@ -344,7 +344,7 @@ export interface TxBodyAminoMsg { export interface TxBodySDKType { messages: AnySDKType[]; memo: string; - timeout_height: Long; + timeout_height: bigint; extension_options: AnySDKType[]; non_critical_extension_options: AnySDKType[]; } @@ -438,7 +438,7 @@ export interface SignerInfo { * number of committed transactions signed by a given address. It is used to * prevent replay attacks. */ - sequence: Long; + sequence: bigint; } export interface SignerInfoProtoMsg { typeUrl: "/cosmos.tx.v1beta1.SignerInfo"; @@ -478,7 +478,7 @@ export interface SignerInfoAminoMsg { export interface SignerInfoSDKType { public_key: AnySDKType; mode_info: ModeInfoSDKType; - sequence: Long; + sequence: bigint; } /** ModeInfo describes the signing mode of a single or nested multisig signer. */ export interface ModeInfo { @@ -586,7 +586,7 @@ export interface Fee { * gas_limit is the maximum gas that can be used in transaction processing * before an out of gas error occurs */ - gasLimit: Long; + gasLimit: bigint; /** * if unset, the first signer is responsible for paying the fees. If set, the specified account must pay the fees. * the payer must be a tx signer (and thus have signed this field in AuthInfo). @@ -641,7 +641,7 @@ export interface FeeAminoMsg { */ export interface FeeSDKType { amount: CoinSDKType[]; - gas_limit: Long; + gas_limit: bigint; payer: string; granter: string; } @@ -768,7 +768,7 @@ function createBaseTx(): Tx { export const Tx = { typeUrl: "/cosmos.tx.v1beta1.Tx", aminoType: "cosmos-sdk/Tx", - encode(message: Tx, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Tx, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.body !== undefined) { TxBody.encode(message.body, writer.uint32(10).fork()).ldelim(); } @@ -780,8 +780,8 @@ export const Tx = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Tx { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Tx { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTx(); while (reader.pos < end) { @@ -804,11 +804,11 @@ export const Tx = { return message; }, fromJSON(object: any): Tx { - return { - body: isSet(object.body) ? TxBody.fromJSON(object.body) : undefined, - authInfo: isSet(object.authInfo) ? AuthInfo.fromJSON(object.authInfo) : undefined, - signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseTx(); + if (isSet(object.body)) obj.body = TxBody.fromJSON(object.body); + if (isSet(object.authInfo)) obj.authInfo = AuthInfo.fromJSON(object.authInfo); + if (Array.isArray(object?.signatures)) object.signatures.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: Tx): unknown { const obj: any = {}; @@ -823,8 +823,12 @@ export const Tx = { }, fromPartial(object: DeepPartial): Tx { const message = createBaseTx(); - message.body = object.body !== undefined && object.body !== null ? TxBody.fromPartial(object.body) : undefined; - message.authInfo = object.authInfo !== undefined && object.authInfo !== null ? AuthInfo.fromPartial(object.authInfo) : undefined; + if (object.body !== undefined && object.body !== null) { + message.body = TxBody.fromPartial(object.body); + } + if (object.authInfo !== undefined && object.authInfo !== null) { + message.authInfo = AuthInfo.fromPartial(object.authInfo); + } message.signatures = object.signatures?.map(e => e) || []; return message; }, @@ -896,7 +900,7 @@ function createBaseTxRaw(): TxRaw { export const TxRaw = { typeUrl: "/cosmos.tx.v1beta1.TxRaw", aminoType: "cosmos-sdk/TxRaw", - encode(message: TxRaw, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TxRaw, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bodyBytes.length !== 0) { writer.uint32(10).bytes(message.bodyBytes); } @@ -908,8 +912,8 @@ export const TxRaw = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TxRaw { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TxRaw { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTxRaw(); while (reader.pos < end) { @@ -932,11 +936,11 @@ export const TxRaw = { return message; }, fromJSON(object: any): TxRaw { - return { - bodyBytes: isSet(object.bodyBytes) ? bytesFromBase64(object.bodyBytes) : new Uint8Array(), - authInfoBytes: isSet(object.authInfoBytes) ? bytesFromBase64(object.authInfoBytes) : new Uint8Array(), - signatures: Array.isArray(object?.signatures) ? object.signatures.map((e: any) => bytesFromBase64(e)) : [] - }; + const obj = createBaseTxRaw(); + if (isSet(object.bodyBytes)) obj.bodyBytes = bytesFromBase64(object.bodyBytes); + if (isSet(object.authInfoBytes)) obj.authInfoBytes = bytesFromBase64(object.authInfoBytes); + if (Array.isArray(object?.signatures)) object.signatures.map((e: any) => bytesFromBase64(e)); + return obj; }, toJSON(message: TxRaw): unknown { const obj: any = {}; @@ -1019,13 +1023,13 @@ function createBaseSignDoc(): SignDoc { bodyBytes: new Uint8Array(), authInfoBytes: new Uint8Array(), chainId: "", - accountNumber: Long.UZERO + accountNumber: BigInt(0) }; } export const SignDoc = { typeUrl: "/cosmos.tx.v1beta1.SignDoc", aminoType: "cosmos-sdk/SignDoc", - encode(message: SignDoc, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignDoc, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bodyBytes.length !== 0) { writer.uint32(10).bytes(message.bodyBytes); } @@ -1035,13 +1039,13 @@ export const SignDoc = { if (message.chainId !== "") { writer.uint32(26).string(message.chainId); } - if (!message.accountNumber.isZero()) { + if (message.accountNumber !== BigInt(0)) { writer.uint32(32).uint64(message.accountNumber); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignDoc { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignDoc { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignDoc(); while (reader.pos < end) { @@ -1057,7 +1061,7 @@ export const SignDoc = { message.chainId = reader.string(); break; case 4: - message.accountNumber = (reader.uint64() as Long); + message.accountNumber = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1067,19 +1071,19 @@ export const SignDoc = { return message; }, fromJSON(object: any): SignDoc { - return { - bodyBytes: isSet(object.bodyBytes) ? bytesFromBase64(object.bodyBytes) : new Uint8Array(), - authInfoBytes: isSet(object.authInfoBytes) ? bytesFromBase64(object.authInfoBytes) : new Uint8Array(), - chainId: isSet(object.chainId) ? String(object.chainId) : "", - accountNumber: isSet(object.accountNumber) ? Long.fromValue(object.accountNumber) : Long.UZERO - }; + const obj = createBaseSignDoc(); + if (isSet(object.bodyBytes)) obj.bodyBytes = bytesFromBase64(object.bodyBytes); + if (isSet(object.authInfoBytes)) obj.authInfoBytes = bytesFromBase64(object.authInfoBytes); + if (isSet(object.chainId)) obj.chainId = String(object.chainId); + if (isSet(object.accountNumber)) obj.accountNumber = BigInt(object.accountNumber.toString()); + return obj; }, toJSON(message: SignDoc): unknown { const obj: any = {}; message.bodyBytes !== undefined && (obj.bodyBytes = base64FromBytes(message.bodyBytes !== undefined ? message.bodyBytes : new Uint8Array())); message.authInfoBytes !== undefined && (obj.authInfoBytes = base64FromBytes(message.authInfoBytes !== undefined ? message.authInfoBytes : new Uint8Array())); message.chainId !== undefined && (obj.chainId = message.chainId); - message.accountNumber !== undefined && (obj.accountNumber = (message.accountNumber || Long.UZERO).toString()); + message.accountNumber !== undefined && (obj.accountNumber = (message.accountNumber || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): SignDoc { @@ -1087,7 +1091,9 @@ export const SignDoc = { message.bodyBytes = object.bodyBytes ?? new Uint8Array(); message.authInfoBytes = object.authInfoBytes ?? new Uint8Array(); message.chainId = object.chainId ?? ""; - message.accountNumber = object.accountNumber !== undefined && object.accountNumber !== null ? Long.fromValue(object.accountNumber) : Long.UZERO; + if (object.accountNumber !== undefined && object.accountNumber !== null) { + message.accountNumber = BigInt(object.accountNumber.toString()); + } return message; }, fromSDK(object: SignDocSDKType): SignDoc { @@ -1111,7 +1117,7 @@ export const SignDoc = { bodyBytes: object.body_bytes, authInfoBytes: object.auth_info_bytes, chainId: object.chain_id, - accountNumber: Long.fromString(object.account_number) + accountNumber: BigInt(object.account_number) }; }, toAmino(message: SignDoc): SignDocAmino { @@ -1149,15 +1155,15 @@ function createBaseSignDocDirectAux(): SignDocDirectAux { bodyBytes: new Uint8Array(), publicKey: Any.fromPartial({}), chainId: "", - accountNumber: Long.UZERO, - sequence: Long.UZERO, + accountNumber: BigInt(0), + sequence: BigInt(0), tip: Tip.fromPartial({}) }; } export const SignDocDirectAux = { typeUrl: "/cosmos.tx.v1beta1.SignDocDirectAux", aminoType: "cosmos-sdk/SignDocDirectAux", - encode(message: SignDocDirectAux, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignDocDirectAux, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bodyBytes.length !== 0) { writer.uint32(10).bytes(message.bodyBytes); } @@ -1167,10 +1173,10 @@ export const SignDocDirectAux = { if (message.chainId !== "") { writer.uint32(26).string(message.chainId); } - if (!message.accountNumber.isZero()) { + if (message.accountNumber !== BigInt(0)) { writer.uint32(32).uint64(message.accountNumber); } - if (!message.sequence.isZero()) { + if (message.sequence !== BigInt(0)) { writer.uint32(40).uint64(message.sequence); } if (message.tip !== undefined) { @@ -1178,8 +1184,8 @@ export const SignDocDirectAux = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignDocDirectAux { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignDocDirectAux { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignDocDirectAux(); while (reader.pos < end) { @@ -1195,10 +1201,10 @@ export const SignDocDirectAux = { message.chainId = reader.string(); break; case 4: - message.accountNumber = (reader.uint64() as Long); + message.accountNumber = reader.uint64(); break; case 5: - message.sequence = (reader.uint64() as Long); + message.sequence = reader.uint64(); break; case 6: message.tip = Tip.decode(reader, reader.uint32()); @@ -1211,33 +1217,41 @@ export const SignDocDirectAux = { return message; }, fromJSON(object: any): SignDocDirectAux { - return { - bodyBytes: isSet(object.bodyBytes) ? bytesFromBase64(object.bodyBytes) : new Uint8Array(), - publicKey: isSet(object.publicKey) ? Any.fromJSON(object.publicKey) : undefined, - chainId: isSet(object.chainId) ? String(object.chainId) : "", - accountNumber: isSet(object.accountNumber) ? Long.fromValue(object.accountNumber) : Long.UZERO, - sequence: isSet(object.sequence) ? Long.fromValue(object.sequence) : Long.UZERO, - tip: isSet(object.tip) ? Tip.fromJSON(object.tip) : undefined - }; + const obj = createBaseSignDocDirectAux(); + if (isSet(object.bodyBytes)) obj.bodyBytes = bytesFromBase64(object.bodyBytes); + if (isSet(object.publicKey)) obj.publicKey = Any.fromJSON(object.publicKey); + if (isSet(object.chainId)) obj.chainId = String(object.chainId); + if (isSet(object.accountNumber)) obj.accountNumber = BigInt(object.accountNumber.toString()); + if (isSet(object.sequence)) obj.sequence = BigInt(object.sequence.toString()); + if (isSet(object.tip)) obj.tip = Tip.fromJSON(object.tip); + return obj; }, toJSON(message: SignDocDirectAux): unknown { const obj: any = {}; message.bodyBytes !== undefined && (obj.bodyBytes = base64FromBytes(message.bodyBytes !== undefined ? message.bodyBytes : new Uint8Array())); message.publicKey !== undefined && (obj.publicKey = message.publicKey ? Any.toJSON(message.publicKey) : undefined); message.chainId !== undefined && (obj.chainId = message.chainId); - message.accountNumber !== undefined && (obj.accountNumber = (message.accountNumber || Long.UZERO).toString()); - message.sequence !== undefined && (obj.sequence = (message.sequence || Long.UZERO).toString()); + message.accountNumber !== undefined && (obj.accountNumber = (message.accountNumber || BigInt(0)).toString()); + message.sequence !== undefined && (obj.sequence = (message.sequence || BigInt(0)).toString()); message.tip !== undefined && (obj.tip = message.tip ? Tip.toJSON(message.tip) : undefined); return obj; }, fromPartial(object: DeepPartial): SignDocDirectAux { const message = createBaseSignDocDirectAux(); message.bodyBytes = object.bodyBytes ?? new Uint8Array(); - message.publicKey = object.publicKey !== undefined && object.publicKey !== null ? Any.fromPartial(object.publicKey) : undefined; + if (object.publicKey !== undefined && object.publicKey !== null) { + message.publicKey = Any.fromPartial(object.publicKey); + } message.chainId = object.chainId ?? ""; - message.accountNumber = object.accountNumber !== undefined && object.accountNumber !== null ? Long.fromValue(object.accountNumber) : Long.UZERO; - message.sequence = object.sequence !== undefined && object.sequence !== null ? Long.fromValue(object.sequence) : Long.UZERO; - message.tip = object.tip !== undefined && object.tip !== null ? Tip.fromPartial(object.tip) : undefined; + if (object.accountNumber !== undefined && object.accountNumber !== null) { + message.accountNumber = BigInt(object.accountNumber.toString()); + } + if (object.sequence !== undefined && object.sequence !== null) { + message.sequence = BigInt(object.sequence.toString()); + } + if (object.tip !== undefined && object.tip !== null) { + message.tip = Tip.fromPartial(object.tip); + } return message; }, fromSDK(object: SignDocDirectAuxSDKType): SignDocDirectAux { @@ -1265,8 +1279,8 @@ export const SignDocDirectAux = { bodyBytes: object.body_bytes, publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, chainId: object.chain_id, - accountNumber: Long.fromString(object.account_number), - sequence: Long.fromString(object.sequence), + accountNumber: BigInt(object.account_number), + sequence: BigInt(object.sequence), tip: object?.tip ? Tip.fromAmino(object.tip) : undefined }; }, @@ -1306,7 +1320,7 @@ function createBaseTxBody(): TxBody { return { messages: [], memo: "", - timeoutHeight: Long.UZERO, + timeoutHeight: BigInt(0), extensionOptions: [], nonCriticalExtensionOptions: [] }; @@ -1314,14 +1328,14 @@ function createBaseTxBody(): TxBody { export const TxBody = { typeUrl: "/cosmos.tx.v1beta1.TxBody", aminoType: "cosmos-sdk/TxBody", - encode(message: TxBody, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TxBody, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.messages) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); } if (message.memo !== "") { writer.uint32(18).string(message.memo); } - if (!message.timeoutHeight.isZero()) { + if (message.timeoutHeight !== BigInt(0)) { writer.uint32(24).uint64(message.timeoutHeight); } for (const v of message.extensionOptions) { @@ -1332,8 +1346,8 @@ export const TxBody = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TxBody { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TxBody { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTxBody(); while (reader.pos < end) { @@ -1346,7 +1360,7 @@ export const TxBody = { message.memo = reader.string(); break; case 3: - message.timeoutHeight = (reader.uint64() as Long); + message.timeoutHeight = reader.uint64(); break; case 1023: message.extensionOptions.push(Any.decode(reader, reader.uint32())); @@ -1362,13 +1376,13 @@ export const TxBody = { return message; }, fromJSON(object: any): TxBody { - return { - messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromJSON(e)) : [], - memo: isSet(object.memo) ? String(object.memo) : "", - timeoutHeight: isSet(object.timeoutHeight) ? Long.fromValue(object.timeoutHeight) : Long.UZERO, - extensionOptions: Array.isArray(object?.extensionOptions) ? object.extensionOptions.map((e: any) => Any.fromJSON(e)) : [], - nonCriticalExtensionOptions: Array.isArray(object?.nonCriticalExtensionOptions) ? object.nonCriticalExtensionOptions.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseTxBody(); + if (Array.isArray(object?.messages)) object.messages.map((e: any) => Any.fromJSON(e)); + if (isSet(object.memo)) obj.memo = String(object.memo); + if (isSet(object.timeoutHeight)) obj.timeoutHeight = BigInt(object.timeoutHeight.toString()); + if (Array.isArray(object?.extensionOptions)) object.extensionOptions.map((e: any) => Any.fromJSON(e)); + if (Array.isArray(object?.nonCriticalExtensionOptions)) object.nonCriticalExtensionOptions.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: TxBody): unknown { const obj: any = {}; @@ -1378,7 +1392,7 @@ export const TxBody = { obj.messages = []; } message.memo !== undefined && (obj.memo = message.memo); - message.timeoutHeight !== undefined && (obj.timeoutHeight = (message.timeoutHeight || Long.UZERO).toString()); + message.timeoutHeight !== undefined && (obj.timeoutHeight = (message.timeoutHeight || BigInt(0)).toString()); if (message.extensionOptions) { obj.extensionOptions = message.extensionOptions.map(e => e ? Any.toJSON(e) : undefined); } else { @@ -1395,7 +1409,9 @@ export const TxBody = { const message = createBaseTxBody(); message.messages = object.messages?.map(e => Any.fromPartial(e)) || []; message.memo = object.memo ?? ""; - message.timeoutHeight = object.timeoutHeight !== undefined && object.timeoutHeight !== null ? Long.fromValue(object.timeoutHeight) : Long.UZERO; + if (object.timeoutHeight !== undefined && object.timeoutHeight !== null) { + message.timeoutHeight = BigInt(object.timeoutHeight.toString()); + } message.extensionOptions = object.extensionOptions?.map(e => Any.fromPartial(e)) || []; message.nonCriticalExtensionOptions = object.nonCriticalExtensionOptions?.map(e => Any.fromPartial(e)) || []; return message; @@ -1434,7 +1450,7 @@ export const TxBody = { return { messages: Array.isArray(object?.messages) ? object.messages.map((e: any) => Any.fromAmino(e)) : [], memo: object.memo, - timeoutHeight: Long.fromString(object.timeout_height), + timeoutHeight: BigInt(object.timeout_height), extensionOptions: Array.isArray(object?.extension_options) ? object.extension_options.map((e: any) => Any.fromAmino(e)) : [], nonCriticalExtensionOptions: Array.isArray(object?.non_critical_extension_options) ? object.non_critical_extension_options.map((e: any) => Any.fromAmino(e)) : [] }; @@ -1492,7 +1508,7 @@ function createBaseAuthInfo(): AuthInfo { export const AuthInfo = { typeUrl: "/cosmos.tx.v1beta1.AuthInfo", aminoType: "cosmos-sdk/AuthInfo", - encode(message: AuthInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuthInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.signerInfos) { SignerInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1504,8 +1520,8 @@ export const AuthInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuthInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuthInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuthInfo(); while (reader.pos < end) { @@ -1528,11 +1544,11 @@ export const AuthInfo = { return message; }, fromJSON(object: any): AuthInfo { - return { - signerInfos: Array.isArray(object?.signerInfos) ? object.signerInfos.map((e: any) => SignerInfo.fromJSON(e)) : [], - fee: isSet(object.fee) ? Fee.fromJSON(object.fee) : undefined, - tip: isSet(object.tip) ? Tip.fromJSON(object.tip) : undefined - }; + const obj = createBaseAuthInfo(); + if (Array.isArray(object?.signerInfos)) object.signerInfos.map((e: any) => SignerInfo.fromJSON(e)); + if (isSet(object.fee)) obj.fee = Fee.fromJSON(object.fee); + if (isSet(object.tip)) obj.tip = Tip.fromJSON(object.tip); + return obj; }, toJSON(message: AuthInfo): unknown { const obj: any = {}; @@ -1548,8 +1564,12 @@ export const AuthInfo = { fromPartial(object: DeepPartial): AuthInfo { const message = createBaseAuthInfo(); message.signerInfos = object.signerInfos?.map(e => SignerInfo.fromPartial(e)) || []; - message.fee = object.fee !== undefined && object.fee !== null ? Fee.fromPartial(object.fee) : undefined; - message.tip = object.tip !== undefined && object.tip !== null ? Tip.fromPartial(object.tip) : undefined; + if (object.fee !== undefined && object.fee !== null) { + message.fee = Fee.fromPartial(object.fee); + } + if (object.tip !== undefined && object.tip !== null) { + message.tip = Tip.fromPartial(object.tip); + } return message; }, fromSDK(object: AuthInfoSDKType): AuthInfo { @@ -1614,26 +1634,26 @@ function createBaseSignerInfo(): SignerInfo { return { publicKey: Any.fromPartial({}), modeInfo: ModeInfo.fromPartial({}), - sequence: Long.UZERO + sequence: BigInt(0) }; } export const SignerInfo = { typeUrl: "/cosmos.tx.v1beta1.SignerInfo", aminoType: "cosmos-sdk/SignerInfo", - encode(message: SignerInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SignerInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.publicKey !== undefined) { Any.encode(message.publicKey, writer.uint32(10).fork()).ldelim(); } if (message.modeInfo !== undefined) { ModeInfo.encode(message.modeInfo, writer.uint32(18).fork()).ldelim(); } - if (!message.sequence.isZero()) { + if (message.sequence !== BigInt(0)) { writer.uint32(24).uint64(message.sequence); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SignerInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SignerInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSignerInfo(); while (reader.pos < end) { @@ -1646,7 +1666,7 @@ export const SignerInfo = { message.modeInfo = ModeInfo.decode(reader, reader.uint32()); break; case 3: - message.sequence = (reader.uint64() as Long); + message.sequence = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1656,24 +1676,30 @@ export const SignerInfo = { return message; }, fromJSON(object: any): SignerInfo { - return { - publicKey: isSet(object.publicKey) ? Any.fromJSON(object.publicKey) : undefined, - modeInfo: isSet(object.modeInfo) ? ModeInfo.fromJSON(object.modeInfo) : undefined, - sequence: isSet(object.sequence) ? Long.fromValue(object.sequence) : Long.UZERO - }; + const obj = createBaseSignerInfo(); + if (isSet(object.publicKey)) obj.publicKey = Any.fromJSON(object.publicKey); + if (isSet(object.modeInfo)) obj.modeInfo = ModeInfo.fromJSON(object.modeInfo); + if (isSet(object.sequence)) obj.sequence = BigInt(object.sequence.toString()); + return obj; }, toJSON(message: SignerInfo): unknown { const obj: any = {}; message.publicKey !== undefined && (obj.publicKey = message.publicKey ? Any.toJSON(message.publicKey) : undefined); message.modeInfo !== undefined && (obj.modeInfo = message.modeInfo ? ModeInfo.toJSON(message.modeInfo) : undefined); - message.sequence !== undefined && (obj.sequence = (message.sequence || Long.UZERO).toString()); + message.sequence !== undefined && (obj.sequence = (message.sequence || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): SignerInfo { const message = createBaseSignerInfo(); - message.publicKey = object.publicKey !== undefined && object.publicKey !== null ? Any.fromPartial(object.publicKey) : undefined; - message.modeInfo = object.modeInfo !== undefined && object.modeInfo !== null ? ModeInfo.fromPartial(object.modeInfo) : undefined; - message.sequence = object.sequence !== undefined && object.sequence !== null ? Long.fromValue(object.sequence) : Long.UZERO; + if (object.publicKey !== undefined && object.publicKey !== null) { + message.publicKey = Any.fromPartial(object.publicKey); + } + if (object.modeInfo !== undefined && object.modeInfo !== null) { + message.modeInfo = ModeInfo.fromPartial(object.modeInfo); + } + if (object.sequence !== undefined && object.sequence !== null) { + message.sequence = BigInt(object.sequence.toString()); + } return message; }, fromSDK(object: SignerInfoSDKType): SignerInfo { @@ -1694,7 +1720,7 @@ export const SignerInfo = { return { publicKey: object?.public_key ? Any.fromAmino(object.public_key) : undefined, modeInfo: object?.mode_info ? ModeInfo.fromAmino(object.mode_info) : undefined, - sequence: Long.fromString(object.sequence) + sequence: BigInt(object.sequence) }; }, toAmino(message: SignerInfo): SignerInfoAmino { @@ -1735,7 +1761,7 @@ function createBaseModeInfo(): ModeInfo { export const ModeInfo = { typeUrl: "/cosmos.tx.v1beta1.ModeInfo", aminoType: "cosmos-sdk/ModeInfo", - encode(message: ModeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.single !== undefined) { ModeInfo_Single.encode(message.single, writer.uint32(10).fork()).ldelim(); } @@ -1744,8 +1770,8 @@ export const ModeInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModeInfo(); while (reader.pos < end) { @@ -1765,10 +1791,10 @@ export const ModeInfo = { return message; }, fromJSON(object: any): ModeInfo { - return { - single: isSet(object.single) ? ModeInfo_Single.fromJSON(object.single) : undefined, - multi: isSet(object.multi) ? ModeInfo_Multi.fromJSON(object.multi) : undefined - }; + const obj = createBaseModeInfo(); + if (isSet(object.single)) obj.single = ModeInfo_Single.fromJSON(object.single); + if (isSet(object.multi)) obj.multi = ModeInfo_Multi.fromJSON(object.multi); + return obj; }, toJSON(message: ModeInfo): unknown { const obj: any = {}; @@ -1778,8 +1804,12 @@ export const ModeInfo = { }, fromPartial(object: DeepPartial): ModeInfo { const message = createBaseModeInfo(); - message.single = object.single !== undefined && object.single !== null ? ModeInfo_Single.fromPartial(object.single) : undefined; - message.multi = object.multi !== undefined && object.multi !== null ? ModeInfo_Multi.fromPartial(object.multi) : undefined; + if (object.single !== undefined && object.single !== null) { + message.single = ModeInfo_Single.fromPartial(object.single); + } + if (object.multi !== undefined && object.multi !== null) { + message.multi = ModeInfo_Multi.fromPartial(object.multi); + } return message; }, fromSDK(object: ModeInfoSDKType): ModeInfo { @@ -1836,14 +1866,14 @@ function createBaseModeInfo_Single(): ModeInfo_Single { export const ModeInfo_Single = { typeUrl: "/cosmos.tx.v1beta1.Single", aminoType: "cosmos-sdk/Single", - encode(message: ModeInfo_Single, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModeInfo_Single, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mode !== 0) { writer.uint32(8).int32(message.mode); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModeInfo_Single { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModeInfo_Single { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModeInfo_Single(); while (reader.pos < end) { @@ -1860,9 +1890,9 @@ export const ModeInfo_Single = { return message; }, fromJSON(object: any): ModeInfo_Single { - return { - mode: isSet(object.mode) ? signModeFromJSON(object.mode) : -1 - }; + const obj = createBaseModeInfo_Single(); + if (isSet(object.mode)) obj.mode = signModeFromJSON(object.mode); + return obj; }, toJSON(message: ModeInfo_Single): unknown { const obj: any = {}; @@ -1925,7 +1955,7 @@ function createBaseModeInfo_Multi(): ModeInfo_Multi { export const ModeInfo_Multi = { typeUrl: "/cosmos.tx.v1beta1.Multi", aminoType: "cosmos-sdk/Multi", - encode(message: ModeInfo_Multi, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModeInfo_Multi, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.bitarray !== undefined) { CompactBitArray.encode(message.bitarray, writer.uint32(10).fork()).ldelim(); } @@ -1934,8 +1964,8 @@ export const ModeInfo_Multi = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModeInfo_Multi { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModeInfo_Multi { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModeInfo_Multi(); while (reader.pos < end) { @@ -1955,10 +1985,10 @@ export const ModeInfo_Multi = { return message; }, fromJSON(object: any): ModeInfo_Multi { - return { - bitarray: isSet(object.bitarray) ? CompactBitArray.fromJSON(object.bitarray) : undefined, - modeInfos: Array.isArray(object?.modeInfos) ? object.modeInfos.map((e: any) => ModeInfo.fromJSON(e)) : [] - }; + const obj = createBaseModeInfo_Multi(); + if (isSet(object.bitarray)) obj.bitarray = CompactBitArray.fromJSON(object.bitarray); + if (Array.isArray(object?.modeInfos)) object.modeInfos.map((e: any) => ModeInfo.fromJSON(e)); + return obj; }, toJSON(message: ModeInfo_Multi): unknown { const obj: any = {}; @@ -1972,7 +2002,9 @@ export const ModeInfo_Multi = { }, fromPartial(object: DeepPartial): ModeInfo_Multi { const message = createBaseModeInfo_Multi(); - message.bitarray = object.bitarray !== undefined && object.bitarray !== null ? CompactBitArray.fromPartial(object.bitarray) : undefined; + if (object.bitarray !== undefined && object.bitarray !== null) { + message.bitarray = CompactBitArray.fromPartial(object.bitarray); + } message.modeInfos = object.modeInfos?.map(e => ModeInfo.fromPartial(e)) || []; return message; }, @@ -2033,7 +2065,7 @@ export const ModeInfo_Multi = { function createBaseFee(): Fee { return { amount: [], - gasLimit: Long.UZERO, + gasLimit: BigInt(0), payer: "", granter: "" }; @@ -2041,11 +2073,11 @@ function createBaseFee(): Fee { export const Fee = { typeUrl: "/cosmos.tx.v1beta1.Fee", aminoType: "cosmos-sdk/Fee", - encode(message: Fee, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Fee, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } - if (!message.gasLimit.isZero()) { + if (message.gasLimit !== BigInt(0)) { writer.uint32(16).uint64(message.gasLimit); } if (message.payer !== "") { @@ -2056,8 +2088,8 @@ export const Fee = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Fee { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Fee { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFee(); while (reader.pos < end) { @@ -2067,7 +2099,7 @@ export const Fee = { message.amount.push(Coin.decode(reader, reader.uint32())); break; case 2: - message.gasLimit = (reader.uint64() as Long); + message.gasLimit = reader.uint64(); break; case 3: message.payer = reader.string(); @@ -2083,12 +2115,12 @@ export const Fee = { return message; }, fromJSON(object: any): Fee { - return { - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [], - gasLimit: isSet(object.gasLimit) ? Long.fromValue(object.gasLimit) : Long.UZERO, - payer: isSet(object.payer) ? String(object.payer) : "", - granter: isSet(object.granter) ? String(object.granter) : "" - }; + const obj = createBaseFee(); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.gasLimit)) obj.gasLimit = BigInt(object.gasLimit.toString()); + if (isSet(object.payer)) obj.payer = String(object.payer); + if (isSet(object.granter)) obj.granter = String(object.granter); + return obj; }, toJSON(message: Fee): unknown { const obj: any = {}; @@ -2097,7 +2129,7 @@ export const Fee = { } else { obj.amount = []; } - message.gasLimit !== undefined && (obj.gasLimit = (message.gasLimit || Long.UZERO).toString()); + message.gasLimit !== undefined && (obj.gasLimit = (message.gasLimit || BigInt(0)).toString()); message.payer !== undefined && (obj.payer = message.payer); message.granter !== undefined && (obj.granter = message.granter); return obj; @@ -2105,7 +2137,9 @@ export const Fee = { fromPartial(object: DeepPartial): Fee { const message = createBaseFee(); message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; - message.gasLimit = object.gasLimit !== undefined && object.gasLimit !== null ? Long.fromValue(object.gasLimit) : Long.UZERO; + if (object.gasLimit !== undefined && object.gasLimit !== null) { + message.gasLimit = BigInt(object.gasLimit.toString()); + } message.payer = object.payer ?? ""; message.granter = object.granter ?? ""; return message; @@ -2133,7 +2167,7 @@ export const Fee = { fromAmino(object: FeeAmino): Fee { return { amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [], - gasLimit: Long.fromString(object.gas_limit), + gasLimit: BigInt(object.gas_limit), payer: object.payer, granter: object.granter }; @@ -2181,7 +2215,7 @@ function createBaseTip(): Tip { export const Tip = { typeUrl: "/cosmos.tx.v1beta1.Tip", aminoType: "cosmos-sdk/Tip", - encode(message: Tip, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Tip, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.amount) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2190,8 +2224,8 @@ export const Tip = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Tip { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Tip { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTip(); while (reader.pos < end) { @@ -2211,10 +2245,10 @@ export const Tip = { return message; }, fromJSON(object: any): Tip { - return { - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [], - tipper: isSet(object.tipper) ? String(object.tipper) : "" - }; + const obj = createBaseTip(); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.tipper)) obj.tipper = String(object.tipper); + return obj; }, toJSON(message: Tip): unknown { const obj: any = {}; @@ -2297,7 +2331,7 @@ function createBaseAuxSignerData(): AuxSignerData { export const AuxSignerData = { typeUrl: "/cosmos.tx.v1beta1.AuxSignerData", aminoType: "cosmos-sdk/AuxSignerData", - encode(message: AuxSignerData, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuxSignerData, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -2312,8 +2346,8 @@ export const AuxSignerData = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuxSignerData { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuxSignerData { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuxSignerData(); while (reader.pos < end) { @@ -2339,12 +2373,12 @@ export const AuxSignerData = { return message; }, fromJSON(object: any): AuxSignerData { - return { - address: isSet(object.address) ? String(object.address) : "", - signDoc: isSet(object.signDoc) ? SignDocDirectAux.fromJSON(object.signDoc) : undefined, - mode: isSet(object.mode) ? signModeFromJSON(object.mode) : -1, - sig: isSet(object.sig) ? bytesFromBase64(object.sig) : new Uint8Array() - }; + const obj = createBaseAuxSignerData(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.signDoc)) obj.signDoc = SignDocDirectAux.fromJSON(object.signDoc); + if (isSet(object.mode)) obj.mode = signModeFromJSON(object.mode); + if (isSet(object.sig)) obj.sig = bytesFromBase64(object.sig); + return obj; }, toJSON(message: AuxSignerData): unknown { const obj: any = {}; @@ -2357,7 +2391,9 @@ export const AuxSignerData = { fromPartial(object: DeepPartial): AuxSignerData { const message = createBaseAuxSignerData(); message.address = object.address ?? ""; - message.signDoc = object.signDoc !== undefined && object.signDoc !== null ? SignDocDirectAux.fromPartial(object.signDoc) : undefined; + if (object.signDoc !== undefined && object.signDoc !== null) { + message.signDoc = SignDocDirectAux.fromPartial(object.signDoc); + } message.mode = object.mode ?? 0; message.sig = object.sig ?? new Uint8Array(); return message; diff --git a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts index c93d99e069..534aba2f2a 100644 --- a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/query.ts @@ -1,6 +1,6 @@ import { Plan, PlanAmino, PlanSDKType, ModuleVersion, ModuleVersionAmino, ModuleVersionSDKType } from "./upgrade"; -import { Long, DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmos.upgrade.v1beta1"; /** * QueryCurrentPlanRequest is the request type for the Query/CurrentPlan RPC @@ -93,7 +93,7 @@ export interface QueryAppliedPlanRequestSDKType { */ export interface QueryAppliedPlanResponse { /** height is the block height at which the plan was applied. */ - height: Long; + height: bigint; } export interface QueryAppliedPlanResponseProtoMsg { typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse"; @@ -116,7 +116,7 @@ export interface QueryAppliedPlanResponseAminoMsg { * method. */ export interface QueryAppliedPlanResponseSDKType { - height: Long; + height: bigint; } /** * QueryUpgradedConsensusStateRequest is the request type for the Query/UpgradedConsensusState @@ -128,7 +128,7 @@ export interface QueryUpgradedConsensusStateRequest { * last height of the current chain must be sent in request * as this is the height under which next consensus state is stored */ - lastHeight: Long; + lastHeight: bigint; } export interface QueryUpgradedConsensusStateRequestProtoMsg { typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest"; @@ -156,7 +156,7 @@ export interface QueryUpgradedConsensusStateRequestAminoMsg { */ /** @deprecated */ export interface QueryUpgradedConsensusStateRequestSDKType { - last_height: Long; + last_height: bigint; } /** * QueryUpgradedConsensusStateResponse is the response type for the Query/UpgradedConsensusState @@ -338,11 +338,11 @@ function createBaseQueryCurrentPlanRequest(): QueryCurrentPlanRequest { export const QueryCurrentPlanRequest = { typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanRequest", aminoType: "cosmos-sdk/QueryCurrentPlanRequest", - encode(_: QueryCurrentPlanRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryCurrentPlanRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCurrentPlanRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCurrentPlanRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCurrentPlanRequest(); while (reader.pos < end) { @@ -356,7 +356,8 @@ export const QueryCurrentPlanRequest = { return message; }, fromJSON(_: any): QueryCurrentPlanRequest { - return {}; + const obj = createBaseQueryCurrentPlanRequest(); + return obj; }, toJSON(_: QueryCurrentPlanRequest): unknown { const obj: any = {}; @@ -410,14 +411,14 @@ function createBaseQueryCurrentPlanResponse(): QueryCurrentPlanResponse { export const QueryCurrentPlanResponse = { typeUrl: "/cosmos.upgrade.v1beta1.QueryCurrentPlanResponse", aminoType: "cosmos-sdk/QueryCurrentPlanResponse", - encode(message: QueryCurrentPlanResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCurrentPlanResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.plan !== undefined) { Plan.encode(message.plan, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCurrentPlanResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCurrentPlanResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCurrentPlanResponse(); while (reader.pos < end) { @@ -434,9 +435,9 @@ export const QueryCurrentPlanResponse = { return message; }, fromJSON(object: any): QueryCurrentPlanResponse { - return { - plan: isSet(object.plan) ? Plan.fromJSON(object.plan) : undefined - }; + const obj = createBaseQueryCurrentPlanResponse(); + if (isSet(object.plan)) obj.plan = Plan.fromJSON(object.plan); + return obj; }, toJSON(message: QueryCurrentPlanResponse): unknown { const obj: any = {}; @@ -445,7 +446,9 @@ export const QueryCurrentPlanResponse = { }, fromPartial(object: DeepPartial): QueryCurrentPlanResponse { const message = createBaseQueryCurrentPlanResponse(); - message.plan = object.plan !== undefined && object.plan !== null ? Plan.fromPartial(object.plan) : undefined; + if (object.plan !== undefined && object.plan !== null) { + message.plan = Plan.fromPartial(object.plan); + } return message; }, fromSDK(object: QueryCurrentPlanResponseSDKType): QueryCurrentPlanResponse { @@ -498,14 +501,14 @@ function createBaseQueryAppliedPlanRequest(): QueryAppliedPlanRequest { export const QueryAppliedPlanRequest = { typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanRequest", aminoType: "cosmos-sdk/QueryAppliedPlanRequest", - encode(message: QueryAppliedPlanRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAppliedPlanRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAppliedPlanRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAppliedPlanRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAppliedPlanRequest(); while (reader.pos < end) { @@ -522,9 +525,9 @@ export const QueryAppliedPlanRequest = { return message; }, fromJSON(object: any): QueryAppliedPlanRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseQueryAppliedPlanRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: QueryAppliedPlanRequest): unknown { const obj: any = {}; @@ -580,27 +583,27 @@ export const QueryAppliedPlanRequest = { }; function createBaseQueryAppliedPlanResponse(): QueryAppliedPlanResponse { return { - height: Long.ZERO + height: BigInt(0) }; } export const QueryAppliedPlanResponse = { typeUrl: "/cosmos.upgrade.v1beta1.QueryAppliedPlanResponse", aminoType: "cosmos-sdk/QueryAppliedPlanResponse", - encode(message: QueryAppliedPlanResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.height.isZero()) { + encode(message: QueryAppliedPlanResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.height !== BigInt(0)) { writer.uint32(8).int64(message.height); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAppliedPlanResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAppliedPlanResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAppliedPlanResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; default: reader.skipType(tag & 7); @@ -610,18 +613,20 @@ export const QueryAppliedPlanResponse = { return message; }, fromJSON(object: any): QueryAppliedPlanResponse { - return { - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO - }; + const obj = createBaseQueryAppliedPlanResponse(); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + return obj; }, toJSON(message: QueryAppliedPlanResponse): unknown { const obj: any = {}; - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryAppliedPlanResponse { const message = createBaseQueryAppliedPlanResponse(); - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } return message; }, fromSDK(object: QueryAppliedPlanResponseSDKType): QueryAppliedPlanResponse { @@ -636,7 +641,7 @@ export const QueryAppliedPlanResponse = { }, fromAmino(object: QueryAppliedPlanResponseAmino): QueryAppliedPlanResponse { return { - height: Long.fromString(object.height) + height: BigInt(object.height) }; }, toAmino(message: QueryAppliedPlanResponse): QueryAppliedPlanResponseAmino { @@ -668,27 +673,27 @@ export const QueryAppliedPlanResponse = { }; function createBaseQueryUpgradedConsensusStateRequest(): QueryUpgradedConsensusStateRequest { return { - lastHeight: Long.ZERO + lastHeight: BigInt(0) }; } export const QueryUpgradedConsensusStateRequest = { typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateRequest", aminoType: "cosmos-sdk/QueryUpgradedConsensusStateRequest", - encode(message: QueryUpgradedConsensusStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.lastHeight.isZero()) { + encode(message: QueryUpgradedConsensusStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.lastHeight !== BigInt(0)) { writer.uint32(8).int64(message.lastHeight); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryUpgradedConsensusStateRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryUpgradedConsensusStateRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryUpgradedConsensusStateRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.lastHeight = (reader.int64() as Long); + message.lastHeight = reader.int64(); break; default: reader.skipType(tag & 7); @@ -698,18 +703,20 @@ export const QueryUpgradedConsensusStateRequest = { return message; }, fromJSON(object: any): QueryUpgradedConsensusStateRequest { - return { - lastHeight: isSet(object.lastHeight) ? Long.fromValue(object.lastHeight) : Long.ZERO - }; + const obj = createBaseQueryUpgradedConsensusStateRequest(); + if (isSet(object.lastHeight)) obj.lastHeight = BigInt(object.lastHeight.toString()); + return obj; }, toJSON(message: QueryUpgradedConsensusStateRequest): unknown { const obj: any = {}; - message.lastHeight !== undefined && (obj.lastHeight = (message.lastHeight || Long.ZERO).toString()); + message.lastHeight !== undefined && (obj.lastHeight = (message.lastHeight || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryUpgradedConsensusStateRequest { const message = createBaseQueryUpgradedConsensusStateRequest(); - message.lastHeight = object.lastHeight !== undefined && object.lastHeight !== null ? Long.fromValue(object.lastHeight) : Long.ZERO; + if (object.lastHeight !== undefined && object.lastHeight !== null) { + message.lastHeight = BigInt(object.lastHeight.toString()); + } return message; }, fromSDK(object: QueryUpgradedConsensusStateRequestSDKType): QueryUpgradedConsensusStateRequest { @@ -724,7 +731,7 @@ export const QueryUpgradedConsensusStateRequest = { }, fromAmino(object: QueryUpgradedConsensusStateRequestAmino): QueryUpgradedConsensusStateRequest { return { - lastHeight: Long.fromString(object.last_height) + lastHeight: BigInt(object.last_height) }; }, toAmino(message: QueryUpgradedConsensusStateRequest): QueryUpgradedConsensusStateRequestAmino { @@ -762,14 +769,14 @@ function createBaseQueryUpgradedConsensusStateResponse(): QueryUpgradedConsensus export const QueryUpgradedConsensusStateResponse = { typeUrl: "/cosmos.upgrade.v1beta1.QueryUpgradedConsensusStateResponse", aminoType: "cosmos-sdk/QueryUpgradedConsensusStateResponse", - encode(message: QueryUpgradedConsensusStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryUpgradedConsensusStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.upgradedConsensusState.length !== 0) { writer.uint32(18).bytes(message.upgradedConsensusState); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryUpgradedConsensusStateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryUpgradedConsensusStateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryUpgradedConsensusStateResponse(); while (reader.pos < end) { @@ -786,9 +793,9 @@ export const QueryUpgradedConsensusStateResponse = { return message; }, fromJSON(object: any): QueryUpgradedConsensusStateResponse { - return { - upgradedConsensusState: isSet(object.upgradedConsensusState) ? bytesFromBase64(object.upgradedConsensusState) : new Uint8Array() - }; + const obj = createBaseQueryUpgradedConsensusStateResponse(); + if (isSet(object.upgradedConsensusState)) obj.upgradedConsensusState = bytesFromBase64(object.upgradedConsensusState); + return obj; }, toJSON(message: QueryUpgradedConsensusStateResponse): unknown { const obj: any = {}; @@ -850,14 +857,14 @@ function createBaseQueryModuleVersionsRequest(): QueryModuleVersionsRequest { export const QueryModuleVersionsRequest = { typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsRequest", aminoType: "cosmos-sdk/QueryModuleVersionsRequest", - encode(message: QueryModuleVersionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryModuleVersionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.moduleName !== "") { writer.uint32(10).string(message.moduleName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryModuleVersionsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryModuleVersionsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryModuleVersionsRequest(); while (reader.pos < end) { @@ -874,9 +881,9 @@ export const QueryModuleVersionsRequest = { return message; }, fromJSON(object: any): QueryModuleVersionsRequest { - return { - moduleName: isSet(object.moduleName) ? String(object.moduleName) : "" - }; + const obj = createBaseQueryModuleVersionsRequest(); + if (isSet(object.moduleName)) obj.moduleName = String(object.moduleName); + return obj; }, toJSON(message: QueryModuleVersionsRequest): unknown { const obj: any = {}; @@ -938,14 +945,14 @@ function createBaseQueryModuleVersionsResponse(): QueryModuleVersionsResponse { export const QueryModuleVersionsResponse = { typeUrl: "/cosmos.upgrade.v1beta1.QueryModuleVersionsResponse", aminoType: "cosmos-sdk/QueryModuleVersionsResponse", - encode(message: QueryModuleVersionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryModuleVersionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.moduleVersions) { ModuleVersion.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryModuleVersionsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryModuleVersionsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryModuleVersionsResponse(); while (reader.pos < end) { @@ -962,9 +969,9 @@ export const QueryModuleVersionsResponse = { return message; }, fromJSON(object: any): QueryModuleVersionsResponse { - return { - moduleVersions: Array.isArray(object?.moduleVersions) ? object.moduleVersions.map((e: any) => ModuleVersion.fromJSON(e)) : [] - }; + const obj = createBaseQueryModuleVersionsResponse(); + if (Array.isArray(object?.moduleVersions)) object.moduleVersions.map((e: any) => ModuleVersion.fromJSON(e)); + return obj; }, toJSON(message: QueryModuleVersionsResponse): unknown { const obj: any = {}; @@ -1036,11 +1043,11 @@ function createBaseQueryAuthorityRequest(): QueryAuthorityRequest { export const QueryAuthorityRequest = { typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityRequest", aminoType: "cosmos-sdk/QueryAuthorityRequest", - encode(_: QueryAuthorityRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryAuthorityRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAuthorityRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAuthorityRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAuthorityRequest(); while (reader.pos < end) { @@ -1054,7 +1061,8 @@ export const QueryAuthorityRequest = { return message; }, fromJSON(_: any): QueryAuthorityRequest { - return {}; + const obj = createBaseQueryAuthorityRequest(); + return obj; }, toJSON(_: QueryAuthorityRequest): unknown { const obj: any = {}; @@ -1108,14 +1116,14 @@ function createBaseQueryAuthorityResponse(): QueryAuthorityResponse { export const QueryAuthorityResponse = { typeUrl: "/cosmos.upgrade.v1beta1.QueryAuthorityResponse", aminoType: "cosmos-sdk/QueryAuthorityResponse", - encode(message: QueryAuthorityResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAuthorityResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAuthorityResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAuthorityResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAuthorityResponse(); while (reader.pos < end) { @@ -1132,9 +1140,9 @@ export const QueryAuthorityResponse = { return message; }, fromJSON(object: any): QueryAuthorityResponse { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseQueryAuthorityResponse(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: QueryAuthorityResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts index 8dceeff46f..9ddd4a4a7c 100644 --- a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/tx.ts @@ -1,5 +1,5 @@ import { Plan, PlanAmino, PlanSDKType } from "./upgrade"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.upgrade.v1beta1"; /** @@ -136,7 +136,7 @@ function createBaseMsgSoftwareUpgrade(): MsgSoftwareUpgrade { export const MsgSoftwareUpgrade = { typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgrade", aminoType: "cosmos-sdk/MsgSoftwareUpgrade", - encode(message: MsgSoftwareUpgrade, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgSoftwareUpgrade, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authority !== "") { writer.uint32(10).string(message.authority); } @@ -145,8 +145,8 @@ export const MsgSoftwareUpgrade = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSoftwareUpgrade { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSoftwareUpgrade { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSoftwareUpgrade(); while (reader.pos < end) { @@ -166,10 +166,10 @@ export const MsgSoftwareUpgrade = { return message; }, fromJSON(object: any): MsgSoftwareUpgrade { - return { - authority: isSet(object.authority) ? String(object.authority) : "", - plan: isSet(object.plan) ? Plan.fromJSON(object.plan) : undefined - }; + const obj = createBaseMsgSoftwareUpgrade(); + if (isSet(object.authority)) obj.authority = String(object.authority); + if (isSet(object.plan)) obj.plan = Plan.fromJSON(object.plan); + return obj; }, toJSON(message: MsgSoftwareUpgrade): unknown { const obj: any = {}; @@ -180,7 +180,9 @@ export const MsgSoftwareUpgrade = { fromPartial(object: DeepPartial): MsgSoftwareUpgrade { const message = createBaseMsgSoftwareUpgrade(); message.authority = object.authority ?? ""; - message.plan = object.plan !== undefined && object.plan !== null ? Plan.fromPartial(object.plan) : undefined; + if (object.plan !== undefined && object.plan !== null) { + message.plan = Plan.fromPartial(object.plan); + } return message; }, fromSDK(object: MsgSoftwareUpgradeSDKType): MsgSoftwareUpgrade { @@ -235,11 +237,11 @@ function createBaseMsgSoftwareUpgradeResponse(): MsgSoftwareUpgradeResponse { export const MsgSoftwareUpgradeResponse = { typeUrl: "/cosmos.upgrade.v1beta1.MsgSoftwareUpgradeResponse", aminoType: "cosmos-sdk/MsgSoftwareUpgradeResponse", - encode(_: MsgSoftwareUpgradeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgSoftwareUpgradeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgSoftwareUpgradeResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgSoftwareUpgradeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgSoftwareUpgradeResponse(); while (reader.pos < end) { @@ -253,7 +255,8 @@ export const MsgSoftwareUpgradeResponse = { return message; }, fromJSON(_: any): MsgSoftwareUpgradeResponse { - return {}; + const obj = createBaseMsgSoftwareUpgradeResponse(); + return obj; }, toJSON(_: MsgSoftwareUpgradeResponse): unknown { const obj: any = {}; @@ -307,14 +310,14 @@ function createBaseMsgCancelUpgrade(): MsgCancelUpgrade { export const MsgCancelUpgrade = { typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgrade", aminoType: "cosmos-sdk/MsgCancelUpgrade", - encode(message: MsgCancelUpgrade, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCancelUpgrade, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.authority !== "") { writer.uint32(10).string(message.authority); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCancelUpgrade { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCancelUpgrade { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCancelUpgrade(); while (reader.pos < end) { @@ -331,9 +334,9 @@ export const MsgCancelUpgrade = { return message; }, fromJSON(object: any): MsgCancelUpgrade { - return { - authority: isSet(object.authority) ? String(object.authority) : "" - }; + const obj = createBaseMsgCancelUpgrade(); + if (isSet(object.authority)) obj.authority = String(object.authority); + return obj; }, toJSON(message: MsgCancelUpgrade): unknown { const obj: any = {}; @@ -393,11 +396,11 @@ function createBaseMsgCancelUpgradeResponse(): MsgCancelUpgradeResponse { export const MsgCancelUpgradeResponse = { typeUrl: "/cosmos.upgrade.v1beta1.MsgCancelUpgradeResponse", aminoType: "cosmos-sdk/MsgCancelUpgradeResponse", - encode(_: MsgCancelUpgradeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCancelUpgradeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCancelUpgradeResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCancelUpgradeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCancelUpgradeResponse(); while (reader.pos < end) { @@ -411,7 +414,8 @@ export const MsgCancelUpgradeResponse = { return message; }, fromJSON(_: any): MsgCancelUpgradeResponse { - return {}; + const obj = createBaseMsgCancelUpgradeResponse(); + return obj; }, toJSON(_: MsgCancelUpgradeResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts index a6f7bdb93d..709f997eea 100644 --- a/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts +++ b/__fixtures__/v-next/outputv2/cosmos/upgrade/v1beta1/upgrade.ts @@ -1,7 +1,7 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; import { Any, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.upgrade.v1beta1"; /** Plan specifies information about a planned upgrade and when it should occur. */ export interface Plan { @@ -26,7 +26,7 @@ export interface Plan { * The height at which the upgrade must be performed. * Only used if Time is not set. */ - height: Long; + height: bigint; /** * Any application specific upgrade info to be included on-chain * such as a git commit that validators could automatically upgrade to @@ -90,7 +90,7 @@ export interface PlanSDKType { name: string; /** @deprecated */ time: Date; - height: Long; + height: bigint; info: string; /** @deprecated */ upgraded_client_state: AnySDKType; @@ -189,7 +189,7 @@ export interface ModuleVersion { /** name of the app module */ name: string; /** consensus version of the app module */ - version: Long; + version: bigint; } export interface ModuleVersionProtoMsg { typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion"; @@ -217,13 +217,13 @@ export interface ModuleVersionAminoMsg { */ export interface ModuleVersionSDKType { name: string; - version: Long; + version: bigint; } function createBasePlan(): Plan { return { name: "", time: new Date(), - height: Long.ZERO, + height: BigInt(0), info: "", upgradedClientState: Any.fromPartial({}) }; @@ -231,14 +231,14 @@ function createBasePlan(): Plan { export const Plan = { typeUrl: "/cosmos.upgrade.v1beta1.Plan", aminoType: "cosmos-sdk/Plan", - encode(message: Plan, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Plan, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } if (message.time !== undefined) { Timestamp.encode(toTimestamp(message.time), writer.uint32(18).fork()).ldelim(); } - if (!message.height.isZero()) { + if (message.height !== BigInt(0)) { writer.uint32(24).int64(message.height); } if (message.info !== "") { @@ -249,8 +249,8 @@ export const Plan = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Plan { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Plan { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePlan(); while (reader.pos < end) { @@ -263,7 +263,7 @@ export const Plan = { message.time = fromTimestamp(Timestamp.decode(reader, reader.uint32())); break; case 3: - message.height = (reader.int64() as Long); + message.height = reader.int64(); break; case 4: message.info = reader.string(); @@ -279,19 +279,19 @@ export const Plan = { return message; }, fromJSON(object: any): Plan { - return { - name: isSet(object.name) ? String(object.name) : "", - time: isSet(object.time) ? new Date(object.time) : undefined, - height: isSet(object.height) ? Long.fromValue(object.height) : Long.ZERO, - info: isSet(object.info) ? String(object.info) : "", - upgradedClientState: isSet(object.upgradedClientState) ? Any.fromJSON(object.upgradedClientState) : undefined - }; + const obj = createBasePlan(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.time)) obj.time = new Date(object.time); + if (isSet(object.height)) obj.height = BigInt(object.height.toString()); + if (isSet(object.info)) obj.info = String(object.info); + if (isSet(object.upgradedClientState)) obj.upgradedClientState = Any.fromJSON(object.upgradedClientState); + return obj; }, toJSON(message: Plan): unknown { const obj: any = {}; message.name !== undefined && (obj.name = message.name); message.time !== undefined && (obj.time = message.time.toISOString()); - message.height !== undefined && (obj.height = (message.height || Long.ZERO).toString()); + message.height !== undefined && (obj.height = (message.height || BigInt(0)).toString()); message.info !== undefined && (obj.info = message.info); message.upgradedClientState !== undefined && (obj.upgradedClientState = message.upgradedClientState ? Any.toJSON(message.upgradedClientState) : undefined); return obj; @@ -300,9 +300,13 @@ export const Plan = { const message = createBasePlan(); message.name = object.name ?? ""; message.time = object.time ?? undefined; - message.height = object.height !== undefined && object.height !== null ? Long.fromValue(object.height) : Long.ZERO; + if (object.height !== undefined && object.height !== null) { + message.height = BigInt(object.height.toString()); + } message.info = object.info ?? ""; - message.upgradedClientState = object.upgradedClientState !== undefined && object.upgradedClientState !== null ? Any.fromPartial(object.upgradedClientState) : undefined; + if (object.upgradedClientState !== undefined && object.upgradedClientState !== null) { + message.upgradedClientState = Any.fromPartial(object.upgradedClientState); + } return message; }, fromSDK(object: PlanSDKType): Plan { @@ -327,7 +331,7 @@ export const Plan = { return { name: object.name, time: object.time, - height: Long.fromString(object.height), + height: BigInt(object.height), info: object.info, upgradedClientState: object?.upgraded_client_state ? Any.fromAmino(object.upgraded_client_state) : undefined }; @@ -373,7 +377,7 @@ function createBaseSoftwareUpgradeProposal(): SoftwareUpgradeProposal { export const SoftwareUpgradeProposal = { typeUrl: "/cosmos.upgrade.v1beta1.SoftwareUpgradeProposal", aminoType: "cosmos-sdk/SoftwareUpgradeProposal", - encode(message: SoftwareUpgradeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SoftwareUpgradeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -385,8 +389,8 @@ export const SoftwareUpgradeProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SoftwareUpgradeProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SoftwareUpgradeProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSoftwareUpgradeProposal(); while (reader.pos < end) { @@ -409,11 +413,11 @@ export const SoftwareUpgradeProposal = { return message; }, fromJSON(object: any): SoftwareUpgradeProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - plan: isSet(object.plan) ? Plan.fromJSON(object.plan) : undefined - }; + const obj = createBaseSoftwareUpgradeProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.plan)) obj.plan = Plan.fromJSON(object.plan); + return obj; }, toJSON(message: SoftwareUpgradeProposal): unknown { const obj: any = {}; @@ -426,7 +430,9 @@ export const SoftwareUpgradeProposal = { const message = createBaseSoftwareUpgradeProposal(); message.title = object.title ?? ""; message.description = object.description ?? ""; - message.plan = object.plan !== undefined && object.plan !== null ? Plan.fromPartial(object.plan) : undefined; + if (object.plan !== undefined && object.plan !== null) { + message.plan = Plan.fromPartial(object.plan); + } return message; }, fromSDK(object: SoftwareUpgradeProposalSDKType): SoftwareUpgradeProposal { @@ -488,7 +494,7 @@ function createBaseCancelSoftwareUpgradeProposal(): CancelSoftwareUpgradeProposa export const CancelSoftwareUpgradeProposal = { typeUrl: "/cosmos.upgrade.v1beta1.CancelSoftwareUpgradeProposal", aminoType: "cosmos-sdk/CancelSoftwareUpgradeProposal", - encode(message: CancelSoftwareUpgradeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CancelSoftwareUpgradeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -497,8 +503,8 @@ export const CancelSoftwareUpgradeProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CancelSoftwareUpgradeProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CancelSoftwareUpgradeProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCancelSoftwareUpgradeProposal(); while (reader.pos < end) { @@ -518,10 +524,10 @@ export const CancelSoftwareUpgradeProposal = { return message; }, fromJSON(object: any): CancelSoftwareUpgradeProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "" - }; + const obj = createBaseCancelSoftwareUpgradeProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + return obj; }, toJSON(message: CancelSoftwareUpgradeProposal): unknown { const obj: any = {}; @@ -584,23 +590,23 @@ export const CancelSoftwareUpgradeProposal = { function createBaseModuleVersion(): ModuleVersion { return { name: "", - version: Long.UZERO + version: BigInt(0) }; } export const ModuleVersion = { typeUrl: "/cosmos.upgrade.v1beta1.ModuleVersion", aminoType: "cosmos-sdk/ModuleVersion", - encode(message: ModuleVersion, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ModuleVersion, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } - if (!message.version.isZero()) { + if (message.version !== BigInt(0)) { writer.uint32(16).uint64(message.version); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ModuleVersion { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ModuleVersion { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModuleVersion(); while (reader.pos < end) { @@ -610,7 +616,7 @@ export const ModuleVersion = { message.name = reader.string(); break; case 2: - message.version = (reader.uint64() as Long); + message.version = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -620,21 +626,23 @@ export const ModuleVersion = { return message; }, fromJSON(object: any): ModuleVersion { - return { - name: isSet(object.name) ? String(object.name) : "", - version: isSet(object.version) ? Long.fromValue(object.version) : Long.UZERO - }; + const obj = createBaseModuleVersion(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.version)) obj.version = BigInt(object.version.toString()); + return obj; }, toJSON(message: ModuleVersion): unknown { const obj: any = {}; message.name !== undefined && (obj.name = message.name); - message.version !== undefined && (obj.version = (message.version || Long.UZERO).toString()); + message.version !== undefined && (obj.version = (message.version || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): ModuleVersion { const message = createBaseModuleVersion(); message.name = object.name ?? ""; - message.version = object.version !== undefined && object.version !== null ? Long.fromValue(object.version) : Long.UZERO; + if (object.version !== undefined && object.version !== null) { + message.version = BigInt(object.version.toString()); + } return message; }, fromSDK(object: ModuleVersionSDKType): ModuleVersion { @@ -652,7 +660,7 @@ export const ModuleVersion = { fromAmino(object: ModuleVersionAmino): ModuleVersion { return { name: object.name, - version: Long.fromString(object.version) + version: BigInt(object.version) }; }, toAmino(message: ModuleVersion): ModuleVersionAmino { diff --git a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts index 5440f1b7e4..7628ba3c9b 100644 --- a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/tx.ts @@ -1,7 +1,7 @@ import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; import { Period, PeriodAmino, PeriodSDKType } from "./vesting"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.vesting.v1beta1"; /** * MsgCreateVestingAccount defines a message that enables creating a vesting @@ -11,7 +11,7 @@ export interface MsgCreateVestingAccount { fromAddress: string; toAddress: string; amount: Coin[]; - endTime: Long; + endTime: bigint; delayed: boolean; } export interface MsgCreateVestingAccountProtoMsg { @@ -41,7 +41,7 @@ export interface MsgCreateVestingAccountSDKType { from_address: string; to_address: string; amount: CoinSDKType[]; - end_time: Long; + end_time: bigint; delayed: boolean; } /** MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. */ @@ -114,7 +114,7 @@ export interface MsgCreatePermanentLockedAccountResponseSDKType {} export interface MsgCreatePeriodicVestingAccount { fromAddress: string; toAddress: string; - startTime: Long; + startTime: bigint; vestingPeriods: Period[]; } export interface MsgCreatePeriodicVestingAccountProtoMsg { @@ -142,7 +142,7 @@ export interface MsgCreatePeriodicVestingAccountAminoMsg { export interface MsgCreatePeriodicVestingAccountSDKType { from_address: string; to_address: string; - start_time: Long; + start_time: bigint; vesting_periods: PeriodSDKType[]; } /** @@ -173,14 +173,14 @@ function createBaseMsgCreateVestingAccount(): MsgCreateVestingAccount { fromAddress: "", toAddress: "", amount: [], - endTime: Long.ZERO, + endTime: BigInt(0), delayed: false }; } export const MsgCreateVestingAccount = { typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccount", aminoType: "cosmos-sdk/MsgCreateVestingAccount", - encode(message: MsgCreateVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); } @@ -190,7 +190,7 @@ export const MsgCreateVestingAccount = { for (const v of message.amount) { Coin.encode(v!, writer.uint32(26).fork()).ldelim(); } - if (!message.endTime.isZero()) { + if (message.endTime !== BigInt(0)) { writer.uint32(32).int64(message.endTime); } if (message.delayed === true) { @@ -198,8 +198,8 @@ export const MsgCreateVestingAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateVestingAccount(); while (reader.pos < end) { @@ -215,7 +215,7 @@ export const MsgCreateVestingAccount = { message.amount.push(Coin.decode(reader, reader.uint32())); break; case 4: - message.endTime = (reader.int64() as Long); + message.endTime = reader.int64(); break; case 5: message.delayed = reader.bool(); @@ -228,13 +228,13 @@ export const MsgCreateVestingAccount = { return message; }, fromJSON(object: any): MsgCreateVestingAccount { - return { - fromAddress: isSet(object.fromAddress) ? String(object.fromAddress) : "", - toAddress: isSet(object.toAddress) ? String(object.toAddress) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [], - endTime: isSet(object.endTime) ? Long.fromValue(object.endTime) : Long.ZERO, - delayed: isSet(object.delayed) ? Boolean(object.delayed) : false - }; + const obj = createBaseMsgCreateVestingAccount(); + if (isSet(object.fromAddress)) obj.fromAddress = String(object.fromAddress); + if (isSet(object.toAddress)) obj.toAddress = String(object.toAddress); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.endTime)) obj.endTime = BigInt(object.endTime.toString()); + if (isSet(object.delayed)) obj.delayed = Boolean(object.delayed); + return obj; }, toJSON(message: MsgCreateVestingAccount): unknown { const obj: any = {}; @@ -245,7 +245,7 @@ export const MsgCreateVestingAccount = { } else { obj.amount = []; } - message.endTime !== undefined && (obj.endTime = (message.endTime || Long.ZERO).toString()); + message.endTime !== undefined && (obj.endTime = (message.endTime || BigInt(0)).toString()); message.delayed !== undefined && (obj.delayed = message.delayed); return obj; }, @@ -254,7 +254,9 @@ export const MsgCreateVestingAccount = { message.fromAddress = object.fromAddress ?? ""; message.toAddress = object.toAddress ?? ""; message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; - message.endTime = object.endTime !== undefined && object.endTime !== null ? Long.fromValue(object.endTime) : Long.ZERO; + if (object.endTime !== undefined && object.endTime !== null) { + message.endTime = BigInt(object.endTime.toString()); + } message.delayed = object.delayed ?? false; return message; }, @@ -285,7 +287,7 @@ export const MsgCreateVestingAccount = { fromAddress: object.from_address, toAddress: object.to_address, amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [], - endTime: Long.fromString(object.end_time), + endTime: BigInt(object.end_time), delayed: object.delayed }; }, @@ -330,11 +332,11 @@ function createBaseMsgCreateVestingAccountResponse(): MsgCreateVestingAccountRes export const MsgCreateVestingAccountResponse = { typeUrl: "/cosmos.vesting.v1beta1.MsgCreateVestingAccountResponse", aminoType: "cosmos-sdk/MsgCreateVestingAccountResponse", - encode(_: MsgCreateVestingAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateVestingAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateVestingAccountResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateVestingAccountResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateVestingAccountResponse(); while (reader.pos < end) { @@ -348,7 +350,8 @@ export const MsgCreateVestingAccountResponse = { return message; }, fromJSON(_: any): MsgCreateVestingAccountResponse { - return {}; + const obj = createBaseMsgCreateVestingAccountResponse(); + return obj; }, toJSON(_: MsgCreateVestingAccountResponse): unknown { const obj: any = {}; @@ -404,7 +407,7 @@ function createBaseMsgCreatePermanentLockedAccount(): MsgCreatePermanentLockedAc export const MsgCreatePermanentLockedAccount = { typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccount", aminoType: "cosmos-sdk/MsgCreatePermanentLockedAccount", - encode(message: MsgCreatePermanentLockedAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreatePermanentLockedAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); } @@ -416,8 +419,8 @@ export const MsgCreatePermanentLockedAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreatePermanentLockedAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreatePermanentLockedAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreatePermanentLockedAccount(); while (reader.pos < end) { @@ -440,11 +443,11 @@ export const MsgCreatePermanentLockedAccount = { return message; }, fromJSON(object: any): MsgCreatePermanentLockedAccount { - return { - fromAddress: isSet(object.fromAddress) ? String(object.fromAddress) : "", - toAddress: isSet(object.toAddress) ? String(object.toAddress) : "", - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgCreatePermanentLockedAccount(); + if (isSet(object.fromAddress)) obj.fromAddress = String(object.fromAddress); + if (isSet(object.toAddress)) obj.toAddress = String(object.toAddress); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgCreatePermanentLockedAccount): unknown { const obj: any = {}; @@ -528,11 +531,11 @@ function createBaseMsgCreatePermanentLockedAccountResponse(): MsgCreatePermanent export const MsgCreatePermanentLockedAccountResponse = { typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePermanentLockedAccountResponse", aminoType: "cosmos-sdk/MsgCreatePermanentLockedAccountResponse", - encode(_: MsgCreatePermanentLockedAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreatePermanentLockedAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreatePermanentLockedAccountResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreatePermanentLockedAccountResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreatePermanentLockedAccountResponse(); while (reader.pos < end) { @@ -546,7 +549,8 @@ export const MsgCreatePermanentLockedAccountResponse = { return message; }, fromJSON(_: any): MsgCreatePermanentLockedAccountResponse { - return {}; + const obj = createBaseMsgCreatePermanentLockedAccountResponse(); + return obj; }, toJSON(_: MsgCreatePermanentLockedAccountResponse): unknown { const obj: any = {}; @@ -596,21 +600,21 @@ function createBaseMsgCreatePeriodicVestingAccount(): MsgCreatePeriodicVestingAc return { fromAddress: "", toAddress: "", - startTime: Long.ZERO, + startTime: BigInt(0), vestingPeriods: [] }; } export const MsgCreatePeriodicVestingAccount = { typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccount", aminoType: "cosmos-sdk/MsgCreatePeriodicVestingAccount", - encode(message: MsgCreatePeriodicVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreatePeriodicVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); } if (message.toAddress !== "") { writer.uint32(18).string(message.toAddress); } - if (!message.startTime.isZero()) { + if (message.startTime !== BigInt(0)) { writer.uint32(24).int64(message.startTime); } for (const v of message.vestingPeriods) { @@ -618,8 +622,8 @@ export const MsgCreatePeriodicVestingAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreatePeriodicVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreatePeriodicVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreatePeriodicVestingAccount(); while (reader.pos < end) { @@ -632,7 +636,7 @@ export const MsgCreatePeriodicVestingAccount = { message.toAddress = reader.string(); break; case 3: - message.startTime = (reader.int64() as Long); + message.startTime = reader.int64(); break; case 4: message.vestingPeriods.push(Period.decode(reader, reader.uint32())); @@ -645,18 +649,18 @@ export const MsgCreatePeriodicVestingAccount = { return message; }, fromJSON(object: any): MsgCreatePeriodicVestingAccount { - return { - fromAddress: isSet(object.fromAddress) ? String(object.fromAddress) : "", - toAddress: isSet(object.toAddress) ? String(object.toAddress) : "", - startTime: isSet(object.startTime) ? Long.fromValue(object.startTime) : Long.ZERO, - vestingPeriods: Array.isArray(object?.vestingPeriods) ? object.vestingPeriods.map((e: any) => Period.fromJSON(e)) : [] - }; + const obj = createBaseMsgCreatePeriodicVestingAccount(); + if (isSet(object.fromAddress)) obj.fromAddress = String(object.fromAddress); + if (isSet(object.toAddress)) obj.toAddress = String(object.toAddress); + if (isSet(object.startTime)) obj.startTime = BigInt(object.startTime.toString()); + if (Array.isArray(object?.vestingPeriods)) object.vestingPeriods.map((e: any) => Period.fromJSON(e)); + return obj; }, toJSON(message: MsgCreatePeriodicVestingAccount): unknown { const obj: any = {}; message.fromAddress !== undefined && (obj.fromAddress = message.fromAddress); message.toAddress !== undefined && (obj.toAddress = message.toAddress); - message.startTime !== undefined && (obj.startTime = (message.startTime || Long.ZERO).toString()); + message.startTime !== undefined && (obj.startTime = (message.startTime || BigInt(0)).toString()); if (message.vestingPeriods) { obj.vestingPeriods = message.vestingPeriods.map(e => e ? Period.toJSON(e) : undefined); } else { @@ -668,7 +672,9 @@ export const MsgCreatePeriodicVestingAccount = { const message = createBaseMsgCreatePeriodicVestingAccount(); message.fromAddress = object.fromAddress ?? ""; message.toAddress = object.toAddress ?? ""; - message.startTime = object.startTime !== undefined && object.startTime !== null ? Long.fromValue(object.startTime) : Long.ZERO; + if (object.startTime !== undefined && object.startTime !== null) { + message.startTime = BigInt(object.startTime.toString()); + } message.vestingPeriods = object.vestingPeriods?.map(e => Period.fromPartial(e)) || []; return message; }, @@ -696,7 +702,7 @@ export const MsgCreatePeriodicVestingAccount = { return { fromAddress: object.from_address, toAddress: object.to_address, - startTime: Long.fromString(object.start_time), + startTime: BigInt(object.start_time), vestingPeriods: Array.isArray(object?.vesting_periods) ? object.vesting_periods.map((e: any) => Period.fromAmino(e)) : [] }; }, @@ -740,11 +746,11 @@ function createBaseMsgCreatePeriodicVestingAccountResponse(): MsgCreatePeriodicV export const MsgCreatePeriodicVestingAccountResponse = { typeUrl: "/cosmos.vesting.v1beta1.MsgCreatePeriodicVestingAccountResponse", aminoType: "cosmos-sdk/MsgCreatePeriodicVestingAccountResponse", - encode(_: MsgCreatePeriodicVestingAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreatePeriodicVestingAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreatePeriodicVestingAccountResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreatePeriodicVestingAccountResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreatePeriodicVestingAccountResponse(); while (reader.pos < end) { @@ -758,7 +764,8 @@ export const MsgCreatePeriodicVestingAccountResponse = { return message; }, fromJSON(_: any): MsgCreatePeriodicVestingAccountResponse { - return {}; + const obj = createBaseMsgCreatePeriodicVestingAccountResponse(); + return obj; }, toJSON(_: MsgCreatePeriodicVestingAccountResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts index a53a752463..bf927bb830 100644 --- a/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts +++ b/__fixtures__/v-next/outputv2/cosmos/vesting/v1beta1/vesting.ts @@ -1,7 +1,7 @@ import { BaseAccount, BaseAccountAmino, BaseAccountSDKType } from "../../auth/v1beta1/auth"; import { Coin, CoinAmino, CoinSDKType } from "../../base/v1beta1/coin"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmos.vesting.v1beta1"; /** * BaseVestingAccount implements the VestingAccount interface. It contains all @@ -12,7 +12,7 @@ export interface BaseVestingAccount { originalVesting: Coin[]; delegatedFree: Coin[]; delegatedVesting: Coin[]; - endTime: Long; + endTime: bigint; } export interface BaseVestingAccountProtoMsg { typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount"; @@ -42,7 +42,7 @@ export interface BaseVestingAccountSDKType { original_vesting: CoinSDKType[]; delegated_free: CoinSDKType[]; delegated_vesting: CoinSDKType[]; - end_time: Long; + end_time: bigint; } /** * ContinuousVestingAccount implements the VestingAccount interface. It @@ -50,7 +50,7 @@ export interface BaseVestingAccountSDKType { */ export interface ContinuousVestingAccount { baseVestingAccount: BaseVestingAccount; - startTime: Long; + startTime: bigint; } export interface ContinuousVestingAccountProtoMsg { typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount"; @@ -74,7 +74,7 @@ export interface ContinuousVestingAccountAminoMsg { */ export interface ContinuousVestingAccountSDKType { base_vesting_account: BaseVestingAccountSDKType; - start_time: Long; + start_time: bigint; } /** * DelayedVestingAccount implements the VestingAccount interface. It vests all @@ -110,7 +110,7 @@ export interface DelayedVestingAccountSDKType { } /** Period defines a length of time and amount of coins that will vest. */ export interface Period { - length: Long; + length: bigint; amount: Coin[]; } export interface PeriodProtoMsg { @@ -128,7 +128,7 @@ export interface PeriodAminoMsg { } /** Period defines a length of time and amount of coins that will vest. */ export interface PeriodSDKType { - length: Long; + length: bigint; amount: CoinSDKType[]; } /** @@ -137,7 +137,7 @@ export interface PeriodSDKType { */ export interface PeriodicVestingAccount { baseVestingAccount: BaseVestingAccount; - startTime: Long; + startTime: bigint; vestingPeriods: Period[]; } export interface PeriodicVestingAccountProtoMsg { @@ -163,7 +163,7 @@ export interface PeriodicVestingAccountAminoMsg { */ export interface PeriodicVestingAccountSDKType { base_vesting_account: BaseVestingAccountSDKType; - start_time: Long; + start_time: bigint; vesting_periods: PeriodSDKType[]; } /** @@ -210,13 +210,13 @@ function createBaseBaseVestingAccount(): BaseVestingAccount { originalVesting: [], delegatedFree: [], delegatedVesting: [], - endTime: Long.ZERO + endTime: BigInt(0) }; } export const BaseVestingAccount = { typeUrl: "/cosmos.vesting.v1beta1.BaseVestingAccount", aminoType: "cosmos-sdk/BaseVestingAccount", - encode(message: BaseVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BaseVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseAccount !== undefined) { BaseAccount.encode(message.baseAccount, writer.uint32(10).fork()).ldelim(); } @@ -229,13 +229,13 @@ export const BaseVestingAccount = { for (const v of message.delegatedVesting) { Coin.encode(v!, writer.uint32(34).fork()).ldelim(); } - if (!message.endTime.isZero()) { + if (message.endTime !== BigInt(0)) { writer.uint32(40).int64(message.endTime); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BaseVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BaseVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBaseVestingAccount(); while (reader.pos < end) { @@ -254,7 +254,7 @@ export const BaseVestingAccount = { message.delegatedVesting.push(Coin.decode(reader, reader.uint32())); break; case 5: - message.endTime = (reader.int64() as Long); + message.endTime = reader.int64(); break; default: reader.skipType(tag & 7); @@ -264,13 +264,13 @@ export const BaseVestingAccount = { return message; }, fromJSON(object: any): BaseVestingAccount { - return { - baseAccount: isSet(object.baseAccount) ? BaseAccount.fromJSON(object.baseAccount) : undefined, - originalVesting: Array.isArray(object?.originalVesting) ? object.originalVesting.map((e: any) => Coin.fromJSON(e)) : [], - delegatedFree: Array.isArray(object?.delegatedFree) ? object.delegatedFree.map((e: any) => Coin.fromJSON(e)) : [], - delegatedVesting: Array.isArray(object?.delegatedVesting) ? object.delegatedVesting.map((e: any) => Coin.fromJSON(e)) : [], - endTime: isSet(object.endTime) ? Long.fromValue(object.endTime) : Long.ZERO - }; + const obj = createBaseBaseVestingAccount(); + if (isSet(object.baseAccount)) obj.baseAccount = BaseAccount.fromJSON(object.baseAccount); + if (Array.isArray(object?.originalVesting)) object.originalVesting.map((e: any) => Coin.fromJSON(e)); + if (Array.isArray(object?.delegatedFree)) object.delegatedFree.map((e: any) => Coin.fromJSON(e)); + if (Array.isArray(object?.delegatedVesting)) object.delegatedVesting.map((e: any) => Coin.fromJSON(e)); + if (isSet(object.endTime)) obj.endTime = BigInt(object.endTime.toString()); + return obj; }, toJSON(message: BaseVestingAccount): unknown { const obj: any = {}; @@ -290,16 +290,20 @@ export const BaseVestingAccount = { } else { obj.delegatedVesting = []; } - message.endTime !== undefined && (obj.endTime = (message.endTime || Long.ZERO).toString()); + message.endTime !== undefined && (obj.endTime = (message.endTime || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): BaseVestingAccount { const message = createBaseBaseVestingAccount(); - message.baseAccount = object.baseAccount !== undefined && object.baseAccount !== null ? BaseAccount.fromPartial(object.baseAccount) : undefined; + if (object.baseAccount !== undefined && object.baseAccount !== null) { + message.baseAccount = BaseAccount.fromPartial(object.baseAccount); + } message.originalVesting = object.originalVesting?.map(e => Coin.fromPartial(e)) || []; message.delegatedFree = object.delegatedFree?.map(e => Coin.fromPartial(e)) || []; message.delegatedVesting = object.delegatedVesting?.map(e => Coin.fromPartial(e)) || []; - message.endTime = object.endTime !== undefined && object.endTime !== null ? Long.fromValue(object.endTime) : Long.ZERO; + if (object.endTime !== undefined && object.endTime !== null) { + message.endTime = BigInt(object.endTime.toString()); + } return message; }, fromSDK(object: BaseVestingAccountSDKType): BaseVestingAccount { @@ -338,7 +342,7 @@ export const BaseVestingAccount = { originalVesting: Array.isArray(object?.original_vesting) ? object.original_vesting.map((e: any) => Coin.fromAmino(e)) : [], delegatedFree: Array.isArray(object?.delegated_free) ? object.delegated_free.map((e: any) => Coin.fromAmino(e)) : [], delegatedVesting: Array.isArray(object?.delegated_vesting) ? object.delegated_vesting.map((e: any) => Coin.fromAmino(e)) : [], - endTime: Long.fromString(object.end_time) + endTime: BigInt(object.end_time) }; }, toAmino(message: BaseVestingAccount): BaseVestingAccountAmino { @@ -387,23 +391,23 @@ export const BaseVestingAccount = { function createBaseContinuousVestingAccount(): ContinuousVestingAccount { return { baseVestingAccount: BaseVestingAccount.fromPartial({}), - startTime: Long.ZERO + startTime: BigInt(0) }; } export const ContinuousVestingAccount = { typeUrl: "/cosmos.vesting.v1beta1.ContinuousVestingAccount", aminoType: "cosmos-sdk/ContinuousVestingAccount", - encode(message: ContinuousVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ContinuousVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); } - if (!message.startTime.isZero()) { + if (message.startTime !== BigInt(0)) { writer.uint32(16).int64(message.startTime); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ContinuousVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ContinuousVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseContinuousVestingAccount(); while (reader.pos < end) { @@ -413,7 +417,7 @@ export const ContinuousVestingAccount = { message.baseVestingAccount = BaseVestingAccount.decode(reader, reader.uint32()); break; case 2: - message.startTime = (reader.int64() as Long); + message.startTime = reader.int64(); break; default: reader.skipType(tag & 7); @@ -423,21 +427,25 @@ export const ContinuousVestingAccount = { return message; }, fromJSON(object: any): ContinuousVestingAccount { - return { - baseVestingAccount: isSet(object.baseVestingAccount) ? BaseVestingAccount.fromJSON(object.baseVestingAccount) : undefined, - startTime: isSet(object.startTime) ? Long.fromValue(object.startTime) : Long.ZERO - }; + const obj = createBaseContinuousVestingAccount(); + if (isSet(object.baseVestingAccount)) obj.baseVestingAccount = BaseVestingAccount.fromJSON(object.baseVestingAccount); + if (isSet(object.startTime)) obj.startTime = BigInt(object.startTime.toString()); + return obj; }, toJSON(message: ContinuousVestingAccount): unknown { const obj: any = {}; message.baseVestingAccount !== undefined && (obj.baseVestingAccount = message.baseVestingAccount ? BaseVestingAccount.toJSON(message.baseVestingAccount) : undefined); - message.startTime !== undefined && (obj.startTime = (message.startTime || Long.ZERO).toString()); + message.startTime !== undefined && (obj.startTime = (message.startTime || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): ContinuousVestingAccount { const message = createBaseContinuousVestingAccount(); - message.baseVestingAccount = object.baseVestingAccount !== undefined && object.baseVestingAccount !== null ? BaseVestingAccount.fromPartial(object.baseVestingAccount) : undefined; - message.startTime = object.startTime !== undefined && object.startTime !== null ? Long.fromValue(object.startTime) : Long.ZERO; + if (object.baseVestingAccount !== undefined && object.baseVestingAccount !== null) { + message.baseVestingAccount = BaseVestingAccount.fromPartial(object.baseVestingAccount); + } + if (object.startTime !== undefined && object.startTime !== null) { + message.startTime = BigInt(object.startTime.toString()); + } return message; }, fromSDK(object: ContinuousVestingAccountSDKType): ContinuousVestingAccount { @@ -455,7 +463,7 @@ export const ContinuousVestingAccount = { fromAmino(object: ContinuousVestingAccountAmino): ContinuousVestingAccount { return { baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined, - startTime: Long.fromString(object.start_time) + startTime: BigInt(object.start_time) }; }, toAmino(message: ContinuousVestingAccount): ContinuousVestingAccountAmino { @@ -494,14 +502,14 @@ function createBaseDelayedVestingAccount(): DelayedVestingAccount { export const DelayedVestingAccount = { typeUrl: "/cosmos.vesting.v1beta1.DelayedVestingAccount", aminoType: "cosmos-sdk/DelayedVestingAccount", - encode(message: DelayedVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DelayedVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DelayedVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DelayedVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDelayedVestingAccount(); while (reader.pos < end) { @@ -518,9 +526,9 @@ export const DelayedVestingAccount = { return message; }, fromJSON(object: any): DelayedVestingAccount { - return { - baseVestingAccount: isSet(object.baseVestingAccount) ? BaseVestingAccount.fromJSON(object.baseVestingAccount) : undefined - }; + const obj = createBaseDelayedVestingAccount(); + if (isSet(object.baseVestingAccount)) obj.baseVestingAccount = BaseVestingAccount.fromJSON(object.baseVestingAccount); + return obj; }, toJSON(message: DelayedVestingAccount): unknown { const obj: any = {}; @@ -529,7 +537,9 @@ export const DelayedVestingAccount = { }, fromPartial(object: DeepPartial): DelayedVestingAccount { const message = createBaseDelayedVestingAccount(); - message.baseVestingAccount = object.baseVestingAccount !== undefined && object.baseVestingAccount !== null ? BaseVestingAccount.fromPartial(object.baseVestingAccount) : undefined; + if (object.baseVestingAccount !== undefined && object.baseVestingAccount !== null) { + message.baseVestingAccount = BaseVestingAccount.fromPartial(object.baseVestingAccount); + } return message; }, fromSDK(object: DelayedVestingAccountSDKType): DelayedVestingAccount { @@ -576,15 +586,15 @@ export const DelayedVestingAccount = { }; function createBasePeriod(): Period { return { - length: Long.ZERO, + length: BigInt(0), amount: [] }; } export const Period = { typeUrl: "/cosmos.vesting.v1beta1.Period", aminoType: "cosmos-sdk/Period", - encode(message: Period, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.length.isZero()) { + encode(message: Period, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.length !== BigInt(0)) { writer.uint32(8).int64(message.length); } for (const v of message.amount) { @@ -592,15 +602,15 @@ export const Period = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Period { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Period { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePeriod(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.length = (reader.int64() as Long); + message.length = reader.int64(); break; case 2: message.amount.push(Coin.decode(reader, reader.uint32())); @@ -613,14 +623,14 @@ export const Period = { return message; }, fromJSON(object: any): Period { - return { - length: isSet(object.length) ? Long.fromValue(object.length) : Long.ZERO, - amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBasePeriod(); + if (isSet(object.length)) obj.length = BigInt(object.length.toString()); + if (Array.isArray(object?.amount)) object.amount.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: Period): unknown { const obj: any = {}; - message.length !== undefined && (obj.length = (message.length || Long.ZERO).toString()); + message.length !== undefined && (obj.length = (message.length || BigInt(0)).toString()); if (message.amount) { obj.amount = message.amount.map(e => e ? Coin.toJSON(e) : undefined); } else { @@ -630,7 +640,9 @@ export const Period = { }, fromPartial(object: DeepPartial): Period { const message = createBasePeriod(); - message.length = object.length !== undefined && object.length !== null ? Long.fromValue(object.length) : Long.ZERO; + if (object.length !== undefined && object.length !== null) { + message.length = BigInt(object.length.toString()); + } message.amount = object.amount?.map(e => Coin.fromPartial(e)) || []; return message; }, @@ -652,7 +664,7 @@ export const Period = { }, fromAmino(object: PeriodAmino): Period { return { - length: Long.fromString(object.length), + length: BigInt(object.length), amount: Array.isArray(object?.amount) ? object.amount.map((e: any) => Coin.fromAmino(e)) : [] }; }, @@ -691,18 +703,18 @@ export const Period = { function createBasePeriodicVestingAccount(): PeriodicVestingAccount { return { baseVestingAccount: BaseVestingAccount.fromPartial({}), - startTime: Long.ZERO, + startTime: BigInt(0), vestingPeriods: [] }; } export const PeriodicVestingAccount = { typeUrl: "/cosmos.vesting.v1beta1.PeriodicVestingAccount", aminoType: "cosmos-sdk/PeriodicVestingAccount", - encode(message: PeriodicVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PeriodicVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); } - if (!message.startTime.isZero()) { + if (message.startTime !== BigInt(0)) { writer.uint32(16).int64(message.startTime); } for (const v of message.vestingPeriods) { @@ -710,8 +722,8 @@ export const PeriodicVestingAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PeriodicVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PeriodicVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePeriodicVestingAccount(); while (reader.pos < end) { @@ -721,7 +733,7 @@ export const PeriodicVestingAccount = { message.baseVestingAccount = BaseVestingAccount.decode(reader, reader.uint32()); break; case 2: - message.startTime = (reader.int64() as Long); + message.startTime = reader.int64(); break; case 3: message.vestingPeriods.push(Period.decode(reader, reader.uint32())); @@ -734,16 +746,16 @@ export const PeriodicVestingAccount = { return message; }, fromJSON(object: any): PeriodicVestingAccount { - return { - baseVestingAccount: isSet(object.baseVestingAccount) ? BaseVestingAccount.fromJSON(object.baseVestingAccount) : undefined, - startTime: isSet(object.startTime) ? Long.fromValue(object.startTime) : Long.ZERO, - vestingPeriods: Array.isArray(object?.vestingPeriods) ? object.vestingPeriods.map((e: any) => Period.fromJSON(e)) : [] - }; + const obj = createBasePeriodicVestingAccount(); + if (isSet(object.baseVestingAccount)) obj.baseVestingAccount = BaseVestingAccount.fromJSON(object.baseVestingAccount); + if (isSet(object.startTime)) obj.startTime = BigInt(object.startTime.toString()); + if (Array.isArray(object?.vestingPeriods)) object.vestingPeriods.map((e: any) => Period.fromJSON(e)); + return obj; }, toJSON(message: PeriodicVestingAccount): unknown { const obj: any = {}; message.baseVestingAccount !== undefined && (obj.baseVestingAccount = message.baseVestingAccount ? BaseVestingAccount.toJSON(message.baseVestingAccount) : undefined); - message.startTime !== undefined && (obj.startTime = (message.startTime || Long.ZERO).toString()); + message.startTime !== undefined && (obj.startTime = (message.startTime || BigInt(0)).toString()); if (message.vestingPeriods) { obj.vestingPeriods = message.vestingPeriods.map(e => e ? Period.toJSON(e) : undefined); } else { @@ -753,8 +765,12 @@ export const PeriodicVestingAccount = { }, fromPartial(object: DeepPartial): PeriodicVestingAccount { const message = createBasePeriodicVestingAccount(); - message.baseVestingAccount = object.baseVestingAccount !== undefined && object.baseVestingAccount !== null ? BaseVestingAccount.fromPartial(object.baseVestingAccount) : undefined; - message.startTime = object.startTime !== undefined && object.startTime !== null ? Long.fromValue(object.startTime) : Long.ZERO; + if (object.baseVestingAccount !== undefined && object.baseVestingAccount !== null) { + message.baseVestingAccount = BaseVestingAccount.fromPartial(object.baseVestingAccount); + } + if (object.startTime !== undefined && object.startTime !== null) { + message.startTime = BigInt(object.startTime.toString()); + } message.vestingPeriods = object.vestingPeriods?.map(e => Period.fromPartial(e)) || []; return message; }, @@ -779,7 +795,7 @@ export const PeriodicVestingAccount = { fromAmino(object: PeriodicVestingAccountAmino): PeriodicVestingAccount { return { baseVestingAccount: object?.base_vesting_account ? BaseVestingAccount.fromAmino(object.base_vesting_account) : undefined, - startTime: Long.fromString(object.start_time), + startTime: BigInt(object.start_time), vestingPeriods: Array.isArray(object?.vesting_periods) ? object.vesting_periods.map((e: any) => Period.fromAmino(e)) : [] }; }, @@ -824,14 +840,14 @@ function createBasePermanentLockedAccount(): PermanentLockedAccount { export const PermanentLockedAccount = { typeUrl: "/cosmos.vesting.v1beta1.PermanentLockedAccount", aminoType: "cosmos-sdk/PermanentLockedAccount", - encode(message: PermanentLockedAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PermanentLockedAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PermanentLockedAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PermanentLockedAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePermanentLockedAccount(); while (reader.pos < end) { @@ -848,9 +864,9 @@ export const PermanentLockedAccount = { return message; }, fromJSON(object: any): PermanentLockedAccount { - return { - baseVestingAccount: isSet(object.baseVestingAccount) ? BaseVestingAccount.fromJSON(object.baseVestingAccount) : undefined - }; + const obj = createBasePermanentLockedAccount(); + if (isSet(object.baseVestingAccount)) obj.baseVestingAccount = BaseVestingAccount.fromJSON(object.baseVestingAccount); + return obj; }, toJSON(message: PermanentLockedAccount): unknown { const obj: any = {}; @@ -859,7 +875,9 @@ export const PermanentLockedAccount = { }, fromPartial(object: DeepPartial): PermanentLockedAccount { const message = createBasePermanentLockedAccount(); - message.baseVestingAccount = object.baseVestingAccount !== undefined && object.baseVestingAccount !== null ? BaseVestingAccount.fromPartial(object.baseVestingAccount) : undefined; + if (object.baseVestingAccount !== undefined && object.baseVestingAccount !== null) { + message.baseVestingAccount = BaseVestingAccount.fromPartial(object.baseVestingAccount); + } return message; }, fromSDK(object: PermanentLockedAccountSDKType): PermanentLockedAccount { diff --git a/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts b/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts index 1474ea00ab..484fb82694 100644 --- a/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts +++ b/__fixtures__/v-next/outputv2/cosmos_proto/cosmos.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../binary"; import { isSet, DeepPartial } from "../helpers"; export const protobufPackage = "cosmos_proto"; export enum ScalarType { @@ -183,7 +183,7 @@ function createBaseInterfaceDescriptor(): InterfaceDescriptor { } export const InterfaceDescriptor = { typeUrl: "/cosmos_proto.InterfaceDescriptor", - encode(message: InterfaceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InterfaceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -192,8 +192,8 @@ export const InterfaceDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InterfaceDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InterfaceDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInterfaceDescriptor(); while (reader.pos < end) { @@ -213,10 +213,10 @@ export const InterfaceDescriptor = { return message; }, fromJSON(object: any): InterfaceDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "" - }; + const obj = createBaseInterfaceDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + return obj; }, toJSON(message: InterfaceDescriptor): unknown { const obj: any = {}; @@ -279,7 +279,7 @@ function createBaseScalarDescriptor(): ScalarDescriptor { } export const ScalarDescriptor = { typeUrl: "/cosmos_proto.ScalarDescriptor", - encode(message: ScalarDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ScalarDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -293,8 +293,8 @@ export const ScalarDescriptor = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ScalarDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ScalarDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseScalarDescriptor(); while (reader.pos < end) { @@ -324,11 +324,11 @@ export const ScalarDescriptor = { return message; }, fromJSON(object: any): ScalarDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "", - fieldType: Array.isArray(object?.fieldType) ? object.fieldType.map((e: any) => scalarTypeFromJSON(e)) : [] - }; + const obj = createBaseScalarDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + if (Array.isArray(object?.fieldType)) object.fieldType.map((e: any) => scalarTypeFromJSON(e)); + return obj; }, toJSON(message: ScalarDescriptor): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts index 2e27d2c83e..2501a7e607 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/genesis.ts @@ -1,7 +1,7 @@ import { MsgStoreCode, MsgStoreCodeAmino, MsgStoreCodeSDKType, MsgInstantiateContract, MsgInstantiateContractAmino, MsgInstantiateContractSDKType, MsgExecuteContract, MsgExecuteContractAmino, MsgExecuteContractSDKType } from "./tx"; import { Params, ParamsAmino, ParamsSDKType, CodeInfo, CodeInfoAmino, CodeInfoSDKType, ContractInfo, ContractInfoAmino, ContractInfoSDKType, Model, ModelAmino, ModelSDKType } from "./types"; -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; export const protobufPackage = "cosmwasm.wasm.v1"; /** GenesisState - genesis state of x/wasm */ export interface GenesisState { @@ -72,7 +72,7 @@ export interface GenesisState_GenMsgsSDKType { } /** Code struct encompasses CodeInfo and CodeBytes */ export interface Code { - codeId: Long; + codeId: bigint; codeInfo: CodeInfo; codeBytes: Uint8Array; /** Pinned to wasmvm cache */ @@ -96,7 +96,7 @@ export interface CodeAminoMsg { } /** Code struct encompasses CodeInfo and CodeBytes */ export interface CodeSDKType { - code_id: Long; + code_id: bigint; code_info: CodeInfoSDKType; code_bytes: Uint8Array; pinned: boolean; @@ -130,7 +130,7 @@ export interface ContractSDKType { /** Sequence key and value of an id generation counter */ export interface Sequence { idKey: Uint8Array; - value: Long; + value: bigint; } export interface SequenceProtoMsg { typeUrl: "/cosmwasm.wasm.v1.Sequence"; @@ -148,7 +148,7 @@ export interface SequenceAminoMsg { /** Sequence key and value of an id generation counter */ export interface SequenceSDKType { id_key: Uint8Array; - value: Long; + value: bigint; } function createBaseGenesisState(): GenesisState { return { @@ -162,7 +162,7 @@ function createBaseGenesisState(): GenesisState { export const GenesisState = { typeUrl: "/cosmwasm.wasm.v1.GenesisState", aminoType: "wasm/GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -180,8 +180,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -210,13 +210,13 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - codes: Array.isArray(object?.codes) ? object.codes.map((e: any) => Code.fromJSON(e)) : [], - contracts: Array.isArray(object?.contracts) ? object.contracts.map((e: any) => Contract.fromJSON(e)) : [], - sequences: Array.isArray(object?.sequences) ? object.sequences.map((e: any) => Sequence.fromJSON(e)) : [], - genMsgs: Array.isArray(object?.genMsgs) ? object.genMsgs.map((e: any) => GenesisState_GenMsgs.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.codes)) object.codes.map((e: any) => Code.fromJSON(e)); + if (Array.isArray(object?.contracts)) object.contracts.map((e: any) => Contract.fromJSON(e)); + if (Array.isArray(object?.sequences)) object.sequences.map((e: any) => Sequence.fromJSON(e)); + if (Array.isArray(object?.genMsgs)) object.genMsgs.map((e: any) => GenesisState_GenMsgs.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -245,7 +245,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.codes = object.codes?.map(e => Code.fromPartial(e)) || []; message.contracts = object.contracts?.map(e => Contract.fromPartial(e)) || []; message.sequences = object.sequences?.map(e => Sequence.fromPartial(e)) || []; @@ -352,7 +354,7 @@ function createBaseGenesisState_GenMsgs(): GenesisState_GenMsgs { export const GenesisState_GenMsgs = { typeUrl: "/cosmwasm.wasm.v1.GenMsgs", aminoType: "wasm/GenMsgs", - encode(message: GenesisState_GenMsgs, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState_GenMsgs, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.storeCode !== undefined) { MsgStoreCode.encode(message.storeCode, writer.uint32(10).fork()).ldelim(); } @@ -364,8 +366,8 @@ export const GenesisState_GenMsgs = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState_GenMsgs { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState_GenMsgs { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState_GenMsgs(); while (reader.pos < end) { @@ -388,11 +390,11 @@ export const GenesisState_GenMsgs = { return message; }, fromJSON(object: any): GenesisState_GenMsgs { - return { - storeCode: isSet(object.storeCode) ? MsgStoreCode.fromJSON(object.storeCode) : undefined, - instantiateContract: isSet(object.instantiateContract) ? MsgInstantiateContract.fromJSON(object.instantiateContract) : undefined, - executeContract: isSet(object.executeContract) ? MsgExecuteContract.fromJSON(object.executeContract) : undefined - }; + const obj = createBaseGenesisState_GenMsgs(); + if (isSet(object.storeCode)) obj.storeCode = MsgStoreCode.fromJSON(object.storeCode); + if (isSet(object.instantiateContract)) obj.instantiateContract = MsgInstantiateContract.fromJSON(object.instantiateContract); + if (isSet(object.executeContract)) obj.executeContract = MsgExecuteContract.fromJSON(object.executeContract); + return obj; }, toJSON(message: GenesisState_GenMsgs): unknown { const obj: any = {}; @@ -403,9 +405,15 @@ export const GenesisState_GenMsgs = { }, fromPartial(object: DeepPartial): GenesisState_GenMsgs { const message = createBaseGenesisState_GenMsgs(); - message.storeCode = object.storeCode !== undefined && object.storeCode !== null ? MsgStoreCode.fromPartial(object.storeCode) : undefined; - message.instantiateContract = object.instantiateContract !== undefined && object.instantiateContract !== null ? MsgInstantiateContract.fromPartial(object.instantiateContract) : undefined; - message.executeContract = object.executeContract !== undefined && object.executeContract !== null ? MsgExecuteContract.fromPartial(object.executeContract) : undefined; + if (object.storeCode !== undefined && object.storeCode !== null) { + message.storeCode = MsgStoreCode.fromPartial(object.storeCode); + } + if (object.instantiateContract !== undefined && object.instantiateContract !== null) { + message.instantiateContract = MsgInstantiateContract.fromPartial(object.instantiateContract); + } + if (object.executeContract !== undefined && object.executeContract !== null) { + message.executeContract = MsgExecuteContract.fromPartial(object.executeContract); + } return message; }, fromSDK(object: GenesisState_GenMsgsSDKType): GenesisState_GenMsgs { @@ -460,7 +468,7 @@ export const GenesisState_GenMsgs = { }; function createBaseCode(): Code { return { - codeId: Long.UZERO, + codeId: BigInt(0), codeInfo: CodeInfo.fromPartial({}), codeBytes: new Uint8Array(), pinned: false @@ -469,8 +477,8 @@ function createBaseCode(): Code { export const Code = { typeUrl: "/cosmwasm.wasm.v1.Code", aminoType: "wasm/Code", - encode(message: Code, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.codeId.isZero()) { + encode(message: Code, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); } if (message.codeInfo !== undefined) { @@ -484,15 +492,15 @@ export const Code = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Code { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Code { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCode(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 2: message.codeInfo = CodeInfo.decode(reader, reader.uint32()); @@ -511,16 +519,16 @@ export const Code = { return message; }, fromJSON(object: any): Code { - return { - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - codeInfo: isSet(object.codeInfo) ? CodeInfo.fromJSON(object.codeInfo) : undefined, - codeBytes: isSet(object.codeBytes) ? bytesFromBase64(object.codeBytes) : new Uint8Array(), - pinned: isSet(object.pinned) ? Boolean(object.pinned) : false - }; + const obj = createBaseCode(); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.codeInfo)) obj.codeInfo = CodeInfo.fromJSON(object.codeInfo); + if (isSet(object.codeBytes)) obj.codeBytes = bytesFromBase64(object.codeBytes); + if (isSet(object.pinned)) obj.pinned = Boolean(object.pinned); + return obj; }, toJSON(message: Code): unknown { const obj: any = {}; - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.codeInfo !== undefined && (obj.codeInfo = message.codeInfo ? CodeInfo.toJSON(message.codeInfo) : undefined); message.codeBytes !== undefined && (obj.codeBytes = base64FromBytes(message.codeBytes !== undefined ? message.codeBytes : new Uint8Array())); message.pinned !== undefined && (obj.pinned = message.pinned); @@ -528,8 +536,12 @@ export const Code = { }, fromPartial(object: DeepPartial): Code { const message = createBaseCode(); - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; - message.codeInfo = object.codeInfo !== undefined && object.codeInfo !== null ? CodeInfo.fromPartial(object.codeInfo) : undefined; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } + if (object.codeInfo !== undefined && object.codeInfo !== null) { + message.codeInfo = CodeInfo.fromPartial(object.codeInfo); + } message.codeBytes = object.codeBytes ?? new Uint8Array(); message.pinned = object.pinned ?? false; return message; @@ -552,7 +564,7 @@ export const Code = { }, fromAmino(object: CodeAmino): Code { return { - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), codeInfo: object?.code_info ? CodeInfo.fromAmino(object.code_info) : undefined, codeBytes: object.code_bytes, pinned: object.pinned @@ -598,7 +610,7 @@ function createBaseContract(): Contract { export const Contract = { typeUrl: "/cosmwasm.wasm.v1.Contract", aminoType: "wasm/Contract", - encode(message: Contract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Contract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } @@ -610,8 +622,8 @@ export const Contract = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Contract { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Contract { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseContract(); while (reader.pos < end) { @@ -634,11 +646,11 @@ export const Contract = { return message; }, fromJSON(object: any): Contract { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "", - contractInfo: isSet(object.contractInfo) ? ContractInfo.fromJSON(object.contractInfo) : undefined, - contractState: Array.isArray(object?.contractState) ? object.contractState.map((e: any) => Model.fromJSON(e)) : [] - }; + const obj = createBaseContract(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + if (isSet(object.contractInfo)) obj.contractInfo = ContractInfo.fromJSON(object.contractInfo); + if (Array.isArray(object?.contractState)) object.contractState.map((e: any) => Model.fromJSON(e)); + return obj; }, toJSON(message: Contract): unknown { const obj: any = {}; @@ -654,7 +666,9 @@ export const Contract = { fromPartial(object: DeepPartial): Contract { const message = createBaseContract(); message.contractAddress = object.contractAddress ?? ""; - message.contractInfo = object.contractInfo !== undefined && object.contractInfo !== null ? ContractInfo.fromPartial(object.contractInfo) : undefined; + if (object.contractInfo !== undefined && object.contractInfo !== null) { + message.contractInfo = ContractInfo.fromPartial(object.contractInfo); + } message.contractState = object.contractState?.map(e => Model.fromPartial(e)) || []; return message; }, @@ -719,23 +733,23 @@ export const Contract = { function createBaseSequence(): Sequence { return { idKey: new Uint8Array(), - value: Long.UZERO + value: BigInt(0) }; } export const Sequence = { typeUrl: "/cosmwasm.wasm.v1.Sequence", aminoType: "wasm/Sequence", - encode(message: Sequence, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Sequence, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.idKey.length !== 0) { writer.uint32(10).bytes(message.idKey); } - if (!message.value.isZero()) { + if (message.value !== BigInt(0)) { writer.uint32(16).uint64(message.value); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Sequence { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Sequence { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSequence(); while (reader.pos < end) { @@ -745,7 +759,7 @@ export const Sequence = { message.idKey = reader.bytes(); break; case 2: - message.value = (reader.uint64() as Long); + message.value = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -755,21 +769,23 @@ export const Sequence = { return message; }, fromJSON(object: any): Sequence { - return { - idKey: isSet(object.idKey) ? bytesFromBase64(object.idKey) : new Uint8Array(), - value: isSet(object.value) ? Long.fromValue(object.value) : Long.UZERO - }; + const obj = createBaseSequence(); + if (isSet(object.idKey)) obj.idKey = bytesFromBase64(object.idKey); + if (isSet(object.value)) obj.value = BigInt(object.value.toString()); + return obj; }, toJSON(message: Sequence): unknown { const obj: any = {}; message.idKey !== undefined && (obj.idKey = base64FromBytes(message.idKey !== undefined ? message.idKey : new Uint8Array())); - message.value !== undefined && (obj.value = (message.value || Long.UZERO).toString()); + message.value !== undefined && (obj.value = (message.value || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Sequence { const message = createBaseSequence(); message.idKey = object.idKey ?? new Uint8Array(); - message.value = object.value !== undefined && object.value !== null ? Long.fromValue(object.value) : Long.UZERO; + if (object.value !== undefined && object.value !== null) { + message.value = BigInt(object.value.toString()); + } return message; }, fromSDK(object: SequenceSDKType): Sequence { @@ -787,7 +803,7 @@ export const Sequence = { fromAmino(object: SequenceAmino): Sequence { return { idKey: object.id_key, - value: Long.fromString(object.value) + value: BigInt(object.value) }; }, toAmino(message: Sequence): SequenceAmino { diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts index a2c564863f..b7b5f60eeb 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/ibc.ts @@ -1,5 +1,5 @@ -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; export const protobufPackage = "cosmwasm.wasm.v1"; /** MsgIBCSend */ export interface MsgIBCSend { @@ -9,12 +9,12 @@ export interface MsgIBCSend { * Timeout height relative to the current block height. * The timeout is disabled when set to 0. */ - timeoutHeight: Long; + timeoutHeight: bigint; /** * Timeout timestamp (in nanoseconds) relative to the current block timestamp. * The timeout is disabled when set to 0. */ - timeoutTimestamp: Long; + timeoutTimestamp: bigint; /** * Data is the payload to transfer. We must not make assumption what format or * content is in here. @@ -52,8 +52,8 @@ export interface MsgIBCSendAminoMsg { /** MsgIBCSend */ export interface MsgIBCSendSDKType { channel: string; - timeout_height: Long; - timeout_timestamp: Long; + timeout_height: bigint; + timeout_timestamp: bigint; data: Uint8Array; } /** MsgIBCCloseChannel port and channel need to be owned by the contract */ @@ -79,22 +79,22 @@ export interface MsgIBCCloseChannelSDKType { function createBaseMsgIBCSend(): MsgIBCSend { return { channel: "", - timeoutHeight: Long.UZERO, - timeoutTimestamp: Long.UZERO, + timeoutHeight: BigInt(0), + timeoutTimestamp: BigInt(0), data: new Uint8Array() }; } export const MsgIBCSend = { typeUrl: "/cosmwasm.wasm.v1.MsgIBCSend", aminoType: "wasm/MsgIBCSend", - encode(message: MsgIBCSend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgIBCSend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channel !== "") { writer.uint32(18).string(message.channel); } - if (!message.timeoutHeight.isZero()) { + if (message.timeoutHeight !== BigInt(0)) { writer.uint32(32).uint64(message.timeoutHeight); } - if (!message.timeoutTimestamp.isZero()) { + if (message.timeoutTimestamp !== BigInt(0)) { writer.uint32(40).uint64(message.timeoutTimestamp); } if (message.data.length !== 0) { @@ -102,8 +102,8 @@ export const MsgIBCSend = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgIBCSend { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgIBCSend { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgIBCSend(); while (reader.pos < end) { @@ -113,10 +113,10 @@ export const MsgIBCSend = { message.channel = reader.string(); break; case 4: - message.timeoutHeight = (reader.uint64() as Long); + message.timeoutHeight = reader.uint64(); break; case 5: - message.timeoutTimestamp = (reader.uint64() as Long); + message.timeoutTimestamp = reader.uint64(); break; case 6: message.data = reader.bytes(); @@ -129,26 +129,30 @@ export const MsgIBCSend = { return message; }, fromJSON(object: any): MsgIBCSend { - return { - channel: isSet(object.channel) ? String(object.channel) : "", - timeoutHeight: isSet(object.timeoutHeight) ? Long.fromValue(object.timeoutHeight) : Long.UZERO, - timeoutTimestamp: isSet(object.timeoutTimestamp) ? Long.fromValue(object.timeoutTimestamp) : Long.UZERO, - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseMsgIBCSend(); + if (isSet(object.channel)) obj.channel = String(object.channel); + if (isSet(object.timeoutHeight)) obj.timeoutHeight = BigInt(object.timeoutHeight.toString()); + if (isSet(object.timeoutTimestamp)) obj.timeoutTimestamp = BigInt(object.timeoutTimestamp.toString()); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: MsgIBCSend): unknown { const obj: any = {}; message.channel !== undefined && (obj.channel = message.channel); - message.timeoutHeight !== undefined && (obj.timeoutHeight = (message.timeoutHeight || Long.UZERO).toString()); - message.timeoutTimestamp !== undefined && (obj.timeoutTimestamp = (message.timeoutTimestamp || Long.UZERO).toString()); + message.timeoutHeight !== undefined && (obj.timeoutHeight = (message.timeoutHeight || BigInt(0)).toString()); + message.timeoutTimestamp !== undefined && (obj.timeoutTimestamp = (message.timeoutTimestamp || BigInt(0)).toString()); message.data !== undefined && (obj.data = base64FromBytes(message.data !== undefined ? message.data : new Uint8Array())); return obj; }, fromPartial(object: DeepPartial): MsgIBCSend { const message = createBaseMsgIBCSend(); message.channel = object.channel ?? ""; - message.timeoutHeight = object.timeoutHeight !== undefined && object.timeoutHeight !== null ? Long.fromValue(object.timeoutHeight) : Long.UZERO; - message.timeoutTimestamp = object.timeoutTimestamp !== undefined && object.timeoutTimestamp !== null ? Long.fromValue(object.timeoutTimestamp) : Long.UZERO; + if (object.timeoutHeight !== undefined && object.timeoutHeight !== null) { + message.timeoutHeight = BigInt(object.timeoutHeight.toString()); + } + if (object.timeoutTimestamp !== undefined && object.timeoutTimestamp !== null) { + message.timeoutTimestamp = BigInt(object.timeoutTimestamp.toString()); + } message.data = object.data ?? new Uint8Array(); return message; }, @@ -171,8 +175,8 @@ export const MsgIBCSend = { fromAmino(object: MsgIBCSendAmino): MsgIBCSend { return { channel: object.channel, - timeoutHeight: Long.fromString(object.timeout_height), - timeoutTimestamp: Long.fromString(object.timeout_timestamp), + timeoutHeight: BigInt(object.timeout_height), + timeoutTimestamp: BigInt(object.timeout_timestamp), data: object.data }; }, @@ -214,14 +218,14 @@ function createBaseMsgIBCCloseChannel(): MsgIBCCloseChannel { export const MsgIBCCloseChannel = { typeUrl: "/cosmwasm.wasm.v1.MsgIBCCloseChannel", aminoType: "wasm/MsgIBCCloseChannel", - encode(message: MsgIBCCloseChannel, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgIBCCloseChannel, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.channel !== "") { writer.uint32(18).string(message.channel); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgIBCCloseChannel { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgIBCCloseChannel { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgIBCCloseChannel(); while (reader.pos < end) { @@ -238,9 +242,9 @@ export const MsgIBCCloseChannel = { return message; }, fromJSON(object: any): MsgIBCCloseChannel { - return { - channel: isSet(object.channel) ? String(object.channel) : "" - }; + const obj = createBaseMsgIBCCloseChannel(); + if (isSet(object.channel)) obj.channel = String(object.channel); + return obj; }, toJSON(message: MsgIBCCloseChannel): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts index f12274ef8b..0dc39b37aa 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/proposal.ts @@ -1,7 +1,7 @@ import { AccessConfig, AccessConfigAmino, AccessConfigSDKType } from "./types"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** StoreCodeProposal gov proposal content type to submit WASM code to the system */ @@ -60,7 +60,7 @@ export interface InstantiateContractProposal { /** Admin is an optional address that can execute migrations */ admin: string; /** CodeID is the reference to the stored WASM code */ - codeId: Long; + codeId: bigint; /** Label is optional metadata to be stored with a constract instance. */ label: string; /** Msg json encoded message to be passed to the contract on instantiation */ @@ -107,7 +107,7 @@ export interface InstantiateContractProposalSDKType { description: string; run_as: string; admin: string; - code_id: Long; + code_id: bigint; label: string; msg: Uint8Array; funds: CoinSDKType[]; @@ -121,7 +121,7 @@ export interface MigrateContractProposal { /** Contract is the address of the smart contract */ contract: string; /** CodeID references the new WASM codesudo */ - codeId: Long; + codeId: bigint; /** Msg json encoded message to be passed to the contract on migration */ msg: Uint8Array; } @@ -151,7 +151,7 @@ export interface MigrateContractProposalSDKType { title: string; description: string; contract: string; - code_id: Long; + code_id: bigint; msg: Uint8Array; } /** SudoContractProposal gov proposal content type to call sudo on a contract. */ @@ -335,7 +335,7 @@ export interface PinCodesProposal { /** Description is a human readable text */ description: string; /** CodeIDs references the new WASM codes */ - codeIds: Long[]; + codeIds: bigint[]; } export interface PinCodesProposalProtoMsg { typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal"; @@ -364,7 +364,7 @@ export interface PinCodesProposalAminoMsg { export interface PinCodesProposalSDKType { title: string; description: string; - code_ids: Long[]; + code_ids: bigint[]; } /** * UnpinCodesProposal gov proposal content type to unpin a set of code ids in @@ -376,7 +376,7 @@ export interface UnpinCodesProposal { /** Description is a human readable text */ description: string; /** CodeIDs references the WASM codes */ - codeIds: Long[]; + codeIds: bigint[]; } export interface UnpinCodesProposalProtoMsg { typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal"; @@ -405,7 +405,7 @@ export interface UnpinCodesProposalAminoMsg { export interface UnpinCodesProposalSDKType { title: string; description: string; - code_ids: Long[]; + code_ids: bigint[]; } function createBaseStoreCodeProposal(): StoreCodeProposal { return { @@ -419,7 +419,7 @@ function createBaseStoreCodeProposal(): StoreCodeProposal { export const StoreCodeProposal = { typeUrl: "/cosmwasm.wasm.v1.StoreCodeProposal", aminoType: "wasm/StoreCodeProposal", - encode(message: StoreCodeProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: StoreCodeProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -437,8 +437,8 @@ export const StoreCodeProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): StoreCodeProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): StoreCodeProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStoreCodeProposal(); while (reader.pos < end) { @@ -467,13 +467,13 @@ export const StoreCodeProposal = { return message; }, fromJSON(object: any): StoreCodeProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - runAs: isSet(object.runAs) ? String(object.runAs) : "", - wasmByteCode: isSet(object.wasmByteCode) ? bytesFromBase64(object.wasmByteCode) : new Uint8Array(), - instantiatePermission: isSet(object.instantiatePermission) ? AccessConfig.fromJSON(object.instantiatePermission) : undefined - }; + const obj = createBaseStoreCodeProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.runAs)) obj.runAs = String(object.runAs); + if (isSet(object.wasmByteCode)) obj.wasmByteCode = bytesFromBase64(object.wasmByteCode); + if (isSet(object.instantiatePermission)) obj.instantiatePermission = AccessConfig.fromJSON(object.instantiatePermission); + return obj; }, toJSON(message: StoreCodeProposal): unknown { const obj: any = {}; @@ -490,7 +490,9 @@ export const StoreCodeProposal = { message.description = object.description ?? ""; message.runAs = object.runAs ?? ""; message.wasmByteCode = object.wasmByteCode ?? new Uint8Array(); - message.instantiatePermission = object.instantiatePermission !== undefined && object.instantiatePermission !== null ? AccessConfig.fromPartial(object.instantiatePermission) : undefined; + if (object.instantiatePermission !== undefined && object.instantiatePermission !== null) { + message.instantiatePermission = AccessConfig.fromPartial(object.instantiatePermission); + } return message; }, fromSDK(object: StoreCodeProposalSDKType): StoreCodeProposal { @@ -557,7 +559,7 @@ function createBaseInstantiateContractProposal(): InstantiateContractProposal { description: "", runAs: "", admin: "", - codeId: Long.UZERO, + codeId: BigInt(0), label: "", msg: new Uint8Array(), funds: [] @@ -566,7 +568,7 @@ function createBaseInstantiateContractProposal(): InstantiateContractProposal { export const InstantiateContractProposal = { typeUrl: "/cosmwasm.wasm.v1.InstantiateContractProposal", aminoType: "wasm/InstantiateContractProposal", - encode(message: InstantiateContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InstantiateContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -579,7 +581,7 @@ export const InstantiateContractProposal = { if (message.admin !== "") { writer.uint32(34).string(message.admin); } - if (!message.codeId.isZero()) { + if (message.codeId !== BigInt(0)) { writer.uint32(40).uint64(message.codeId); } if (message.label !== "") { @@ -593,8 +595,8 @@ export const InstantiateContractProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InstantiateContractProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InstantiateContractProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInstantiateContractProposal(); while (reader.pos < end) { @@ -613,7 +615,7 @@ export const InstantiateContractProposal = { message.admin = reader.string(); break; case 5: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 6: message.label = reader.string(); @@ -632,16 +634,16 @@ export const InstantiateContractProposal = { return message; }, fromJSON(object: any): InstantiateContractProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - runAs: isSet(object.runAs) ? String(object.runAs) : "", - admin: isSet(object.admin) ? String(object.admin) : "", - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - label: isSet(object.label) ? String(object.label) : "", - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array(), - funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseInstantiateContractProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.runAs)) obj.runAs = String(object.runAs); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.label)) obj.label = String(object.label); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + if (Array.isArray(object?.funds)) object.funds.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: InstantiateContractProposal): unknown { const obj: any = {}; @@ -649,7 +651,7 @@ export const InstantiateContractProposal = { message.description !== undefined && (obj.description = message.description); message.runAs !== undefined && (obj.runAs = message.runAs); message.admin !== undefined && (obj.admin = message.admin); - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.label !== undefined && (obj.label = message.label); message.msg !== undefined && (obj.msg = base64FromBytes(message.msg !== undefined ? message.msg : new Uint8Array())); if (message.funds) { @@ -665,7 +667,9 @@ export const InstantiateContractProposal = { message.description = object.description ?? ""; message.runAs = object.runAs ?? ""; message.admin = object.admin ?? ""; - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } message.label = object.label ?? ""; message.msg = object.msg ?? new Uint8Array(); message.funds = object.funds?.map(e => Coin.fromPartial(e)) || []; @@ -705,7 +709,7 @@ export const InstantiateContractProposal = { description: object.description, runAs: object.run_as, admin: object.admin, - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), label: object.label, msg: toUtf8(JSON.stringify(object.msg)), funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromAmino(e)) : [] @@ -754,14 +758,14 @@ function createBaseMigrateContractProposal(): MigrateContractProposal { title: "", description: "", contract: "", - codeId: Long.UZERO, + codeId: BigInt(0), msg: new Uint8Array() }; } export const MigrateContractProposal = { typeUrl: "/cosmwasm.wasm.v1.MigrateContractProposal", aminoType: "wasm/MigrateContractProposal", - encode(message: MigrateContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MigrateContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -771,7 +775,7 @@ export const MigrateContractProposal = { if (message.contract !== "") { writer.uint32(34).string(message.contract); } - if (!message.codeId.isZero()) { + if (message.codeId !== BigInt(0)) { writer.uint32(40).uint64(message.codeId); } if (message.msg.length !== 0) { @@ -779,8 +783,8 @@ export const MigrateContractProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MigrateContractProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MigrateContractProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMigrateContractProposal(); while (reader.pos < end) { @@ -796,7 +800,7 @@ export const MigrateContractProposal = { message.contract = reader.string(); break; case 5: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 6: message.msg = reader.bytes(); @@ -809,20 +813,20 @@ export const MigrateContractProposal = { return message; }, fromJSON(object: any): MigrateContractProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - contract: isSet(object.contract) ? String(object.contract) : "", - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array() - }; + const obj = createBaseMigrateContractProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + return obj; }, toJSON(message: MigrateContractProposal): unknown { const obj: any = {}; message.title !== undefined && (obj.title = message.title); message.description !== undefined && (obj.description = message.description); message.contract !== undefined && (obj.contract = message.contract); - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.msg !== undefined && (obj.msg = base64FromBytes(message.msg !== undefined ? message.msg : new Uint8Array())); return obj; }, @@ -831,7 +835,9 @@ export const MigrateContractProposal = { message.title = object.title ?? ""; message.description = object.description ?? ""; message.contract = object.contract ?? ""; - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } message.msg = object.msg ?? new Uint8Array(); return message; }, @@ -858,7 +864,7 @@ export const MigrateContractProposal = { title: object.title, description: object.description, contract: object.contract, - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), msg: toUtf8(JSON.stringify(object.msg)) }; }, @@ -904,7 +910,7 @@ function createBaseSudoContractProposal(): SudoContractProposal { export const SudoContractProposal = { typeUrl: "/cosmwasm.wasm.v1.SudoContractProposal", aminoType: "wasm/SudoContractProposal", - encode(message: SudoContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SudoContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -919,8 +925,8 @@ export const SudoContractProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SudoContractProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SudoContractProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSudoContractProposal(); while (reader.pos < end) { @@ -946,12 +952,12 @@ export const SudoContractProposal = { return message; }, fromJSON(object: any): SudoContractProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - contract: isSet(object.contract) ? String(object.contract) : "", - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array() - }; + const obj = createBaseSudoContractProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + return obj; }, toJSON(message: SudoContractProposal): unknown { const obj: any = {}; @@ -1036,7 +1042,7 @@ function createBaseExecuteContractProposal(): ExecuteContractProposal { export const ExecuteContractProposal = { typeUrl: "/cosmwasm.wasm.v1.ExecuteContractProposal", aminoType: "wasm/ExecuteContractProposal", - encode(message: ExecuteContractProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ExecuteContractProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1057,8 +1063,8 @@ export const ExecuteContractProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ExecuteContractProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ExecuteContractProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExecuteContractProposal(); while (reader.pos < end) { @@ -1090,14 +1096,14 @@ export const ExecuteContractProposal = { return message; }, fromJSON(object: any): ExecuteContractProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - runAs: isSet(object.runAs) ? String(object.runAs) : "", - contract: isSet(object.contract) ? String(object.contract) : "", - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array(), - funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseExecuteContractProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.runAs)) obj.runAs = String(object.runAs); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + if (Array.isArray(object?.funds)) object.funds.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: ExecuteContractProposal): unknown { const obj: any = {}; @@ -1204,7 +1210,7 @@ function createBaseUpdateAdminProposal(): UpdateAdminProposal { export const UpdateAdminProposal = { typeUrl: "/cosmwasm.wasm.v1.UpdateAdminProposal", aminoType: "wasm/UpdateAdminProposal", - encode(message: UpdateAdminProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateAdminProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1219,8 +1225,8 @@ export const UpdateAdminProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateAdminProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateAdminProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateAdminProposal(); while (reader.pos < end) { @@ -1246,12 +1252,12 @@ export const UpdateAdminProposal = { return message; }, fromJSON(object: any): UpdateAdminProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - newAdmin: isSet(object.newAdmin) ? String(object.newAdmin) : "", - contract: isSet(object.contract) ? String(object.contract) : "" - }; + const obj = createBaseUpdateAdminProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.newAdmin)) obj.newAdmin = String(object.newAdmin); + if (isSet(object.contract)) obj.contract = String(object.contract); + return obj; }, toJSON(message: UpdateAdminProposal): unknown { const obj: any = {}; @@ -1333,7 +1339,7 @@ function createBaseClearAdminProposal(): ClearAdminProposal { export const ClearAdminProposal = { typeUrl: "/cosmwasm.wasm.v1.ClearAdminProposal", aminoType: "wasm/ClearAdminProposal", - encode(message: ClearAdminProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ClearAdminProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1345,8 +1351,8 @@ export const ClearAdminProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ClearAdminProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ClearAdminProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseClearAdminProposal(); while (reader.pos < end) { @@ -1369,11 +1375,11 @@ export const ClearAdminProposal = { return message; }, fromJSON(object: any): ClearAdminProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - contract: isSet(object.contract) ? String(object.contract) : "" - }; + const obj = createBaseClearAdminProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.contract)) obj.contract = String(object.contract); + return obj; }, toJSON(message: ClearAdminProposal): unknown { const obj: any = {}; @@ -1449,7 +1455,7 @@ function createBasePinCodesProposal(): PinCodesProposal { export const PinCodesProposal = { typeUrl: "/cosmwasm.wasm.v1.PinCodesProposal", aminoType: "wasm/PinCodesProposal", - encode(message: PinCodesProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: PinCodesProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1463,8 +1469,8 @@ export const PinCodesProposal = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): PinCodesProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): PinCodesProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePinCodesProposal(); while (reader.pos < end) { @@ -1480,10 +1486,10 @@ export const PinCodesProposal = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.codeIds.push((reader.uint64() as Long)); + message.codeIds.push(reader.uint64()); } } else { - message.codeIds.push((reader.uint64() as Long)); + message.codeIds.push(reader.uint64()); } break; default: @@ -1494,18 +1500,18 @@ export const PinCodesProposal = { return message; }, fromJSON(object: any): PinCodesProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - codeIds: Array.isArray(object?.codeIds) ? object.codeIds.map((e: any) => Long.fromValue(e)) : [] - }; + const obj = createBasePinCodesProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (Array.isArray(object?.codeIds)) object.codeIds.map((e: any) => BigInt(e.toString())); + return obj; }, toJSON(message: PinCodesProposal): unknown { const obj: any = {}; message.title !== undefined && (obj.title = message.title); message.description !== undefined && (obj.description = message.description); if (message.codeIds) { - obj.codeIds = message.codeIds.map(e => (e || Long.UZERO).toString()); + obj.codeIds = message.codeIds.map(e => (e || BigInt(0)).toString()); } else { obj.codeIds = []; } @@ -1515,7 +1521,7 @@ export const PinCodesProposal = { const message = createBasePinCodesProposal(); message.title = object.title ?? ""; message.description = object.description ?? ""; - message.codeIds = object.codeIds?.map(e => Long.fromValue(e)) || []; + message.codeIds = object.codeIds?.map(e => BigInt(e.toString())) || []; return message; }, fromSDK(object: PinCodesProposalSDKType): PinCodesProposal { @@ -1540,7 +1546,7 @@ export const PinCodesProposal = { return { title: object.title, description: object.description, - codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => e) : [] + codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => BigInt(e)) : [] }; }, toAmino(message: PinCodesProposal): PinCodesProposalAmino { @@ -1548,7 +1554,7 @@ export const PinCodesProposal = { obj.title = message.title; obj.description = message.description; if (message.codeIds) { - obj.code_ids = message.codeIds.map(e => e); + obj.code_ids = message.codeIds.map(e => e.toString()); } else { obj.code_ids = []; } @@ -1586,7 +1592,7 @@ function createBaseUnpinCodesProposal(): UnpinCodesProposal { export const UnpinCodesProposal = { typeUrl: "/cosmwasm.wasm.v1.UnpinCodesProposal", aminoType: "wasm/UnpinCodesProposal", - encode(message: UnpinCodesProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UnpinCodesProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -1600,8 +1606,8 @@ export const UnpinCodesProposal = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UnpinCodesProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UnpinCodesProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUnpinCodesProposal(); while (reader.pos < end) { @@ -1617,10 +1623,10 @@ export const UnpinCodesProposal = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.codeIds.push((reader.uint64() as Long)); + message.codeIds.push(reader.uint64()); } } else { - message.codeIds.push((reader.uint64() as Long)); + message.codeIds.push(reader.uint64()); } break; default: @@ -1631,18 +1637,18 @@ export const UnpinCodesProposal = { return message; }, fromJSON(object: any): UnpinCodesProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - codeIds: Array.isArray(object?.codeIds) ? object.codeIds.map((e: any) => Long.fromValue(e)) : [] - }; + const obj = createBaseUnpinCodesProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (Array.isArray(object?.codeIds)) object.codeIds.map((e: any) => BigInt(e.toString())); + return obj; }, toJSON(message: UnpinCodesProposal): unknown { const obj: any = {}; message.title !== undefined && (obj.title = message.title); message.description !== undefined && (obj.description = message.description); if (message.codeIds) { - obj.codeIds = message.codeIds.map(e => (e || Long.UZERO).toString()); + obj.codeIds = message.codeIds.map(e => (e || BigInt(0)).toString()); } else { obj.codeIds = []; } @@ -1652,7 +1658,7 @@ export const UnpinCodesProposal = { const message = createBaseUnpinCodesProposal(); message.title = object.title ?? ""; message.description = object.description ?? ""; - message.codeIds = object.codeIds?.map(e => Long.fromValue(e)) || []; + message.codeIds = object.codeIds?.map(e => BigInt(e.toString())) || []; return message; }, fromSDK(object: UnpinCodesProposalSDKType): UnpinCodesProposal { @@ -1677,7 +1683,7 @@ export const UnpinCodesProposal = { return { title: object.title, description: object.description, - codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => e) : [] + codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => BigInt(e)) : [] }; }, toAmino(message: UnpinCodesProposal): UnpinCodesProposalAmino { @@ -1685,7 +1691,7 @@ export const UnpinCodesProposal = { obj.title = message.title; obj.description = message.description; if (message.codeIds) { - obj.code_ids = message.codeIds.map(e => e); + obj.code_ids = message.codeIds.map(e => e.toString()); } else { obj.code_ids = []; } diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts index fc17f50d59..b458bd6c62 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { ContractInfo, ContractInfoAmino, ContractInfoSDKType, ContractCodeHistoryEntry, ContractCodeHistoryEntryAmino, ContractCodeHistoryEntrySDKType, Model, ModelAmino, ModelSDKType } from "./types"; -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** @@ -148,7 +148,7 @@ export interface QueryContractsByCodeRequest { * grpc-gateway_out does not support Go style CodID * pagination defines an optional pagination for the request. */ - codeId: Long; + codeId: bigint; pagination: PageRequest; } export interface QueryContractsByCodeRequestProtoMsg { @@ -176,7 +176,7 @@ export interface QueryContractsByCodeRequestAminoMsg { * RPC method */ export interface QueryContractsByCodeRequestSDKType { - code_id: Long; + code_id: bigint; pagination: PageRequestSDKType; } /** @@ -420,7 +420,7 @@ export interface QuerySmartContractStateResponseSDKType { /** QueryCodeRequest is the request type for the Query/Code RPC method */ export interface QueryCodeRequest { /** grpc-gateway_out does not support Go style CodID */ - codeId: Long; + codeId: bigint; } export interface QueryCodeRequestProtoMsg { typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest"; @@ -437,11 +437,11 @@ export interface QueryCodeRequestAminoMsg { } /** QueryCodeRequest is the request type for the Query/Code RPC method */ export interface QueryCodeRequestSDKType { - code_id: Long; + code_id: bigint; } /** CodeInfoResponse contains code meta data from CodeInfo */ export interface CodeInfoResponse { - codeId: Long; + codeId: bigint; creator: string; dataHash: Uint8Array; } @@ -461,7 +461,7 @@ export interface CodeInfoResponseAminoMsg { } /** CodeInfoResponse contains code meta data from CodeInfo */ export interface CodeInfoResponseSDKType { - code_id: Long; + code_id: bigint; creator: string; data_hash: Uint8Array; } @@ -571,7 +571,7 @@ export interface QueryPinnedCodesRequestSDKType { * Query/PinnedCodes RPC method */ export interface QueryPinnedCodesResponse { - codeIds: Long[]; + codeIds: bigint[]; /** pagination defines the pagination in the response. */ pagination: PageResponse; } @@ -597,7 +597,7 @@ export interface QueryPinnedCodesResponseAminoMsg { * Query/PinnedCodes RPC method */ export interface QueryPinnedCodesResponseSDKType { - code_ids: Long[]; + code_ids: bigint[]; pagination: PageResponseSDKType; } function createBaseQueryContractInfoRequest(): QueryContractInfoRequest { @@ -608,14 +608,14 @@ function createBaseQueryContractInfoRequest(): QueryContractInfoRequest { export const QueryContractInfoRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoRequest", aminoType: "wasm/QueryContractInfoRequest", - encode(message: QueryContractInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryContractInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryContractInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryContractInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryContractInfoRequest(); while (reader.pos < end) { @@ -632,9 +632,9 @@ export const QueryContractInfoRequest = { return message; }, fromJSON(object: any): QueryContractInfoRequest { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseQueryContractInfoRequest(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: QueryContractInfoRequest): unknown { const obj: any = {}; @@ -697,7 +697,7 @@ function createBaseQueryContractInfoResponse(): QueryContractInfoResponse { export const QueryContractInfoResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryContractInfoResponse", aminoType: "wasm/QueryContractInfoResponse", - encode(message: QueryContractInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryContractInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -706,8 +706,8 @@ export const QueryContractInfoResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryContractInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryContractInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryContractInfoResponse(); while (reader.pos < end) { @@ -727,10 +727,10 @@ export const QueryContractInfoResponse = { return message; }, fromJSON(object: any): QueryContractInfoResponse { - return { - address: isSet(object.address) ? String(object.address) : "", - contractInfo: isSet(object.contractInfo) ? ContractInfo.fromJSON(object.contractInfo) : undefined - }; + const obj = createBaseQueryContractInfoResponse(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.contractInfo)) obj.contractInfo = ContractInfo.fromJSON(object.contractInfo); + return obj; }, toJSON(message: QueryContractInfoResponse): unknown { const obj: any = {}; @@ -741,7 +741,9 @@ export const QueryContractInfoResponse = { fromPartial(object: DeepPartial): QueryContractInfoResponse { const message = createBaseQueryContractInfoResponse(); message.address = object.address ?? ""; - message.contractInfo = object.contractInfo !== undefined && object.contractInfo !== null ? ContractInfo.fromPartial(object.contractInfo) : undefined; + if (object.contractInfo !== undefined && object.contractInfo !== null) { + message.contractInfo = ContractInfo.fromPartial(object.contractInfo); + } return message; }, fromSDK(object: QueryContractInfoResponseSDKType): QueryContractInfoResponse { @@ -799,7 +801,7 @@ function createBaseQueryContractHistoryRequest(): QueryContractHistoryRequest { export const QueryContractHistoryRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryRequest", aminoType: "wasm/QueryContractHistoryRequest", - encode(message: QueryContractHistoryRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryContractHistoryRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -808,8 +810,8 @@ export const QueryContractHistoryRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryContractHistoryRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryContractHistoryRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryContractHistoryRequest(); while (reader.pos < end) { @@ -829,10 +831,10 @@ export const QueryContractHistoryRequest = { return message; }, fromJSON(object: any): QueryContractHistoryRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryContractHistoryRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryContractHistoryRequest): unknown { const obj: any = {}; @@ -843,7 +845,9 @@ export const QueryContractHistoryRequest = { fromPartial(object: DeepPartial): QueryContractHistoryRequest { const message = createBaseQueryContractHistoryRequest(); message.address = object.address ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryContractHistoryRequestSDKType): QueryContractHistoryRequest { @@ -901,7 +905,7 @@ function createBaseQueryContractHistoryResponse(): QueryContractHistoryResponse export const QueryContractHistoryResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryContractHistoryResponse", aminoType: "wasm/QueryContractHistoryResponse", - encode(message: QueryContractHistoryResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryContractHistoryResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { ContractCodeHistoryEntry.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -910,8 +914,8 @@ export const QueryContractHistoryResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryContractHistoryResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryContractHistoryResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryContractHistoryResponse(); while (reader.pos < end) { @@ -931,10 +935,10 @@ export const QueryContractHistoryResponse = { return message; }, fromJSON(object: any): QueryContractHistoryResponse { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => ContractCodeHistoryEntry.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryContractHistoryResponse(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => ContractCodeHistoryEntry.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryContractHistoryResponse): unknown { const obj: any = {}; @@ -949,7 +953,9 @@ export const QueryContractHistoryResponse = { fromPartial(object: DeepPartial): QueryContractHistoryResponse { const message = createBaseQueryContractHistoryResponse(); message.entries = object.entries?.map(e => ContractCodeHistoryEntry.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryContractHistoryResponseSDKType): QueryContractHistoryResponse { @@ -1008,15 +1014,15 @@ export const QueryContractHistoryResponse = { }; function createBaseQueryContractsByCodeRequest(): QueryContractsByCodeRequest { return { - codeId: Long.UZERO, + codeId: BigInt(0), pagination: PageRequest.fromPartial({}) }; } export const QueryContractsByCodeRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeRequest", aminoType: "wasm/QueryContractsByCodeRequest", - encode(message: QueryContractsByCodeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.codeId.isZero()) { + encode(message: QueryContractsByCodeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); } if (message.pagination !== undefined) { @@ -1024,15 +1030,15 @@ export const QueryContractsByCodeRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryContractsByCodeRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryContractsByCodeRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryContractsByCodeRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 2: message.pagination = PageRequest.decode(reader, reader.uint32()); @@ -1045,21 +1051,25 @@ export const QueryContractsByCodeRequest = { return message; }, fromJSON(object: any): QueryContractsByCodeRequest { - return { - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryContractsByCodeRequest(); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryContractsByCodeRequest): unknown { const obj: any = {}; - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.pagination !== undefined && (obj.pagination = message.pagination ? PageRequest.toJSON(message.pagination) : undefined); return obj; }, fromPartial(object: DeepPartial): QueryContractsByCodeRequest { const message = createBaseQueryContractsByCodeRequest(); - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryContractsByCodeRequestSDKType): QueryContractsByCodeRequest { @@ -1076,7 +1086,7 @@ export const QueryContractsByCodeRequest = { }, fromAmino(object: QueryContractsByCodeRequestAmino): QueryContractsByCodeRequest { return { - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), pagination: object?.pagination ? PageRequest.fromAmino(object.pagination) : undefined }; }, @@ -1117,7 +1127,7 @@ function createBaseQueryContractsByCodeResponse(): QueryContractsByCodeResponse export const QueryContractsByCodeResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryContractsByCodeResponse", aminoType: "wasm/QueryContractsByCodeResponse", - encode(message: QueryContractsByCodeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryContractsByCodeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.contracts) { writer.uint32(10).string(v!); } @@ -1126,8 +1136,8 @@ export const QueryContractsByCodeResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryContractsByCodeResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryContractsByCodeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryContractsByCodeResponse(); while (reader.pos < end) { @@ -1147,10 +1157,10 @@ export const QueryContractsByCodeResponse = { return message; }, fromJSON(object: any): QueryContractsByCodeResponse { - return { - contracts: Array.isArray(object?.contracts) ? object.contracts.map((e: any) => String(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryContractsByCodeResponse(); + if (Array.isArray(object?.contracts)) object.contracts.map((e: any) => String(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryContractsByCodeResponse): unknown { const obj: any = {}; @@ -1165,7 +1175,9 @@ export const QueryContractsByCodeResponse = { fromPartial(object: DeepPartial): QueryContractsByCodeResponse { const message = createBaseQueryContractsByCodeResponse(); message.contracts = object.contracts?.map(e => e) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryContractsByCodeResponseSDKType): QueryContractsByCodeResponse { @@ -1231,7 +1243,7 @@ function createBaseQueryAllContractStateRequest(): QueryAllContractStateRequest export const QueryAllContractStateRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateRequest", aminoType: "wasm/QueryAllContractStateRequest", - encode(message: QueryAllContractStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllContractStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -1240,8 +1252,8 @@ export const QueryAllContractStateRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllContractStateRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllContractStateRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllContractStateRequest(); while (reader.pos < end) { @@ -1261,10 +1273,10 @@ export const QueryAllContractStateRequest = { return message; }, fromJSON(object: any): QueryAllContractStateRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllContractStateRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllContractStateRequest): unknown { const obj: any = {}; @@ -1275,7 +1287,9 @@ export const QueryAllContractStateRequest = { fromPartial(object: DeepPartial): QueryAllContractStateRequest { const message = createBaseQueryAllContractStateRequest(); message.address = object.address ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllContractStateRequestSDKType): QueryAllContractStateRequest { @@ -1333,7 +1347,7 @@ function createBaseQueryAllContractStateResponse(): QueryAllContractStateRespons export const QueryAllContractStateResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryAllContractStateResponse", aminoType: "wasm/QueryAllContractStateResponse", - encode(message: QueryAllContractStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllContractStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.models) { Model.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1342,8 +1356,8 @@ export const QueryAllContractStateResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllContractStateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllContractStateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllContractStateResponse(); while (reader.pos < end) { @@ -1363,10 +1377,10 @@ export const QueryAllContractStateResponse = { return message; }, fromJSON(object: any): QueryAllContractStateResponse { - return { - models: Array.isArray(object?.models) ? object.models.map((e: any) => Model.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllContractStateResponse(); + if (Array.isArray(object?.models)) object.models.map((e: any) => Model.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllContractStateResponse): unknown { const obj: any = {}; @@ -1381,7 +1395,9 @@ export const QueryAllContractStateResponse = { fromPartial(object: DeepPartial): QueryAllContractStateResponse { const message = createBaseQueryAllContractStateResponse(); message.models = object.models?.map(e => Model.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllContractStateResponseSDKType): QueryAllContractStateResponse { @@ -1447,7 +1463,7 @@ function createBaseQueryRawContractStateRequest(): QueryRawContractStateRequest export const QueryRawContractStateRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateRequest", aminoType: "wasm/QueryRawContractStateRequest", - encode(message: QueryRawContractStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryRawContractStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -1456,8 +1472,8 @@ export const QueryRawContractStateRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryRawContractStateRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryRawContractStateRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryRawContractStateRequest(); while (reader.pos < end) { @@ -1477,10 +1493,10 @@ export const QueryRawContractStateRequest = { return message; }, fromJSON(object: any): QueryRawContractStateRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - queryData: isSet(object.queryData) ? bytesFromBase64(object.queryData) : new Uint8Array() - }; + const obj = createBaseQueryRawContractStateRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.queryData)) obj.queryData = bytesFromBase64(object.queryData); + return obj; }, toJSON(message: QueryRawContractStateRequest): unknown { const obj: any = {}; @@ -1548,14 +1564,14 @@ function createBaseQueryRawContractStateResponse(): QueryRawContractStateRespons export const QueryRawContractStateResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryRawContractStateResponse", aminoType: "wasm/QueryRawContractStateResponse", - encode(message: QueryRawContractStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryRawContractStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryRawContractStateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryRawContractStateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryRawContractStateResponse(); while (reader.pos < end) { @@ -1572,9 +1588,9 @@ export const QueryRawContractStateResponse = { return message; }, fromJSON(object: any): QueryRawContractStateResponse { - return { - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseQueryRawContractStateResponse(); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: QueryRawContractStateResponse): unknown { const obj: any = {}; @@ -1637,7 +1653,7 @@ function createBaseQuerySmartContractStateRequest(): QuerySmartContractStateRequ export const QuerySmartContractStateRequest = { typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateRequest", aminoType: "wasm/QuerySmartContractStateRequest", - encode(message: QuerySmartContractStateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySmartContractStateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -1646,8 +1662,8 @@ export const QuerySmartContractStateRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySmartContractStateRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySmartContractStateRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySmartContractStateRequest(); while (reader.pos < end) { @@ -1667,10 +1683,10 @@ export const QuerySmartContractStateRequest = { return message; }, fromJSON(object: any): QuerySmartContractStateRequest { - return { - address: isSet(object.address) ? String(object.address) : "", - queryData: isSet(object.queryData) ? bytesFromBase64(object.queryData) : new Uint8Array() - }; + const obj = createBaseQuerySmartContractStateRequest(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.queryData)) obj.queryData = bytesFromBase64(object.queryData); + return obj; }, toJSON(message: QuerySmartContractStateRequest): unknown { const obj: any = {}; @@ -1738,14 +1754,14 @@ function createBaseQuerySmartContractStateResponse(): QuerySmartContractStateRes export const QuerySmartContractStateResponse = { typeUrl: "/cosmwasm.wasm.v1.QuerySmartContractStateResponse", aminoType: "wasm/QuerySmartContractStateResponse", - encode(message: QuerySmartContractStateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuerySmartContractStateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySmartContractStateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySmartContractStateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySmartContractStateResponse(); while (reader.pos < end) { @@ -1762,9 +1778,9 @@ export const QuerySmartContractStateResponse = { return message; }, fromJSON(object: any): QuerySmartContractStateResponse { - return { - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseQuerySmartContractStateResponse(); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: QuerySmartContractStateResponse): unknown { const obj: any = {}; @@ -1820,27 +1836,27 @@ export const QuerySmartContractStateResponse = { }; function createBaseQueryCodeRequest(): QueryCodeRequest { return { - codeId: Long.UZERO + codeId: BigInt(0) }; } export const QueryCodeRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryCodeRequest", aminoType: "wasm/QueryCodeRequest", - encode(message: QueryCodeRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.codeId.isZero()) { + encode(message: QueryCodeRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCodeRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCodeRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCodeRequest(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1850,18 +1866,20 @@ export const QueryCodeRequest = { return message; }, fromJSON(object: any): QueryCodeRequest { - return { - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO - }; + const obj = createBaseQueryCodeRequest(); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + return obj; }, toJSON(message: QueryCodeRequest): unknown { const obj: any = {}; - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryCodeRequest { const message = createBaseQueryCodeRequest(); - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } return message; }, fromSDK(object: QueryCodeRequestSDKType): QueryCodeRequest { @@ -1876,7 +1894,7 @@ export const QueryCodeRequest = { }, fromAmino(object: QueryCodeRequestAmino): QueryCodeRequest { return { - codeId: Long.fromString(object.code_id) + codeId: BigInt(object.code_id) }; }, toAmino(message: QueryCodeRequest): QueryCodeRequestAmino { @@ -1908,7 +1926,7 @@ export const QueryCodeRequest = { }; function createBaseCodeInfoResponse(): CodeInfoResponse { return { - codeId: Long.UZERO, + codeId: BigInt(0), creator: "", dataHash: new Uint8Array() }; @@ -1916,8 +1934,8 @@ function createBaseCodeInfoResponse(): CodeInfoResponse { export const CodeInfoResponse = { typeUrl: "/cosmwasm.wasm.v1.CodeInfoResponse", aminoType: "wasm/CodeInfoResponse", - encode(message: CodeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.codeId.isZero()) { + encode(message: CodeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); } if (message.creator !== "") { @@ -1928,15 +1946,15 @@ export const CodeInfoResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CodeInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CodeInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCodeInfoResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 2: message.creator = reader.string(); @@ -1952,22 +1970,24 @@ export const CodeInfoResponse = { return message; }, fromJSON(object: any): CodeInfoResponse { - return { - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - creator: isSet(object.creator) ? String(object.creator) : "", - dataHash: isSet(object.dataHash) ? bytesFromBase64(object.dataHash) : new Uint8Array() - }; + const obj = createBaseCodeInfoResponse(); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.creator)) obj.creator = String(object.creator); + if (isSet(object.dataHash)) obj.dataHash = bytesFromBase64(object.dataHash); + return obj; }, toJSON(message: CodeInfoResponse): unknown { const obj: any = {}; - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.creator !== undefined && (obj.creator = message.creator); message.dataHash !== undefined && (obj.dataHash = base64FromBytes(message.dataHash !== undefined ? message.dataHash : new Uint8Array())); return obj; }, fromPartial(object: DeepPartial): CodeInfoResponse { const message = createBaseCodeInfoResponse(); - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } message.creator = object.creator ?? ""; message.dataHash = object.dataHash ?? new Uint8Array(); return message; @@ -1988,7 +2008,7 @@ export const CodeInfoResponse = { }, fromAmino(object: CodeInfoResponseAmino): CodeInfoResponse { return { - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), creator: object.creator, dataHash: object.data_hash }; @@ -2031,7 +2051,7 @@ function createBaseQueryCodeResponse(): QueryCodeResponse { export const QueryCodeResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryCodeResponse", aminoType: "wasm/QueryCodeResponse", - encode(message: QueryCodeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCodeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeInfo !== undefined) { CodeInfoResponse.encode(message.codeInfo, writer.uint32(10).fork()).ldelim(); } @@ -2040,8 +2060,8 @@ export const QueryCodeResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCodeResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCodeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCodeResponse(); while (reader.pos < end) { @@ -2061,10 +2081,10 @@ export const QueryCodeResponse = { return message; }, fromJSON(object: any): QueryCodeResponse { - return { - codeInfo: isSet(object.codeInfo) ? CodeInfoResponse.fromJSON(object.codeInfo) : undefined, - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseQueryCodeResponse(); + if (isSet(object.codeInfo)) obj.codeInfo = CodeInfoResponse.fromJSON(object.codeInfo); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: QueryCodeResponse): unknown { const obj: any = {}; @@ -2074,7 +2094,9 @@ export const QueryCodeResponse = { }, fromPartial(object: DeepPartial): QueryCodeResponse { const message = createBaseQueryCodeResponse(); - message.codeInfo = object.codeInfo !== undefined && object.codeInfo !== null ? CodeInfoResponse.fromPartial(object.codeInfo) : undefined; + if (object.codeInfo !== undefined && object.codeInfo !== null) { + message.codeInfo = CodeInfoResponse.fromPartial(object.codeInfo); + } message.data = object.data ?? new Uint8Array(); return message; }, @@ -2132,14 +2154,14 @@ function createBaseQueryCodesRequest(): QueryCodesRequest { export const QueryCodesRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryCodesRequest", aminoType: "wasm/QueryCodesRequest", - encode(message: QueryCodesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCodesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCodesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCodesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCodesRequest(); while (reader.pos < end) { @@ -2156,9 +2178,9 @@ export const QueryCodesRequest = { return message; }, fromJSON(object: any): QueryCodesRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryCodesRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryCodesRequest): unknown { const obj: any = {}; @@ -2167,7 +2189,9 @@ export const QueryCodesRequest = { }, fromPartial(object: DeepPartial): QueryCodesRequest { const message = createBaseQueryCodesRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryCodesRequestSDKType): QueryCodesRequest { @@ -2221,7 +2245,7 @@ function createBaseQueryCodesResponse(): QueryCodesResponse { export const QueryCodesResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryCodesResponse", aminoType: "wasm/QueryCodesResponse", - encode(message: QueryCodesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCodesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.codeInfos) { CodeInfoResponse.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2230,8 +2254,8 @@ export const QueryCodesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCodesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCodesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCodesResponse(); while (reader.pos < end) { @@ -2251,10 +2275,10 @@ export const QueryCodesResponse = { return message; }, fromJSON(object: any): QueryCodesResponse { - return { - codeInfos: Array.isArray(object?.codeInfos) ? object.codeInfos.map((e: any) => CodeInfoResponse.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryCodesResponse(); + if (Array.isArray(object?.codeInfos)) object.codeInfos.map((e: any) => CodeInfoResponse.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryCodesResponse): unknown { const obj: any = {}; @@ -2269,7 +2293,9 @@ export const QueryCodesResponse = { fromPartial(object: DeepPartial): QueryCodesResponse { const message = createBaseQueryCodesResponse(); message.codeInfos = object.codeInfos?.map(e => CodeInfoResponse.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryCodesResponseSDKType): QueryCodesResponse { @@ -2334,14 +2360,14 @@ function createBaseQueryPinnedCodesRequest(): QueryPinnedCodesRequest { export const QueryPinnedCodesRequest = { typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesRequest", aminoType: "wasm/QueryPinnedCodesRequest", - encode(message: QueryPinnedCodesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPinnedCodesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(18).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPinnedCodesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPinnedCodesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPinnedCodesRequest(); while (reader.pos < end) { @@ -2358,9 +2384,9 @@ export const QueryPinnedCodesRequest = { return message; }, fromJSON(object: any): QueryPinnedCodesRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryPinnedCodesRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryPinnedCodesRequest): unknown { const obj: any = {}; @@ -2369,7 +2395,9 @@ export const QueryPinnedCodesRequest = { }, fromPartial(object: DeepPartial): QueryPinnedCodesRequest { const message = createBaseQueryPinnedCodesRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryPinnedCodesRequestSDKType): QueryPinnedCodesRequest { @@ -2423,7 +2451,7 @@ function createBaseQueryPinnedCodesResponse(): QueryPinnedCodesResponse { export const QueryPinnedCodesResponse = { typeUrl: "/cosmwasm.wasm.v1.QueryPinnedCodesResponse", aminoType: "wasm/QueryPinnedCodesResponse", - encode(message: QueryPinnedCodesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryPinnedCodesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.codeIds) { writer.uint64(v); @@ -2434,8 +2462,8 @@ export const QueryPinnedCodesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPinnedCodesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPinnedCodesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPinnedCodesResponse(); while (reader.pos < end) { @@ -2445,10 +2473,10 @@ export const QueryPinnedCodesResponse = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.codeIds.push((reader.uint64() as Long)); + message.codeIds.push(reader.uint64()); } } else { - message.codeIds.push((reader.uint64() as Long)); + message.codeIds.push(reader.uint64()); } break; case 2: @@ -2462,15 +2490,15 @@ export const QueryPinnedCodesResponse = { return message; }, fromJSON(object: any): QueryPinnedCodesResponse { - return { - codeIds: Array.isArray(object?.codeIds) ? object.codeIds.map((e: any) => Long.fromValue(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryPinnedCodesResponse(); + if (Array.isArray(object?.codeIds)) object.codeIds.map((e: any) => BigInt(e.toString())); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryPinnedCodesResponse): unknown { const obj: any = {}; if (message.codeIds) { - obj.codeIds = message.codeIds.map(e => (e || Long.UZERO).toString()); + obj.codeIds = message.codeIds.map(e => (e || BigInt(0)).toString()); } else { obj.codeIds = []; } @@ -2479,8 +2507,10 @@ export const QueryPinnedCodesResponse = { }, fromPartial(object: DeepPartial): QueryPinnedCodesResponse { const message = createBaseQueryPinnedCodesResponse(); - message.codeIds = object.codeIds?.map(e => Long.fromValue(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + message.codeIds = object.codeIds?.map(e => BigInt(e.toString())) || []; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryPinnedCodesResponseSDKType): QueryPinnedCodesResponse { @@ -2501,14 +2531,14 @@ export const QueryPinnedCodesResponse = { }, fromAmino(object: QueryPinnedCodesResponseAmino): QueryPinnedCodesResponse { return { - codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => e) : [], + codeIds: Array.isArray(object?.code_ids) ? object.code_ids.map((e: any) => BigInt(e)) : [], pagination: object?.pagination ? PageResponse.fromAmino(object.pagination) : undefined }; }, toAmino(message: QueryPinnedCodesResponse): QueryPinnedCodesResponseAmino { const obj: any = {}; if (message.codeIds) { - obj.code_ids = message.codeIds.map(e => e); + obj.code_ids = message.codeIds.map(e => e.toString()); } else { obj.code_ids = []; } diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts index 8ed3eaa889..28fb879d34 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/tx.ts @@ -1,7 +1,7 @@ import { AccessConfig, AccessConfigAmino, AccessConfigSDKType } from "./types"; import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../helpers"; import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** MsgStoreCode submit Wasm code to the system */ @@ -45,7 +45,7 @@ export interface MsgStoreCodeSDKType { /** MsgStoreCodeResponse returns store result data. */ export interface MsgStoreCodeResponse { /** CodeID is the reference to the stored WASM code */ - codeId: Long; + codeId: bigint; } export interface MsgStoreCodeResponseProtoMsg { typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse"; @@ -62,7 +62,7 @@ export interface MsgStoreCodeResponseAminoMsg { } /** MsgStoreCodeResponse returns store result data. */ export interface MsgStoreCodeResponseSDKType { - code_id: Long; + code_id: bigint; } /** * MsgInstantiateContract create a new smart contract instance for the given @@ -74,7 +74,7 @@ export interface MsgInstantiateContract { /** Admin is an optional address that can execute migrations */ admin: string; /** CodeID is the reference to the stored WASM code */ - codeId: Long; + codeId: bigint; /** Label is optional metadata to be stored with a contract instance. */ label: string; /** Msg json encoded message to be passed to the contract on instantiation */ @@ -115,7 +115,7 @@ export interface MsgInstantiateContractAminoMsg { export interface MsgInstantiateContractSDKType { sender: string; admin: string; - code_id: Long; + code_id: bigint; label: string; msg: Uint8Array; funds: CoinSDKType[]; @@ -213,7 +213,7 @@ export interface MsgMigrateContract { /** Contract is the address of the smart contract */ contract: string; /** CodeID references the new WASM code */ - codeId: Long; + codeId: bigint; /** Msg json encoded message to be passed to the contract on migration */ msg: Uint8Array; } @@ -240,7 +240,7 @@ export interface MsgMigrateContractAminoMsg { export interface MsgMigrateContractSDKType { sender: string; contract: string; - code_id: Long; + code_id: bigint; msg: Uint8Array; } /** MsgMigrateContractResponse returns contract migration result data. */ @@ -368,7 +368,7 @@ function createBaseMsgStoreCode(): MsgStoreCode { export const MsgStoreCode = { typeUrl: "/cosmwasm.wasm.v1.MsgStoreCode", aminoType: "wasm/MsgStoreCode", - encode(message: MsgStoreCode, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgStoreCode, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } @@ -380,8 +380,8 @@ export const MsgStoreCode = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgStoreCode { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgStoreCode { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgStoreCode(); while (reader.pos < end) { @@ -404,11 +404,11 @@ export const MsgStoreCode = { return message; }, fromJSON(object: any): MsgStoreCode { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - wasmByteCode: isSet(object.wasmByteCode) ? bytesFromBase64(object.wasmByteCode) : new Uint8Array(), - instantiatePermission: isSet(object.instantiatePermission) ? AccessConfig.fromJSON(object.instantiatePermission) : undefined - }; + const obj = createBaseMsgStoreCode(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.wasmByteCode)) obj.wasmByteCode = bytesFromBase64(object.wasmByteCode); + if (isSet(object.instantiatePermission)) obj.instantiatePermission = AccessConfig.fromJSON(object.instantiatePermission); + return obj; }, toJSON(message: MsgStoreCode): unknown { const obj: any = {}; @@ -421,7 +421,9 @@ export const MsgStoreCode = { const message = createBaseMsgStoreCode(); message.sender = object.sender ?? ""; message.wasmByteCode = object.wasmByteCode ?? new Uint8Array(); - message.instantiatePermission = object.instantiatePermission !== undefined && object.instantiatePermission !== null ? AccessConfig.fromPartial(object.instantiatePermission) : undefined; + if (object.instantiatePermission !== undefined && object.instantiatePermission !== null) { + message.instantiatePermission = AccessConfig.fromPartial(object.instantiatePermission); + } return message; }, fromSDK(object: MsgStoreCodeSDKType): MsgStoreCode { @@ -476,27 +478,27 @@ export const MsgStoreCode = { }; function createBaseMsgStoreCodeResponse(): MsgStoreCodeResponse { return { - codeId: Long.UZERO + codeId: BigInt(0) }; } export const MsgStoreCodeResponse = { typeUrl: "/cosmwasm.wasm.v1.MsgStoreCodeResponse", aminoType: "wasm/MsgStoreCodeResponse", - encode(message: MsgStoreCodeResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.codeId.isZero()) { + encode(message: MsgStoreCodeResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgStoreCodeResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgStoreCodeResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgStoreCodeResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -506,18 +508,20 @@ export const MsgStoreCodeResponse = { return message; }, fromJSON(object: any): MsgStoreCodeResponse { - return { - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO - }; + const obj = createBaseMsgStoreCodeResponse(); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + return obj; }, toJSON(message: MsgStoreCodeResponse): unknown { const obj: any = {}; - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MsgStoreCodeResponse { const message = createBaseMsgStoreCodeResponse(); - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } return message; }, fromSDK(object: MsgStoreCodeResponseSDKType): MsgStoreCodeResponse { @@ -532,7 +536,7 @@ export const MsgStoreCodeResponse = { }, fromAmino(object: MsgStoreCodeResponseAmino): MsgStoreCodeResponse { return { - codeId: Long.fromString(object.code_id) + codeId: BigInt(object.code_id) }; }, toAmino(message: MsgStoreCodeResponse): MsgStoreCodeResponseAmino { @@ -566,7 +570,7 @@ function createBaseMsgInstantiateContract(): MsgInstantiateContract { return { sender: "", admin: "", - codeId: Long.UZERO, + codeId: BigInt(0), label: "", msg: new Uint8Array(), funds: [] @@ -575,14 +579,14 @@ function createBaseMsgInstantiateContract(): MsgInstantiateContract { export const MsgInstantiateContract = { typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContract", aminoType: "wasm/MsgInstantiateContract", - encode(message: MsgInstantiateContract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgInstantiateContract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } if (message.admin !== "") { writer.uint32(18).string(message.admin); } - if (!message.codeId.isZero()) { + if (message.codeId !== BigInt(0)) { writer.uint32(24).uint64(message.codeId); } if (message.label !== "") { @@ -596,8 +600,8 @@ export const MsgInstantiateContract = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgInstantiateContract { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgInstantiateContract { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgInstantiateContract(); while (reader.pos < end) { @@ -610,7 +614,7 @@ export const MsgInstantiateContract = { message.admin = reader.string(); break; case 3: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 4: message.label = reader.string(); @@ -629,20 +633,20 @@ export const MsgInstantiateContract = { return message; }, fromJSON(object: any): MsgInstantiateContract { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - admin: isSet(object.admin) ? String(object.admin) : "", - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - label: isSet(object.label) ? String(object.label) : "", - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array(), - funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgInstantiateContract(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.label)) obj.label = String(object.label); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + if (Array.isArray(object?.funds)) object.funds.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgInstantiateContract): unknown { const obj: any = {}; message.sender !== undefined && (obj.sender = message.sender); message.admin !== undefined && (obj.admin = message.admin); - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.label !== undefined && (obj.label = message.label); message.msg !== undefined && (obj.msg = base64FromBytes(message.msg !== undefined ? message.msg : new Uint8Array())); if (message.funds) { @@ -656,7 +660,9 @@ export const MsgInstantiateContract = { const message = createBaseMsgInstantiateContract(); message.sender = object.sender ?? ""; message.admin = object.admin ?? ""; - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } message.label = object.label ?? ""; message.msg = object.msg ?? new Uint8Array(); message.funds = object.funds?.map(e => Coin.fromPartial(e)) || []; @@ -690,7 +696,7 @@ export const MsgInstantiateContract = { return { sender: object.sender, admin: object.admin, - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), label: object.label, msg: toUtf8(JSON.stringify(object.msg)), funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromAmino(e)) : [] @@ -741,7 +747,7 @@ function createBaseMsgInstantiateContractResponse(): MsgInstantiateContractRespo export const MsgInstantiateContractResponse = { typeUrl: "/cosmwasm.wasm.v1.MsgInstantiateContractResponse", aminoType: "wasm/MsgInstantiateContractResponse", - encode(message: MsgInstantiateContractResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgInstantiateContractResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -750,8 +756,8 @@ export const MsgInstantiateContractResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgInstantiateContractResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgInstantiateContractResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgInstantiateContractResponse(); while (reader.pos < end) { @@ -771,10 +777,10 @@ export const MsgInstantiateContractResponse = { return message; }, fromJSON(object: any): MsgInstantiateContractResponse { - return { - address: isSet(object.address) ? String(object.address) : "", - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseMsgInstantiateContractResponse(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: MsgInstantiateContractResponse): unknown { const obj: any = {}; @@ -845,7 +851,7 @@ function createBaseMsgExecuteContract(): MsgExecuteContract { export const MsgExecuteContract = { typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContract", aminoType: "wasm/MsgExecuteContract", - encode(message: MsgExecuteContract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgExecuteContract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } @@ -860,8 +866,8 @@ export const MsgExecuteContract = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExecuteContract { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExecuteContract { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExecuteContract(); while (reader.pos < end) { @@ -887,12 +893,12 @@ export const MsgExecuteContract = { return message; }, fromJSON(object: any): MsgExecuteContract { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - contract: isSet(object.contract) ? String(object.contract) : "", - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array(), - funds: Array.isArray(object?.funds) ? object.funds.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseMsgExecuteContract(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + if (Array.isArray(object?.funds)) object.funds.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: MsgExecuteContract): unknown { const obj: any = {}; @@ -984,14 +990,14 @@ function createBaseMsgExecuteContractResponse(): MsgExecuteContractResponse { export const MsgExecuteContractResponse = { typeUrl: "/cosmwasm.wasm.v1.MsgExecuteContractResponse", aminoType: "wasm/MsgExecuteContractResponse", - encode(message: MsgExecuteContractResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgExecuteContractResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgExecuteContractResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgExecuteContractResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgExecuteContractResponse(); while (reader.pos < end) { @@ -1008,9 +1014,9 @@ export const MsgExecuteContractResponse = { return message; }, fromJSON(object: any): MsgExecuteContractResponse { - return { - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseMsgExecuteContractResponse(); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: MsgExecuteContractResponse): unknown { const obj: any = {}; @@ -1068,21 +1074,21 @@ function createBaseMsgMigrateContract(): MsgMigrateContract { return { sender: "", contract: "", - codeId: Long.UZERO, + codeId: BigInt(0), msg: new Uint8Array() }; } export const MsgMigrateContract = { typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContract", aminoType: "wasm/MsgMigrateContract", - encode(message: MsgMigrateContract, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgMigrateContract, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } if (message.contract !== "") { writer.uint32(18).string(message.contract); } - if (!message.codeId.isZero()) { + if (message.codeId !== BigInt(0)) { writer.uint32(24).uint64(message.codeId); } if (message.msg.length !== 0) { @@ -1090,8 +1096,8 @@ export const MsgMigrateContract = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgMigrateContract { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgMigrateContract { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgMigrateContract(); while (reader.pos < end) { @@ -1104,7 +1110,7 @@ export const MsgMigrateContract = { message.contract = reader.string(); break; case 3: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 4: message.msg = reader.bytes(); @@ -1117,18 +1123,18 @@ export const MsgMigrateContract = { return message; }, fromJSON(object: any): MsgMigrateContract { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - contract: isSet(object.contract) ? String(object.contract) : "", - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array() - }; + const obj = createBaseMsgMigrateContract(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + return obj; }, toJSON(message: MsgMigrateContract): unknown { const obj: any = {}; message.sender !== undefined && (obj.sender = message.sender); message.contract !== undefined && (obj.contract = message.contract); - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.msg !== undefined && (obj.msg = base64FromBytes(message.msg !== undefined ? message.msg : new Uint8Array())); return obj; }, @@ -1136,7 +1142,9 @@ export const MsgMigrateContract = { const message = createBaseMsgMigrateContract(); message.sender = object.sender ?? ""; message.contract = object.contract ?? ""; - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } message.msg = object.msg ?? new Uint8Array(); return message; }, @@ -1160,7 +1168,7 @@ export const MsgMigrateContract = { return { sender: object.sender, contract: object.contract, - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), msg: toUtf8(JSON.stringify(object.msg)) }; }, @@ -1202,14 +1210,14 @@ function createBaseMsgMigrateContractResponse(): MsgMigrateContractResponse { export const MsgMigrateContractResponse = { typeUrl: "/cosmwasm.wasm.v1.MsgMigrateContractResponse", aminoType: "wasm/MsgMigrateContractResponse", - encode(message: MsgMigrateContractResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgMigrateContractResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.data.length !== 0) { writer.uint32(10).bytes(message.data); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgMigrateContractResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgMigrateContractResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgMigrateContractResponse(); while (reader.pos < end) { @@ -1226,9 +1234,9 @@ export const MsgMigrateContractResponse = { return message; }, fromJSON(object: any): MsgMigrateContractResponse { - return { - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array() - }; + const obj = createBaseMsgMigrateContractResponse(); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + return obj; }, toJSON(message: MsgMigrateContractResponse): unknown { const obj: any = {}; @@ -1292,7 +1300,7 @@ function createBaseMsgUpdateAdmin(): MsgUpdateAdmin { export const MsgUpdateAdmin = { typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdmin", aminoType: "wasm/MsgUpdateAdmin", - encode(message: MsgUpdateAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } @@ -1304,8 +1312,8 @@ export const MsgUpdateAdmin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateAdmin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateAdmin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateAdmin(); while (reader.pos < end) { @@ -1328,11 +1336,11 @@ export const MsgUpdateAdmin = { return message; }, fromJSON(object: any): MsgUpdateAdmin { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - newAdmin: isSet(object.newAdmin) ? String(object.newAdmin) : "", - contract: isSet(object.contract) ? String(object.contract) : "" - }; + const obj = createBaseMsgUpdateAdmin(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.newAdmin)) obj.newAdmin = String(object.newAdmin); + if (isSet(object.contract)) obj.contract = String(object.contract); + return obj; }, toJSON(message: MsgUpdateAdmin): unknown { const obj: any = {}; @@ -1404,11 +1412,11 @@ function createBaseMsgUpdateAdminResponse(): MsgUpdateAdminResponse { export const MsgUpdateAdminResponse = { typeUrl: "/cosmwasm.wasm.v1.MsgUpdateAdminResponse", aminoType: "wasm/MsgUpdateAdminResponse", - encode(_: MsgUpdateAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateAdminResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateAdminResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateAdminResponse(); while (reader.pos < end) { @@ -1422,7 +1430,8 @@ export const MsgUpdateAdminResponse = { return message; }, fromJSON(_: any): MsgUpdateAdminResponse { - return {}; + const obj = createBaseMsgUpdateAdminResponse(); + return obj; }, toJSON(_: MsgUpdateAdminResponse): unknown { const obj: any = {}; @@ -1477,7 +1486,7 @@ function createBaseMsgClearAdmin(): MsgClearAdmin { export const MsgClearAdmin = { typeUrl: "/cosmwasm.wasm.v1.MsgClearAdmin", aminoType: "wasm/MsgClearAdmin", - encode(message: MsgClearAdmin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgClearAdmin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sender !== "") { writer.uint32(10).string(message.sender); } @@ -1486,8 +1495,8 @@ export const MsgClearAdmin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgClearAdmin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgClearAdmin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgClearAdmin(); while (reader.pos < end) { @@ -1507,10 +1516,10 @@ export const MsgClearAdmin = { return message; }, fromJSON(object: any): MsgClearAdmin { - return { - sender: isSet(object.sender) ? String(object.sender) : "", - contract: isSet(object.contract) ? String(object.contract) : "" - }; + const obj = createBaseMsgClearAdmin(); + if (isSet(object.sender)) obj.sender = String(object.sender); + if (isSet(object.contract)) obj.contract = String(object.contract); + return obj; }, toJSON(message: MsgClearAdmin): unknown { const obj: any = {}; @@ -1576,11 +1585,11 @@ function createBaseMsgClearAdminResponse(): MsgClearAdminResponse { export const MsgClearAdminResponse = { typeUrl: "/cosmwasm.wasm.v1.MsgClearAdminResponse", aminoType: "wasm/MsgClearAdminResponse", - encode(_: MsgClearAdminResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgClearAdminResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgClearAdminResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgClearAdminResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgClearAdminResponse(); while (reader.pos < end) { @@ -1594,7 +1603,8 @@ export const MsgClearAdminResponse = { return message; }, fromJSON(_: any): MsgClearAdminResponse { - return {}; + const obj = createBaseMsgClearAdminResponse(); + return obj; }, toJSON(_: MsgClearAdminResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts index 15d5ac3701..b41d97a6b4 100644 --- a/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputv2/cosmwasm/wasm/v1/types.ts @@ -1,6 +1,6 @@ import { Any, AnyProtoMsg, AnyAmino, AnySDKType } from "../../../google/protobuf/any"; -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; export const protobufPackage = "cosmwasm.wasm.v1"; /** AccessType permission types */ @@ -148,7 +148,7 @@ export interface AccessConfigSDKType { export interface Params { codeUploadAccess: AccessConfig; instantiateDefaultPermission: AccessType; - maxWasmCodeSize: Long; + maxWasmCodeSize: bigint; } export interface ParamsProtoMsg { typeUrl: "/cosmwasm.wasm.v1.Params"; @@ -168,7 +168,7 @@ export interface ParamsAminoMsg { export interface ParamsSDKType { code_upload_access: AccessConfigSDKType; instantiate_default_permission: AccessType; - max_wasm_code_size: Long; + max_wasm_code_size: bigint; } /** CodeInfo is data for the uploaded contract WASM code */ export interface CodeInfo { @@ -205,7 +205,7 @@ export interface CodeInfoSDKType { /** ContractInfo stores a WASM contract instance */ export interface ContractInfo { /** CodeID is the reference to the stored Wasm code */ - codeId: Long; + codeId: bigint; /** Creator address who initially instantiated the contract */ creator: string; /** Admin is an optional address that can execute migrations */ @@ -265,7 +265,7 @@ export interface ContractInfoAminoMsg { } /** ContractInfo stores a WASM contract instance */ export interface ContractInfoSDKType { - code_id: Long; + code_id: bigint; creator: string; admin: string; label: string; @@ -277,7 +277,7 @@ export interface ContractInfoSDKType { export interface ContractCodeHistoryEntry { operation: ContractCodeHistoryOperationType; /** CodeID is the reference to the stored WASM code */ - codeId: Long; + codeId: bigint; /** Updated Tx position when the operation was executed. */ updated: AbsoluteTxPosition; msg: Uint8Array; @@ -302,7 +302,7 @@ export interface ContractCodeHistoryEntryAminoMsg { /** ContractCodeHistoryEntry metadata to a contract. */ export interface ContractCodeHistoryEntrySDKType { operation: ContractCodeHistoryOperationType; - code_id: Long; + code_id: bigint; updated: AbsoluteTxPositionSDKType; msg: Uint8Array; } @@ -312,12 +312,12 @@ export interface ContractCodeHistoryEntrySDKType { */ export interface AbsoluteTxPosition { /** BlockHeight is the block the contract was created at */ - blockHeight: Long; + blockHeight: bigint; /** * TxIndex is a monotonic counter within the block (actual transaction index, * or gas consumed) */ - txIndex: Long; + txIndex: bigint; } export interface AbsoluteTxPositionProtoMsg { typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition"; @@ -345,8 +345,8 @@ export interface AbsoluteTxPositionAminoMsg { * ordering of transactions. */ export interface AbsoluteTxPositionSDKType { - block_height: Long; - tx_index: Long; + block_height: bigint; + tx_index: bigint; } /** Model is a struct that holds a KV pair */ export interface Model { @@ -383,14 +383,14 @@ function createBaseAccessTypeParam(): AccessTypeParam { export const AccessTypeParam = { typeUrl: "/cosmwasm.wasm.v1.AccessTypeParam", aminoType: "wasm/AccessTypeParam", - encode(message: AccessTypeParam, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AccessTypeParam, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(8).int32(message.value); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AccessTypeParam { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AccessTypeParam { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAccessTypeParam(); while (reader.pos < end) { @@ -407,9 +407,9 @@ export const AccessTypeParam = { return message; }, fromJSON(object: any): AccessTypeParam { - return { - value: isSet(object.value) ? accessTypeFromJSON(object.value) : -1 - }; + const obj = createBaseAccessTypeParam(); + if (isSet(object.value)) obj.value = accessTypeFromJSON(object.value); + return obj; }, toJSON(message: AccessTypeParam): unknown { const obj: any = {}; @@ -472,7 +472,7 @@ function createBaseAccessConfig(): AccessConfig { export const AccessConfig = { typeUrl: "/cosmwasm.wasm.v1.AccessConfig", aminoType: "wasm/AccessConfig", - encode(message: AccessConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AccessConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.permission !== 0) { writer.uint32(8).int32(message.permission); } @@ -481,8 +481,8 @@ export const AccessConfig = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AccessConfig { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AccessConfig { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAccessConfig(); while (reader.pos < end) { @@ -502,10 +502,10 @@ export const AccessConfig = { return message; }, fromJSON(object: any): AccessConfig { - return { - permission: isSet(object.permission) ? accessTypeFromJSON(object.permission) : -1, - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseAccessConfig(); + if (isSet(object.permission)) obj.permission = accessTypeFromJSON(object.permission); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: AccessConfig): unknown { const obj: any = {}; @@ -569,26 +569,26 @@ function createBaseParams(): Params { return { codeUploadAccess: AccessConfig.fromPartial({}), instantiateDefaultPermission: 0, - maxWasmCodeSize: Long.UZERO + maxWasmCodeSize: BigInt(0) }; } export const Params = { typeUrl: "/cosmwasm.wasm.v1.Params", aminoType: "wasm/Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeUploadAccess !== undefined) { AccessConfig.encode(message.codeUploadAccess, writer.uint32(10).fork()).ldelim(); } if (message.instantiateDefaultPermission !== 0) { writer.uint32(16).int32(message.instantiateDefaultPermission); } - if (!message.maxWasmCodeSize.isZero()) { + if (message.maxWasmCodeSize !== BigInt(0)) { writer.uint32(24).uint64(message.maxWasmCodeSize); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -601,7 +601,7 @@ export const Params = { message.instantiateDefaultPermission = (reader.int32() as any); break; case 3: - message.maxWasmCodeSize = (reader.uint64() as Long); + message.maxWasmCodeSize = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -611,24 +611,28 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - codeUploadAccess: isSet(object.codeUploadAccess) ? AccessConfig.fromJSON(object.codeUploadAccess) : undefined, - instantiateDefaultPermission: isSet(object.instantiateDefaultPermission) ? accessTypeFromJSON(object.instantiateDefaultPermission) : -1, - maxWasmCodeSize: isSet(object.maxWasmCodeSize) ? Long.fromValue(object.maxWasmCodeSize) : Long.UZERO - }; + const obj = createBaseParams(); + if (isSet(object.codeUploadAccess)) obj.codeUploadAccess = AccessConfig.fromJSON(object.codeUploadAccess); + if (isSet(object.instantiateDefaultPermission)) obj.instantiateDefaultPermission = accessTypeFromJSON(object.instantiateDefaultPermission); + if (isSet(object.maxWasmCodeSize)) obj.maxWasmCodeSize = BigInt(object.maxWasmCodeSize.toString()); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; message.codeUploadAccess !== undefined && (obj.codeUploadAccess = message.codeUploadAccess ? AccessConfig.toJSON(message.codeUploadAccess) : undefined); message.instantiateDefaultPermission !== undefined && (obj.instantiateDefaultPermission = accessTypeToJSON(message.instantiateDefaultPermission)); - message.maxWasmCodeSize !== undefined && (obj.maxWasmCodeSize = (message.maxWasmCodeSize || Long.UZERO).toString()); + message.maxWasmCodeSize !== undefined && (obj.maxWasmCodeSize = (message.maxWasmCodeSize || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Params { const message = createBaseParams(); - message.codeUploadAccess = object.codeUploadAccess !== undefined && object.codeUploadAccess !== null ? AccessConfig.fromPartial(object.codeUploadAccess) : undefined; + if (object.codeUploadAccess !== undefined && object.codeUploadAccess !== null) { + message.codeUploadAccess = AccessConfig.fromPartial(object.codeUploadAccess); + } message.instantiateDefaultPermission = object.instantiateDefaultPermission ?? 0; - message.maxWasmCodeSize = object.maxWasmCodeSize !== undefined && object.maxWasmCodeSize !== null ? Long.fromValue(object.maxWasmCodeSize) : Long.UZERO; + if (object.maxWasmCodeSize !== undefined && object.maxWasmCodeSize !== null) { + message.maxWasmCodeSize = BigInt(object.maxWasmCodeSize.toString()); + } return message; }, fromSDK(object: ParamsSDKType): Params { @@ -649,7 +653,7 @@ export const Params = { return { codeUploadAccess: object?.code_upload_access ? AccessConfig.fromAmino(object.code_upload_access) : undefined, instantiateDefaultPermission: isSet(object.instantiate_default_permission) ? accessTypeFromJSON(object.instantiate_default_permission) : -1, - maxWasmCodeSize: Long.fromString(object.max_wasm_code_size) + maxWasmCodeSize: BigInt(object.max_wasm_code_size) }; }, toAmino(message: Params): ParamsAmino { @@ -691,7 +695,7 @@ function createBaseCodeInfo(): CodeInfo { export const CodeInfo = { typeUrl: "/cosmwasm.wasm.v1.CodeInfo", aminoType: "wasm/CodeInfo", - encode(message: CodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.codeHash.length !== 0) { writer.uint32(10).bytes(message.codeHash); } @@ -703,8 +707,8 @@ export const CodeInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CodeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CodeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCodeInfo(); while (reader.pos < end) { @@ -727,11 +731,11 @@ export const CodeInfo = { return message; }, fromJSON(object: any): CodeInfo { - return { - codeHash: isSet(object.codeHash) ? bytesFromBase64(object.codeHash) : new Uint8Array(), - creator: isSet(object.creator) ? String(object.creator) : "", - instantiateConfig: isSet(object.instantiateConfig) ? AccessConfig.fromJSON(object.instantiateConfig) : undefined - }; + const obj = createBaseCodeInfo(); + if (isSet(object.codeHash)) obj.codeHash = bytesFromBase64(object.codeHash); + if (isSet(object.creator)) obj.creator = String(object.creator); + if (isSet(object.instantiateConfig)) obj.instantiateConfig = AccessConfig.fromJSON(object.instantiateConfig); + return obj; }, toJSON(message: CodeInfo): unknown { const obj: any = {}; @@ -744,7 +748,9 @@ export const CodeInfo = { const message = createBaseCodeInfo(); message.codeHash = object.codeHash ?? new Uint8Array(); message.creator = object.creator ?? ""; - message.instantiateConfig = object.instantiateConfig !== undefined && object.instantiateConfig !== null ? AccessConfig.fromPartial(object.instantiateConfig) : undefined; + if (object.instantiateConfig !== undefined && object.instantiateConfig !== null) { + message.instantiateConfig = AccessConfig.fromPartial(object.instantiateConfig); + } return message; }, fromSDK(object: CodeInfoSDKType): CodeInfo { @@ -799,7 +805,7 @@ export const CodeInfo = { }; function createBaseContractInfo(): ContractInfo { return { - codeId: Long.UZERO, + codeId: BigInt(0), creator: "", admin: "", label: "", @@ -811,8 +817,8 @@ function createBaseContractInfo(): ContractInfo { export const ContractInfo = { typeUrl: "/cosmwasm.wasm.v1.ContractInfo", aminoType: "wasm/ContractInfo", - encode(message: ContractInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.codeId.isZero()) { + encode(message: ContractInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.codeId !== BigInt(0)) { writer.uint32(8).uint64(message.codeId); } if (message.creator !== "") { @@ -835,15 +841,15 @@ export const ContractInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ContractInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ContractInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseContractInfo(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 2: message.creator = reader.string(); @@ -871,19 +877,19 @@ export const ContractInfo = { return message; }, fromJSON(object: any): ContractInfo { - return { - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - creator: isSet(object.creator) ? String(object.creator) : "", - admin: isSet(object.admin) ? String(object.admin) : "", - label: isSet(object.label) ? String(object.label) : "", - created: isSet(object.created) ? AbsoluteTxPosition.fromJSON(object.created) : undefined, - ibcPortId: isSet(object.ibcPortId) ? String(object.ibcPortId) : "", - extension: isSet(object.extension) ? Any.fromJSON(object.extension) : undefined - }; + const obj = createBaseContractInfo(); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.creator)) obj.creator = String(object.creator); + if (isSet(object.admin)) obj.admin = String(object.admin); + if (isSet(object.label)) obj.label = String(object.label); + if (isSet(object.created)) obj.created = AbsoluteTxPosition.fromJSON(object.created); + if (isSet(object.ibcPortId)) obj.ibcPortId = String(object.ibcPortId); + if (isSet(object.extension)) obj.extension = Any.fromJSON(object.extension); + return obj; }, toJSON(message: ContractInfo): unknown { const obj: any = {}; - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.creator !== undefined && (obj.creator = message.creator); message.admin !== undefined && (obj.admin = message.admin); message.label !== undefined && (obj.label = message.label); @@ -894,13 +900,19 @@ export const ContractInfo = { }, fromPartial(object: DeepPartial): ContractInfo { const message = createBaseContractInfo(); - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } message.creator = object.creator ?? ""; message.admin = object.admin ?? ""; message.label = object.label ?? ""; - message.created = object.created !== undefined && object.created !== null ? AbsoluteTxPosition.fromPartial(object.created) : undefined; + if (object.created !== undefined && object.created !== null) { + message.created = AbsoluteTxPosition.fromPartial(object.created); + } message.ibcPortId = object.ibcPortId ?? ""; - message.extension = object.extension !== undefined && object.extension !== null ? Any.fromPartial(object.extension) : undefined; + if (object.extension !== undefined && object.extension !== null) { + message.extension = Any.fromPartial(object.extension); + } return message; }, fromSDK(object: ContractInfoSDKType): ContractInfo { @@ -927,7 +939,7 @@ export const ContractInfo = { }, fromAmino(object: ContractInfoAmino): ContractInfo { return { - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), creator: object.creator, admin: object.admin, label: object.label, @@ -972,7 +984,7 @@ export const ContractInfo = { function createBaseContractCodeHistoryEntry(): ContractCodeHistoryEntry { return { operation: 0, - codeId: Long.UZERO, + codeId: BigInt(0), updated: AbsoluteTxPosition.fromPartial({}), msg: new Uint8Array() }; @@ -980,11 +992,11 @@ function createBaseContractCodeHistoryEntry(): ContractCodeHistoryEntry { export const ContractCodeHistoryEntry = { typeUrl: "/cosmwasm.wasm.v1.ContractCodeHistoryEntry", aminoType: "wasm/ContractCodeHistoryEntry", - encode(message: ContractCodeHistoryEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ContractCodeHistoryEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operation !== 0) { writer.uint32(8).int32(message.operation); } - if (!message.codeId.isZero()) { + if (message.codeId !== BigInt(0)) { writer.uint32(16).uint64(message.codeId); } if (message.updated !== undefined) { @@ -995,8 +1007,8 @@ export const ContractCodeHistoryEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ContractCodeHistoryEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ContractCodeHistoryEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseContractCodeHistoryEntry(); while (reader.pos < end) { @@ -1006,7 +1018,7 @@ export const ContractCodeHistoryEntry = { message.operation = (reader.int32() as any); break; case 2: - message.codeId = (reader.uint64() as Long); + message.codeId = reader.uint64(); break; case 3: message.updated = AbsoluteTxPosition.decode(reader, reader.uint32()); @@ -1022,17 +1034,17 @@ export const ContractCodeHistoryEntry = { return message; }, fromJSON(object: any): ContractCodeHistoryEntry { - return { - operation: isSet(object.operation) ? contractCodeHistoryOperationTypeFromJSON(object.operation) : -1, - codeId: isSet(object.codeId) ? Long.fromValue(object.codeId) : Long.UZERO, - updated: isSet(object.updated) ? AbsoluteTxPosition.fromJSON(object.updated) : undefined, - msg: isSet(object.msg) ? bytesFromBase64(object.msg) : new Uint8Array() - }; + const obj = createBaseContractCodeHistoryEntry(); + if (isSet(object.operation)) obj.operation = contractCodeHistoryOperationTypeFromJSON(object.operation); + if (isSet(object.codeId)) obj.codeId = BigInt(object.codeId.toString()); + if (isSet(object.updated)) obj.updated = AbsoluteTxPosition.fromJSON(object.updated); + if (isSet(object.msg)) obj.msg = bytesFromBase64(object.msg); + return obj; }, toJSON(message: ContractCodeHistoryEntry): unknown { const obj: any = {}; message.operation !== undefined && (obj.operation = contractCodeHistoryOperationTypeToJSON(message.operation)); - message.codeId !== undefined && (obj.codeId = (message.codeId || Long.UZERO).toString()); + message.codeId !== undefined && (obj.codeId = (message.codeId || BigInt(0)).toString()); message.updated !== undefined && (obj.updated = message.updated ? AbsoluteTxPosition.toJSON(message.updated) : undefined); message.msg !== undefined && (obj.msg = base64FromBytes(message.msg !== undefined ? message.msg : new Uint8Array())); return obj; @@ -1040,8 +1052,12 @@ export const ContractCodeHistoryEntry = { fromPartial(object: DeepPartial): ContractCodeHistoryEntry { const message = createBaseContractCodeHistoryEntry(); message.operation = object.operation ?? 0; - message.codeId = object.codeId !== undefined && object.codeId !== null ? Long.fromValue(object.codeId) : Long.UZERO; - message.updated = object.updated !== undefined && object.updated !== null ? AbsoluteTxPosition.fromPartial(object.updated) : undefined; + if (object.codeId !== undefined && object.codeId !== null) { + message.codeId = BigInt(object.codeId.toString()); + } + if (object.updated !== undefined && object.updated !== null) { + message.updated = AbsoluteTxPosition.fromPartial(object.updated); + } message.msg = object.msg ?? new Uint8Array(); return message; }, @@ -1064,7 +1080,7 @@ export const ContractCodeHistoryEntry = { fromAmino(object: ContractCodeHistoryEntryAmino): ContractCodeHistoryEntry { return { operation: isSet(object.operation) ? contractCodeHistoryOperationTypeFromJSON(object.operation) : -1, - codeId: Long.fromString(object.code_id), + codeId: BigInt(object.code_id), updated: object?.updated ? AbsoluteTxPosition.fromAmino(object.updated) : undefined, msg: toUtf8(JSON.stringify(object.msg)) }; @@ -1101,34 +1117,34 @@ export const ContractCodeHistoryEntry = { }; function createBaseAbsoluteTxPosition(): AbsoluteTxPosition { return { - blockHeight: Long.UZERO, - txIndex: Long.UZERO + blockHeight: BigInt(0), + txIndex: BigInt(0) }; } export const AbsoluteTxPosition = { typeUrl: "/cosmwasm.wasm.v1.AbsoluteTxPosition", aminoType: "wasm/AbsoluteTxPosition", - encode(message: AbsoluteTxPosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.blockHeight.isZero()) { + encode(message: AbsoluteTxPosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.blockHeight !== BigInt(0)) { writer.uint32(8).uint64(message.blockHeight); } - if (!message.txIndex.isZero()) { + if (message.txIndex !== BigInt(0)) { writer.uint32(16).uint64(message.txIndex); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AbsoluteTxPosition { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AbsoluteTxPosition { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAbsoluteTxPosition(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.blockHeight = (reader.uint64() as Long); + message.blockHeight = reader.uint64(); break; case 2: - message.txIndex = (reader.uint64() as Long); + message.txIndex = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1138,21 +1154,25 @@ export const AbsoluteTxPosition = { return message; }, fromJSON(object: any): AbsoluteTxPosition { - return { - blockHeight: isSet(object.blockHeight) ? Long.fromValue(object.blockHeight) : Long.UZERO, - txIndex: isSet(object.txIndex) ? Long.fromValue(object.txIndex) : Long.UZERO - }; + const obj = createBaseAbsoluteTxPosition(); + if (isSet(object.blockHeight)) obj.blockHeight = BigInt(object.blockHeight.toString()); + if (isSet(object.txIndex)) obj.txIndex = BigInt(object.txIndex.toString()); + return obj; }, toJSON(message: AbsoluteTxPosition): unknown { const obj: any = {}; - message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || Long.UZERO).toString()); - message.txIndex !== undefined && (obj.txIndex = (message.txIndex || Long.UZERO).toString()); + message.blockHeight !== undefined && (obj.blockHeight = (message.blockHeight || BigInt(0)).toString()); + message.txIndex !== undefined && (obj.txIndex = (message.txIndex || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): AbsoluteTxPosition { const message = createBaseAbsoluteTxPosition(); - message.blockHeight = object.blockHeight !== undefined && object.blockHeight !== null ? Long.fromValue(object.blockHeight) : Long.UZERO; - message.txIndex = object.txIndex !== undefined && object.txIndex !== null ? Long.fromValue(object.txIndex) : Long.UZERO; + if (object.blockHeight !== undefined && object.blockHeight !== null) { + message.blockHeight = BigInt(object.blockHeight.toString()); + } + if (object.txIndex !== undefined && object.txIndex !== null) { + message.txIndex = BigInt(object.txIndex.toString()); + } return message; }, fromSDK(object: AbsoluteTxPositionSDKType): AbsoluteTxPosition { @@ -1169,8 +1189,8 @@ export const AbsoluteTxPosition = { }, fromAmino(object: AbsoluteTxPositionAmino): AbsoluteTxPosition { return { - blockHeight: Long.fromString(object.block_height), - txIndex: Long.fromString(object.tx_index) + blockHeight: BigInt(object.block_height), + txIndex: BigInt(object.tx_index) }; }, toAmino(message: AbsoluteTxPosition): AbsoluteTxPositionAmino { @@ -1210,7 +1230,7 @@ function createBaseModel(): Model { export const Model = { typeUrl: "/cosmwasm.wasm.v1.Model", aminoType: "wasm/Model", - encode(message: Model, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Model, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key.length !== 0) { writer.uint32(10).bytes(message.key); } @@ -1219,8 +1239,8 @@ export const Model = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Model { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Model { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseModel(); while (reader.pos < end) { @@ -1240,10 +1260,10 @@ export const Model = { return message; }, fromJSON(object: any): Model { - return { - key: isSet(object.key) ? bytesFromBase64(object.key) : new Uint8Array(), - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array() - }; + const obj = createBaseModel(); + if (isSet(object.key)) obj.key = bytesFromBase64(object.key); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + return obj; }, toJSON(message: Model): unknown { const obj: any = {}; @@ -1303,8 +1323,8 @@ export const Model = { }; } }; -export const ContractInfoExtension_InterfaceDecoder = (input: _m0.Reader | Uint8Array): Any => { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); +export const ContractInfoExtension_InterfaceDecoder = (input: BinaryReader | Uint8Array): Any => { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); const data = Any.decode(reader, reader.uint32()); switch (data.typeUrl) { default: diff --git a/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts b/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts index e004efb28e..db56cdb495 100644 --- a/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts +++ b/__fixtures__/v-next/outputv2/evmos/claims/v1/claims.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.claims.v1"; /** Action defines the list of available actions to claim the airdrop tokens. */ @@ -175,7 +175,7 @@ function createBaseClaim(): Claim { } export const Claim = { typeUrl: "/evmos.claims.v1.Claim", - encode(message: Claim, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Claim, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.action !== 0) { writer.uint32(8).int32(message.action); } @@ -187,8 +187,8 @@ export const Claim = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Claim { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Claim { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseClaim(); while (reader.pos < end) { @@ -211,11 +211,11 @@ export const Claim = { return message; }, fromJSON(object: any): Claim { - return { - action: isSet(object.action) ? actionFromJSON(object.action) : -1, - completed: isSet(object.completed) ? Boolean(object.completed) : false, - claimableAmount: isSet(object.claimableAmount) ? String(object.claimableAmount) : "" - }; + const obj = createBaseClaim(); + if (isSet(object.action)) obj.action = actionFromJSON(object.action); + if (isSet(object.completed)) obj.completed = Boolean(object.completed); + if (isSet(object.claimableAmount)) obj.claimableAmount = String(object.claimableAmount); + return obj; }, toJSON(message: Claim): unknown { const obj: any = {}; @@ -284,7 +284,7 @@ function createBaseClaimsRecordAddress(): ClaimsRecordAddress { } export const ClaimsRecordAddress = { typeUrl: "/evmos.claims.v1.ClaimsRecordAddress", - encode(message: ClaimsRecordAddress, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ClaimsRecordAddress, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } @@ -298,8 +298,8 @@ export const ClaimsRecordAddress = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ClaimsRecordAddress { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ClaimsRecordAddress { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseClaimsRecordAddress(); while (reader.pos < end) { @@ -329,11 +329,11 @@ export const ClaimsRecordAddress = { return message; }, fromJSON(object: any): ClaimsRecordAddress { - return { - address: isSet(object.address) ? String(object.address) : "", - initialClaimableAmount: isSet(object.initialClaimableAmount) ? String(object.initialClaimableAmount) : "", - actionsCompleted: Array.isArray(object?.actionsCompleted) ? object.actionsCompleted.map((e: any) => Boolean(e)) : [] - }; + const obj = createBaseClaimsRecordAddress(); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.initialClaimableAmount)) obj.initialClaimableAmount = String(object.initialClaimableAmount); + if (Array.isArray(object?.actionsCompleted)) object.actionsCompleted.map((e: any) => Boolean(e)); + return obj; }, toJSON(message: ClaimsRecordAddress): unknown { const obj: any = {}; @@ -413,7 +413,7 @@ function createBaseClaimsRecord(): ClaimsRecord { } export const ClaimsRecord = { typeUrl: "/evmos.claims.v1.ClaimsRecord", - encode(message: ClaimsRecord, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ClaimsRecord, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.initialClaimableAmount !== "") { writer.uint32(10).string(message.initialClaimableAmount); } @@ -424,8 +424,8 @@ export const ClaimsRecord = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ClaimsRecord { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ClaimsRecord { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseClaimsRecord(); while (reader.pos < end) { @@ -452,10 +452,10 @@ export const ClaimsRecord = { return message; }, fromJSON(object: any): ClaimsRecord { - return { - initialClaimableAmount: isSet(object.initialClaimableAmount) ? String(object.initialClaimableAmount) : "", - actionsCompleted: Array.isArray(object?.actionsCompleted) ? object.actionsCompleted.map((e: any) => Boolean(e)) : [] - }; + const obj = createBaseClaimsRecord(); + if (isSet(object.initialClaimableAmount)) obj.initialClaimableAmount = String(object.initialClaimableAmount); + if (Array.isArray(object?.actionsCompleted)) object.actionsCompleted.map((e: any) => Boolean(e)); + return obj; }, toJSON(message: ClaimsRecord): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts index 8e1fd45437..2c1e3c800d 100644 --- a/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/claims/v1/genesis.ts @@ -1,7 +1,7 @@ import { ClaimsRecordAddress, ClaimsRecordAddressAmino, ClaimsRecordAddressSDKType } from "./claims"; import { Timestamp } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; export const protobufPackage = "evmos.claims.v1"; /** GenesisState define the claims module's genesis state. */ @@ -97,7 +97,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/evmos.claims.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -106,8 +106,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -127,10 +127,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - claimsRecords: Array.isArray(object?.claimsRecords) ? object.claimsRecords.map((e: any) => ClaimsRecordAddress.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.claimsRecords)) object.claimsRecords.map((e: any) => ClaimsRecordAddress.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -144,7 +144,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.claimsRecords = object.claimsRecords?.map(e => ClaimsRecordAddress.fromPartial(e)) || []; return message; }, @@ -209,7 +211,7 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/evmos.claims.v1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableClaims === true) { writer.uint32(8).bool(message.enableClaims); } @@ -233,8 +235,8 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -269,15 +271,15 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - enableClaims: isSet(object.enableClaims) ? Boolean(object.enableClaims) : false, - airdropStartTime: isSet(object.airdropStartTime) ? new Date(object.airdropStartTime) : undefined, - durationUntilDecay: isSet(object.durationUntilDecay) ? Duration.fromJSON(object.durationUntilDecay) : undefined, - durationOfDecay: isSet(object.durationOfDecay) ? Duration.fromJSON(object.durationOfDecay) : undefined, - claimsDenom: isSet(object.claimsDenom) ? String(object.claimsDenom) : "", - authorizedChannels: Array.isArray(object?.authorizedChannels) ? object.authorizedChannels.map((e: any) => String(e)) : [], - evmChannels: Array.isArray(object?.evmChannels) ? object.evmChannels.map((e: any) => String(e)) : [] - }; + const obj = createBaseParams(); + if (isSet(object.enableClaims)) obj.enableClaims = Boolean(object.enableClaims); + if (isSet(object.airdropStartTime)) obj.airdropStartTime = new Date(object.airdropStartTime); + if (isSet(object.durationUntilDecay)) obj.durationUntilDecay = Duration.fromJSON(object.durationUntilDecay); + if (isSet(object.durationOfDecay)) obj.durationOfDecay = Duration.fromJSON(object.durationOfDecay); + if (isSet(object.claimsDenom)) obj.claimsDenom = String(object.claimsDenom); + if (Array.isArray(object?.authorizedChannels)) object.authorizedChannels.map((e: any) => String(e)); + if (Array.isArray(object?.evmChannels)) object.evmChannels.map((e: any) => String(e)); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -302,8 +304,12 @@ export const Params = { const message = createBaseParams(); message.enableClaims = object.enableClaims ?? false; message.airdropStartTime = object.airdropStartTime ?? undefined; - message.durationUntilDecay = object.durationUntilDecay !== undefined && object.durationUntilDecay !== null ? Duration.fromPartial(object.durationUntilDecay) : undefined; - message.durationOfDecay = object.durationOfDecay !== undefined && object.durationOfDecay !== null ? Duration.fromPartial(object.durationOfDecay) : undefined; + if (object.durationUntilDecay !== undefined && object.durationUntilDecay !== null) { + message.durationUntilDecay = Duration.fromPartial(object.durationUntilDecay); + } + if (object.durationOfDecay !== undefined && object.durationOfDecay !== null) { + message.durationOfDecay = Duration.fromPartial(object.durationOfDecay); + } message.claimsDenom = object.claimsDenom ?? ""; message.authorizedChannels = object.authorizedChannels?.map(e => e) || []; message.evmChannels = object.evmChannels?.map(e => e) || []; diff --git a/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts index 75b7b55b33..7149982262 100644 --- a/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/claims/v1/query.ts @@ -2,7 +2,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageRe import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; import { ClaimsRecordAddress, ClaimsRecordAddressAmino, ClaimsRecordAddressSDKType, Claim, ClaimAmino, ClaimSDKType } from "./claims"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "evmos.claims.v1"; /** @@ -234,11 +234,11 @@ function createBaseQueryTotalUnclaimedRequest(): QueryTotalUnclaimedRequest { } export const QueryTotalUnclaimedRequest = { typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedRequest", - encode(_: QueryTotalUnclaimedRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryTotalUnclaimedRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTotalUnclaimedRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTotalUnclaimedRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTotalUnclaimedRequest(); while (reader.pos < end) { @@ -252,7 +252,8 @@ export const QueryTotalUnclaimedRequest = { return message; }, fromJSON(_: any): QueryTotalUnclaimedRequest { - return {}; + const obj = createBaseQueryTotalUnclaimedRequest(); + return obj; }, toJSON(_: QueryTotalUnclaimedRequest): unknown { const obj: any = {}; @@ -299,14 +300,14 @@ function createBaseQueryTotalUnclaimedResponse(): QueryTotalUnclaimedResponse { } export const QueryTotalUnclaimedResponse = { typeUrl: "/evmos.claims.v1.QueryTotalUnclaimedResponse", - encode(message: QueryTotalUnclaimedResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTotalUnclaimedResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.coins) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTotalUnclaimedResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTotalUnclaimedResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTotalUnclaimedResponse(); while (reader.pos < end) { @@ -323,9 +324,9 @@ export const QueryTotalUnclaimedResponse = { return message; }, fromJSON(object: any): QueryTotalUnclaimedResponse { - return { - coins: Array.isArray(object?.coins) ? object.coins.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseQueryTotalUnclaimedResponse(); + if (Array.isArray(object?.coins)) object.coins.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: QueryTotalUnclaimedResponse): unknown { const obj: any = {}; @@ -390,11 +391,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { } export const QueryParamsRequest = { typeUrl: "/evmos.claims.v1.QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -408,7 +409,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -455,14 +457,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { } export const QueryParamsResponse = { typeUrl: "/evmos.claims.v1.QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -479,9 +481,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -490,7 +492,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -536,14 +540,14 @@ function createBaseQueryClaimsRecordsRequest(): QueryClaimsRecordsRequest { } export const QueryClaimsRecordsRequest = { typeUrl: "/evmos.claims.v1.QueryClaimsRecordsRequest", - encode(message: QueryClaimsRecordsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClaimsRecordsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClaimsRecordsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClaimsRecordsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClaimsRecordsRequest(); while (reader.pos < end) { @@ -560,9 +564,9 @@ export const QueryClaimsRecordsRequest = { return message; }, fromJSON(object: any): QueryClaimsRecordsRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryClaimsRecordsRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryClaimsRecordsRequest): unknown { const obj: any = {}; @@ -571,7 +575,9 @@ export const QueryClaimsRecordsRequest = { }, fromPartial(object: DeepPartial): QueryClaimsRecordsRequest { const message = createBaseQueryClaimsRecordsRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryClaimsRecordsRequestSDKType): QueryClaimsRecordsRequest { @@ -618,7 +624,7 @@ function createBaseQueryClaimsRecordsResponse(): QueryClaimsRecordsResponse { } export const QueryClaimsRecordsResponse = { typeUrl: "/evmos.claims.v1.QueryClaimsRecordsResponse", - encode(message: QueryClaimsRecordsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClaimsRecordsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.claims) { ClaimsRecordAddress.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -627,8 +633,8 @@ export const QueryClaimsRecordsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClaimsRecordsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClaimsRecordsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClaimsRecordsResponse(); while (reader.pos < end) { @@ -648,10 +654,10 @@ export const QueryClaimsRecordsResponse = { return message; }, fromJSON(object: any): QueryClaimsRecordsResponse { - return { - claims: Array.isArray(object?.claims) ? object.claims.map((e: any) => ClaimsRecordAddress.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryClaimsRecordsResponse(); + if (Array.isArray(object?.claims)) object.claims.map((e: any) => ClaimsRecordAddress.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryClaimsRecordsResponse): unknown { const obj: any = {}; @@ -666,7 +672,9 @@ export const QueryClaimsRecordsResponse = { fromPartial(object: DeepPartial): QueryClaimsRecordsResponse { const message = createBaseQueryClaimsRecordsResponse(); message.claims = object.claims?.map(e => ClaimsRecordAddress.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryClaimsRecordsResponseSDKType): QueryClaimsRecordsResponse { @@ -724,14 +732,14 @@ function createBaseQueryClaimsRecordRequest(): QueryClaimsRecordRequest { } export const QueryClaimsRecordRequest = { typeUrl: "/evmos.claims.v1.QueryClaimsRecordRequest", - encode(message: QueryClaimsRecordRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClaimsRecordRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClaimsRecordRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClaimsRecordRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClaimsRecordRequest(); while (reader.pos < end) { @@ -748,9 +756,9 @@ export const QueryClaimsRecordRequest = { return message; }, fromJSON(object: any): QueryClaimsRecordRequest { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseQueryClaimsRecordRequest(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: QueryClaimsRecordRequest): unknown { const obj: any = {}; @@ -806,7 +814,7 @@ function createBaseQueryClaimsRecordResponse(): QueryClaimsRecordResponse { } export const QueryClaimsRecordResponse = { typeUrl: "/evmos.claims.v1.QueryClaimsRecordResponse", - encode(message: QueryClaimsRecordResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryClaimsRecordResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.initialClaimableAmount !== "") { writer.uint32(10).string(message.initialClaimableAmount); } @@ -815,8 +823,8 @@ export const QueryClaimsRecordResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryClaimsRecordResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryClaimsRecordResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryClaimsRecordResponse(); while (reader.pos < end) { @@ -836,10 +844,10 @@ export const QueryClaimsRecordResponse = { return message; }, fromJSON(object: any): QueryClaimsRecordResponse { - return { - initialClaimableAmount: isSet(object.initialClaimableAmount) ? String(object.initialClaimableAmount) : "", - claims: Array.isArray(object?.claims) ? object.claims.map((e: any) => Claim.fromJSON(e)) : [] - }; + const obj = createBaseQueryClaimsRecordResponse(); + if (isSet(object.initialClaimableAmount)) obj.initialClaimableAmount = String(object.initialClaimableAmount); + if (Array.isArray(object?.claims)) object.claims.map((e: any) => Claim.fromJSON(e)); + return obj; }, toJSON(message: QueryClaimsRecordResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts index 35c45ccc9e..a8bfabc2b9 100644 --- a/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/epochs/v1/genesis.ts @@ -1,16 +1,16 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.epochs.v1"; export interface EpochInfo { identifier: string; startTime: Date; duration: Duration; - currentEpoch: Long; + currentEpoch: bigint; currentEpochStartTime: Date; epochCountingStarted: boolean; - currentEpochStartHeight: Long; + currentEpochStartHeight: bigint; } export interface EpochInfoProtoMsg { typeUrl: "/evmos.epochs.v1.EpochInfo"; @@ -33,10 +33,10 @@ export interface EpochInfoSDKType { identifier: string; start_time: Date; duration: DurationSDKType; - current_epoch: Long; + current_epoch: bigint; current_epoch_start_time: Date; epoch_counting_started: boolean; - current_epoch_start_height: Long; + current_epoch_start_height: bigint; } /** GenesisState defines the epochs module's genesis state. */ export interface GenesisState { @@ -63,15 +63,15 @@ function createBaseEpochInfo(): EpochInfo { identifier: "", startTime: new Date(), duration: Duration.fromPartial({}), - currentEpoch: Long.ZERO, + currentEpoch: BigInt(0), currentEpochStartTime: new Date(), epochCountingStarted: false, - currentEpochStartHeight: Long.ZERO + currentEpochStartHeight: BigInt(0) }; } export const EpochInfo = { typeUrl: "/evmos.epochs.v1.EpochInfo", - encode(message: EpochInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EpochInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); } @@ -81,7 +81,7 @@ export const EpochInfo = { if (message.duration !== undefined) { Duration.encode(message.duration, writer.uint32(26).fork()).ldelim(); } - if (!message.currentEpoch.isZero()) { + if (message.currentEpoch !== BigInt(0)) { writer.uint32(32).int64(message.currentEpoch); } if (message.currentEpochStartTime !== undefined) { @@ -90,13 +90,13 @@ export const EpochInfo = { if (message.epochCountingStarted === true) { writer.uint32(48).bool(message.epochCountingStarted); } - if (!message.currentEpochStartHeight.isZero()) { + if (message.currentEpochStartHeight !== BigInt(0)) { writer.uint32(56).int64(message.currentEpochStartHeight); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EpochInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EpochInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEpochInfo(); while (reader.pos < end) { @@ -112,7 +112,7 @@ export const EpochInfo = { message.duration = Duration.decode(reader, reader.uint32()); break; case 4: - message.currentEpoch = (reader.int64() as Long); + message.currentEpoch = reader.int64(); break; case 5: message.currentEpochStartTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); @@ -121,7 +121,7 @@ export const EpochInfo = { message.epochCountingStarted = reader.bool(); break; case 7: - message.currentEpochStartHeight = (reader.int64() as Long); + message.currentEpochStartHeight = reader.int64(); break; default: reader.skipType(tag & 7); @@ -131,36 +131,42 @@ export const EpochInfo = { return message; }, fromJSON(object: any): EpochInfo { - return { - identifier: isSet(object.identifier) ? String(object.identifier) : "", - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - duration: isSet(object.duration) ? Duration.fromJSON(object.duration) : undefined, - currentEpoch: isSet(object.currentEpoch) ? Long.fromValue(object.currentEpoch) : Long.ZERO, - currentEpochStartTime: isSet(object.currentEpochStartTime) ? new Date(object.currentEpochStartTime) : undefined, - epochCountingStarted: isSet(object.epochCountingStarted) ? Boolean(object.epochCountingStarted) : false, - currentEpochStartHeight: isSet(object.currentEpochStartHeight) ? Long.fromValue(object.currentEpochStartHeight) : Long.ZERO - }; + const obj = createBaseEpochInfo(); + if (isSet(object.identifier)) obj.identifier = String(object.identifier); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (isSet(object.duration)) obj.duration = Duration.fromJSON(object.duration); + if (isSet(object.currentEpoch)) obj.currentEpoch = BigInt(object.currentEpoch.toString()); + if (isSet(object.currentEpochStartTime)) obj.currentEpochStartTime = new Date(object.currentEpochStartTime); + if (isSet(object.epochCountingStarted)) obj.epochCountingStarted = Boolean(object.epochCountingStarted); + if (isSet(object.currentEpochStartHeight)) obj.currentEpochStartHeight = BigInt(object.currentEpochStartHeight.toString()); + return obj; }, toJSON(message: EpochInfo): unknown { const obj: any = {}; message.identifier !== undefined && (obj.identifier = message.identifier); message.startTime !== undefined && (obj.startTime = message.startTime.toISOString()); message.duration !== undefined && (obj.duration = message.duration ? Duration.toJSON(message.duration) : undefined); - message.currentEpoch !== undefined && (obj.currentEpoch = (message.currentEpoch || Long.ZERO).toString()); + message.currentEpoch !== undefined && (obj.currentEpoch = (message.currentEpoch || BigInt(0)).toString()); message.currentEpochStartTime !== undefined && (obj.currentEpochStartTime = message.currentEpochStartTime.toISOString()); message.epochCountingStarted !== undefined && (obj.epochCountingStarted = message.epochCountingStarted); - message.currentEpochStartHeight !== undefined && (obj.currentEpochStartHeight = (message.currentEpochStartHeight || Long.ZERO).toString()); + message.currentEpochStartHeight !== undefined && (obj.currentEpochStartHeight = (message.currentEpochStartHeight || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EpochInfo { const message = createBaseEpochInfo(); message.identifier = object.identifier ?? ""; message.startTime = object.startTime ?? undefined; - message.duration = object.duration !== undefined && object.duration !== null ? Duration.fromPartial(object.duration) : undefined; - message.currentEpoch = object.currentEpoch !== undefined && object.currentEpoch !== null ? Long.fromValue(object.currentEpoch) : Long.ZERO; + if (object.duration !== undefined && object.duration !== null) { + message.duration = Duration.fromPartial(object.duration); + } + if (object.currentEpoch !== undefined && object.currentEpoch !== null) { + message.currentEpoch = BigInt(object.currentEpoch.toString()); + } message.currentEpochStartTime = object.currentEpochStartTime ?? undefined; message.epochCountingStarted = object.epochCountingStarted ?? false; - message.currentEpochStartHeight = object.currentEpochStartHeight !== undefined && object.currentEpochStartHeight !== null ? Long.fromValue(object.currentEpochStartHeight) : Long.ZERO; + if (object.currentEpochStartHeight !== undefined && object.currentEpochStartHeight !== null) { + message.currentEpochStartHeight = BigInt(object.currentEpochStartHeight.toString()); + } return message; }, fromSDK(object: EpochInfoSDKType): EpochInfo { @@ -190,10 +196,10 @@ export const EpochInfo = { identifier: object.identifier, startTime: object.start_time, duration: object?.duration ? Duration.fromAmino(object.duration) : undefined, - currentEpoch: Long.fromString(object.current_epoch), + currentEpoch: BigInt(object.current_epoch), currentEpochStartTime: object.current_epoch_start_time, epochCountingStarted: object.epoch_counting_started, - currentEpochStartHeight: Long.fromString(object.current_epoch_start_height) + currentEpochStartHeight: BigInt(object.current_epoch_start_height) }; }, toAmino(message: EpochInfo): EpochInfoAmino { @@ -230,14 +236,14 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/evmos.epochs.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.epochs) { EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -254,9 +260,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - epochs: Array.isArray(object?.epochs) ? object.epochs.map((e: any) => EpochInfo.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (Array.isArray(object?.epochs)) object.epochs.map((e: any) => EpochInfo.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts index c6b1eb6c1d..99183b6776 100644 --- a/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/epochs/v1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { EpochInfo, EpochInfoAmino, EpochInfoSDKType } from "./genesis"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.epochs.v1"; export interface QueryEpochsInfoRequest { pagination: PageRequest; @@ -58,7 +58,7 @@ export interface QueryCurrentEpochRequestSDKType { identifier: string; } export interface QueryCurrentEpochResponse { - currentEpoch: Long; + currentEpoch: bigint; } export interface QueryCurrentEpochResponseProtoMsg { typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse"; @@ -72,7 +72,7 @@ export interface QueryCurrentEpochResponseAminoMsg { value: QueryCurrentEpochResponseAmino; } export interface QueryCurrentEpochResponseSDKType { - current_epoch: Long; + current_epoch: bigint; } function createBaseQueryEpochsInfoRequest(): QueryEpochsInfoRequest { return { @@ -81,14 +81,14 @@ function createBaseQueryEpochsInfoRequest(): QueryEpochsInfoRequest { } export const QueryEpochsInfoRequest = { typeUrl: "/evmos.epochs.v1.QueryEpochsInfoRequest", - encode(message: QueryEpochsInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryEpochsInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryEpochsInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryEpochsInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryEpochsInfoRequest(); while (reader.pos < end) { @@ -105,9 +105,9 @@ export const QueryEpochsInfoRequest = { return message; }, fromJSON(object: any): QueryEpochsInfoRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryEpochsInfoRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryEpochsInfoRequest): unknown { const obj: any = {}; @@ -116,7 +116,9 @@ export const QueryEpochsInfoRequest = { }, fromPartial(object: DeepPartial): QueryEpochsInfoRequest { const message = createBaseQueryEpochsInfoRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryEpochsInfoRequestSDKType): QueryEpochsInfoRequest { @@ -163,7 +165,7 @@ function createBaseQueryEpochsInfoResponse(): QueryEpochsInfoResponse { } export const QueryEpochsInfoResponse = { typeUrl: "/evmos.epochs.v1.QueryEpochsInfoResponse", - encode(message: QueryEpochsInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryEpochsInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.epochs) { EpochInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -172,8 +174,8 @@ export const QueryEpochsInfoResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryEpochsInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryEpochsInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryEpochsInfoResponse(); while (reader.pos < end) { @@ -193,10 +195,10 @@ export const QueryEpochsInfoResponse = { return message; }, fromJSON(object: any): QueryEpochsInfoResponse { - return { - epochs: Array.isArray(object?.epochs) ? object.epochs.map((e: any) => EpochInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryEpochsInfoResponse(); + if (Array.isArray(object?.epochs)) object.epochs.map((e: any) => EpochInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryEpochsInfoResponse): unknown { const obj: any = {}; @@ -211,7 +213,9 @@ export const QueryEpochsInfoResponse = { fromPartial(object: DeepPartial): QueryEpochsInfoResponse { const message = createBaseQueryEpochsInfoResponse(); message.epochs = object.epochs?.map(e => EpochInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryEpochsInfoResponseSDKType): QueryEpochsInfoResponse { @@ -269,14 +273,14 @@ function createBaseQueryCurrentEpochRequest(): QueryCurrentEpochRequest { } export const QueryCurrentEpochRequest = { typeUrl: "/evmos.epochs.v1.QueryCurrentEpochRequest", - encode(message: QueryCurrentEpochRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCurrentEpochRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identifier !== "") { writer.uint32(10).string(message.identifier); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCurrentEpochRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCurrentEpochRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCurrentEpochRequest(); while (reader.pos < end) { @@ -293,9 +297,9 @@ export const QueryCurrentEpochRequest = { return message; }, fromJSON(object: any): QueryCurrentEpochRequest { - return { - identifier: isSet(object.identifier) ? String(object.identifier) : "" - }; + const obj = createBaseQueryCurrentEpochRequest(); + if (isSet(object.identifier)) obj.identifier = String(object.identifier); + return obj; }, toJSON(message: QueryCurrentEpochRequest): unknown { const obj: any = {}; @@ -345,26 +349,26 @@ export const QueryCurrentEpochRequest = { }; function createBaseQueryCurrentEpochResponse(): QueryCurrentEpochResponse { return { - currentEpoch: Long.ZERO + currentEpoch: BigInt(0) }; } export const QueryCurrentEpochResponse = { typeUrl: "/evmos.epochs.v1.QueryCurrentEpochResponse", - encode(message: QueryCurrentEpochResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.currentEpoch.isZero()) { + encode(message: QueryCurrentEpochResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.currentEpoch !== BigInt(0)) { writer.uint32(8).int64(message.currentEpoch); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCurrentEpochResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCurrentEpochResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCurrentEpochResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.currentEpoch = (reader.int64() as Long); + message.currentEpoch = reader.int64(); break; default: reader.skipType(tag & 7); @@ -374,18 +378,20 @@ export const QueryCurrentEpochResponse = { return message; }, fromJSON(object: any): QueryCurrentEpochResponse { - return { - currentEpoch: isSet(object.currentEpoch) ? Long.fromValue(object.currentEpoch) : Long.ZERO - }; + const obj = createBaseQueryCurrentEpochResponse(); + if (isSet(object.currentEpoch)) obj.currentEpoch = BigInt(object.currentEpoch.toString()); + return obj; }, toJSON(message: QueryCurrentEpochResponse): unknown { const obj: any = {}; - message.currentEpoch !== undefined && (obj.currentEpoch = (message.currentEpoch || Long.ZERO).toString()); + message.currentEpoch !== undefined && (obj.currentEpoch = (message.currentEpoch || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryCurrentEpochResponse { const message = createBaseQueryCurrentEpochResponse(); - message.currentEpoch = object.currentEpoch !== undefined && object.currentEpoch !== null ? Long.fromValue(object.currentEpoch) : Long.ZERO; + if (object.currentEpoch !== undefined && object.currentEpoch !== null) { + message.currentEpoch = BigInt(object.currentEpoch.toString()); + } return message; }, fromSDK(object: QueryCurrentEpochResponseSDKType): QueryCurrentEpochResponse { @@ -400,7 +406,7 @@ export const QueryCurrentEpochResponse = { }, fromAmino(object: QueryCurrentEpochResponseAmino): QueryCurrentEpochResponse { return { - currentEpoch: Long.fromString(object.current_epoch) + currentEpoch: BigInt(object.current_epoch) }; }, toAmino(message: QueryCurrentEpochResponse): QueryCurrentEpochResponseAmino { diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts index 71ff04ce36..29029668b6 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/erc20.ts @@ -1,5 +1,5 @@ import { Metadata, MetadataAmino, MetadataSDKType } from "../../../cosmos/bank/v1beta1/bank"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.erc20.v1"; /** Owner enumerates the ownership of a ERC20 contract. */ @@ -229,7 +229,7 @@ function createBaseTokenPair(): TokenPair { } export const TokenPair = { typeUrl: "/evmos.erc20.v1.TokenPair", - encode(message: TokenPair, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TokenPair, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.erc20Address !== "") { writer.uint32(10).string(message.erc20Address); } @@ -244,8 +244,8 @@ export const TokenPair = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TokenPair { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TokenPair { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTokenPair(); while (reader.pos < end) { @@ -271,12 +271,12 @@ export const TokenPair = { return message; }, fromJSON(object: any): TokenPair { - return { - erc20Address: isSet(object.erc20Address) ? String(object.erc20Address) : "", - denom: isSet(object.denom) ? String(object.denom) : "", - enabled: isSet(object.enabled) ? Boolean(object.enabled) : false, - contractOwner: isSet(object.contractOwner) ? ownerFromJSON(object.contractOwner) : -1 - }; + const obj = createBaseTokenPair(); + if (isSet(object.erc20Address)) obj.erc20Address = String(object.erc20Address); + if (isSet(object.denom)) obj.denom = String(object.denom); + if (isSet(object.enabled)) obj.enabled = Boolean(object.enabled); + if (isSet(object.contractOwner)) obj.contractOwner = ownerFromJSON(object.contractOwner); + return obj; }, toJSON(message: TokenPair): unknown { const obj: any = {}; @@ -351,7 +351,7 @@ function createBaseRegisterCoinProposal(): RegisterCoinProposal { } export const RegisterCoinProposal = { typeUrl: "/evmos.erc20.v1.RegisterCoinProposal", - encode(message: RegisterCoinProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RegisterCoinProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -363,8 +363,8 @@ export const RegisterCoinProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RegisterCoinProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RegisterCoinProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRegisterCoinProposal(); while (reader.pos < end) { @@ -387,11 +387,11 @@ export const RegisterCoinProposal = { return message; }, fromJSON(object: any): RegisterCoinProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - metadata: isSet(object.metadata) ? Metadata.fromJSON(object.metadata) : undefined - }; + const obj = createBaseRegisterCoinProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.metadata)) obj.metadata = Metadata.fromJSON(object.metadata); + return obj; }, toJSON(message: RegisterCoinProposal): unknown { const obj: any = {}; @@ -404,7 +404,9 @@ export const RegisterCoinProposal = { const message = createBaseRegisterCoinProposal(); message.title = object.title ?? ""; message.description = object.description ?? ""; - message.metadata = object.metadata !== undefined && object.metadata !== null ? Metadata.fromPartial(object.metadata) : undefined; + if (object.metadata !== undefined && object.metadata !== null) { + message.metadata = Metadata.fromPartial(object.metadata); + } return message; }, fromSDK(object: RegisterCoinProposalSDKType): RegisterCoinProposal { @@ -460,7 +462,7 @@ function createBaseRegisterERC20Proposal(): RegisterERC20Proposal { } export const RegisterERC20Proposal = { typeUrl: "/evmos.erc20.v1.RegisterERC20Proposal", - encode(message: RegisterERC20Proposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RegisterERC20Proposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -472,8 +474,8 @@ export const RegisterERC20Proposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RegisterERC20Proposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RegisterERC20Proposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRegisterERC20Proposal(); while (reader.pos < end) { @@ -496,11 +498,11 @@ export const RegisterERC20Proposal = { return message; }, fromJSON(object: any): RegisterERC20Proposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - erc20address: isSet(object.erc20address) ? String(object.erc20address) : "" - }; + const obj = createBaseRegisterERC20Proposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.erc20address)) obj.erc20address = String(object.erc20address); + return obj; }, toJSON(message: RegisterERC20Proposal): unknown { const obj: any = {}; @@ -569,7 +571,7 @@ function createBaseToggleTokenConversionProposal(): ToggleTokenConversionProposa } export const ToggleTokenConversionProposal = { typeUrl: "/evmos.erc20.v1.ToggleTokenConversionProposal", - encode(message: ToggleTokenConversionProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ToggleTokenConversionProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -581,8 +583,8 @@ export const ToggleTokenConversionProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ToggleTokenConversionProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ToggleTokenConversionProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseToggleTokenConversionProposal(); while (reader.pos < end) { @@ -605,11 +607,11 @@ export const ToggleTokenConversionProposal = { return message; }, fromJSON(object: any): ToggleTokenConversionProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - token: isSet(object.token) ? String(object.token) : "" - }; + const obj = createBaseToggleTokenConversionProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.token)) obj.token = String(object.token); + return obj; }, toJSON(message: ToggleTokenConversionProposal): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts index c9b66b2efc..20d9a89c06 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/genesis.ts @@ -1,5 +1,5 @@ import { TokenPair, TokenPairAmino, TokenPairSDKType } from "./erc20"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.erc20.v1"; /** GenesisState defines the module's genesis state. */ @@ -72,7 +72,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/evmos.erc20.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -81,8 +81,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -102,10 +102,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - tokenPairs: Array.isArray(object?.tokenPairs) ? object.tokenPairs.map((e: any) => TokenPair.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.tokenPairs)) object.tokenPairs.map((e: any) => TokenPair.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -119,7 +119,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.tokenPairs = object.tokenPairs?.map(e => TokenPair.fromPartial(e)) || []; return message; }, @@ -179,7 +181,7 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/evmos.erc20.v1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableErc20 === true) { writer.uint32(8).bool(message.enableErc20); } @@ -188,8 +190,8 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -209,10 +211,10 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - enableErc20: isSet(object.enableErc20) ? Boolean(object.enableErc20) : false, - enableEvmHook: isSet(object.enableEvmHook) ? Boolean(object.enableEvmHook) : false - }; + const obj = createBaseParams(); + if (isSet(object.enableErc20)) obj.enableErc20 = Boolean(object.enableErc20); + if (isSet(object.enableEvmHook)) obj.enableEvmHook = Boolean(object.enableEvmHook); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts index 49c47834d1..f5cf9bb7ae 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { TokenPair, TokenPairAmino, TokenPairSDKType } from "./erc20"; import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.erc20.v1"; /** @@ -176,14 +176,14 @@ function createBaseQueryTokenPairsRequest(): QueryTokenPairsRequest { } export const QueryTokenPairsRequest = { typeUrl: "/evmos.erc20.v1.QueryTokenPairsRequest", - encode(message: QueryTokenPairsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTokenPairsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTokenPairsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTokenPairsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTokenPairsRequest(); while (reader.pos < end) { @@ -200,9 +200,9 @@ export const QueryTokenPairsRequest = { return message; }, fromJSON(object: any): QueryTokenPairsRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryTokenPairsRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryTokenPairsRequest): unknown { const obj: any = {}; @@ -211,7 +211,9 @@ export const QueryTokenPairsRequest = { }, fromPartial(object: DeepPartial): QueryTokenPairsRequest { const message = createBaseQueryTokenPairsRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryTokenPairsRequestSDKType): QueryTokenPairsRequest { @@ -258,7 +260,7 @@ function createBaseQueryTokenPairsResponse(): QueryTokenPairsResponse { } export const QueryTokenPairsResponse = { typeUrl: "/evmos.erc20.v1.QueryTokenPairsResponse", - encode(message: QueryTokenPairsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTokenPairsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.tokenPairs) { TokenPair.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -267,8 +269,8 @@ export const QueryTokenPairsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTokenPairsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTokenPairsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTokenPairsResponse(); while (reader.pos < end) { @@ -288,10 +290,10 @@ export const QueryTokenPairsResponse = { return message; }, fromJSON(object: any): QueryTokenPairsResponse { - return { - tokenPairs: Array.isArray(object?.tokenPairs) ? object.tokenPairs.map((e: any) => TokenPair.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryTokenPairsResponse(); + if (Array.isArray(object?.tokenPairs)) object.tokenPairs.map((e: any) => TokenPair.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryTokenPairsResponse): unknown { const obj: any = {}; @@ -306,7 +308,9 @@ export const QueryTokenPairsResponse = { fromPartial(object: DeepPartial): QueryTokenPairsResponse { const message = createBaseQueryTokenPairsResponse(); message.tokenPairs = object.tokenPairs?.map(e => TokenPair.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryTokenPairsResponseSDKType): QueryTokenPairsResponse { @@ -364,14 +368,14 @@ function createBaseQueryTokenPairRequest(): QueryTokenPairRequest { } export const QueryTokenPairRequest = { typeUrl: "/evmos.erc20.v1.QueryTokenPairRequest", - encode(message: QueryTokenPairRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTokenPairRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.token !== "") { writer.uint32(10).string(message.token); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTokenPairRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTokenPairRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTokenPairRequest(); while (reader.pos < end) { @@ -388,9 +392,9 @@ export const QueryTokenPairRequest = { return message; }, fromJSON(object: any): QueryTokenPairRequest { - return { - token: isSet(object.token) ? String(object.token) : "" - }; + const obj = createBaseQueryTokenPairRequest(); + if (isSet(object.token)) obj.token = String(object.token); + return obj; }, toJSON(message: QueryTokenPairRequest): unknown { const obj: any = {}; @@ -445,14 +449,14 @@ function createBaseQueryTokenPairResponse(): QueryTokenPairResponse { } export const QueryTokenPairResponse = { typeUrl: "/evmos.erc20.v1.QueryTokenPairResponse", - encode(message: QueryTokenPairResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryTokenPairResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.tokenPair !== undefined) { TokenPair.encode(message.tokenPair, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryTokenPairResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryTokenPairResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryTokenPairResponse(); while (reader.pos < end) { @@ -469,9 +473,9 @@ export const QueryTokenPairResponse = { return message; }, fromJSON(object: any): QueryTokenPairResponse { - return { - tokenPair: isSet(object.tokenPair) ? TokenPair.fromJSON(object.tokenPair) : undefined - }; + const obj = createBaseQueryTokenPairResponse(); + if (isSet(object.tokenPair)) obj.tokenPair = TokenPair.fromJSON(object.tokenPair); + return obj; }, toJSON(message: QueryTokenPairResponse): unknown { const obj: any = {}; @@ -480,7 +484,9 @@ export const QueryTokenPairResponse = { }, fromPartial(object: DeepPartial): QueryTokenPairResponse { const message = createBaseQueryTokenPairResponse(); - message.tokenPair = object.tokenPair !== undefined && object.tokenPair !== null ? TokenPair.fromPartial(object.tokenPair) : undefined; + if (object.tokenPair !== undefined && object.tokenPair !== null) { + message.tokenPair = TokenPair.fromPartial(object.tokenPair); + } return message; }, fromSDK(object: QueryTokenPairResponseSDKType): QueryTokenPairResponse { @@ -524,11 +530,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { } export const QueryParamsRequest = { typeUrl: "/evmos.erc20.v1.QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -542,7 +548,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -589,14 +596,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { } export const QueryParamsResponse = { typeUrl: "/evmos.erc20.v1.QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -613,9 +620,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -624,7 +631,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts b/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts index e83c162caa..5f84463f34 100644 --- a/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/evmos/erc20/v1/tx.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.erc20.v1"; /** MsgConvertCoin defines a Msg to convert a native Cosmos coin to a ERC20 token */ @@ -123,7 +123,7 @@ function createBaseMsgConvertCoin(): MsgConvertCoin { } export const MsgConvertCoin = { typeUrl: "/evmos.erc20.v1.MsgConvertCoin", - encode(message: MsgConvertCoin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgConvertCoin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.coin !== undefined) { Coin.encode(message.coin, writer.uint32(10).fork()).ldelim(); } @@ -135,8 +135,8 @@ export const MsgConvertCoin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgConvertCoin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgConvertCoin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgConvertCoin(); while (reader.pos < end) { @@ -159,11 +159,11 @@ export const MsgConvertCoin = { return message; }, fromJSON(object: any): MsgConvertCoin { - return { - coin: isSet(object.coin) ? Coin.fromJSON(object.coin) : undefined, - receiver: isSet(object.receiver) ? String(object.receiver) : "", - sender: isSet(object.sender) ? String(object.sender) : "" - }; + const obj = createBaseMsgConvertCoin(); + if (isSet(object.coin)) obj.coin = Coin.fromJSON(object.coin); + if (isSet(object.receiver)) obj.receiver = String(object.receiver); + if (isSet(object.sender)) obj.sender = String(object.sender); + return obj; }, toJSON(message: MsgConvertCoin): unknown { const obj: any = {}; @@ -174,7 +174,9 @@ export const MsgConvertCoin = { }, fromPartial(object: DeepPartial): MsgConvertCoin { const message = createBaseMsgConvertCoin(); - message.coin = object.coin !== undefined && object.coin !== null ? Coin.fromPartial(object.coin) : undefined; + if (object.coin !== undefined && object.coin !== null) { + message.coin = Coin.fromPartial(object.coin); + } message.receiver = object.receiver ?? ""; message.sender = object.sender ?? ""; return message; @@ -228,11 +230,11 @@ function createBaseMsgConvertCoinResponse(): MsgConvertCoinResponse { } export const MsgConvertCoinResponse = { typeUrl: "/evmos.erc20.v1.MsgConvertCoinResponse", - encode(_: MsgConvertCoinResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgConvertCoinResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgConvertCoinResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgConvertCoinResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgConvertCoinResponse(); while (reader.pos < end) { @@ -246,7 +248,8 @@ export const MsgConvertCoinResponse = { return message; }, fromJSON(_: any): MsgConvertCoinResponse { - return {}; + const obj = createBaseMsgConvertCoinResponse(); + return obj; }, toJSON(_: MsgConvertCoinResponse): unknown { const obj: any = {}; @@ -296,7 +299,7 @@ function createBaseMsgConvertERC20(): MsgConvertERC20 { } export const MsgConvertERC20 = { typeUrl: "/evmos.erc20.v1.MsgConvertERC20", - encode(message: MsgConvertERC20, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgConvertERC20, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } @@ -311,8 +314,8 @@ export const MsgConvertERC20 = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgConvertERC20 { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgConvertERC20 { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgConvertERC20(); while (reader.pos < end) { @@ -338,12 +341,12 @@ export const MsgConvertERC20 = { return message; }, fromJSON(object: any): MsgConvertERC20 { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "", - amount: isSet(object.amount) ? String(object.amount) : "", - receiver: isSet(object.receiver) ? String(object.receiver) : "", - sender: isSet(object.sender) ? String(object.sender) : "" - }; + const obj = createBaseMsgConvertERC20(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + if (isSet(object.amount)) obj.amount = String(object.amount); + if (isSet(object.receiver)) obj.receiver = String(object.receiver); + if (isSet(object.sender)) obj.sender = String(object.sender); + return obj; }, toJSON(message: MsgConvertERC20): unknown { const obj: any = {}; @@ -414,11 +417,11 @@ function createBaseMsgConvertERC20Response(): MsgConvertERC20Response { } export const MsgConvertERC20Response = { typeUrl: "/evmos.erc20.v1.MsgConvertERC20Response", - encode(_: MsgConvertERC20Response, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgConvertERC20Response, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgConvertERC20Response { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgConvertERC20Response { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgConvertERC20Response(); while (reader.pos < end) { @@ -432,7 +435,8 @@ export const MsgConvertERC20Response = { return message; }, fromJSON(_: any): MsgConvertERC20Response { - return {}; + const obj = createBaseMsgConvertERC20Response(); + return obj; }, toJSON(_: MsgConvertERC20Response): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts index d475689795..7dbd4ccc7b 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/fees.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.fees.v1"; /** @@ -57,7 +57,7 @@ function createBaseDevFeeInfo(): DevFeeInfo { } export const DevFeeInfo = { typeUrl: "/evmos.fees.v1.DevFeeInfo", - encode(message: DevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } @@ -69,8 +69,8 @@ export const DevFeeInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DevFeeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DevFeeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDevFeeInfo(); while (reader.pos < end) { @@ -93,11 +93,11 @@ export const DevFeeInfo = { return message; }, fromJSON(object: any): DevFeeInfo { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "", - deployerAddress: isSet(object.deployerAddress) ? String(object.deployerAddress) : "", - withdrawAddress: isSet(object.withdrawAddress) ? String(object.withdrawAddress) : "" - }; + const obj = createBaseDevFeeInfo(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + if (isSet(object.deployerAddress)) obj.deployerAddress = String(object.deployerAddress); + if (isSet(object.withdrawAddress)) obj.withdrawAddress = String(object.withdrawAddress); + return obj; }, toJSON(message: DevFeeInfo): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts index 708736e7ce..55b2430dc7 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/genesis.ts @@ -1,6 +1,7 @@ import { DevFeeInfo, DevFeeInfoAmino, DevFeeInfoSDKType } from "./fees"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; +import { Decimal } from "@cosmjs/math"; export const protobufPackage = "evmos.fees.v1"; /** GenesisState defines the module's genesis state. */ export interface GenesisState { @@ -47,7 +48,7 @@ export interface Params { * addr_derivation_cost_create defines the cost of address derivation for * verifying the contract deployer at fee registration */ - addrDerivationCostCreate: Long; + addrDerivationCostCreate: bigint; /** min_gas_price defines the minimum gas price value for cosmos and eth transactions */ minGasPrice: string; } @@ -86,7 +87,7 @@ export interface ParamsSDKType { enable_fees: boolean; developer_shares: string; validator_shares: string; - addr_derivation_cost_create: Long; + addr_derivation_cost_create: bigint; min_gas_price: string; } function createBaseGenesisState(): GenesisState { @@ -97,7 +98,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/evmos.fees.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -106,8 +107,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -127,10 +128,10 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - devFeeInfos: Array.isArray(object?.devFeeInfos) ? object.devFeeInfos.map((e: any) => DevFeeInfo.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.devFeeInfos)) object.devFeeInfos.map((e: any) => DevFeeInfo.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -144,7 +145,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.devFeeInfos = object.devFeeInfos?.map(e => DevFeeInfo.fromPartial(e)) || []; return message; }, @@ -201,32 +204,32 @@ function createBaseParams(): Params { enableFees: false, developerShares: "", validatorShares: "", - addrDerivationCostCreate: Long.UZERO, + addrDerivationCostCreate: BigInt(0), minGasPrice: "" }; } export const Params = { typeUrl: "/evmos.fees.v1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableFees === true) { writer.uint32(8).bool(message.enableFees); } if (message.developerShares !== "") { - writer.uint32(18).string(message.developerShares); + writer.uint32(18).string(Decimal.fromUserInput(message.developerShares, 18).atomics); } if (message.validatorShares !== "") { - writer.uint32(26).string(message.validatorShares); + writer.uint32(26).string(Decimal.fromUserInput(message.validatorShares, 18).atomics); } - if (!message.addrDerivationCostCreate.isZero()) { + if (message.addrDerivationCostCreate !== BigInt(0)) { writer.uint32(32).uint64(message.addrDerivationCostCreate); } if (message.minGasPrice !== "") { - writer.uint32(42).string(message.minGasPrice); + writer.uint32(42).string(Decimal.fromUserInput(message.minGasPrice, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -236,16 +239,16 @@ export const Params = { message.enableFees = reader.bool(); break; case 2: - message.developerShares = reader.string(); + message.developerShares = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.validatorShares = reader.string(); + message.validatorShares = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 4: - message.addrDerivationCostCreate = (reader.uint64() as Long); + message.addrDerivationCostCreate = reader.uint64(); break; case 5: - message.minGasPrice = reader.string(); + message.minGasPrice = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -255,20 +258,20 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - enableFees: isSet(object.enableFees) ? Boolean(object.enableFees) : false, - developerShares: isSet(object.developerShares) ? String(object.developerShares) : "", - validatorShares: isSet(object.validatorShares) ? String(object.validatorShares) : "", - addrDerivationCostCreate: isSet(object.addrDerivationCostCreate) ? Long.fromValue(object.addrDerivationCostCreate) : Long.UZERO, - minGasPrice: isSet(object.minGasPrice) ? String(object.minGasPrice) : "" - }; + const obj = createBaseParams(); + if (isSet(object.enableFees)) obj.enableFees = Boolean(object.enableFees); + if (isSet(object.developerShares)) obj.developerShares = String(object.developerShares); + if (isSet(object.validatorShares)) obj.validatorShares = String(object.validatorShares); + if (isSet(object.addrDerivationCostCreate)) obj.addrDerivationCostCreate = BigInt(object.addrDerivationCostCreate.toString()); + if (isSet(object.minGasPrice)) obj.minGasPrice = String(object.minGasPrice); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; message.enableFees !== undefined && (obj.enableFees = message.enableFees); message.developerShares !== undefined && (obj.developerShares = message.developerShares); message.validatorShares !== undefined && (obj.validatorShares = message.validatorShares); - message.addrDerivationCostCreate !== undefined && (obj.addrDerivationCostCreate = (message.addrDerivationCostCreate || Long.UZERO).toString()); + message.addrDerivationCostCreate !== undefined && (obj.addrDerivationCostCreate = (message.addrDerivationCostCreate || BigInt(0)).toString()); message.minGasPrice !== undefined && (obj.minGasPrice = message.minGasPrice); return obj; }, @@ -277,7 +280,9 @@ export const Params = { message.enableFees = object.enableFees ?? false; message.developerShares = object.developerShares ?? ""; message.validatorShares = object.validatorShares ?? ""; - message.addrDerivationCostCreate = object.addrDerivationCostCreate !== undefined && object.addrDerivationCostCreate !== null ? Long.fromValue(object.addrDerivationCostCreate) : Long.UZERO; + if (object.addrDerivationCostCreate !== undefined && object.addrDerivationCostCreate !== null) { + message.addrDerivationCostCreate = BigInt(object.addrDerivationCostCreate.toString()); + } message.minGasPrice = object.minGasPrice ?? ""; return message; }, @@ -304,7 +309,7 @@ export const Params = { enableFees: object.enable_fees, developerShares: object.developer_shares, validatorShares: object.validator_shares, - addrDerivationCostCreate: Long.fromString(object.addr_derivation_cost_create), + addrDerivationCostCreate: BigInt(object.addr_derivation_cost_create), minGasPrice: object.min_gas_price }; }, diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts index 3e672d32ea..558dc0d3d3 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/query.ts @@ -1,7 +1,7 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageResponseAmino, PageResponseSDKType } from "../../../cosmos/base/query/v1beta1/pagination"; import { DevFeeInfo, DevFeeInfoAmino, DevFeeInfoSDKType } from "./fees"; import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.fees.v1"; /** @@ -249,14 +249,14 @@ function createBaseQueryDevFeeInfosRequest(): QueryDevFeeInfosRequest { } export const QueryDevFeeInfosRequest = { typeUrl: "/evmos.fees.v1.QueryDevFeeInfosRequest", - encode(message: QueryDevFeeInfosRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDevFeeInfosRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDevFeeInfosRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDevFeeInfosRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDevFeeInfosRequest(); while (reader.pos < end) { @@ -273,9 +273,9 @@ export const QueryDevFeeInfosRequest = { return message; }, fromJSON(object: any): QueryDevFeeInfosRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDevFeeInfosRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDevFeeInfosRequest): unknown { const obj: any = {}; @@ -284,7 +284,9 @@ export const QueryDevFeeInfosRequest = { }, fromPartial(object: DeepPartial): QueryDevFeeInfosRequest { const message = createBaseQueryDevFeeInfosRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDevFeeInfosRequestSDKType): QueryDevFeeInfosRequest { @@ -331,7 +333,7 @@ function createBaseQueryDevFeeInfosResponse(): QueryDevFeeInfosResponse { } export const QueryDevFeeInfosResponse = { typeUrl: "/evmos.fees.v1.QueryDevFeeInfosResponse", - encode(message: QueryDevFeeInfosResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDevFeeInfosResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fees) { DevFeeInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -340,8 +342,8 @@ export const QueryDevFeeInfosResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDevFeeInfosResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDevFeeInfosResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDevFeeInfosResponse(); while (reader.pos < end) { @@ -361,10 +363,10 @@ export const QueryDevFeeInfosResponse = { return message; }, fromJSON(object: any): QueryDevFeeInfosResponse { - return { - fees: Array.isArray(object?.fees) ? object.fees.map((e: any) => DevFeeInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDevFeeInfosResponse(); + if (Array.isArray(object?.fees)) object.fees.map((e: any) => DevFeeInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDevFeeInfosResponse): unknown { const obj: any = {}; @@ -379,7 +381,9 @@ export const QueryDevFeeInfosResponse = { fromPartial(object: DeepPartial): QueryDevFeeInfosResponse { const message = createBaseQueryDevFeeInfosResponse(); message.fees = object.fees?.map(e => DevFeeInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDevFeeInfosResponseSDKType): QueryDevFeeInfosResponse { @@ -437,14 +441,14 @@ function createBaseQueryDevFeeInfoRequest(): QueryDevFeeInfoRequest { } export const QueryDevFeeInfoRequest = { typeUrl: "/evmos.fees.v1.QueryDevFeeInfoRequest", - encode(message: QueryDevFeeInfoRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDevFeeInfoRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDevFeeInfoRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDevFeeInfoRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDevFeeInfoRequest(); while (reader.pos < end) { @@ -461,9 +465,9 @@ export const QueryDevFeeInfoRequest = { return message; }, fromJSON(object: any): QueryDevFeeInfoRequest { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "" - }; + const obj = createBaseQueryDevFeeInfoRequest(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + return obj; }, toJSON(message: QueryDevFeeInfoRequest): unknown { const obj: any = {}; @@ -518,14 +522,14 @@ function createBaseQueryDevFeeInfoResponse(): QueryDevFeeInfoResponse { } export const QueryDevFeeInfoResponse = { typeUrl: "/evmos.fees.v1.QueryDevFeeInfoResponse", - encode(message: QueryDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fee !== undefined) { DevFeeInfo.encode(message.fee, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDevFeeInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDevFeeInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDevFeeInfoResponse(); while (reader.pos < end) { @@ -542,9 +546,9 @@ export const QueryDevFeeInfoResponse = { return message; }, fromJSON(object: any): QueryDevFeeInfoResponse { - return { - fee: isSet(object.fee) ? DevFeeInfo.fromJSON(object.fee) : undefined - }; + const obj = createBaseQueryDevFeeInfoResponse(); + if (isSet(object.fee)) obj.fee = DevFeeInfo.fromJSON(object.fee); + return obj; }, toJSON(message: QueryDevFeeInfoResponse): unknown { const obj: any = {}; @@ -553,7 +557,9 @@ export const QueryDevFeeInfoResponse = { }, fromPartial(object: DeepPartial): QueryDevFeeInfoResponse { const message = createBaseQueryDevFeeInfoResponse(); - message.fee = object.fee !== undefined && object.fee !== null ? DevFeeInfo.fromPartial(object.fee) : undefined; + if (object.fee !== undefined && object.fee !== null) { + message.fee = DevFeeInfo.fromPartial(object.fee); + } return message; }, fromSDK(object: QueryDevFeeInfoResponseSDKType): QueryDevFeeInfoResponse { @@ -597,11 +603,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { } export const QueryParamsRequest = { typeUrl: "/evmos.fees.v1.QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -615,7 +621,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -662,14 +669,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { } export const QueryParamsResponse = { typeUrl: "/evmos.fees.v1.QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -686,9 +693,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -697,7 +704,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { @@ -744,7 +753,7 @@ function createBaseQueryDevFeeInfosPerDeployerRequest(): QueryDevFeeInfosPerDepl } export const QueryDevFeeInfosPerDeployerRequest = { typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerRequest", - encode(message: QueryDevFeeInfosPerDeployerRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDevFeeInfosPerDeployerRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deployerAddress !== "") { writer.uint32(10).string(message.deployerAddress); } @@ -753,8 +762,8 @@ export const QueryDevFeeInfosPerDeployerRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDevFeeInfosPerDeployerRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDevFeeInfosPerDeployerRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDevFeeInfosPerDeployerRequest(); while (reader.pos < end) { @@ -774,10 +783,10 @@ export const QueryDevFeeInfosPerDeployerRequest = { return message; }, fromJSON(object: any): QueryDevFeeInfosPerDeployerRequest { - return { - deployerAddress: isSet(object.deployerAddress) ? String(object.deployerAddress) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDevFeeInfosPerDeployerRequest(); + if (isSet(object.deployerAddress)) obj.deployerAddress = String(object.deployerAddress); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDevFeeInfosPerDeployerRequest): unknown { const obj: any = {}; @@ -788,7 +797,9 @@ export const QueryDevFeeInfosPerDeployerRequest = { fromPartial(object: DeepPartial): QueryDevFeeInfosPerDeployerRequest { const message = createBaseQueryDevFeeInfosPerDeployerRequest(); message.deployerAddress = object.deployerAddress ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDevFeeInfosPerDeployerRequestSDKType): QueryDevFeeInfosPerDeployerRequest { @@ -839,7 +850,7 @@ function createBaseQueryDevFeeInfosPerDeployerResponse(): QueryDevFeeInfosPerDep } export const QueryDevFeeInfosPerDeployerResponse = { typeUrl: "/evmos.fees.v1.QueryDevFeeInfosPerDeployerResponse", - encode(message: QueryDevFeeInfosPerDeployerResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryDevFeeInfosPerDeployerResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fees) { DevFeeInfo.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -848,8 +859,8 @@ export const QueryDevFeeInfosPerDeployerResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryDevFeeInfosPerDeployerResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryDevFeeInfosPerDeployerResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryDevFeeInfosPerDeployerResponse(); while (reader.pos < end) { @@ -869,10 +880,10 @@ export const QueryDevFeeInfosPerDeployerResponse = { return message; }, fromJSON(object: any): QueryDevFeeInfosPerDeployerResponse { - return { - fees: Array.isArray(object?.fees) ? object.fees.map((e: any) => DevFeeInfo.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryDevFeeInfosPerDeployerResponse(); + if (Array.isArray(object?.fees)) object.fees.map((e: any) => DevFeeInfo.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryDevFeeInfosPerDeployerResponse): unknown { const obj: any = {}; @@ -887,7 +898,9 @@ export const QueryDevFeeInfosPerDeployerResponse = { fromPartial(object: DeepPartial): QueryDevFeeInfosPerDeployerResponse { const message = createBaseQueryDevFeeInfosPerDeployerResponse(); message.fees = object.fees?.map(e => DevFeeInfo.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryDevFeeInfosPerDeployerResponseSDKType): QueryDevFeeInfosPerDeployerResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts b/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts index 449ded883a..488def2850 100644 --- a/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/evmos/fees/v1/tx.ts @@ -1,5 +1,5 @@ -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.fees.v1"; /** MsgRegisterFeesContract defines a message that registers a DevFeeInfo */ export interface MsgRegisterDevFeeInfo { @@ -17,7 +17,7 @@ export interface MsgRegisterDevFeeInfo { * the nonce that determines the contract's address - it can be an EOA nonce * or a factory contract nonce */ - nonces: Long[]; + nonces: bigint[]; } export interface MsgRegisterDevFeeInfoProtoMsg { typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo"; @@ -50,7 +50,7 @@ export interface MsgRegisterDevFeeInfoSDKType { contract_address: string; deployer_address: string; withdraw_address: string; - nonces: Long[]; + nonces: bigint[]; } /** * MsgRegisterDevFeeInfoResponse defines the MsgRegisterDevFeeInfo response @@ -190,7 +190,7 @@ function createBaseMsgRegisterDevFeeInfo(): MsgRegisterDevFeeInfo { } export const MsgRegisterDevFeeInfo = { typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfo", - encode(message: MsgRegisterDevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgRegisterDevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } @@ -207,8 +207,8 @@ export const MsgRegisterDevFeeInfo = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRegisterDevFeeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRegisterDevFeeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRegisterDevFeeInfo(); while (reader.pos < end) { @@ -227,10 +227,10 @@ export const MsgRegisterDevFeeInfo = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.nonces.push((reader.uint64() as Long)); + message.nonces.push(reader.uint64()); } } else { - message.nonces.push((reader.uint64() as Long)); + message.nonces.push(reader.uint64()); } break; default: @@ -241,12 +241,12 @@ export const MsgRegisterDevFeeInfo = { return message; }, fromJSON(object: any): MsgRegisterDevFeeInfo { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "", - deployerAddress: isSet(object.deployerAddress) ? String(object.deployerAddress) : "", - withdrawAddress: isSet(object.withdrawAddress) ? String(object.withdrawAddress) : "", - nonces: Array.isArray(object?.nonces) ? object.nonces.map((e: any) => Long.fromValue(e)) : [] - }; + const obj = createBaseMsgRegisterDevFeeInfo(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + if (isSet(object.deployerAddress)) obj.deployerAddress = String(object.deployerAddress); + if (isSet(object.withdrawAddress)) obj.withdrawAddress = String(object.withdrawAddress); + if (Array.isArray(object?.nonces)) object.nonces.map((e: any) => BigInt(e.toString())); + return obj; }, toJSON(message: MsgRegisterDevFeeInfo): unknown { const obj: any = {}; @@ -254,7 +254,7 @@ export const MsgRegisterDevFeeInfo = { message.deployerAddress !== undefined && (obj.deployerAddress = message.deployerAddress); message.withdrawAddress !== undefined && (obj.withdrawAddress = message.withdrawAddress); if (message.nonces) { - obj.nonces = message.nonces.map(e => (e || Long.UZERO).toString()); + obj.nonces = message.nonces.map(e => (e || BigInt(0)).toString()); } else { obj.nonces = []; } @@ -265,7 +265,7 @@ export const MsgRegisterDevFeeInfo = { message.contractAddress = object.contractAddress ?? ""; message.deployerAddress = object.deployerAddress ?? ""; message.withdrawAddress = object.withdrawAddress ?? ""; - message.nonces = object.nonces?.map(e => Long.fromValue(e)) || []; + message.nonces = object.nonces?.map(e => BigInt(e.toString())) || []; return message; }, fromSDK(object: MsgRegisterDevFeeInfoSDKType): MsgRegisterDevFeeInfo { @@ -293,7 +293,7 @@ export const MsgRegisterDevFeeInfo = { contractAddress: object.contract_address, deployerAddress: object.deployer_address, withdrawAddress: object.withdraw_address, - nonces: Array.isArray(object?.nonces) ? object.nonces.map((e: any) => e) : [] + nonces: Array.isArray(object?.nonces) ? object.nonces.map((e: any) => BigInt(e)) : [] }; }, toAmino(message: MsgRegisterDevFeeInfo): MsgRegisterDevFeeInfoAmino { @@ -302,7 +302,7 @@ export const MsgRegisterDevFeeInfo = { obj.deployer_address = message.deployerAddress; obj.withdraw_address = message.withdrawAddress; if (message.nonces) { - obj.nonces = message.nonces.map(e => e); + obj.nonces = message.nonces.map(e => e.toString()); } else { obj.nonces = []; } @@ -329,11 +329,11 @@ function createBaseMsgRegisterDevFeeInfoResponse(): MsgRegisterDevFeeInfoRespons } export const MsgRegisterDevFeeInfoResponse = { typeUrl: "/evmos.fees.v1.MsgRegisterDevFeeInfoResponse", - encode(_: MsgRegisterDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgRegisterDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgRegisterDevFeeInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgRegisterDevFeeInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgRegisterDevFeeInfoResponse(); while (reader.pos < end) { @@ -347,7 +347,8 @@ export const MsgRegisterDevFeeInfoResponse = { return message; }, fromJSON(_: any): MsgRegisterDevFeeInfoResponse { - return {}; + const obj = createBaseMsgRegisterDevFeeInfoResponse(); + return obj; }, toJSON(_: MsgRegisterDevFeeInfoResponse): unknown { const obj: any = {}; @@ -395,7 +396,7 @@ function createBaseMsgCancelDevFeeInfo(): MsgCancelDevFeeInfo { } export const MsgCancelDevFeeInfo = { typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfo", - encode(message: MsgCancelDevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCancelDevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } @@ -404,8 +405,8 @@ export const MsgCancelDevFeeInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCancelDevFeeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCancelDevFeeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCancelDevFeeInfo(); while (reader.pos < end) { @@ -425,10 +426,10 @@ export const MsgCancelDevFeeInfo = { return message; }, fromJSON(object: any): MsgCancelDevFeeInfo { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "", - deployerAddress: isSet(object.deployerAddress) ? String(object.deployerAddress) : "" - }; + const obj = createBaseMsgCancelDevFeeInfo(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + if (isSet(object.deployerAddress)) obj.deployerAddress = String(object.deployerAddress); + return obj; }, toJSON(message: MsgCancelDevFeeInfo): unknown { const obj: any = {}; @@ -487,11 +488,11 @@ function createBaseMsgCancelDevFeeInfoResponse(): MsgCancelDevFeeInfoResponse { } export const MsgCancelDevFeeInfoResponse = { typeUrl: "/evmos.fees.v1.MsgCancelDevFeeInfoResponse", - encode(_: MsgCancelDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCancelDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCancelDevFeeInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCancelDevFeeInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCancelDevFeeInfoResponse(); while (reader.pos < end) { @@ -505,7 +506,8 @@ export const MsgCancelDevFeeInfoResponse = { return message; }, fromJSON(_: any): MsgCancelDevFeeInfoResponse { - return {}; + const obj = createBaseMsgCancelDevFeeInfoResponse(); + return obj; }, toJSON(_: MsgCancelDevFeeInfoResponse): unknown { const obj: any = {}; @@ -554,7 +556,7 @@ function createBaseMsgUpdateDevFeeInfo(): MsgUpdateDevFeeInfo { } export const MsgUpdateDevFeeInfo = { typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfo", - encode(message: MsgUpdateDevFeeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgUpdateDevFeeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contractAddress !== "") { writer.uint32(10).string(message.contractAddress); } @@ -566,8 +568,8 @@ export const MsgUpdateDevFeeInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateDevFeeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateDevFeeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateDevFeeInfo(); while (reader.pos < end) { @@ -590,11 +592,11 @@ export const MsgUpdateDevFeeInfo = { return message; }, fromJSON(object: any): MsgUpdateDevFeeInfo { - return { - contractAddress: isSet(object.contractAddress) ? String(object.contractAddress) : "", - deployerAddress: isSet(object.deployerAddress) ? String(object.deployerAddress) : "", - withdrawAddress: isSet(object.withdrawAddress) ? String(object.withdrawAddress) : "" - }; + const obj = createBaseMsgUpdateDevFeeInfo(); + if (isSet(object.contractAddress)) obj.contractAddress = String(object.contractAddress); + if (isSet(object.deployerAddress)) obj.deployerAddress = String(object.deployerAddress); + if (isSet(object.withdrawAddress)) obj.withdrawAddress = String(object.withdrawAddress); + return obj; }, toJSON(message: MsgUpdateDevFeeInfo): unknown { const obj: any = {}; @@ -659,11 +661,11 @@ function createBaseMsgUpdateDevFeeInfoResponse(): MsgUpdateDevFeeInfoResponse { } export const MsgUpdateDevFeeInfoResponse = { typeUrl: "/evmos.fees.v1.MsgUpdateDevFeeInfoResponse", - encode(_: MsgUpdateDevFeeInfoResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgUpdateDevFeeInfoResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgUpdateDevFeeInfoResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgUpdateDevFeeInfoResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgUpdateDevFeeInfoResponse(); while (reader.pos < end) { @@ -677,7 +679,8 @@ export const MsgUpdateDevFeeInfoResponse = { return message; }, fromJSON(_: any): MsgUpdateDevFeeInfoResponse { - return {}; + const obj = createBaseMsgUpdateDevFeeInfoResponse(); + return obj; }, toJSON(_: MsgUpdateDevFeeInfoResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts index 0c336b95d4..abc09f9e41 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/genesis.ts @@ -1,6 +1,7 @@ import { Incentive, IncentiveAmino, IncentiveSDKType, GasMeter, GasMeterAmino, GasMeterSDKType } from "./incentives"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; +import { Decimal } from "@cosmjs/math"; export const protobufPackage = "evmos.incentives.v1"; /** GenesisState defines the module's genesis state. */ export interface GenesisState { @@ -80,7 +81,7 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/evmos.incentives.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } @@ -92,8 +93,8 @@ export const GenesisState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -116,11 +117,11 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - incentives: Array.isArray(object?.incentives) ? object.incentives.map((e: any) => Incentive.fromJSON(e)) : [], - gasMeters: Array.isArray(object?.gasMeters) ? object.gasMeters.map((e: any) => GasMeter.fromJSON(e)) : [] - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (Array.isArray(object?.incentives)) object.incentives.map((e: any) => Incentive.fromJSON(e)); + if (Array.isArray(object?.gasMeters)) object.gasMeters.map((e: any) => GasMeter.fromJSON(e)); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -139,7 +140,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } message.incentives = object.incentives?.map(e => Incentive.fromPartial(e)) || []; message.gasMeters = object.gasMeters?.map(e => GasMeter.fromPartial(e)) || []; return message; @@ -214,23 +217,23 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/evmos.incentives.v1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableIncentives === true) { writer.uint32(8).bool(message.enableIncentives); } if (message.allocationLimit !== "") { - writer.uint32(18).string(message.allocationLimit); + writer.uint32(18).string(Decimal.fromUserInput(message.allocationLimit, 18).atomics); } if (message.incentivesEpochIdentifier !== "") { writer.uint32(26).string(message.incentivesEpochIdentifier); } if (message.rewardScaler !== "") { - writer.uint32(34).string(message.rewardScaler); + writer.uint32(34).string(Decimal.fromUserInput(message.rewardScaler, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -240,13 +243,13 @@ export const Params = { message.enableIncentives = reader.bool(); break; case 2: - message.allocationLimit = reader.string(); + message.allocationLimit = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: message.incentivesEpochIdentifier = reader.string(); break; case 4: - message.rewardScaler = reader.string(); + message.rewardScaler = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -256,12 +259,12 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - enableIncentives: isSet(object.enableIncentives) ? Boolean(object.enableIncentives) : false, - allocationLimit: isSet(object.allocationLimit) ? String(object.allocationLimit) : "", - incentivesEpochIdentifier: isSet(object.incentivesEpochIdentifier) ? String(object.incentivesEpochIdentifier) : "", - rewardScaler: isSet(object.rewardScaler) ? String(object.rewardScaler) : "" - }; + const obj = createBaseParams(); + if (isSet(object.enableIncentives)) obj.enableIncentives = Boolean(object.enableIncentives); + if (isSet(object.allocationLimit)) obj.allocationLimit = String(object.allocationLimit); + if (isSet(object.incentivesEpochIdentifier)) obj.incentivesEpochIdentifier = String(object.incentivesEpochIdentifier); + if (isSet(object.rewardScaler)) obj.rewardScaler = String(object.rewardScaler); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts index 9a3185de12..8057180618 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/incentives.ts @@ -1,7 +1,7 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Timestamp } from "../../../google/protobuf/timestamp"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.incentives.v1"; /** * Incentive defines an instance that organizes distribution conditions for a @@ -17,7 +17,7 @@ export interface Incentive { /** distribution start time */ startTime: Date; /** cumulative gas spent by all gasmeters of the incentive during the epoch */ - totalGas: Long; + totalGas: bigint; } export interface IncentiveProtoMsg { typeUrl: "/evmos.incentives.v1.Incentive"; @@ -52,7 +52,7 @@ export interface IncentiveSDKType { allocations: DecCoinSDKType[]; epochs: number; start_time: Date; - total_gas: Long; + total_gas: bigint; } /** GasMeter tracks the cumulative gas spent per participant in one epoch */ export interface GasMeter { @@ -61,7 +61,7 @@ export interface GasMeter { /** participant address that interacts with the incentive */ participant: string; /** cumulative gas spent during the epoch */ - cumulativeGas: Long; + cumulativeGas: bigint; } export interface GasMeterProtoMsg { typeUrl: "/evmos.incentives.v1.GasMeter"; @@ -84,10 +84,11 @@ export interface GasMeterAminoMsg { export interface GasMeterSDKType { contract: string; participant: string; - cumulative_gas: Long; + cumulative_gas: bigint; } /** RegisterIncentiveProposal is a gov Content type to register an incentive */ export interface RegisterIncentiveProposal { + $typeUrl?: string; /** title of the proposal */ title: string; /** proposal description */ @@ -122,6 +123,7 @@ export interface RegisterIncentiveProposalAminoMsg { } /** RegisterIncentiveProposal is a gov Content type to register an incentive */ export interface RegisterIncentiveProposalSDKType { + $typeUrl?: string; title: string; description: string; contract: string; @@ -166,12 +168,12 @@ function createBaseIncentive(): Incentive { allocations: [], epochs: 0, startTime: new Date(), - totalGas: Long.UZERO + totalGas: BigInt(0) }; } export const Incentive = { typeUrl: "/evmos.incentives.v1.Incentive", - encode(message: Incentive, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Incentive, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); } @@ -184,13 +186,13 @@ export const Incentive = { if (message.startTime !== undefined) { Timestamp.encode(toTimestamp(message.startTime), writer.uint32(34).fork()).ldelim(); } - if (!message.totalGas.isZero()) { + if (message.totalGas !== BigInt(0)) { writer.uint32(40).uint64(message.totalGas); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Incentive { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Incentive { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseIncentive(); while (reader.pos < end) { @@ -209,7 +211,7 @@ export const Incentive = { message.startTime = fromTimestamp(Timestamp.decode(reader, reader.uint32())); break; case 5: - message.totalGas = (reader.uint64() as Long); + message.totalGas = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -219,13 +221,13 @@ export const Incentive = { return message; }, fromJSON(object: any): Incentive { - return { - contract: isSet(object.contract) ? String(object.contract) : "", - allocations: Array.isArray(object?.allocations) ? object.allocations.map((e: any) => DecCoin.fromJSON(e)) : [], - epochs: isSet(object.epochs) ? Number(object.epochs) : 0, - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - totalGas: isSet(object.totalGas) ? Long.fromValue(object.totalGas) : Long.UZERO - }; + const obj = createBaseIncentive(); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (Array.isArray(object?.allocations)) object.allocations.map((e: any) => DecCoin.fromJSON(e)); + if (isSet(object.epochs)) obj.epochs = Number(object.epochs); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (isSet(object.totalGas)) obj.totalGas = BigInt(object.totalGas.toString()); + return obj; }, toJSON(message: Incentive): unknown { const obj: any = {}; @@ -237,7 +239,7 @@ export const Incentive = { } message.epochs !== undefined && (obj.epochs = Math.round(message.epochs)); message.startTime !== undefined && (obj.startTime = message.startTime.toISOString()); - message.totalGas !== undefined && (obj.totalGas = (message.totalGas || Long.UZERO).toString()); + message.totalGas !== undefined && (obj.totalGas = (message.totalGas || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): Incentive { @@ -246,7 +248,9 @@ export const Incentive = { message.allocations = object.allocations?.map(e => DecCoin.fromPartial(e)) || []; message.epochs = object.epochs ?? 0; message.startTime = object.startTime ?? undefined; - message.totalGas = object.totalGas !== undefined && object.totalGas !== null ? Long.fromValue(object.totalGas) : Long.UZERO; + if (object.totalGas !== undefined && object.totalGas !== null) { + message.totalGas = BigInt(object.totalGas.toString()); + } return message; }, fromSDK(object: IncentiveSDKType): Incentive { @@ -277,7 +281,7 @@ export const Incentive = { allocations: Array.isArray(object?.allocations) ? object.allocations.map((e: any) => DecCoin.fromAmino(e)) : [], epochs: object.epochs, startTime: object.start_time, - totalGas: Long.fromString(object.total_gas) + totalGas: BigInt(object.total_gas) }; }, toAmino(message: Incentive): IncentiveAmino { @@ -313,25 +317,25 @@ function createBaseGasMeter(): GasMeter { return { contract: "", participant: "", - cumulativeGas: Long.UZERO + cumulativeGas: BigInt(0) }; } export const GasMeter = { typeUrl: "/evmos.incentives.v1.GasMeter", - encode(message: GasMeter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GasMeter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); } if (message.participant !== "") { writer.uint32(18).string(message.participant); } - if (!message.cumulativeGas.isZero()) { + if (message.cumulativeGas !== BigInt(0)) { writer.uint32(24).uint64(message.cumulativeGas); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GasMeter { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GasMeter { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGasMeter(); while (reader.pos < end) { @@ -344,7 +348,7 @@ export const GasMeter = { message.participant = reader.string(); break; case 3: - message.cumulativeGas = (reader.uint64() as Long); + message.cumulativeGas = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -354,24 +358,26 @@ export const GasMeter = { return message; }, fromJSON(object: any): GasMeter { - return { - contract: isSet(object.contract) ? String(object.contract) : "", - participant: isSet(object.participant) ? String(object.participant) : "", - cumulativeGas: isSet(object.cumulativeGas) ? Long.fromValue(object.cumulativeGas) : Long.UZERO - }; + const obj = createBaseGasMeter(); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.participant)) obj.participant = String(object.participant); + if (isSet(object.cumulativeGas)) obj.cumulativeGas = BigInt(object.cumulativeGas.toString()); + return obj; }, toJSON(message: GasMeter): unknown { const obj: any = {}; message.contract !== undefined && (obj.contract = message.contract); message.participant !== undefined && (obj.participant = message.participant); - message.cumulativeGas !== undefined && (obj.cumulativeGas = (message.cumulativeGas || Long.UZERO).toString()); + message.cumulativeGas !== undefined && (obj.cumulativeGas = (message.cumulativeGas || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): GasMeter { const message = createBaseGasMeter(); message.contract = object.contract ?? ""; message.participant = object.participant ?? ""; - message.cumulativeGas = object.cumulativeGas !== undefined && object.cumulativeGas !== null ? Long.fromValue(object.cumulativeGas) : Long.UZERO; + if (object.cumulativeGas !== undefined && object.cumulativeGas !== null) { + message.cumulativeGas = BigInt(object.cumulativeGas.toString()); + } return message; }, fromSDK(object: GasMeterSDKType): GasMeter { @@ -392,7 +398,7 @@ export const GasMeter = { return { contract: object.contract, participant: object.participant, - cumulativeGas: Long.fromString(object.cumulative_gas) + cumulativeGas: BigInt(object.cumulative_gas) }; }, toAmino(message: GasMeter): GasMeterAmino { @@ -420,6 +426,7 @@ export const GasMeter = { }; function createBaseRegisterIncentiveProposal(): RegisterIncentiveProposal { return { + $typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal", title: "", description: "", contract: "", @@ -429,7 +436,7 @@ function createBaseRegisterIncentiveProposal(): RegisterIncentiveProposal { } export const RegisterIncentiveProposal = { typeUrl: "/evmos.incentives.v1.RegisterIncentiveProposal", - encode(message: RegisterIncentiveProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RegisterIncentiveProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -447,8 +454,8 @@ export const RegisterIncentiveProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RegisterIncentiveProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RegisterIncentiveProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRegisterIncentiveProposal(); while (reader.pos < end) { @@ -477,13 +484,13 @@ export const RegisterIncentiveProposal = { return message; }, fromJSON(object: any): RegisterIncentiveProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - contract: isSet(object.contract) ? String(object.contract) : "", - allocations: Array.isArray(object?.allocations) ? object.allocations.map((e: any) => DecCoin.fromJSON(e)) : [], - epochs: isSet(object.epochs) ? Number(object.epochs) : 0 - }; + const obj = createBaseRegisterIncentiveProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (Array.isArray(object?.allocations)) object.allocations.map((e: any) => DecCoin.fromJSON(e)); + if (isSet(object.epochs)) obj.epochs = Number(object.epochs); + return obj; }, toJSON(message: RegisterIncentiveProposal): unknown { const obj: any = {}; @@ -576,7 +583,7 @@ function createBaseCancelIncentiveProposal(): CancelIncentiveProposal { } export const CancelIncentiveProposal = { typeUrl: "/evmos.incentives.v1.CancelIncentiveProposal", - encode(message: CancelIncentiveProposal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CancelIncentiveProposal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.title !== "") { writer.uint32(10).string(message.title); } @@ -588,8 +595,8 @@ export const CancelIncentiveProposal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CancelIncentiveProposal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CancelIncentiveProposal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCancelIncentiveProposal(); while (reader.pos < end) { @@ -612,11 +619,11 @@ export const CancelIncentiveProposal = { return message; }, fromJSON(object: any): CancelIncentiveProposal { - return { - title: isSet(object.title) ? String(object.title) : "", - description: isSet(object.description) ? String(object.description) : "", - contract: isSet(object.contract) ? String(object.contract) : "" - }; + const obj = createBaseCancelIncentiveProposal(); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.contract)) obj.contract = String(object.contract); + return obj; }, toJSON(message: CancelIncentiveProposal): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts index b71b0f11ad..21b5f0d9c6 100644 --- a/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/incentives/v1/query.ts @@ -2,8 +2,8 @@ import { PageRequest, PageRequestAmino, PageRequestSDKType, PageResponse, PageRe import { Incentive, IncentiveAmino, IncentiveSDKType, GasMeter, GasMeterAmino, GasMeterSDKType } from "./incentives"; import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.incentives.v1"; /** * QueryIncentivesRequest is the request type for the Query/Incentives RPC @@ -227,7 +227,7 @@ export interface QueryGasMeterResponse { * QueryGasMeterResponse is the response type for the Query/Incentive RPC * method. */ - gasMeter: Long; + gasMeter: bigint; } export interface QueryGasMeterResponseProtoMsg { typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse"; @@ -253,7 +253,7 @@ export interface QueryGasMeterResponseAminoMsg { * method. */ export interface QueryGasMeterResponseSDKType { - gas_meter: Long; + gas_meter: bigint; } /** * QueryAllocationMetersRequest is the request type for the @@ -430,14 +430,14 @@ function createBaseQueryIncentivesRequest(): QueryIncentivesRequest { } export const QueryIncentivesRequest = { typeUrl: "/evmos.incentives.v1.QueryIncentivesRequest", - encode(message: QueryIncentivesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryIncentivesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryIncentivesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryIncentivesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryIncentivesRequest(); while (reader.pos < end) { @@ -454,9 +454,9 @@ export const QueryIncentivesRequest = { return message; }, fromJSON(object: any): QueryIncentivesRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryIncentivesRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryIncentivesRequest): unknown { const obj: any = {}; @@ -465,7 +465,9 @@ export const QueryIncentivesRequest = { }, fromPartial(object: DeepPartial): QueryIncentivesRequest { const message = createBaseQueryIncentivesRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryIncentivesRequestSDKType): QueryIncentivesRequest { @@ -512,7 +514,7 @@ function createBaseQueryIncentivesResponse(): QueryIncentivesResponse { } export const QueryIncentivesResponse = { typeUrl: "/evmos.incentives.v1.QueryIncentivesResponse", - encode(message: QueryIncentivesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryIncentivesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.incentives) { Incentive.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -521,8 +523,8 @@ export const QueryIncentivesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryIncentivesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryIncentivesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryIncentivesResponse(); while (reader.pos < end) { @@ -542,10 +544,10 @@ export const QueryIncentivesResponse = { return message; }, fromJSON(object: any): QueryIncentivesResponse { - return { - incentives: Array.isArray(object?.incentives) ? object.incentives.map((e: any) => Incentive.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryIncentivesResponse(); + if (Array.isArray(object?.incentives)) object.incentives.map((e: any) => Incentive.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryIncentivesResponse): unknown { const obj: any = {}; @@ -560,7 +562,9 @@ export const QueryIncentivesResponse = { fromPartial(object: DeepPartial): QueryIncentivesResponse { const message = createBaseQueryIncentivesResponse(); message.incentives = object.incentives?.map(e => Incentive.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryIncentivesResponseSDKType): QueryIncentivesResponse { @@ -618,14 +622,14 @@ function createBaseQueryIncentiveRequest(): QueryIncentiveRequest { } export const QueryIncentiveRequest = { typeUrl: "/evmos.incentives.v1.QueryIncentiveRequest", - encode(message: QueryIncentiveRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryIncentiveRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryIncentiveRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryIncentiveRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryIncentiveRequest(); while (reader.pos < end) { @@ -642,9 +646,9 @@ export const QueryIncentiveRequest = { return message; }, fromJSON(object: any): QueryIncentiveRequest { - return { - contract: isSet(object.contract) ? String(object.contract) : "" - }; + const obj = createBaseQueryIncentiveRequest(); + if (isSet(object.contract)) obj.contract = String(object.contract); + return obj; }, toJSON(message: QueryIncentiveRequest): unknown { const obj: any = {}; @@ -699,14 +703,14 @@ function createBaseQueryIncentiveResponse(): QueryIncentiveResponse { } export const QueryIncentiveResponse = { typeUrl: "/evmos.incentives.v1.QueryIncentiveResponse", - encode(message: QueryIncentiveResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryIncentiveResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.incentive !== undefined) { Incentive.encode(message.incentive, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryIncentiveResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryIncentiveResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryIncentiveResponse(); while (reader.pos < end) { @@ -723,9 +727,9 @@ export const QueryIncentiveResponse = { return message; }, fromJSON(object: any): QueryIncentiveResponse { - return { - incentive: isSet(object.incentive) ? Incentive.fromJSON(object.incentive) : undefined - }; + const obj = createBaseQueryIncentiveResponse(); + if (isSet(object.incentive)) obj.incentive = Incentive.fromJSON(object.incentive); + return obj; }, toJSON(message: QueryIncentiveResponse): unknown { const obj: any = {}; @@ -734,7 +738,9 @@ export const QueryIncentiveResponse = { }, fromPartial(object: DeepPartial): QueryIncentiveResponse { const message = createBaseQueryIncentiveResponse(); - message.incentive = object.incentive !== undefined && object.incentive !== null ? Incentive.fromPartial(object.incentive) : undefined; + if (object.incentive !== undefined && object.incentive !== null) { + message.incentive = Incentive.fromPartial(object.incentive); + } return message; }, fromSDK(object: QueryIncentiveResponseSDKType): QueryIncentiveResponse { @@ -781,7 +787,7 @@ function createBaseQueryGasMetersRequest(): QueryGasMetersRequest { } export const QueryGasMetersRequest = { typeUrl: "/evmos.incentives.v1.QueryGasMetersRequest", - encode(message: QueryGasMetersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGasMetersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); } @@ -790,8 +796,8 @@ export const QueryGasMetersRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGasMetersRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGasMetersRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGasMetersRequest(); while (reader.pos < end) { @@ -811,10 +817,10 @@ export const QueryGasMetersRequest = { return message; }, fromJSON(object: any): QueryGasMetersRequest { - return { - contract: isSet(object.contract) ? String(object.contract) : "", - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGasMetersRequest(); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGasMetersRequest): unknown { const obj: any = {}; @@ -825,7 +831,9 @@ export const QueryGasMetersRequest = { fromPartial(object: DeepPartial): QueryGasMetersRequest { const message = createBaseQueryGasMetersRequest(); message.contract = object.contract ?? ""; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGasMetersRequestSDKType): QueryGasMetersRequest { @@ -876,7 +884,7 @@ function createBaseQueryGasMetersResponse(): QueryGasMetersResponse { } export const QueryGasMetersResponse = { typeUrl: "/evmos.incentives.v1.QueryGasMetersResponse", - encode(message: QueryGasMetersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGasMetersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.gasMeters) { GasMeter.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -885,8 +893,8 @@ export const QueryGasMetersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGasMetersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGasMetersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGasMetersResponse(); while (reader.pos < end) { @@ -906,10 +914,10 @@ export const QueryGasMetersResponse = { return message; }, fromJSON(object: any): QueryGasMetersResponse { - return { - gasMeters: Array.isArray(object?.gasMeters) ? object.gasMeters.map((e: any) => GasMeter.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryGasMetersResponse(); + if (Array.isArray(object?.gasMeters)) object.gasMeters.map((e: any) => GasMeter.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryGasMetersResponse): unknown { const obj: any = {}; @@ -924,7 +932,9 @@ export const QueryGasMetersResponse = { fromPartial(object: DeepPartial): QueryGasMetersResponse { const message = createBaseQueryGasMetersResponse(); message.gasMeters = object.gasMeters?.map(e => GasMeter.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryGasMetersResponseSDKType): QueryGasMetersResponse { @@ -983,7 +993,7 @@ function createBaseQueryGasMeterRequest(): QueryGasMeterRequest { } export const QueryGasMeterRequest = { typeUrl: "/evmos.incentives.v1.QueryGasMeterRequest", - encode(message: QueryGasMeterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryGasMeterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contract !== "") { writer.uint32(10).string(message.contract); } @@ -992,8 +1002,8 @@ export const QueryGasMeterRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGasMeterRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGasMeterRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGasMeterRequest(); while (reader.pos < end) { @@ -1013,10 +1023,10 @@ export const QueryGasMeterRequest = { return message; }, fromJSON(object: any): QueryGasMeterRequest { - return { - contract: isSet(object.contract) ? String(object.contract) : "", - participant: isSet(object.participant) ? String(object.participant) : "" - }; + const obj = createBaseQueryGasMeterRequest(); + if (isSet(object.contract)) obj.contract = String(object.contract); + if (isSet(object.participant)) obj.participant = String(object.participant); + return obj; }, toJSON(message: QueryGasMeterRequest): unknown { const obj: any = {}; @@ -1072,26 +1082,26 @@ export const QueryGasMeterRequest = { }; function createBaseQueryGasMeterResponse(): QueryGasMeterResponse { return { - gasMeter: Long.UZERO + gasMeter: BigInt(0) }; } export const QueryGasMeterResponse = { typeUrl: "/evmos.incentives.v1.QueryGasMeterResponse", - encode(message: QueryGasMeterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.gasMeter.isZero()) { + encode(message: QueryGasMeterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.gasMeter !== BigInt(0)) { writer.uint32(8).uint64(message.gasMeter); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryGasMeterResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryGasMeterResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryGasMeterResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.gasMeter = (reader.uint64() as Long); + message.gasMeter = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -1101,18 +1111,20 @@ export const QueryGasMeterResponse = { return message; }, fromJSON(object: any): QueryGasMeterResponse { - return { - gasMeter: isSet(object.gasMeter) ? Long.fromValue(object.gasMeter) : Long.UZERO - }; + const obj = createBaseQueryGasMeterResponse(); + if (isSet(object.gasMeter)) obj.gasMeter = BigInt(object.gasMeter.toString()); + return obj; }, toJSON(message: QueryGasMeterResponse): unknown { const obj: any = {}; - message.gasMeter !== undefined && (obj.gasMeter = (message.gasMeter || Long.UZERO).toString()); + message.gasMeter !== undefined && (obj.gasMeter = (message.gasMeter || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryGasMeterResponse { const message = createBaseQueryGasMeterResponse(); - message.gasMeter = object.gasMeter !== undefined && object.gasMeter !== null ? Long.fromValue(object.gasMeter) : Long.UZERO; + if (object.gasMeter !== undefined && object.gasMeter !== null) { + message.gasMeter = BigInt(object.gasMeter.toString()); + } return message; }, fromSDK(object: QueryGasMeterResponseSDKType): QueryGasMeterResponse { @@ -1127,7 +1139,7 @@ export const QueryGasMeterResponse = { }, fromAmino(object: QueryGasMeterResponseAmino): QueryGasMeterResponse { return { - gasMeter: Long.fromString(object.gas_meter) + gasMeter: BigInt(object.gas_meter) }; }, toAmino(message: QueryGasMeterResponse): QueryGasMeterResponseAmino { @@ -1158,14 +1170,14 @@ function createBaseQueryAllocationMetersRequest(): QueryAllocationMetersRequest } export const QueryAllocationMetersRequest = { typeUrl: "/evmos.incentives.v1.QueryAllocationMetersRequest", - encode(message: QueryAllocationMetersRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllocationMetersRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pagination !== undefined) { PageRequest.encode(message.pagination, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllocationMetersRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllocationMetersRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllocationMetersRequest(); while (reader.pos < end) { @@ -1182,9 +1194,9 @@ export const QueryAllocationMetersRequest = { return message; }, fromJSON(object: any): QueryAllocationMetersRequest { - return { - pagination: isSet(object.pagination) ? PageRequest.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllocationMetersRequest(); + if (isSet(object.pagination)) obj.pagination = PageRequest.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllocationMetersRequest): unknown { const obj: any = {}; @@ -1193,7 +1205,9 @@ export const QueryAllocationMetersRequest = { }, fromPartial(object: DeepPartial): QueryAllocationMetersRequest { const message = createBaseQueryAllocationMetersRequest(); - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageRequest.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageRequest.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllocationMetersRequestSDKType): QueryAllocationMetersRequest { @@ -1240,7 +1254,7 @@ function createBaseQueryAllocationMetersResponse(): QueryAllocationMetersRespons } export const QueryAllocationMetersResponse = { typeUrl: "/evmos.incentives.v1.QueryAllocationMetersResponse", - encode(message: QueryAllocationMetersResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllocationMetersResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.allocationMeters) { DecCoin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1249,8 +1263,8 @@ export const QueryAllocationMetersResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllocationMetersResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllocationMetersResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllocationMetersResponse(); while (reader.pos < end) { @@ -1270,10 +1284,10 @@ export const QueryAllocationMetersResponse = { return message; }, fromJSON(object: any): QueryAllocationMetersResponse { - return { - allocationMeters: Array.isArray(object?.allocationMeters) ? object.allocationMeters.map((e: any) => DecCoin.fromJSON(e)) : [], - pagination: isSet(object.pagination) ? PageResponse.fromJSON(object.pagination) : undefined - }; + const obj = createBaseQueryAllocationMetersResponse(); + if (Array.isArray(object?.allocationMeters)) object.allocationMeters.map((e: any) => DecCoin.fromJSON(e)); + if (isSet(object.pagination)) obj.pagination = PageResponse.fromJSON(object.pagination); + return obj; }, toJSON(message: QueryAllocationMetersResponse): unknown { const obj: any = {}; @@ -1288,7 +1302,9 @@ export const QueryAllocationMetersResponse = { fromPartial(object: DeepPartial): QueryAllocationMetersResponse { const message = createBaseQueryAllocationMetersResponse(); message.allocationMeters = object.allocationMeters?.map(e => DecCoin.fromPartial(e)) || []; - message.pagination = object.pagination !== undefined && object.pagination !== null ? PageResponse.fromPartial(object.pagination) : undefined; + if (object.pagination !== undefined && object.pagination !== null) { + message.pagination = PageResponse.fromPartial(object.pagination); + } return message; }, fromSDK(object: QueryAllocationMetersResponseSDKType): QueryAllocationMetersResponse { @@ -1346,14 +1362,14 @@ function createBaseQueryAllocationMeterRequest(): QueryAllocationMeterRequest { } export const QueryAllocationMeterRequest = { typeUrl: "/evmos.incentives.v1.QueryAllocationMeterRequest", - encode(message: QueryAllocationMeterRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllocationMeterRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.denom !== "") { writer.uint32(10).string(message.denom); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllocationMeterRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllocationMeterRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllocationMeterRequest(); while (reader.pos < end) { @@ -1370,9 +1386,9 @@ export const QueryAllocationMeterRequest = { return message; }, fromJSON(object: any): QueryAllocationMeterRequest { - return { - denom: isSet(object.denom) ? String(object.denom) : "" - }; + const obj = createBaseQueryAllocationMeterRequest(); + if (isSet(object.denom)) obj.denom = String(object.denom); + return obj; }, toJSON(message: QueryAllocationMeterRequest): unknown { const obj: any = {}; @@ -1427,14 +1443,14 @@ function createBaseQueryAllocationMeterResponse(): QueryAllocationMeterResponse } export const QueryAllocationMeterResponse = { typeUrl: "/evmos.incentives.v1.QueryAllocationMeterResponse", - encode(message: QueryAllocationMeterResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryAllocationMeterResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allocationMeter !== undefined) { DecCoin.encode(message.allocationMeter, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryAllocationMeterResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryAllocationMeterResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryAllocationMeterResponse(); while (reader.pos < end) { @@ -1451,9 +1467,9 @@ export const QueryAllocationMeterResponse = { return message; }, fromJSON(object: any): QueryAllocationMeterResponse { - return { - allocationMeter: isSet(object.allocationMeter) ? DecCoin.fromJSON(object.allocationMeter) : undefined - }; + const obj = createBaseQueryAllocationMeterResponse(); + if (isSet(object.allocationMeter)) obj.allocationMeter = DecCoin.fromJSON(object.allocationMeter); + return obj; }, toJSON(message: QueryAllocationMeterResponse): unknown { const obj: any = {}; @@ -1462,7 +1478,9 @@ export const QueryAllocationMeterResponse = { }, fromPartial(object: DeepPartial): QueryAllocationMeterResponse { const message = createBaseQueryAllocationMeterResponse(); - message.allocationMeter = object.allocationMeter !== undefined && object.allocationMeter !== null ? DecCoin.fromPartial(object.allocationMeter) : undefined; + if (object.allocationMeter !== undefined && object.allocationMeter !== null) { + message.allocationMeter = DecCoin.fromPartial(object.allocationMeter); + } return message; }, fromSDK(object: QueryAllocationMeterResponseSDKType): QueryAllocationMeterResponse { @@ -1506,11 +1524,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { } export const QueryParamsRequest = { typeUrl: "/evmos.incentives.v1.QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -1524,7 +1542,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -1571,14 +1590,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { } export const QueryParamsResponse = { typeUrl: "/evmos.incentives.v1.QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -1595,9 +1614,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -1606,7 +1625,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts index 7e3023b384..769de0eaf1 100644 --- a/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/inflation/v1/genesis.ts @@ -1,19 +1,19 @@ import { ExponentialCalculation, ExponentialCalculationAmino, ExponentialCalculationSDKType, InflationDistribution, InflationDistributionAmino, InflationDistributionSDKType } from "./inflation"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.inflation.v1"; /** GenesisState defines the inflation module's genesis state. */ export interface GenesisState { /** params defines all the paramaters of the module. */ params: Params; /** amount of past periods, based on the epochs per period param */ - period: Long; + period: bigint; /** inflation epoch identifier */ epochIdentifier: string; /** number of epochs after which inflation is recalculated */ - epochsPerPeriod: Long; + epochsPerPeriod: bigint; /** number of epochs that have passed while inflation is disabled */ - skippedEpochs: Long; + skippedEpochs: bigint; } export interface GenesisStateProtoMsg { typeUrl: "/evmos.inflation.v1.GenesisState"; @@ -39,10 +39,10 @@ export interface GenesisStateAminoMsg { /** GenesisState defines the inflation module's genesis state. */ export interface GenesisStateSDKType { params: ParamsSDKType; - period: Long; + period: bigint; epoch_identifier: string; - epochs_per_period: Long; - skipped_epochs: Long; + epochs_per_period: bigint; + skipped_epochs: bigint; } /** Params holds parameters for the inflation module. */ export interface Params { @@ -84,34 +84,34 @@ export interface ParamsSDKType { function createBaseGenesisState(): GenesisState { return { params: Params.fromPartial({}), - period: Long.UZERO, + period: BigInt(0), epochIdentifier: "", - epochsPerPeriod: Long.ZERO, - skippedEpochs: Long.UZERO + epochsPerPeriod: BigInt(0), + skippedEpochs: BigInt(0) }; } export const GenesisState = { typeUrl: "/evmos.inflation.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } - if (!message.period.isZero()) { + if (message.period !== BigInt(0)) { writer.uint32(16).uint64(message.period); } if (message.epochIdentifier !== "") { writer.uint32(26).string(message.epochIdentifier); } - if (!message.epochsPerPeriod.isZero()) { + if (message.epochsPerPeriod !== BigInt(0)) { writer.uint32(32).int64(message.epochsPerPeriod); } - if (!message.skippedEpochs.isZero()) { + if (message.skippedEpochs !== BigInt(0)) { writer.uint32(40).uint64(message.skippedEpochs); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -121,16 +121,16 @@ export const GenesisState = { message.params = Params.decode(reader, reader.uint32()); break; case 2: - message.period = (reader.uint64() as Long); + message.period = reader.uint64(); break; case 3: message.epochIdentifier = reader.string(); break; case 4: - message.epochsPerPeriod = (reader.int64() as Long); + message.epochsPerPeriod = reader.int64(); break; case 5: - message.skippedEpochs = (reader.uint64() as Long); + message.skippedEpochs = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -140,30 +140,38 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined, - period: isSet(object.period) ? Long.fromValue(object.period) : Long.UZERO, - epochIdentifier: isSet(object.epochIdentifier) ? String(object.epochIdentifier) : "", - epochsPerPeriod: isSet(object.epochsPerPeriod) ? Long.fromValue(object.epochsPerPeriod) : Long.ZERO, - skippedEpochs: isSet(object.skippedEpochs) ? Long.fromValue(object.skippedEpochs) : Long.UZERO - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + if (isSet(object.period)) obj.period = BigInt(object.period.toString()); + if (isSet(object.epochIdentifier)) obj.epochIdentifier = String(object.epochIdentifier); + if (isSet(object.epochsPerPeriod)) obj.epochsPerPeriod = BigInt(object.epochsPerPeriod.toString()); + if (isSet(object.skippedEpochs)) obj.skippedEpochs = BigInt(object.skippedEpochs.toString()); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; message.params !== undefined && (obj.params = message.params ? Params.toJSON(message.params) : undefined); - message.period !== undefined && (obj.period = (message.period || Long.UZERO).toString()); + message.period !== undefined && (obj.period = (message.period || BigInt(0)).toString()); message.epochIdentifier !== undefined && (obj.epochIdentifier = message.epochIdentifier); - message.epochsPerPeriod !== undefined && (obj.epochsPerPeriod = (message.epochsPerPeriod || Long.ZERO).toString()); - message.skippedEpochs !== undefined && (obj.skippedEpochs = (message.skippedEpochs || Long.UZERO).toString()); + message.epochsPerPeriod !== undefined && (obj.epochsPerPeriod = (message.epochsPerPeriod || BigInt(0)).toString()); + message.skippedEpochs !== undefined && (obj.skippedEpochs = (message.skippedEpochs || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; - message.period = object.period !== undefined && object.period !== null ? Long.fromValue(object.period) : Long.UZERO; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } + if (object.period !== undefined && object.period !== null) { + message.period = BigInt(object.period.toString()); + } message.epochIdentifier = object.epochIdentifier ?? ""; - message.epochsPerPeriod = object.epochsPerPeriod !== undefined && object.epochsPerPeriod !== null ? Long.fromValue(object.epochsPerPeriod) : Long.ZERO; - message.skippedEpochs = object.skippedEpochs !== undefined && object.skippedEpochs !== null ? Long.fromValue(object.skippedEpochs) : Long.UZERO; + if (object.epochsPerPeriod !== undefined && object.epochsPerPeriod !== null) { + message.epochsPerPeriod = BigInt(object.epochsPerPeriod.toString()); + } + if (object.skippedEpochs !== undefined && object.skippedEpochs !== null) { + message.skippedEpochs = BigInt(object.skippedEpochs.toString()); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { @@ -187,10 +195,10 @@ export const GenesisState = { fromAmino(object: GenesisStateAmino): GenesisState { return { params: object?.params ? Params.fromAmino(object.params) : undefined, - period: Long.fromString(object.period), + period: BigInt(object.period), epochIdentifier: object.epoch_identifier, - epochsPerPeriod: Long.fromString(object.epochs_per_period), - skippedEpochs: Long.fromString(object.skipped_epochs) + epochsPerPeriod: BigInt(object.epochs_per_period), + skippedEpochs: BigInt(object.skipped_epochs) }; }, toAmino(message: GenesisState): GenesisStateAmino { @@ -228,7 +236,7 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/evmos.inflation.v1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.mintDenom !== "") { writer.uint32(10).string(message.mintDenom); } @@ -243,8 +251,8 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -270,12 +278,12 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - mintDenom: isSet(object.mintDenom) ? String(object.mintDenom) : "", - exponentialCalculation: isSet(object.exponentialCalculation) ? ExponentialCalculation.fromJSON(object.exponentialCalculation) : undefined, - inflationDistribution: isSet(object.inflationDistribution) ? InflationDistribution.fromJSON(object.inflationDistribution) : undefined, - enableInflation: isSet(object.enableInflation) ? Boolean(object.enableInflation) : false - }; + const obj = createBaseParams(); + if (isSet(object.mintDenom)) obj.mintDenom = String(object.mintDenom); + if (isSet(object.exponentialCalculation)) obj.exponentialCalculation = ExponentialCalculation.fromJSON(object.exponentialCalculation); + if (isSet(object.inflationDistribution)) obj.inflationDistribution = InflationDistribution.fromJSON(object.inflationDistribution); + if (isSet(object.enableInflation)) obj.enableInflation = Boolean(object.enableInflation); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -288,8 +296,12 @@ export const Params = { fromPartial(object: DeepPartial): Params { const message = createBaseParams(); message.mintDenom = object.mintDenom ?? ""; - message.exponentialCalculation = object.exponentialCalculation !== undefined && object.exponentialCalculation !== null ? ExponentialCalculation.fromPartial(object.exponentialCalculation) : undefined; - message.inflationDistribution = object.inflationDistribution !== undefined && object.inflationDistribution !== null ? InflationDistribution.fromPartial(object.inflationDistribution) : undefined; + if (object.exponentialCalculation !== undefined && object.exponentialCalculation !== null) { + message.exponentialCalculation = ExponentialCalculation.fromPartial(object.exponentialCalculation); + } + if (object.inflationDistribution !== undefined && object.inflationDistribution !== null) { + message.inflationDistribution = InflationDistribution.fromPartial(object.inflationDistribution); + } message.enableInflation = object.enableInflation ?? false; return message; }, diff --git a/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts b/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts index 9d9b4b193a..aec89e9561 100644 --- a/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts +++ b/__fixtures__/v-next/outputv2/evmos/inflation/v1/inflation.ts @@ -1,4 +1,5 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { Decimal } from "@cosmjs/math"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.inflation.v1"; /** @@ -144,33 +145,33 @@ function createBaseInflationDistribution(): InflationDistribution { } export const InflationDistribution = { typeUrl: "/evmos.inflation.v1.InflationDistribution", - encode(message: InflationDistribution, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: InflationDistribution, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.stakingRewards !== "") { - writer.uint32(10).string(message.stakingRewards); + writer.uint32(10).string(Decimal.fromUserInput(message.stakingRewards, 18).atomics); } if (message.usageIncentives !== "") { - writer.uint32(18).string(message.usageIncentives); + writer.uint32(18).string(Decimal.fromUserInput(message.usageIncentives, 18).atomics); } if (message.communityPool !== "") { - writer.uint32(26).string(message.communityPool); + writer.uint32(26).string(Decimal.fromUserInput(message.communityPool, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): InflationDistribution { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): InflationDistribution { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseInflationDistribution(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.stakingRewards = reader.string(); + message.stakingRewards = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 2: - message.usageIncentives = reader.string(); + message.usageIncentives = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.communityPool = reader.string(); + message.communityPool = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -180,11 +181,11 @@ export const InflationDistribution = { return message; }, fromJSON(object: any): InflationDistribution { - return { - stakingRewards: isSet(object.stakingRewards) ? String(object.stakingRewards) : "", - usageIncentives: isSet(object.usageIncentives) ? String(object.usageIncentives) : "", - communityPool: isSet(object.communityPool) ? String(object.communityPool) : "" - }; + const obj = createBaseInflationDistribution(); + if (isSet(object.stakingRewards)) obj.stakingRewards = String(object.stakingRewards); + if (isSet(object.usageIncentives)) obj.usageIncentives = String(object.usageIncentives); + if (isSet(object.communityPool)) obj.communityPool = String(object.communityPool); + return obj; }, toJSON(message: InflationDistribution): unknown { const obj: any = {}; @@ -255,45 +256,45 @@ function createBaseExponentialCalculation(): ExponentialCalculation { } export const ExponentialCalculation = { typeUrl: "/evmos.inflation.v1.ExponentialCalculation", - encode(message: ExponentialCalculation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ExponentialCalculation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.a !== "") { - writer.uint32(10).string(message.a); + writer.uint32(10).string(Decimal.fromUserInput(message.a, 18).atomics); } if (message.r !== "") { - writer.uint32(18).string(message.r); + writer.uint32(18).string(Decimal.fromUserInput(message.r, 18).atomics); } if (message.c !== "") { - writer.uint32(26).string(message.c); + writer.uint32(26).string(Decimal.fromUserInput(message.c, 18).atomics); } if (message.bondingTarget !== "") { - writer.uint32(34).string(message.bondingTarget); + writer.uint32(34).string(Decimal.fromUserInput(message.bondingTarget, 18).atomics); } if (message.maxVariance !== "") { - writer.uint32(42).string(message.maxVariance); + writer.uint32(42).string(Decimal.fromUserInput(message.maxVariance, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ExponentialCalculation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ExponentialCalculation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExponentialCalculation(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.a = reader.string(); + message.a = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 2: - message.r = reader.string(); + message.r = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 3: - message.c = reader.string(); + message.c = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 4: - message.bondingTarget = reader.string(); + message.bondingTarget = Decimal.fromAtomics(reader.string(), 18).toString(); break; case 5: - message.maxVariance = reader.string(); + message.maxVariance = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -303,13 +304,13 @@ export const ExponentialCalculation = { return message; }, fromJSON(object: any): ExponentialCalculation { - return { - a: isSet(object.a) ? String(object.a) : "", - r: isSet(object.r) ? String(object.r) : "", - c: isSet(object.c) ? String(object.c) : "", - bondingTarget: isSet(object.bondingTarget) ? String(object.bondingTarget) : "", - maxVariance: isSet(object.maxVariance) ? String(object.maxVariance) : "" - }; + const obj = createBaseExponentialCalculation(); + if (isSet(object.a)) obj.a = String(object.a); + if (isSet(object.r)) obj.r = String(object.r); + if (isSet(object.c)) obj.c = String(object.c); + if (isSet(object.bondingTarget)) obj.bondingTarget = String(object.bondingTarget); + if (isSet(object.maxVariance)) obj.maxVariance = String(object.maxVariance); + return obj; }, toJSON(message: ExponentialCalculation): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts index a66dc8e0b6..722ca1730e 100644 --- a/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/inflation/v1/query.ts @@ -1,7 +1,8 @@ import { DecCoin, DecCoinAmino, DecCoinSDKType } from "../../../cosmos/base/v1beta1/coin"; import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import { Long, DeepPartial, isSet } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { DeepPartial, isSet } from "../../../helpers"; +import { Decimal } from "@cosmjs/math"; export const protobufPackage = "evmos.inflation.v1"; /** QueryPeriodRequest is the request type for the Query/Period RPC method. */ export interface QueryPeriodRequest {} @@ -20,7 +21,7 @@ export interface QueryPeriodRequestSDKType {} /** QueryPeriodResponse is the response type for the Query/Period RPC method. */ export interface QueryPeriodResponse { /** period is the current minting per epoch provision value. */ - period: Long; + period: bigint; } export interface QueryPeriodResponseProtoMsg { typeUrl: "/evmos.inflation.v1.QueryPeriodResponse"; @@ -37,7 +38,7 @@ export interface QueryPeriodResponseAminoMsg { } /** QueryPeriodResponse is the response type for the Query/Period RPC method. */ export interface QueryPeriodResponseSDKType { - period: Long; + period: bigint; } /** * QueryEpochMintProvisionRequest is the request type for the @@ -122,7 +123,7 @@ export interface QuerySkippedEpochsRequestSDKType {} */ export interface QuerySkippedEpochsResponse { /** number of epochs that the inflation module has been disabled. */ - skippedEpochs: Long; + skippedEpochs: bigint; } export interface QuerySkippedEpochsResponseProtoMsg { typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse"; @@ -145,7 +146,7 @@ export interface QuerySkippedEpochsResponseAminoMsg { * RPC method. */ export interface QuerySkippedEpochsResponseSDKType { - skipped_epochs: Long; + skipped_epochs: bigint; } /** * QueryCirculatingSupplyRequest is the request type for the @@ -296,11 +297,11 @@ function createBaseQueryPeriodRequest(): QueryPeriodRequest { } export const QueryPeriodRequest = { typeUrl: "/evmos.inflation.v1.QueryPeriodRequest", - encode(_: QueryPeriodRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryPeriodRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPeriodRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPeriodRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPeriodRequest(); while (reader.pos < end) { @@ -314,7 +315,8 @@ export const QueryPeriodRequest = { return message; }, fromJSON(_: any): QueryPeriodRequest { - return {}; + const obj = createBaseQueryPeriodRequest(); + return obj; }, toJSON(_: QueryPeriodRequest): unknown { const obj: any = {}; @@ -356,26 +358,26 @@ export const QueryPeriodRequest = { }; function createBaseQueryPeriodResponse(): QueryPeriodResponse { return { - period: Long.UZERO + period: BigInt(0) }; } export const QueryPeriodResponse = { typeUrl: "/evmos.inflation.v1.QueryPeriodResponse", - encode(message: QueryPeriodResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.period.isZero()) { + encode(message: QueryPeriodResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.period !== BigInt(0)) { writer.uint32(8).uint64(message.period); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryPeriodResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryPeriodResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryPeriodResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.period = (reader.uint64() as Long); + message.period = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -385,18 +387,20 @@ export const QueryPeriodResponse = { return message; }, fromJSON(object: any): QueryPeriodResponse { - return { - period: isSet(object.period) ? Long.fromValue(object.period) : Long.UZERO - }; + const obj = createBaseQueryPeriodResponse(); + if (isSet(object.period)) obj.period = BigInt(object.period.toString()); + return obj; }, toJSON(message: QueryPeriodResponse): unknown { const obj: any = {}; - message.period !== undefined && (obj.period = (message.period || Long.UZERO).toString()); + message.period !== undefined && (obj.period = (message.period || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QueryPeriodResponse { const message = createBaseQueryPeriodResponse(); - message.period = object.period !== undefined && object.period !== null ? Long.fromValue(object.period) : Long.UZERO; + if (object.period !== undefined && object.period !== null) { + message.period = BigInt(object.period.toString()); + } return message; }, fromSDK(object: QueryPeriodResponseSDKType): QueryPeriodResponse { @@ -411,7 +415,7 @@ export const QueryPeriodResponse = { }, fromAmino(object: QueryPeriodResponseAmino): QueryPeriodResponse { return { - period: Long.fromString(object.period) + period: BigInt(object.period) }; }, toAmino(message: QueryPeriodResponse): QueryPeriodResponseAmino { @@ -440,11 +444,11 @@ function createBaseQueryEpochMintProvisionRequest(): QueryEpochMintProvisionRequ } export const QueryEpochMintProvisionRequest = { typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionRequest", - encode(_: QueryEpochMintProvisionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryEpochMintProvisionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryEpochMintProvisionRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryEpochMintProvisionRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryEpochMintProvisionRequest(); while (reader.pos < end) { @@ -458,7 +462,8 @@ export const QueryEpochMintProvisionRequest = { return message; }, fromJSON(_: any): QueryEpochMintProvisionRequest { - return {}; + const obj = createBaseQueryEpochMintProvisionRequest(); + return obj; }, toJSON(_: QueryEpochMintProvisionRequest): unknown { const obj: any = {}; @@ -505,14 +510,14 @@ function createBaseQueryEpochMintProvisionResponse(): QueryEpochMintProvisionRes } export const QueryEpochMintProvisionResponse = { typeUrl: "/evmos.inflation.v1.QueryEpochMintProvisionResponse", - encode(message: QueryEpochMintProvisionResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryEpochMintProvisionResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.epochMintProvision !== undefined) { DecCoin.encode(message.epochMintProvision, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryEpochMintProvisionResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryEpochMintProvisionResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryEpochMintProvisionResponse(); while (reader.pos < end) { @@ -529,9 +534,9 @@ export const QueryEpochMintProvisionResponse = { return message; }, fromJSON(object: any): QueryEpochMintProvisionResponse { - return { - epochMintProvision: isSet(object.epochMintProvision) ? DecCoin.fromJSON(object.epochMintProvision) : undefined - }; + const obj = createBaseQueryEpochMintProvisionResponse(); + if (isSet(object.epochMintProvision)) obj.epochMintProvision = DecCoin.fromJSON(object.epochMintProvision); + return obj; }, toJSON(message: QueryEpochMintProvisionResponse): unknown { const obj: any = {}; @@ -540,7 +545,9 @@ export const QueryEpochMintProvisionResponse = { }, fromPartial(object: DeepPartial): QueryEpochMintProvisionResponse { const message = createBaseQueryEpochMintProvisionResponse(); - message.epochMintProvision = object.epochMintProvision !== undefined && object.epochMintProvision !== null ? DecCoin.fromPartial(object.epochMintProvision) : undefined; + if (object.epochMintProvision !== undefined && object.epochMintProvision !== null) { + message.epochMintProvision = DecCoin.fromPartial(object.epochMintProvision); + } return message; }, fromSDK(object: QueryEpochMintProvisionResponseSDKType): QueryEpochMintProvisionResponse { @@ -584,11 +591,11 @@ function createBaseQuerySkippedEpochsRequest(): QuerySkippedEpochsRequest { } export const QuerySkippedEpochsRequest = { typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsRequest", - encode(_: QuerySkippedEpochsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QuerySkippedEpochsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySkippedEpochsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySkippedEpochsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySkippedEpochsRequest(); while (reader.pos < end) { @@ -602,7 +609,8 @@ export const QuerySkippedEpochsRequest = { return message; }, fromJSON(_: any): QuerySkippedEpochsRequest { - return {}; + const obj = createBaseQuerySkippedEpochsRequest(); + return obj; }, toJSON(_: QuerySkippedEpochsRequest): unknown { const obj: any = {}; @@ -644,26 +652,26 @@ export const QuerySkippedEpochsRequest = { }; function createBaseQuerySkippedEpochsResponse(): QuerySkippedEpochsResponse { return { - skippedEpochs: Long.UZERO + skippedEpochs: BigInt(0) }; } export const QuerySkippedEpochsResponse = { typeUrl: "/evmos.inflation.v1.QuerySkippedEpochsResponse", - encode(message: QuerySkippedEpochsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.skippedEpochs.isZero()) { + encode(message: QuerySkippedEpochsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.skippedEpochs !== BigInt(0)) { writer.uint32(8).uint64(message.skippedEpochs); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuerySkippedEpochsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuerySkippedEpochsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuerySkippedEpochsResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.skippedEpochs = (reader.uint64() as Long); + message.skippedEpochs = reader.uint64(); break; default: reader.skipType(tag & 7); @@ -673,18 +681,20 @@ export const QuerySkippedEpochsResponse = { return message; }, fromJSON(object: any): QuerySkippedEpochsResponse { - return { - skippedEpochs: isSet(object.skippedEpochs) ? Long.fromValue(object.skippedEpochs) : Long.UZERO - }; + const obj = createBaseQuerySkippedEpochsResponse(); + if (isSet(object.skippedEpochs)) obj.skippedEpochs = BigInt(object.skippedEpochs.toString()); + return obj; }, toJSON(message: QuerySkippedEpochsResponse): unknown { const obj: any = {}; - message.skippedEpochs !== undefined && (obj.skippedEpochs = (message.skippedEpochs || Long.UZERO).toString()); + message.skippedEpochs !== undefined && (obj.skippedEpochs = (message.skippedEpochs || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QuerySkippedEpochsResponse { const message = createBaseQuerySkippedEpochsResponse(); - message.skippedEpochs = object.skippedEpochs !== undefined && object.skippedEpochs !== null ? Long.fromValue(object.skippedEpochs) : Long.UZERO; + if (object.skippedEpochs !== undefined && object.skippedEpochs !== null) { + message.skippedEpochs = BigInt(object.skippedEpochs.toString()); + } return message; }, fromSDK(object: QuerySkippedEpochsResponseSDKType): QuerySkippedEpochsResponse { @@ -699,7 +709,7 @@ export const QuerySkippedEpochsResponse = { }, fromAmino(object: QuerySkippedEpochsResponseAmino): QuerySkippedEpochsResponse { return { - skippedEpochs: Long.fromString(object.skipped_epochs) + skippedEpochs: BigInt(object.skipped_epochs) }; }, toAmino(message: QuerySkippedEpochsResponse): QuerySkippedEpochsResponseAmino { @@ -728,11 +738,11 @@ function createBaseQueryCirculatingSupplyRequest(): QueryCirculatingSupplyReques } export const QueryCirculatingSupplyRequest = { typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyRequest", - encode(_: QueryCirculatingSupplyRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryCirculatingSupplyRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCirculatingSupplyRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCirculatingSupplyRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCirculatingSupplyRequest(); while (reader.pos < end) { @@ -746,7 +756,8 @@ export const QueryCirculatingSupplyRequest = { return message; }, fromJSON(_: any): QueryCirculatingSupplyRequest { - return {}; + const obj = createBaseQueryCirculatingSupplyRequest(); + return obj; }, toJSON(_: QueryCirculatingSupplyRequest): unknown { const obj: any = {}; @@ -793,14 +804,14 @@ function createBaseQueryCirculatingSupplyResponse(): QueryCirculatingSupplyRespo } export const QueryCirculatingSupplyResponse = { typeUrl: "/evmos.inflation.v1.QueryCirculatingSupplyResponse", - encode(message: QueryCirculatingSupplyResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryCirculatingSupplyResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.circulatingSupply !== undefined) { DecCoin.encode(message.circulatingSupply, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryCirculatingSupplyResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryCirculatingSupplyResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryCirculatingSupplyResponse(); while (reader.pos < end) { @@ -817,9 +828,9 @@ export const QueryCirculatingSupplyResponse = { return message; }, fromJSON(object: any): QueryCirculatingSupplyResponse { - return { - circulatingSupply: isSet(object.circulatingSupply) ? DecCoin.fromJSON(object.circulatingSupply) : undefined - }; + const obj = createBaseQueryCirculatingSupplyResponse(); + if (isSet(object.circulatingSupply)) obj.circulatingSupply = DecCoin.fromJSON(object.circulatingSupply); + return obj; }, toJSON(message: QueryCirculatingSupplyResponse): unknown { const obj: any = {}; @@ -828,7 +839,9 @@ export const QueryCirculatingSupplyResponse = { }, fromPartial(object: DeepPartial): QueryCirculatingSupplyResponse { const message = createBaseQueryCirculatingSupplyResponse(); - message.circulatingSupply = object.circulatingSupply !== undefined && object.circulatingSupply !== null ? DecCoin.fromPartial(object.circulatingSupply) : undefined; + if (object.circulatingSupply !== undefined && object.circulatingSupply !== null) { + message.circulatingSupply = DecCoin.fromPartial(object.circulatingSupply); + } return message; }, fromSDK(object: QueryCirculatingSupplyResponseSDKType): QueryCirculatingSupplyResponse { @@ -872,11 +885,11 @@ function createBaseQueryInflationRateRequest(): QueryInflationRateRequest { } export const QueryInflationRateRequest = { typeUrl: "/evmos.inflation.v1.QueryInflationRateRequest", - encode(_: QueryInflationRateRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryInflationRateRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryInflationRateRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryInflationRateRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryInflationRateRequest(); while (reader.pos < end) { @@ -890,7 +903,8 @@ export const QueryInflationRateRequest = { return message; }, fromJSON(_: any): QueryInflationRateRequest { - return {}; + const obj = createBaseQueryInflationRateRequest(); + return obj; }, toJSON(_: QueryInflationRateRequest): unknown { const obj: any = {}; @@ -937,21 +951,21 @@ function createBaseQueryInflationRateResponse(): QueryInflationRateResponse { } export const QueryInflationRateResponse = { typeUrl: "/evmos.inflation.v1.QueryInflationRateResponse", - encode(message: QueryInflationRateResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryInflationRateResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.inflationRate !== "") { - writer.uint32(10).string(message.inflationRate); + writer.uint32(10).string(Decimal.fromUserInput(message.inflationRate, 18).atomics); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryInflationRateResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryInflationRateResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryInflationRateResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.inflationRate = reader.string(); + message.inflationRate = Decimal.fromAtomics(reader.string(), 18).toString(); break; default: reader.skipType(tag & 7); @@ -961,9 +975,9 @@ export const QueryInflationRateResponse = { return message; }, fromJSON(object: any): QueryInflationRateResponse { - return { - inflationRate: isSet(object.inflationRate) ? String(object.inflationRate) : "" - }; + const obj = createBaseQueryInflationRateResponse(); + if (isSet(object.inflationRate)) obj.inflationRate = String(object.inflationRate); + return obj; }, toJSON(message: QueryInflationRateResponse): unknown { const obj: any = {}; @@ -1016,11 +1030,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { } export const QueryParamsRequest = { typeUrl: "/evmos.inflation.v1.QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -1034,7 +1048,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -1081,14 +1096,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { } export const QueryParamsResponse = { typeUrl: "/evmos.inflation.v1.QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -1105,9 +1120,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -1116,7 +1131,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts b/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts index 1b76c2d363..6c0b7867d6 100644 --- a/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts +++ b/__fixtures__/v-next/outputv2/evmos/recovery/v1/genesis.ts @@ -1,5 +1,5 @@ import { Duration, DurationAmino, DurationSDKType } from "../../../google/protobuf/duration"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.recovery.v1"; /** GenesisState defines the recovery module's genesis state. */ @@ -58,14 +58,14 @@ function createBaseGenesisState(): GenesisState { } export const GenesisState = { typeUrl: "/evmos.recovery.v1.GenesisState", - encode(message: GenesisState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenesisState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenesisState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenesisState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenesisState(); while (reader.pos < end) { @@ -82,9 +82,9 @@ export const GenesisState = { return message; }, fromJSON(object: any): GenesisState { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseGenesisState(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: GenesisState): unknown { const obj: any = {}; @@ -93,7 +93,9 @@ export const GenesisState = { }, fromPartial(object: DeepPartial): GenesisState { const message = createBaseGenesisState(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: GenesisStateSDKType): GenesisState { @@ -140,7 +142,7 @@ function createBaseParams(): Params { } export const Params = { typeUrl: "/evmos.recovery.v1.Params", - encode(message: Params, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Params, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.enableRecovery === true) { writer.uint32(8).bool(message.enableRecovery); } @@ -149,8 +151,8 @@ export const Params = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Params { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Params { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParams(); while (reader.pos < end) { @@ -170,10 +172,10 @@ export const Params = { return message; }, fromJSON(object: any): Params { - return { - enableRecovery: isSet(object.enableRecovery) ? Boolean(object.enableRecovery) : false, - packetTimeoutDuration: isSet(object.packetTimeoutDuration) ? Duration.fromJSON(object.packetTimeoutDuration) : undefined - }; + const obj = createBaseParams(); + if (isSet(object.enableRecovery)) obj.enableRecovery = Boolean(object.enableRecovery); + if (isSet(object.packetTimeoutDuration)) obj.packetTimeoutDuration = Duration.fromJSON(object.packetTimeoutDuration); + return obj; }, toJSON(message: Params): unknown { const obj: any = {}; @@ -184,7 +186,9 @@ export const Params = { fromPartial(object: DeepPartial): Params { const message = createBaseParams(); message.enableRecovery = object.enableRecovery ?? false; - message.packetTimeoutDuration = object.packetTimeoutDuration !== undefined && object.packetTimeoutDuration !== null ? Duration.fromPartial(object.packetTimeoutDuration) : undefined; + if (object.packetTimeoutDuration !== undefined && object.packetTimeoutDuration !== null) { + message.packetTimeoutDuration = Duration.fromPartial(object.packetTimeoutDuration); + } return message; }, fromSDK(object: ParamsSDKType): Params { diff --git a/__fixtures__/v-next/outputv2/evmos/recovery/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/recovery/v1/query.ts index ac74ff73fb..4fcc3ef5b4 100644 --- a/__fixtures__/v-next/outputv2/evmos/recovery/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/recovery/v1/query.ts @@ -1,5 +1,5 @@ import { Params, ParamsAmino, ParamsSDKType } from "./genesis"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, isSet } from "../../../helpers"; export const protobufPackage = "evmos.recovery.v1"; /** QueryParamsRequest is the request type for the Query/Params RPC method. */ @@ -43,11 +43,11 @@ function createBaseQueryParamsRequest(): QueryParamsRequest { } export const QueryParamsRequest = { typeUrl: "/evmos.recovery.v1.QueryParamsRequest", - encode(_: QueryParamsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: QueryParamsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsRequest(); while (reader.pos < end) { @@ -61,7 +61,8 @@ export const QueryParamsRequest = { return message; }, fromJSON(_: any): QueryParamsRequest { - return {}; + const obj = createBaseQueryParamsRequest(); + return obj; }, toJSON(_: QueryParamsRequest): unknown { const obj: any = {}; @@ -108,14 +109,14 @@ function createBaseQueryParamsResponse(): QueryParamsResponse { } export const QueryParamsResponse = { typeUrl: "/evmos.recovery.v1.QueryParamsResponse", - encode(message: QueryParamsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryParamsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.params !== undefined) { Params.encode(message.params, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryParamsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryParamsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryParamsResponse(); while (reader.pos < end) { @@ -132,9 +133,9 @@ export const QueryParamsResponse = { return message; }, fromJSON(object: any): QueryParamsResponse { - return { - params: isSet(object.params) ? Params.fromJSON(object.params) : undefined - }; + const obj = createBaseQueryParamsResponse(); + if (isSet(object.params)) obj.params = Params.fromJSON(object.params); + return obj; }, toJSON(message: QueryParamsResponse): unknown { const obj: any = {}; @@ -143,7 +144,9 @@ export const QueryParamsResponse = { }, fromPartial(object: DeepPartial): QueryParamsResponse { const message = createBaseQueryParamsResponse(); - message.params = object.params !== undefined && object.params !== null ? Params.fromPartial(object.params) : undefined; + if (object.params !== undefined && object.params !== null) { + message.params = Params.fromPartial(object.params); + } return message; }, fromSDK(object: QueryParamsResponseSDKType): QueryParamsResponse { diff --git a/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts b/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts index 35cd50ad67..f8859657bb 100644 --- a/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts +++ b/__fixtures__/v-next/outputv2/evmos/vesting/v1/query.ts @@ -1,5 +1,5 @@ import { Coin, CoinAmino, CoinSDKType } from "../../../cosmos/base/v1beta1/coin"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.vesting.v1"; /** QueryBalancesRequest is the request type for the Query/Balances RPC method. */ @@ -72,14 +72,14 @@ function createBaseQueryBalancesRequest(): QueryBalancesRequest { } export const QueryBalancesRequest = { typeUrl: "/evmos.vesting.v1.QueryBalancesRequest", - encode(message: QueryBalancesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBalancesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.address !== "") { writer.uint32(10).string(message.address); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalancesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBalancesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBalancesRequest(); while (reader.pos < end) { @@ -96,9 +96,9 @@ export const QueryBalancesRequest = { return message; }, fromJSON(object: any): QueryBalancesRequest { - return { - address: isSet(object.address) ? String(object.address) : "" - }; + const obj = createBaseQueryBalancesRequest(); + if (isSet(object.address)) obj.address = String(object.address); + return obj; }, toJSON(message: QueryBalancesRequest): unknown { const obj: any = {}; @@ -155,7 +155,7 @@ function createBaseQueryBalancesResponse(): QueryBalancesResponse { } export const QueryBalancesResponse = { typeUrl: "/evmos.vesting.v1.QueryBalancesResponse", - encode(message: QueryBalancesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QueryBalancesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.locked) { Coin.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -167,8 +167,8 @@ export const QueryBalancesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QueryBalancesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QueryBalancesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQueryBalancesResponse(); while (reader.pos < end) { @@ -191,11 +191,11 @@ export const QueryBalancesResponse = { return message; }, fromJSON(object: any): QueryBalancesResponse { - return { - locked: Array.isArray(object?.locked) ? object.locked.map((e: any) => Coin.fromJSON(e)) : [], - unvested: Array.isArray(object?.unvested) ? object.unvested.map((e: any) => Coin.fromJSON(e)) : [], - vested: Array.isArray(object?.vested) ? object.vested.map((e: any) => Coin.fromJSON(e)) : [] - }; + const obj = createBaseQueryBalancesResponse(); + if (Array.isArray(object?.locked)) object.locked.map((e: any) => Coin.fromJSON(e)); + if (Array.isArray(object?.unvested)) object.unvested.map((e: any) => Coin.fromJSON(e)); + if (Array.isArray(object?.vested)) object.vested.map((e: any) => Coin.fromJSON(e)); + return obj; }, toJSON(message: QueryBalancesResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts b/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts index 4844519bb9..e3d5fd7cc8 100644 --- a/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts +++ b/__fixtures__/v-next/outputv2/evmos/vesting/v1/tx.ts @@ -1,6 +1,6 @@ import { Timestamp } from "../../../google/protobuf/timestamp"; import { Period, PeriodAmino, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.vesting.v1"; /** MsgCreateClawbackVestingAccount defines a message that enables creating a ClawbackVestingAccount. */ @@ -166,7 +166,7 @@ function createBaseMsgCreateClawbackVestingAccount(): MsgCreateClawbackVestingAc } export const MsgCreateClawbackVestingAccount = { typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccount", - encode(message: MsgCreateClawbackVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgCreateClawbackVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fromAddress !== "") { writer.uint32(10).string(message.fromAddress); } @@ -187,8 +187,8 @@ export const MsgCreateClawbackVestingAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateClawbackVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateClawbackVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateClawbackVestingAccount(); while (reader.pos < end) { @@ -220,14 +220,14 @@ export const MsgCreateClawbackVestingAccount = { return message; }, fromJSON(object: any): MsgCreateClawbackVestingAccount { - return { - fromAddress: isSet(object.fromAddress) ? String(object.fromAddress) : "", - toAddress: isSet(object.toAddress) ? String(object.toAddress) : "", - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - lockupPeriods: Array.isArray(object?.lockupPeriods) ? object.lockupPeriods.map((e: any) => Period.fromJSON(e)) : [], - vestingPeriods: Array.isArray(object?.vestingPeriods) ? object.vestingPeriods.map((e: any) => Period.fromJSON(e)) : [], - merge: isSet(object.merge) ? Boolean(object.merge) : false - }; + const obj = createBaseMsgCreateClawbackVestingAccount(); + if (isSet(object.fromAddress)) obj.fromAddress = String(object.fromAddress); + if (isSet(object.toAddress)) obj.toAddress = String(object.toAddress); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (Array.isArray(object?.lockupPeriods)) object.lockupPeriods.map((e: any) => Period.fromJSON(e)); + if (Array.isArray(object?.vestingPeriods)) object.vestingPeriods.map((e: any) => Period.fromJSON(e)); + if (isSet(object.merge)) obj.merge = Boolean(object.merge); + return obj; }, toJSON(message: MsgCreateClawbackVestingAccount): unknown { const obj: any = {}; @@ -334,11 +334,11 @@ function createBaseMsgCreateClawbackVestingAccountResponse(): MsgCreateClawbackV } export const MsgCreateClawbackVestingAccountResponse = { typeUrl: "/evmos.vesting.v1.MsgCreateClawbackVestingAccountResponse", - encode(_: MsgCreateClawbackVestingAccountResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgCreateClawbackVestingAccountResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgCreateClawbackVestingAccountResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgCreateClawbackVestingAccountResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgCreateClawbackVestingAccountResponse(); while (reader.pos < end) { @@ -352,7 +352,8 @@ export const MsgCreateClawbackVestingAccountResponse = { return message; }, fromJSON(_: any): MsgCreateClawbackVestingAccountResponse { - return {}; + const obj = createBaseMsgCreateClawbackVestingAccountResponse(); + return obj; }, toJSON(_: MsgCreateClawbackVestingAccountResponse): unknown { const obj: any = {}; @@ -401,7 +402,7 @@ function createBaseMsgClawback(): MsgClawback { } export const MsgClawback = { typeUrl: "/evmos.vesting.v1.MsgClawback", - encode(message: MsgClawback, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MsgClawback, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.funderAddress !== "") { writer.uint32(10).string(message.funderAddress); } @@ -413,8 +414,8 @@ export const MsgClawback = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgClawback { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgClawback { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgClawback(); while (reader.pos < end) { @@ -437,11 +438,11 @@ export const MsgClawback = { return message; }, fromJSON(object: any): MsgClawback { - return { - funderAddress: isSet(object.funderAddress) ? String(object.funderAddress) : "", - accountAddress: isSet(object.accountAddress) ? String(object.accountAddress) : "", - destAddress: isSet(object.destAddress) ? String(object.destAddress) : "" - }; + const obj = createBaseMsgClawback(); + if (isSet(object.funderAddress)) obj.funderAddress = String(object.funderAddress); + if (isSet(object.accountAddress)) obj.accountAddress = String(object.accountAddress); + if (isSet(object.destAddress)) obj.destAddress = String(object.destAddress); + return obj; }, toJSON(message: MsgClawback): unknown { const obj: any = {}; @@ -506,11 +507,11 @@ function createBaseMsgClawbackResponse(): MsgClawbackResponse { } export const MsgClawbackResponse = { typeUrl: "/evmos.vesting.v1.MsgClawbackResponse", - encode(_: MsgClawbackResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: MsgClawbackResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MsgClawbackResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MsgClawbackResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMsgClawbackResponse(); while (reader.pos < end) { @@ -524,7 +525,8 @@ export const MsgClawbackResponse = { return message; }, fromJSON(_: any): MsgClawbackResponse { - return {}; + const obj = createBaseMsgClawbackResponse(); + return obj; }, toJSON(_: MsgClawbackResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts b/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts index 0d77705a79..81b67b76b5 100644 --- a/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts +++ b/__fixtures__/v-next/outputv2/evmos/vesting/v1/vesting.ts @@ -1,6 +1,6 @@ import { BaseVestingAccount, BaseVestingAccountAmino, BaseVestingAccountSDKType, Period, PeriodAmino, PeriodSDKType } from "../../../cosmos/vesting/v1beta1/vesting"; import { Timestamp } from "../../../google/protobuf/timestamp"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "evmos.vesting.v1"; /** @@ -77,7 +77,7 @@ function createBaseClawbackVestingAccount(): ClawbackVestingAccount { } export const ClawbackVestingAccount = { typeUrl: "/evmos.vesting.v1.ClawbackVestingAccount", - encode(message: ClawbackVestingAccount, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ClawbackVestingAccount, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.baseVestingAccount !== undefined) { BaseVestingAccount.encode(message.baseVestingAccount, writer.uint32(10).fork()).ldelim(); } @@ -95,8 +95,8 @@ export const ClawbackVestingAccount = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ClawbackVestingAccount { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ClawbackVestingAccount { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseClawbackVestingAccount(); while (reader.pos < end) { @@ -125,13 +125,13 @@ export const ClawbackVestingAccount = { return message; }, fromJSON(object: any): ClawbackVestingAccount { - return { - baseVestingAccount: isSet(object.baseVestingAccount) ? BaseVestingAccount.fromJSON(object.baseVestingAccount) : undefined, - funderAddress: isSet(object.funderAddress) ? String(object.funderAddress) : "", - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - lockupPeriods: Array.isArray(object?.lockupPeriods) ? object.lockupPeriods.map((e: any) => Period.fromJSON(e)) : [], - vestingPeriods: Array.isArray(object?.vestingPeriods) ? object.vestingPeriods.map((e: any) => Period.fromJSON(e)) : [] - }; + const obj = createBaseClawbackVestingAccount(); + if (isSet(object.baseVestingAccount)) obj.baseVestingAccount = BaseVestingAccount.fromJSON(object.baseVestingAccount); + if (isSet(object.funderAddress)) obj.funderAddress = String(object.funderAddress); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (Array.isArray(object?.lockupPeriods)) object.lockupPeriods.map((e: any) => Period.fromJSON(e)); + if (Array.isArray(object?.vestingPeriods)) object.vestingPeriods.map((e: any) => Period.fromJSON(e)); + return obj; }, toJSON(message: ClawbackVestingAccount): unknown { const obj: any = {}; @@ -152,7 +152,9 @@ export const ClawbackVestingAccount = { }, fromPartial(object: DeepPartial): ClawbackVestingAccount { const message = createBaseClawbackVestingAccount(); - message.baseVestingAccount = object.baseVestingAccount !== undefined && object.baseVestingAccount !== null ? BaseVestingAccount.fromPartial(object.baseVestingAccount) : undefined; + if (object.baseVestingAccount !== undefined && object.baseVestingAccount !== null) { + message.baseVestingAccount = BaseVestingAccount.fromPartial(object.baseVestingAccount); + } message.funderAddress = object.funderAddress ?? ""; message.startTime = object.startTime ?? undefined; message.lockupPeriods = object.lockupPeriods?.map(e => Period.fromPartial(e)) || []; diff --git a/__fixtures__/v-next/outputv2/google/api/auth.ts b/__fixtures__/v-next/outputv2/google/api/auth.ts index 472a2ce8f1..fb25d7a4bb 100644 --- a/__fixtures__/v-next/outputv2/google/api/auth.ts +++ b/__fixtures__/v-next/outputv2/google/api/auth.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -599,7 +599,7 @@ function createBaseAuthentication(): Authentication { } export const Authentication = { typeUrl: "/google.api.Authentication", - encode(message: Authentication, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Authentication, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { AuthenticationRule.encode(v!, writer.uint32(26).fork()).ldelim(); } @@ -608,8 +608,8 @@ export const Authentication = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Authentication { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Authentication { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuthentication(); while (reader.pos < end) { @@ -629,10 +629,10 @@ export const Authentication = { return message; }, fromJSON(object: any): Authentication { - return { - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => AuthenticationRule.fromJSON(e)) : [], - providers: Array.isArray(object?.providers) ? object.providers.map((e: any) => AuthProvider.fromJSON(e)) : [] - }; + const obj = createBaseAuthentication(); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => AuthenticationRule.fromJSON(e)); + if (Array.isArray(object?.providers)) object.providers.map((e: any) => AuthProvider.fromJSON(e)); + return obj; }, toJSON(message: Authentication): unknown { const obj: any = {}; @@ -720,7 +720,7 @@ function createBaseAuthenticationRule(): AuthenticationRule { } export const AuthenticationRule = { typeUrl: "/google.api.AuthenticationRule", - encode(message: AuthenticationRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuthenticationRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -735,8 +735,8 @@ export const AuthenticationRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuthenticationRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuthenticationRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuthenticationRule(); while (reader.pos < end) { @@ -762,12 +762,12 @@ export const AuthenticationRule = { return message; }, fromJSON(object: any): AuthenticationRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - oauth: isSet(object.oauth) ? OAuthRequirements.fromJSON(object.oauth) : undefined, - allowWithoutCredential: isSet(object.allowWithoutCredential) ? Boolean(object.allowWithoutCredential) : false, - requirements: Array.isArray(object?.requirements) ? object.requirements.map((e: any) => AuthRequirement.fromJSON(e)) : [] - }; + const obj = createBaseAuthenticationRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isSet(object.oauth)) obj.oauth = OAuthRequirements.fromJSON(object.oauth); + if (isSet(object.allowWithoutCredential)) obj.allowWithoutCredential = Boolean(object.allowWithoutCredential); + if (Array.isArray(object?.requirements)) object.requirements.map((e: any) => AuthRequirement.fromJSON(e)); + return obj; }, toJSON(message: AuthenticationRule): unknown { const obj: any = {}; @@ -784,7 +784,9 @@ export const AuthenticationRule = { fromPartial(object: DeepPartial): AuthenticationRule { const message = createBaseAuthenticationRule(); message.selector = object.selector ?? ""; - message.oauth = object.oauth !== undefined && object.oauth !== null ? OAuthRequirements.fromPartial(object.oauth) : undefined; + if (object.oauth !== undefined && object.oauth !== null) { + message.oauth = OAuthRequirements.fromPartial(object.oauth); + } message.allowWithoutCredential = object.allowWithoutCredential ?? false; message.requirements = object.requirements?.map(e => AuthRequirement.fromPartial(e)) || []; return message; @@ -854,7 +856,7 @@ function createBaseJwtLocation(): JwtLocation { } export const JwtLocation = { typeUrl: "/google.api.JwtLocation", - encode(message: JwtLocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: JwtLocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.header !== undefined) { writer.uint32(10).string(message.header); } @@ -866,8 +868,8 @@ export const JwtLocation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): JwtLocation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): JwtLocation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseJwtLocation(); while (reader.pos < end) { @@ -890,11 +892,11 @@ export const JwtLocation = { return message; }, fromJSON(object: any): JwtLocation { - return { - header: isSet(object.header) ? String(object.header) : undefined, - query: isSet(object.query) ? String(object.query) : undefined, - valuePrefix: isSet(object.valuePrefix) ? String(object.valuePrefix) : "" - }; + const obj = createBaseJwtLocation(); + if (isSet(object.header)) obj.header = String(object.header); + if (isSet(object.query)) obj.query = String(object.query); + if (isSet(object.valuePrefix)) obj.valuePrefix = String(object.valuePrefix); + return obj; }, toJSON(message: JwtLocation): unknown { const obj: any = {}; @@ -966,7 +968,7 @@ function createBaseAuthProvider(): AuthProvider { } export const AuthProvider = { typeUrl: "/google.api.AuthProvider", - encode(message: AuthProvider, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuthProvider, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); } @@ -987,8 +989,8 @@ export const AuthProvider = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuthProvider { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuthProvider { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuthProvider(); while (reader.pos < end) { @@ -1020,14 +1022,14 @@ export const AuthProvider = { return message; }, fromJSON(object: any): AuthProvider { - return { - id: isSet(object.id) ? String(object.id) : "", - issuer: isSet(object.issuer) ? String(object.issuer) : "", - jwksUri: isSet(object.jwksUri) ? String(object.jwksUri) : "", - audiences: isSet(object.audiences) ? String(object.audiences) : "", - authorizationUrl: isSet(object.authorizationUrl) ? String(object.authorizationUrl) : "", - jwtLocations: Array.isArray(object?.jwtLocations) ? object.jwtLocations.map((e: any) => JwtLocation.fromJSON(e)) : [] - }; + const obj = createBaseAuthProvider(); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.issuer)) obj.issuer = String(object.issuer); + if (isSet(object.jwksUri)) obj.jwksUri = String(object.jwksUri); + if (isSet(object.audiences)) obj.audiences = String(object.audiences); + if (isSet(object.authorizationUrl)) obj.authorizationUrl = String(object.authorizationUrl); + if (Array.isArray(object?.jwtLocations)) object.jwtLocations.map((e: any) => JwtLocation.fromJSON(e)); + return obj; }, toJSON(message: AuthProvider): unknown { const obj: any = {}; @@ -1124,14 +1126,14 @@ function createBaseOAuthRequirements(): OAuthRequirements { } export const OAuthRequirements = { typeUrl: "/google.api.OAuthRequirements", - encode(message: OAuthRequirements, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OAuthRequirements, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.canonicalScopes !== "") { writer.uint32(10).string(message.canonicalScopes); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OAuthRequirements { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OAuthRequirements { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOAuthRequirements(); while (reader.pos < end) { @@ -1148,9 +1150,9 @@ export const OAuthRequirements = { return message; }, fromJSON(object: any): OAuthRequirements { - return { - canonicalScopes: isSet(object.canonicalScopes) ? String(object.canonicalScopes) : "" - }; + const obj = createBaseOAuthRequirements(); + if (isSet(object.canonicalScopes)) obj.canonicalScopes = String(object.canonicalScopes); + return obj; }, toJSON(message: OAuthRequirements): unknown { const obj: any = {}; @@ -1206,7 +1208,7 @@ function createBaseAuthRequirement(): AuthRequirement { } export const AuthRequirement = { typeUrl: "/google.api.AuthRequirement", - encode(message: AuthRequirement, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AuthRequirement, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.providerId !== "") { writer.uint32(10).string(message.providerId); } @@ -1215,8 +1217,8 @@ export const AuthRequirement = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AuthRequirement { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AuthRequirement { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAuthRequirement(); while (reader.pos < end) { @@ -1236,10 +1238,10 @@ export const AuthRequirement = { return message; }, fromJSON(object: any): AuthRequirement { - return { - providerId: isSet(object.providerId) ? String(object.providerId) : "", - audiences: isSet(object.audiences) ? String(object.audiences) : "" - }; + const obj = createBaseAuthRequirement(); + if (isSet(object.providerId)) obj.providerId = String(object.providerId); + if (isSet(object.audiences)) obj.audiences = String(object.audiences); + return obj; }, toJSON(message: AuthRequirement): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/backend.ts b/__fixtures__/v-next/outputv2/google/api/backend.ts index 620d5e02d3..c813b80831 100644 --- a/__fixtures__/v-next/outputv2/google/api/backend.ts +++ b/__fixtures__/v-next/outputv2/google/api/backend.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -321,14 +321,14 @@ function createBaseBackend(): Backend { } export const Backend = { typeUrl: "/google.api.Backend", - encode(message: Backend, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Backend, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { BackendRule.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Backend { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Backend { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBackend(); while (reader.pos < end) { @@ -345,9 +345,9 @@ export const Backend = { return message; }, fromJSON(object: any): Backend { - return { - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => BackendRule.fromJSON(e)) : [] - }; + const obj = createBaseBackend(); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => BackendRule.fromJSON(e)); + return obj; }, toJSON(message: Backend): unknown { const obj: any = {}; @@ -422,7 +422,7 @@ function createBaseBackendRule(): BackendRule { } export const BackendRule = { typeUrl: "/google.api.BackendRule", - encode(message: BackendRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BackendRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -452,8 +452,8 @@ export const BackendRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BackendRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BackendRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBackendRule(); while (reader.pos < end) { @@ -494,17 +494,17 @@ export const BackendRule = { return message; }, fromJSON(object: any): BackendRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - address: isSet(object.address) ? String(object.address) : "", - deadline: isSet(object.deadline) ? Number(object.deadline) : 0, - minDeadline: isSet(object.minDeadline) ? Number(object.minDeadline) : 0, - operationDeadline: isSet(object.operationDeadline) ? Number(object.operationDeadline) : 0, - pathTranslation: isSet(object.pathTranslation) ? backendRule_PathTranslationFromJSON(object.pathTranslation) : -1, - jwtAudience: isSet(object.jwtAudience) ? String(object.jwtAudience) : undefined, - disableAuth: isSet(object.disableAuth) ? Boolean(object.disableAuth) : undefined, - protocol: isSet(object.protocol) ? String(object.protocol) : "" - }; + const obj = createBaseBackendRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isSet(object.address)) obj.address = String(object.address); + if (isSet(object.deadline)) obj.deadline = Number(object.deadline); + if (isSet(object.minDeadline)) obj.minDeadline = Number(object.minDeadline); + if (isSet(object.operationDeadline)) obj.operationDeadline = Number(object.operationDeadline); + if (isSet(object.pathTranslation)) obj.pathTranslation = backendRule_PathTranslationFromJSON(object.pathTranslation); + if (isSet(object.jwtAudience)) obj.jwtAudience = String(object.jwtAudience); + if (isSet(object.disableAuth)) obj.disableAuth = Boolean(object.disableAuth); + if (isSet(object.protocol)) obj.protocol = String(object.protocol); + return obj; }, toJSON(message: BackendRule): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/billing.ts b/__fixtures__/v-next/outputv2/google/api/billing.ts index 088a78a2d9..b9fa9cd0e2 100644 --- a/__fixtures__/v-next/outputv2/google/api/billing.ts +++ b/__fixtures__/v-next/outputv2/google/api/billing.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -187,14 +187,14 @@ function createBaseBilling(): Billing { } export const Billing = { typeUrl: "/google.api.Billing", - encode(message: Billing, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Billing, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.consumerDestinations) { Billing_BillingDestination.encode(v!, writer.uint32(66).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Billing { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Billing { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBilling(); while (reader.pos < end) { @@ -211,9 +211,9 @@ export const Billing = { return message; }, fromJSON(object: any): Billing { - return { - consumerDestinations: Array.isArray(object?.consumerDestinations) ? object.consumerDestinations.map((e: any) => Billing_BillingDestination.fromJSON(e)) : [] - }; + const obj = createBaseBilling(); + if (Array.isArray(object?.consumerDestinations)) object.consumerDestinations.map((e: any) => Billing_BillingDestination.fromJSON(e)); + return obj; }, toJSON(message: Billing): unknown { const obj: any = {}; @@ -281,7 +281,7 @@ function createBaseBilling_BillingDestination(): Billing_BillingDestination { } export const Billing_BillingDestination = { typeUrl: "/google.api.BillingDestination", - encode(message: Billing_BillingDestination, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Billing_BillingDestination, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.monitoredResource !== "") { writer.uint32(10).string(message.monitoredResource); } @@ -290,8 +290,8 @@ export const Billing_BillingDestination = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Billing_BillingDestination { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Billing_BillingDestination { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBilling_BillingDestination(); while (reader.pos < end) { @@ -311,10 +311,10 @@ export const Billing_BillingDestination = { return message; }, fromJSON(object: any): Billing_BillingDestination { - return { - monitoredResource: isSet(object.monitoredResource) ? String(object.monitoredResource) : "", - metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => String(e)) : [] - }; + const obj = createBaseBilling_BillingDestination(); + if (isSet(object.monitoredResource)) obj.monitoredResource = String(object.monitoredResource); + if (Array.isArray(object?.metrics)) object.metrics.map((e: any) => String(e)); + return obj; }, toJSON(message: Billing_BillingDestination): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/config_change.ts b/__fixtures__/v-next/outputv2/google/api/config_change.ts index 61cb9da111..938586beb4 100644 --- a/__fixtures__/v-next/outputv2/google/api/config_change.ts +++ b/__fixtures__/v-next/outputv2/google/api/config_change.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -211,7 +211,7 @@ function createBaseConfigChange(): ConfigChange { } export const ConfigChange = { typeUrl: "/google.api.ConfigChange", - encode(message: ConfigChange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConfigChange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.element !== "") { writer.uint32(10).string(message.element); } @@ -229,8 +229,8 @@ export const ConfigChange = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConfigChange { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConfigChange { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConfigChange(); while (reader.pos < end) { @@ -259,13 +259,13 @@ export const ConfigChange = { return message; }, fromJSON(object: any): ConfigChange { - return { - element: isSet(object.element) ? String(object.element) : "", - oldValue: isSet(object.oldValue) ? String(object.oldValue) : "", - newValue: isSet(object.newValue) ? String(object.newValue) : "", - changeType: isSet(object.changeType) ? changeTypeFromJSON(object.changeType) : -1, - advices: Array.isArray(object?.advices) ? object.advices.map((e: any) => Advice.fromJSON(e)) : [] - }; + const obj = createBaseConfigChange(); + if (isSet(object.element)) obj.element = String(object.element); + if (isSet(object.oldValue)) obj.oldValue = String(object.oldValue); + if (isSet(object.newValue)) obj.newValue = String(object.newValue); + if (isSet(object.changeType)) obj.changeType = changeTypeFromJSON(object.changeType); + if (Array.isArray(object?.advices)) object.advices.map((e: any) => Advice.fromJSON(e)); + return obj; }, toJSON(message: ConfigChange): unknown { const obj: any = {}; @@ -356,14 +356,14 @@ function createBaseAdvice(): Advice { } export const Advice = { typeUrl: "/google.api.Advice", - encode(message: Advice, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Advice, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(18).string(message.description); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Advice { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Advice { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAdvice(); while (reader.pos < end) { @@ -380,9 +380,9 @@ export const Advice = { return message; }, fromJSON(object: any): Advice { - return { - description: isSet(object.description) ? String(object.description) : "" - }; + const obj = createBaseAdvice(); + if (isSet(object.description)) obj.description = String(object.description); + return obj; }, toJSON(message: Advice): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/consumer.ts b/__fixtures__/v-next/outputv2/google/api/consumer.ts index 1fc8feba69..668bf1edf9 100644 --- a/__fixtures__/v-next/outputv2/google/api/consumer.ts +++ b/__fixtures__/v-next/outputv2/google/api/consumer.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** Supported data type of the property values */ @@ -202,14 +202,14 @@ function createBaseProjectProperties(): ProjectProperties { } export const ProjectProperties = { typeUrl: "/google.api.ProjectProperties", - encode(message: ProjectProperties, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ProjectProperties, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.properties) { Property.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ProjectProperties { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ProjectProperties { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProjectProperties(); while (reader.pos < end) { @@ -226,9 +226,9 @@ export const ProjectProperties = { return message; }, fromJSON(object: any): ProjectProperties { - return { - properties: Array.isArray(object?.properties) ? object.properties.map((e: any) => Property.fromJSON(e)) : [] - }; + const obj = createBaseProjectProperties(); + if (Array.isArray(object?.properties)) object.properties.map((e: any) => Property.fromJSON(e)); + return obj; }, toJSON(message: ProjectProperties): unknown { const obj: any = {}; @@ -297,7 +297,7 @@ function createBaseProperty(): Property { } export const Property = { typeUrl: "/google.api.Property", - encode(message: Property, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Property, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -309,8 +309,8 @@ export const Property = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Property { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Property { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseProperty(); while (reader.pos < end) { @@ -333,11 +333,11 @@ export const Property = { return message; }, fromJSON(object: any): Property { - return { - name: isSet(object.name) ? String(object.name) : "", - type: isSet(object.type) ? property_PropertyTypeFromJSON(object.type) : -1, - description: isSet(object.description) ? String(object.description) : "" - }; + const obj = createBaseProperty(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.type)) obj.type = property_PropertyTypeFromJSON(object.type); + if (isSet(object.description)) obj.description = String(object.description); + return obj; }, toJSON(message: Property): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/context.ts b/__fixtures__/v-next/outputv2/google/api/context.ts index 0506a3b084..5bdfa61864 100644 --- a/__fixtures__/v-next/outputv2/google/api/context.ts +++ b/__fixtures__/v-next/outputv2/google/api/context.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -220,14 +220,14 @@ function createBaseContext(): Context { } export const Context = { typeUrl: "/google.api.Context", - encode(message: Context, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Context, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { ContextRule.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Context { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Context { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseContext(); while (reader.pos < end) { @@ -244,9 +244,9 @@ export const Context = { return message; }, fromJSON(object: any): Context { - return { - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => ContextRule.fromJSON(e)) : [] - }; + const obj = createBaseContext(); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => ContextRule.fromJSON(e)); + return obj; }, toJSON(message: Context): unknown { const obj: any = {}; @@ -317,7 +317,7 @@ function createBaseContextRule(): ContextRule { } export const ContextRule = { typeUrl: "/google.api.ContextRule", - encode(message: ContextRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ContextRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -335,8 +335,8 @@ export const ContextRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ContextRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ContextRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseContextRule(); while (reader.pos < end) { @@ -365,13 +365,13 @@ export const ContextRule = { return message; }, fromJSON(object: any): ContextRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - requested: Array.isArray(object?.requested) ? object.requested.map((e: any) => String(e)) : [], - provided: Array.isArray(object?.provided) ? object.provided.map((e: any) => String(e)) : [], - allowedRequestExtensions: Array.isArray(object?.allowedRequestExtensions) ? object.allowedRequestExtensions.map((e: any) => String(e)) : [], - allowedResponseExtensions: Array.isArray(object?.allowedResponseExtensions) ? object.allowedResponseExtensions.map((e: any) => String(e)) : [] - }; + const obj = createBaseContextRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (Array.isArray(object?.requested)) object.requested.map((e: any) => String(e)); + if (Array.isArray(object?.provided)) object.provided.map((e: any) => String(e)); + if (Array.isArray(object?.allowedRequestExtensions)) object.allowedRequestExtensions.map((e: any) => String(e)); + if (Array.isArray(object?.allowedResponseExtensions)) object.allowedResponseExtensions.map((e: any) => String(e)); + return obj; }, toJSON(message: ContextRule): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/control.ts b/__fixtures__/v-next/outputv2/google/api/control.ts index 1fc2d72e2f..7e0c417bdc 100644 --- a/__fixtures__/v-next/outputv2/google/api/control.ts +++ b/__fixtures__/v-next/outputv2/google/api/control.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -48,14 +48,14 @@ function createBaseControl(): Control { } export const Control = { typeUrl: "/google.api.Control", - encode(message: Control, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Control, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.environment !== "") { writer.uint32(10).string(message.environment); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Control { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Control { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseControl(); while (reader.pos < end) { @@ -72,9 +72,9 @@ export const Control = { return message; }, fromJSON(object: any): Control { - return { - environment: isSet(object.environment) ? String(object.environment) : "" - }; + const obj = createBaseControl(); + if (isSet(object.environment)) obj.environment = String(object.environment); + return obj; }, toJSON(message: Control): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/distribution.ts b/__fixtures__/v-next/outputv2/google/api/distribution.ts index 15621767ce..79aaaf942e 100644 --- a/__fixtures__/v-next/outputv2/google/api/distribution.ts +++ b/__fixtures__/v-next/outputv2/google/api/distribution.ts @@ -1,7 +1,7 @@ import { Timestamp } from "../protobuf/timestamp"; import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp } from "../../helpers"; export const protobufPackage = "google.api"; /** * `Distribution` contains summary statistics for a population of values. It @@ -25,7 +25,7 @@ export interface Distribution { * must equal the sum of the values in `bucket_counts` if a histogram is * provided. */ - count: Long; + count: bigint; /** * The arithmetic mean of the values in the population. If `count` is zero * then this field must be zero. @@ -70,7 +70,7 @@ export interface Distribution { * counts for the finite buckets (number 1 through N-2). The N'th value in * `bucket_counts` is the count for the overflow bucket (number N-1). */ - bucketCounts: Long[]; + bucketCounts: bigint[]; /** Must be in increasing order of `value` field. */ exemplars: Distribution_Exemplar[]; } @@ -170,12 +170,12 @@ export interface DistributionAminoMsg { * will render the `mean` and `sum_of_squared_deviation` fields meaningless. */ export interface DistributionSDKType { - count: Long; + count: bigint; mean: number; sum_of_squared_deviation: number; range: Distribution_RangeSDKType; bucket_options: Distribution_BucketOptionsSDKType; - bucket_counts: Long[]; + bucket_counts: bigint[]; exemplars: Distribution_ExemplarSDKType[]; } /** The range of the population values. */ @@ -549,7 +549,7 @@ export interface Distribution_ExemplarSDKType { } function createBaseDistribution(): Distribution { return { - count: Long.ZERO, + count: BigInt(0), mean: 0, sumOfSquaredDeviation: 0, range: Distribution_Range.fromPartial({}), @@ -560,8 +560,8 @@ function createBaseDistribution(): Distribution { } export const Distribution = { typeUrl: "/google.api.Distribution", - encode(message: Distribution, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.count.isZero()) { + encode(message: Distribution, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.count !== BigInt(0)) { writer.uint32(8).int64(message.count); } if (message.mean !== 0) { @@ -586,15 +586,15 @@ export const Distribution = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.count = (reader.int64() as Long); + message.count = reader.int64(); break; case 2: message.mean = reader.double(); @@ -612,10 +612,10 @@ export const Distribution = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.bucketCounts.push((reader.int64() as Long)); + message.bucketCounts.push(reader.int64()); } } else { - message.bucketCounts.push((reader.int64() as Long)); + message.bucketCounts.push(reader.int64()); } break; case 10: @@ -629,25 +629,25 @@ export const Distribution = { return message; }, fromJSON(object: any): Distribution { - return { - count: isSet(object.count) ? Long.fromValue(object.count) : Long.ZERO, - mean: isSet(object.mean) ? Number(object.mean) : 0, - sumOfSquaredDeviation: isSet(object.sumOfSquaredDeviation) ? Number(object.sumOfSquaredDeviation) : 0, - range: isSet(object.range) ? Distribution_Range.fromJSON(object.range) : undefined, - bucketOptions: isSet(object.bucketOptions) ? Distribution_BucketOptions.fromJSON(object.bucketOptions) : undefined, - bucketCounts: Array.isArray(object?.bucketCounts) ? object.bucketCounts.map((e: any) => Long.fromValue(e)) : [], - exemplars: Array.isArray(object?.exemplars) ? object.exemplars.map((e: any) => Distribution_Exemplar.fromJSON(e)) : [] - }; + const obj = createBaseDistribution(); + if (isSet(object.count)) obj.count = BigInt(object.count.toString()); + if (isSet(object.mean)) obj.mean = Number(object.mean); + if (isSet(object.sumOfSquaredDeviation)) obj.sumOfSquaredDeviation = Number(object.sumOfSquaredDeviation); + if (isSet(object.range)) obj.range = Distribution_Range.fromJSON(object.range); + if (isSet(object.bucketOptions)) obj.bucketOptions = Distribution_BucketOptions.fromJSON(object.bucketOptions); + if (Array.isArray(object?.bucketCounts)) object.bucketCounts.map((e: any) => BigInt(e.toString())); + if (Array.isArray(object?.exemplars)) object.exemplars.map((e: any) => Distribution_Exemplar.fromJSON(e)); + return obj; }, toJSON(message: Distribution): unknown { const obj: any = {}; - message.count !== undefined && (obj.count = (message.count || Long.ZERO).toString()); + message.count !== undefined && (obj.count = (message.count || BigInt(0)).toString()); message.mean !== undefined && (obj.mean = message.mean); message.sumOfSquaredDeviation !== undefined && (obj.sumOfSquaredDeviation = message.sumOfSquaredDeviation); message.range !== undefined && (obj.range = message.range ? Distribution_Range.toJSON(message.range) : undefined); message.bucketOptions !== undefined && (obj.bucketOptions = message.bucketOptions ? Distribution_BucketOptions.toJSON(message.bucketOptions) : undefined); if (message.bucketCounts) { - obj.bucketCounts = message.bucketCounts.map(e => (e || Long.ZERO).toString()); + obj.bucketCounts = message.bucketCounts.map(e => (e || BigInt(0)).toString()); } else { obj.bucketCounts = []; } @@ -660,12 +660,18 @@ export const Distribution = { }, fromPartial(object: DeepPartial): Distribution { const message = createBaseDistribution(); - message.count = object.count !== undefined && object.count !== null ? Long.fromValue(object.count) : Long.ZERO; + if (object.count !== undefined && object.count !== null) { + message.count = BigInt(object.count.toString()); + } message.mean = object.mean ?? 0; message.sumOfSquaredDeviation = object.sumOfSquaredDeviation ?? 0; - message.range = object.range !== undefined && object.range !== null ? Distribution_Range.fromPartial(object.range) : undefined; - message.bucketOptions = object.bucketOptions !== undefined && object.bucketOptions !== null ? Distribution_BucketOptions.fromPartial(object.bucketOptions) : undefined; - message.bucketCounts = object.bucketCounts?.map(e => Long.fromValue(e)) || []; + if (object.range !== undefined && object.range !== null) { + message.range = Distribution_Range.fromPartial(object.range); + } + if (object.bucketOptions !== undefined && object.bucketOptions !== null) { + message.bucketOptions = Distribution_BucketOptions.fromPartial(object.bucketOptions); + } + message.bucketCounts = object.bucketCounts?.map(e => BigInt(e.toString())) || []; message.exemplars = object.exemplars?.map(e => Distribution_Exemplar.fromPartial(e)) || []; return message; }, @@ -701,12 +707,12 @@ export const Distribution = { }, fromAmino(object: DistributionAmino): Distribution { return { - count: Long.fromString(object.count), + count: BigInt(object.count), mean: object.mean, sumOfSquaredDeviation: object.sum_of_squared_deviation, range: object?.range ? Distribution_Range.fromAmino(object.range) : undefined, bucketOptions: object?.bucket_options ? Distribution_BucketOptions.fromAmino(object.bucket_options) : undefined, - bucketCounts: Array.isArray(object?.bucket_counts) ? object.bucket_counts.map((e: any) => e) : [], + bucketCounts: Array.isArray(object?.bucket_counts) ? object.bucket_counts.map((e: any) => BigInt(e)) : [], exemplars: Array.isArray(object?.exemplars) ? object.exemplars.map((e: any) => Distribution_Exemplar.fromAmino(e)) : [] }; }, @@ -718,7 +724,7 @@ export const Distribution = { obj.range = message.range ? Distribution_Range.toAmino(message.range) : undefined; obj.bucket_options = message.bucketOptions ? Distribution_BucketOptions.toAmino(message.bucketOptions) : undefined; if (message.bucketCounts) { - obj.bucket_counts = message.bucketCounts.map(e => e); + obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { obj.bucket_counts = []; } @@ -753,7 +759,7 @@ function createBaseDistribution_Range(): Distribution_Range { } export const Distribution_Range = { typeUrl: "/google.api.Range", - encode(message: Distribution_Range, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_Range, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.min !== 0) { writer.uint32(9).double(message.min); } @@ -762,8 +768,8 @@ export const Distribution_Range = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_Range { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_Range { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_Range(); while (reader.pos < end) { @@ -783,10 +789,10 @@ export const Distribution_Range = { return message; }, fromJSON(object: any): Distribution_Range { - return { - min: isSet(object.min) ? Number(object.min) : 0, - max: isSet(object.max) ? Number(object.max) : 0 - }; + const obj = createBaseDistribution_Range(); + if (isSet(object.min)) obj.min = Number(object.min); + if (isSet(object.max)) obj.max = Number(object.max); + return obj; }, toJSON(message: Distribution_Range): unknown { const obj: any = {}; @@ -849,7 +855,7 @@ function createBaseDistribution_BucketOptions(): Distribution_BucketOptions { } export const Distribution_BucketOptions = { typeUrl: "/google.api.BucketOptions", - encode(message: Distribution_BucketOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_BucketOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.linearBuckets !== undefined) { Distribution_BucketOptions_Linear.encode(message.linearBuckets, writer.uint32(10).fork()).ldelim(); } @@ -861,8 +867,8 @@ export const Distribution_BucketOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_BucketOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_BucketOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_BucketOptions(); while (reader.pos < end) { @@ -885,11 +891,11 @@ export const Distribution_BucketOptions = { return message; }, fromJSON(object: any): Distribution_BucketOptions { - return { - linearBuckets: isSet(object.linearBuckets) ? Distribution_BucketOptions_Linear.fromJSON(object.linearBuckets) : undefined, - exponentialBuckets: isSet(object.exponentialBuckets) ? Distribution_BucketOptions_Exponential.fromJSON(object.exponentialBuckets) : undefined, - explicitBuckets: isSet(object.explicitBuckets) ? Distribution_BucketOptions_Explicit.fromJSON(object.explicitBuckets) : undefined - }; + const obj = createBaseDistribution_BucketOptions(); + if (isSet(object.linearBuckets)) obj.linearBuckets = Distribution_BucketOptions_Linear.fromJSON(object.linearBuckets); + if (isSet(object.exponentialBuckets)) obj.exponentialBuckets = Distribution_BucketOptions_Exponential.fromJSON(object.exponentialBuckets); + if (isSet(object.explicitBuckets)) obj.explicitBuckets = Distribution_BucketOptions_Explicit.fromJSON(object.explicitBuckets); + return obj; }, toJSON(message: Distribution_BucketOptions): unknown { const obj: any = {}; @@ -900,9 +906,15 @@ export const Distribution_BucketOptions = { }, fromPartial(object: DeepPartial): Distribution_BucketOptions { const message = createBaseDistribution_BucketOptions(); - message.linearBuckets = object.linearBuckets !== undefined && object.linearBuckets !== null ? Distribution_BucketOptions_Linear.fromPartial(object.linearBuckets) : undefined; - message.exponentialBuckets = object.exponentialBuckets !== undefined && object.exponentialBuckets !== null ? Distribution_BucketOptions_Exponential.fromPartial(object.exponentialBuckets) : undefined; - message.explicitBuckets = object.explicitBuckets !== undefined && object.explicitBuckets !== null ? Distribution_BucketOptions_Explicit.fromPartial(object.explicitBuckets) : undefined; + if (object.linearBuckets !== undefined && object.linearBuckets !== null) { + message.linearBuckets = Distribution_BucketOptions_Linear.fromPartial(object.linearBuckets); + } + if (object.exponentialBuckets !== undefined && object.exponentialBuckets !== null) { + message.exponentialBuckets = Distribution_BucketOptions_Exponential.fromPartial(object.exponentialBuckets); + } + if (object.explicitBuckets !== undefined && object.explicitBuckets !== null) { + message.explicitBuckets = Distribution_BucketOptions_Explicit.fromPartial(object.explicitBuckets); + } return message; }, fromSDK(object: Distribution_BucketOptionsSDKType): Distribution_BucketOptions { @@ -958,7 +970,7 @@ function createBaseDistribution_BucketOptions_Linear(): Distribution_BucketOptio } export const Distribution_BucketOptions_Linear = { typeUrl: "/google.api.Linear", - encode(message: Distribution_BucketOptions_Linear, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_BucketOptions_Linear, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); } @@ -970,8 +982,8 @@ export const Distribution_BucketOptions_Linear = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_BucketOptions_Linear { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_BucketOptions_Linear { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_BucketOptions_Linear(); while (reader.pos < end) { @@ -994,11 +1006,11 @@ export const Distribution_BucketOptions_Linear = { return message; }, fromJSON(object: any): Distribution_BucketOptions_Linear { - return { - numFiniteBuckets: isSet(object.numFiniteBuckets) ? Number(object.numFiniteBuckets) : 0, - width: isSet(object.width) ? Number(object.width) : 0, - offset: isSet(object.offset) ? Number(object.offset) : 0 - }; + const obj = createBaseDistribution_BucketOptions_Linear(); + if (isSet(object.numFiniteBuckets)) obj.numFiniteBuckets = Number(object.numFiniteBuckets); + if (isSet(object.width)) obj.width = Number(object.width); + if (isSet(object.offset)) obj.offset = Number(object.offset); + return obj; }, toJSON(message: Distribution_BucketOptions_Linear): unknown { const obj: any = {}; @@ -1067,7 +1079,7 @@ function createBaseDistribution_BucketOptions_Exponential(): Distribution_Bucket } export const Distribution_BucketOptions_Exponential = { typeUrl: "/google.api.Exponential", - encode(message: Distribution_BucketOptions_Exponential, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_BucketOptions_Exponential, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); } @@ -1079,8 +1091,8 @@ export const Distribution_BucketOptions_Exponential = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_BucketOptions_Exponential { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_BucketOptions_Exponential { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_BucketOptions_Exponential(); while (reader.pos < end) { @@ -1103,11 +1115,11 @@ export const Distribution_BucketOptions_Exponential = { return message; }, fromJSON(object: any): Distribution_BucketOptions_Exponential { - return { - numFiniteBuckets: isSet(object.numFiniteBuckets) ? Number(object.numFiniteBuckets) : 0, - growthFactor: isSet(object.growthFactor) ? Number(object.growthFactor) : 0, - scale: isSet(object.scale) ? Number(object.scale) : 0 - }; + const obj = createBaseDistribution_BucketOptions_Exponential(); + if (isSet(object.numFiniteBuckets)) obj.numFiniteBuckets = Number(object.numFiniteBuckets); + if (isSet(object.growthFactor)) obj.growthFactor = Number(object.growthFactor); + if (isSet(object.scale)) obj.scale = Number(object.scale); + return obj; }, toJSON(message: Distribution_BucketOptions_Exponential): unknown { const obj: any = {}; @@ -1174,7 +1186,7 @@ function createBaseDistribution_BucketOptions_Explicit(): Distribution_BucketOpt } export const Distribution_BucketOptions_Explicit = { typeUrl: "/google.api.Explicit", - encode(message: Distribution_BucketOptions_Explicit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_BucketOptions_Explicit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.bounds) { writer.double(v); @@ -1182,8 +1194,8 @@ export const Distribution_BucketOptions_Explicit = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_BucketOptions_Explicit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_BucketOptions_Explicit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_BucketOptions_Explicit(); while (reader.pos < end) { @@ -1207,9 +1219,9 @@ export const Distribution_BucketOptions_Explicit = { return message; }, fromJSON(object: any): Distribution_BucketOptions_Explicit { - return { - bounds: Array.isArray(object?.bounds) ? object.bounds.map((e: any) => Number(e)) : [] - }; + const obj = createBaseDistribution_BucketOptions_Explicit(); + if (Array.isArray(object?.bounds)) object.bounds.map((e: any) => Number(e)); + return obj; }, toJSON(message: Distribution_BucketOptions_Explicit): unknown { const obj: any = {}; @@ -1278,7 +1290,7 @@ function createBaseDistribution_Exemplar(): Distribution_Exemplar { } export const Distribution_Exemplar = { typeUrl: "/google.api.Exemplar", - encode(message: Distribution_Exemplar, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_Exemplar, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== 0) { writer.uint32(9).double(message.value); } @@ -1290,8 +1302,8 @@ export const Distribution_Exemplar = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_Exemplar { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_Exemplar { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_Exemplar(); while (reader.pos < end) { @@ -1314,11 +1326,11 @@ export const Distribution_Exemplar = { return message; }, fromJSON(object: any): Distribution_Exemplar { - return { - value: isSet(object.value) ? Number(object.value) : 0, - timestamp: isSet(object.timestamp) ? new Date(object.timestamp) : undefined, - attachments: Array.isArray(object?.attachments) ? object.attachments.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseDistribution_Exemplar(); + if (isSet(object.value)) obj.value = Number(object.value); + if (isSet(object.timestamp)) obj.timestamp = new Date(object.timestamp); + if (Array.isArray(object?.attachments)) object.attachments.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: Distribution_Exemplar): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/documentation.ts b/__fixtures__/v-next/outputv2/google/api/documentation.ts index 9c2bbfcdfb..911bdb379b 100644 --- a/__fixtures__/v-next/outputv2/google/api/documentation.ts +++ b/__fixtures__/v-next/outputv2/google/api/documentation.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -415,7 +415,7 @@ function createBaseDocumentation(): Documentation { } export const Documentation = { typeUrl: "/google.api.Documentation", - encode(message: Documentation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Documentation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.summary !== "") { writer.uint32(10).string(message.summary); } @@ -436,8 +436,8 @@ export const Documentation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Documentation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Documentation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDocumentation(); while (reader.pos < end) { @@ -469,14 +469,14 @@ export const Documentation = { return message; }, fromJSON(object: any): Documentation { - return { - summary: isSet(object.summary) ? String(object.summary) : "", - pages: Array.isArray(object?.pages) ? object.pages.map((e: any) => Page.fromJSON(e)) : [], - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => DocumentationRule.fromJSON(e)) : [], - documentationRootUrl: isSet(object.documentationRootUrl) ? String(object.documentationRootUrl) : "", - serviceRootUrl: isSet(object.serviceRootUrl) ? String(object.serviceRootUrl) : "", - overview: isSet(object.overview) ? String(object.overview) : "" - }; + const obj = createBaseDocumentation(); + if (isSet(object.summary)) obj.summary = String(object.summary); + if (Array.isArray(object?.pages)) object.pages.map((e: any) => Page.fromJSON(e)); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => DocumentationRule.fromJSON(e)); + if (isSet(object.documentationRootUrl)) obj.documentationRootUrl = String(object.documentationRootUrl); + if (isSet(object.serviceRootUrl)) obj.serviceRootUrl = String(object.serviceRootUrl); + if (isSet(object.overview)) obj.overview = String(object.overview); + return obj; }, toJSON(message: Documentation): unknown { const obj: any = {}; @@ -587,7 +587,7 @@ function createBaseDocumentationRule(): DocumentationRule { } export const DocumentationRule = { typeUrl: "/google.api.DocumentationRule", - encode(message: DocumentationRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DocumentationRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -599,8 +599,8 @@ export const DocumentationRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DocumentationRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DocumentationRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDocumentationRule(); while (reader.pos < end) { @@ -623,11 +623,11 @@ export const DocumentationRule = { return message; }, fromJSON(object: any): DocumentationRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - description: isSet(object.description) ? String(object.description) : "", - deprecationDescription: isSet(object.deprecationDescription) ? String(object.deprecationDescription) : "" - }; + const obj = createBaseDocumentationRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.deprecationDescription)) obj.deprecationDescription = String(object.deprecationDescription); + return obj; }, toJSON(message: DocumentationRule): unknown { const obj: any = {}; @@ -696,7 +696,7 @@ function createBasePage(): Page { } export const Page = { typeUrl: "/google.api.Page", - encode(message: Page, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Page, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -708,8 +708,8 @@ export const Page = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Page { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Page { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBasePage(); while (reader.pos < end) { @@ -732,11 +732,11 @@ export const Page = { return message; }, fromJSON(object: any): Page { - return { - name: isSet(object.name) ? String(object.name) : "", - content: isSet(object.content) ? String(object.content) : "", - subpages: Array.isArray(object?.subpages) ? object.subpages.map((e: any) => Page.fromJSON(e)) : [] - }; + const obj = createBasePage(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.content)) obj.content = String(object.content); + if (Array.isArray(object?.subpages)) object.subpages.map((e: any) => Page.fromJSON(e)); + return obj; }, toJSON(message: Page): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/endpoint.ts b/__fixtures__/v-next/outputv2/google/api/endpoint.ts index 50f1d1a9cf..554b3fc55a 100644 --- a/__fixtures__/v-next/outputv2/google/api/endpoint.ts +++ b/__fixtures__/v-next/outputv2/google/api/endpoint.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -144,7 +144,7 @@ function createBaseEndpoint(): Endpoint { } export const Endpoint = { typeUrl: "/google.api.Endpoint", - encode(message: Endpoint, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Endpoint, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -159,8 +159,8 @@ export const Endpoint = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Endpoint { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Endpoint { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEndpoint(); while (reader.pos < end) { @@ -186,12 +186,12 @@ export const Endpoint = { return message; }, fromJSON(object: any): Endpoint { - return { - name: isSet(object.name) ? String(object.name) : "", - aliases: Array.isArray(object?.aliases) ? object.aliases.map((e: any) => String(e)) : [], - target: isSet(object.target) ? String(object.target) : "", - allowCors: isSet(object.allowCors) ? Boolean(object.allowCors) : false - }; + const obj = createBaseEndpoint(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.aliases)) object.aliases.map((e: any) => String(e)); + if (isSet(object.target)) obj.target = String(object.target); + if (isSet(object.allowCors)) obj.allowCors = Boolean(object.allowCors); + return obj; }, toJSON(message: Endpoint): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts b/__fixtures__/v-next/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts index 902ff55a29..88e35b17d7 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/conformance/v1alpha1/conformance_service.ts @@ -2,8 +2,8 @@ import { ParsedExpr, ParsedExprAmino, ParsedExprSDKType, SourcePosition, SourceP import { Decl, DeclAmino, DeclSDKType, CheckedExpr, CheckedExprAmino, CheckedExprSDKType } from "../../v1alpha1/checked"; import { ExprValue, ExprValueAmino, ExprValueSDKType } from "../../v1alpha1/eval"; import { Status, StatusAmino, StatusSDKType } from "../../../../rpc/status"; -import { Long, isSet, DeepPartial, isObject } from "../../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../../binary"; +import { isSet, DeepPartial, isObject } from "../../../../../helpers"; export const protobufPackage = "google.api.expr.conformance.v1alpha1"; /** Severities of issues. */ export enum IssueDetails_Severity { @@ -324,7 +324,7 @@ export interface IssueDetails { /** Position in the source, if known. */ position: SourcePosition; /** Expression ID from [Expr][], 0 if unknown. */ - id: Long; + id: bigint; } export interface IssueDetailsProtoMsg { typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails"; @@ -355,7 +355,7 @@ export interface IssueDetailsAminoMsg { export interface IssueDetailsSDKType { severity: IssueDetails_Severity; position: SourcePositionSDKType; - id: Long; + id: bigint; } function createBaseParseRequest(): ParseRequest { return { @@ -367,7 +367,7 @@ function createBaseParseRequest(): ParseRequest { } export const ParseRequest = { typeUrl: "/google.api.expr.conformance.v1alpha1.ParseRequest", - encode(message: ParseRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ParseRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.celSource !== "") { writer.uint32(10).string(message.celSource); } @@ -382,8 +382,8 @@ export const ParseRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ParseRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ParseRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParseRequest(); while (reader.pos < end) { @@ -409,12 +409,12 @@ export const ParseRequest = { return message; }, fromJSON(object: any): ParseRequest { - return { - celSource: isSet(object.celSource) ? String(object.celSource) : "", - syntaxVersion: isSet(object.syntaxVersion) ? String(object.syntaxVersion) : "", - sourceLocation: isSet(object.sourceLocation) ? String(object.sourceLocation) : "", - disableMacros: isSet(object.disableMacros) ? Boolean(object.disableMacros) : false - }; + const obj = createBaseParseRequest(); + if (isSet(object.celSource)) obj.celSource = String(object.celSource); + if (isSet(object.syntaxVersion)) obj.syntaxVersion = String(object.syntaxVersion); + if (isSet(object.sourceLocation)) obj.sourceLocation = String(object.sourceLocation); + if (isSet(object.disableMacros)) obj.disableMacros = Boolean(object.disableMacros); + return obj; }, toJSON(message: ParseRequest): unknown { const obj: any = {}; @@ -488,7 +488,7 @@ function createBaseParseResponse(): ParseResponse { } export const ParseResponse = { typeUrl: "/google.api.expr.conformance.v1alpha1.ParseResponse", - encode(message: ParseResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ParseResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parsedExpr !== undefined) { ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim(); } @@ -497,8 +497,8 @@ export const ParseResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ParseResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ParseResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParseResponse(); while (reader.pos < end) { @@ -518,10 +518,10 @@ export const ParseResponse = { return message; }, fromJSON(object: any): ParseResponse { - return { - parsedExpr: isSet(object.parsedExpr) ? ParsedExpr.fromJSON(object.parsedExpr) : undefined, - issues: Array.isArray(object?.issues) ? object.issues.map((e: any) => Status.fromJSON(e)) : [] - }; + const obj = createBaseParseResponse(); + if (isSet(object.parsedExpr)) obj.parsedExpr = ParsedExpr.fromJSON(object.parsedExpr); + if (Array.isArray(object?.issues)) object.issues.map((e: any) => Status.fromJSON(e)); + return obj; }, toJSON(message: ParseResponse): unknown { const obj: any = {}; @@ -535,7 +535,9 @@ export const ParseResponse = { }, fromPartial(object: DeepPartial): ParseResponse { const message = createBaseParseResponse(); - message.parsedExpr = object.parsedExpr !== undefined && object.parsedExpr !== null ? ParsedExpr.fromPartial(object.parsedExpr) : undefined; + if (object.parsedExpr !== undefined && object.parsedExpr !== null) { + message.parsedExpr = ParsedExpr.fromPartial(object.parsedExpr); + } message.issues = object.issues?.map(e => Status.fromPartial(e)) || []; return message; }, @@ -597,7 +599,7 @@ function createBaseCheckRequest(): CheckRequest { } export const CheckRequest = { typeUrl: "/google.api.expr.conformance.v1alpha1.CheckRequest", - encode(message: CheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parsedExpr !== undefined) { ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim(); } @@ -612,8 +614,8 @@ export const CheckRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckRequest(); while (reader.pos < end) { @@ -639,12 +641,12 @@ export const CheckRequest = { return message; }, fromJSON(object: any): CheckRequest { - return { - parsedExpr: isSet(object.parsedExpr) ? ParsedExpr.fromJSON(object.parsedExpr) : undefined, - typeEnv: Array.isArray(object?.typeEnv) ? object.typeEnv.map((e: any) => Decl.fromJSON(e)) : [], - container: isSet(object.container) ? String(object.container) : "", - noStdEnv: isSet(object.noStdEnv) ? Boolean(object.noStdEnv) : false - }; + const obj = createBaseCheckRequest(); + if (isSet(object.parsedExpr)) obj.parsedExpr = ParsedExpr.fromJSON(object.parsedExpr); + if (Array.isArray(object?.typeEnv)) object.typeEnv.map((e: any) => Decl.fromJSON(e)); + if (isSet(object.container)) obj.container = String(object.container); + if (isSet(object.noStdEnv)) obj.noStdEnv = Boolean(object.noStdEnv); + return obj; }, toJSON(message: CheckRequest): unknown { const obj: any = {}; @@ -660,7 +662,9 @@ export const CheckRequest = { }, fromPartial(object: DeepPartial): CheckRequest { const message = createBaseCheckRequest(); - message.parsedExpr = object.parsedExpr !== undefined && object.parsedExpr !== null ? ParsedExpr.fromPartial(object.parsedExpr) : undefined; + if (object.parsedExpr !== undefined && object.parsedExpr !== null) { + message.parsedExpr = ParsedExpr.fromPartial(object.parsedExpr); + } message.typeEnv = object.typeEnv?.map(e => Decl.fromPartial(e)) || []; message.container = object.container ?? ""; message.noStdEnv = object.noStdEnv ?? false; @@ -730,7 +734,7 @@ function createBaseCheckResponse(): CheckResponse { } export const CheckResponse = { typeUrl: "/google.api.expr.conformance.v1alpha1.CheckResponse", - encode(message: CheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.checkedExpr !== undefined) { CheckedExpr.encode(message.checkedExpr, writer.uint32(10).fork()).ldelim(); } @@ -739,8 +743,8 @@ export const CheckResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckResponse(); while (reader.pos < end) { @@ -760,10 +764,10 @@ export const CheckResponse = { return message; }, fromJSON(object: any): CheckResponse { - return { - checkedExpr: isSet(object.checkedExpr) ? CheckedExpr.fromJSON(object.checkedExpr) : undefined, - issues: Array.isArray(object?.issues) ? object.issues.map((e: any) => Status.fromJSON(e)) : [] - }; + const obj = createBaseCheckResponse(); + if (isSet(object.checkedExpr)) obj.checkedExpr = CheckedExpr.fromJSON(object.checkedExpr); + if (Array.isArray(object?.issues)) object.issues.map((e: any) => Status.fromJSON(e)); + return obj; }, toJSON(message: CheckResponse): unknown { const obj: any = {}; @@ -777,7 +781,9 @@ export const CheckResponse = { }, fromPartial(object: DeepPartial): CheckResponse { const message = createBaseCheckResponse(); - message.checkedExpr = object.checkedExpr !== undefined && object.checkedExpr !== null ? CheckedExpr.fromPartial(object.checkedExpr) : undefined; + if (object.checkedExpr !== undefined && object.checkedExpr !== null) { + message.checkedExpr = CheckedExpr.fromPartial(object.checkedExpr); + } message.issues = object.issues?.map(e => Status.fromPartial(e)) || []; return message; }, @@ -836,7 +842,7 @@ function createBaseEvalRequest_BindingsEntry(): EvalRequest_BindingsEntry { }; } export const EvalRequest_BindingsEntry = { - encode(message: EvalRequest_BindingsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EvalRequest_BindingsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -845,8 +851,8 @@ export const EvalRequest_BindingsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalRequest_BindingsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalRequest_BindingsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalRequest_BindingsEntry(); while (reader.pos < end) { @@ -866,10 +872,10 @@ export const EvalRequest_BindingsEntry = { return message; }, fromJSON(object: any): EvalRequest_BindingsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? ExprValue.fromJSON(object.value) : undefined - }; + const obj = createBaseEvalRequest_BindingsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = ExprValue.fromJSON(object.value); + return obj; }, toJSON(message: EvalRequest_BindingsEntry): unknown { const obj: any = {}; @@ -880,7 +886,9 @@ export const EvalRequest_BindingsEntry = { fromPartial(object: DeepPartial): EvalRequest_BindingsEntry { const message = createBaseEvalRequest_BindingsEntry(); message.key = object.key ?? ""; - message.value = object.value !== undefined && object.value !== null ? ExprValue.fromPartial(object.value) : undefined; + if (object.value !== undefined && object.value !== null) { + message.value = ExprValue.fromPartial(object.value); + } return message; }, fromSDK(object: EvalRequest_BindingsEntrySDKType): EvalRequest_BindingsEntry { @@ -927,7 +935,7 @@ function createBaseEvalRequest(): EvalRequest { } export const EvalRequest = { typeUrl: "/google.api.expr.conformance.v1alpha1.EvalRequest", - encode(message: EvalRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EvalRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parsedExpr !== undefined) { ParsedExpr.encode(message.parsedExpr, writer.uint32(10).fork()).ldelim(); } @@ -945,8 +953,8 @@ export const EvalRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalRequest(); while (reader.pos < end) { @@ -975,17 +983,17 @@ export const EvalRequest = { return message; }, fromJSON(object: any): EvalRequest { - return { - parsedExpr: isSet(object.parsedExpr) ? ParsedExpr.fromJSON(object.parsedExpr) : undefined, - checkedExpr: isSet(object.checkedExpr) ? CheckedExpr.fromJSON(object.checkedExpr) : undefined, - bindings: isObject(object.bindings) ? Object.entries(object.bindings).reduce<{ - [key: string]: ExprValue; - }>((acc, [key, value]) => { - acc[key] = ExprValue.fromJSON(value); - return acc; - }, {}) : {}, - container: isSet(object.container) ? String(object.container) : "" - }; + const obj = createBaseEvalRequest(); + if (isSet(object.parsedExpr)) obj.parsedExpr = ParsedExpr.fromJSON(object.parsedExpr); + if (isSet(object.checkedExpr)) obj.checkedExpr = CheckedExpr.fromJSON(object.checkedExpr); + if (isObject(object.bindings)) obj.bindings = Object.entries(object.bindings).reduce<{ + [key: string]: ExprValue; + }>((acc, [key, value]) => { + acc[key] = ExprValue.fromJSON(value); + return acc; + }, {}); + if (isSet(object.container)) obj.container = String(object.container); + return obj; }, toJSON(message: EvalRequest): unknown { const obj: any = {}; @@ -1002,8 +1010,12 @@ export const EvalRequest = { }, fromPartial(object: DeepPartial): EvalRequest { const message = createBaseEvalRequest(); - message.parsedExpr = object.parsedExpr !== undefined && object.parsedExpr !== null ? ParsedExpr.fromPartial(object.parsedExpr) : undefined; - message.checkedExpr = object.checkedExpr !== undefined && object.checkedExpr !== null ? CheckedExpr.fromPartial(object.checkedExpr) : undefined; + if (object.parsedExpr !== undefined && object.parsedExpr !== null) { + message.parsedExpr = ParsedExpr.fromPartial(object.parsedExpr); + } + if (object.checkedExpr !== undefined && object.checkedExpr !== null) { + message.checkedExpr = CheckedExpr.fromPartial(object.checkedExpr); + } message.bindings = Object.entries(object.bindings ?? {}).reduce<{ [key: string]: ExprValue; }>((acc, [key, value]) => { @@ -1091,7 +1103,7 @@ function createBaseEvalResponse(): EvalResponse { } export const EvalResponse = { typeUrl: "/google.api.expr.conformance.v1alpha1.EvalResponse", - encode(message: EvalResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EvalResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.result !== undefined) { ExprValue.encode(message.result, writer.uint32(10).fork()).ldelim(); } @@ -1100,8 +1112,8 @@ export const EvalResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalResponse(); while (reader.pos < end) { @@ -1121,10 +1133,10 @@ export const EvalResponse = { return message; }, fromJSON(object: any): EvalResponse { - return { - result: isSet(object.result) ? ExprValue.fromJSON(object.result) : undefined, - issues: Array.isArray(object?.issues) ? object.issues.map((e: any) => Status.fromJSON(e)) : [] - }; + const obj = createBaseEvalResponse(); + if (isSet(object.result)) obj.result = ExprValue.fromJSON(object.result); + if (Array.isArray(object?.issues)) object.issues.map((e: any) => Status.fromJSON(e)); + return obj; }, toJSON(message: EvalResponse): unknown { const obj: any = {}; @@ -1138,7 +1150,9 @@ export const EvalResponse = { }, fromPartial(object: DeepPartial): EvalResponse { const message = createBaseEvalResponse(); - message.result = object.result !== undefined && object.result !== null ? ExprValue.fromPartial(object.result) : undefined; + if (object.result !== undefined && object.result !== null) { + message.result = ExprValue.fromPartial(object.result); + } message.issues = object.issues?.map(e => Status.fromPartial(e)) || []; return message; }, @@ -1194,25 +1208,25 @@ function createBaseIssueDetails(): IssueDetails { return { severity: 0, position: SourcePosition.fromPartial({}), - id: Long.ZERO + id: BigInt(0) }; } export const IssueDetails = { typeUrl: "/google.api.expr.conformance.v1alpha1.IssueDetails", - encode(message: IssueDetails, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: IssueDetails, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.severity !== 0) { writer.uint32(8).int32(message.severity); } if (message.position !== undefined) { SourcePosition.encode(message.position, writer.uint32(18).fork()).ldelim(); } - if (!message.id.isZero()) { + if (message.id !== BigInt(0)) { writer.uint32(24).int64(message.id); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): IssueDetails { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): IssueDetails { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseIssueDetails(); while (reader.pos < end) { @@ -1225,7 +1239,7 @@ export const IssueDetails = { message.position = SourcePosition.decode(reader, reader.uint32()); break; case 3: - message.id = (reader.int64() as Long); + message.id = reader.int64(); break; default: reader.skipType(tag & 7); @@ -1235,24 +1249,28 @@ export const IssueDetails = { return message; }, fromJSON(object: any): IssueDetails { - return { - severity: isSet(object.severity) ? issueDetails_SeverityFromJSON(object.severity) : -1, - position: isSet(object.position) ? SourcePosition.fromJSON(object.position) : undefined, - id: isSet(object.id) ? Long.fromValue(object.id) : Long.ZERO - }; + const obj = createBaseIssueDetails(); + if (isSet(object.severity)) obj.severity = issueDetails_SeverityFromJSON(object.severity); + if (isSet(object.position)) obj.position = SourcePosition.fromJSON(object.position); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + return obj; }, toJSON(message: IssueDetails): unknown { const obj: any = {}; message.severity !== undefined && (obj.severity = issueDetails_SeverityToJSON(message.severity)); message.position !== undefined && (obj.position = message.position ? SourcePosition.toJSON(message.position) : undefined); - message.id !== undefined && (obj.id = (message.id || Long.ZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): IssueDetails { const message = createBaseIssueDetails(); message.severity = object.severity ?? 0; - message.position = object.position !== undefined && object.position !== null ? SourcePosition.fromPartial(object.position) : undefined; - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.ZERO; + if (object.position !== undefined && object.position !== null) { + message.position = SourcePosition.fromPartial(object.position); + } + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } return message; }, fromSDK(object: IssueDetailsSDKType): IssueDetails { @@ -1273,7 +1291,7 @@ export const IssueDetails = { return { severity: isSet(object.severity) ? issueDetails_SeverityFromJSON(object.severity) : -1, position: object?.position ? SourcePosition.fromAmino(object.position) : undefined, - id: Long.fromString(object.id) + id: BigInt(object.id) }; }, toAmino(message: IssueDetails): IssueDetailsAmino { diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/checked.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/checked.ts index 3feecc0f6e..1ba9af9445 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/checked.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/checked.ts @@ -1,8 +1,8 @@ import { SourceInfo, SourceInfoAmino, SourceInfoSDKType, Expr, ExprAmino, ExprSDKType, Constant, ConstantAmino, ConstantSDKType } from "./syntax"; import { Empty, EmptyAmino, EmptySDKType } from "../../../protobuf/empty"; import { NullValue, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; -import { Long, isSet, DeepPartial, isObject } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; /** CEL primitive types. */ export enum Type_PrimitiveType { @@ -142,7 +142,7 @@ export function type_WellKnownTypeToJSON(object: Type_WellKnownType): string { } } export interface CheckedExpr_ReferenceMapEntry { - key: Long; + key: bigint; value: Reference; } export interface CheckedExpr_ReferenceMapEntryProtoMsg { @@ -158,11 +158,11 @@ export interface CheckedExpr_ReferenceMapEntryAminoMsg { value: CheckedExpr_ReferenceMapEntryAmino; } export interface CheckedExpr_ReferenceMapEntrySDKType { - key: Long; + key: bigint; value: ReferenceSDKType; } export interface CheckedExpr_TypeMapEntry { - key: Long; + key: bigint; value: Type; } export interface CheckedExpr_TypeMapEntryProtoMsg { @@ -178,7 +178,7 @@ export interface CheckedExpr_TypeMapEntryAminoMsg { value: CheckedExpr_TypeMapEntryAmino; } export interface CheckedExpr_TypeMapEntrySDKType { - key: Long; + key: bigint; value: TypeSDKType; } /** A CEL expression which has been successfully type checked. */ @@ -201,7 +201,7 @@ export interface CheckedExpr { * the message. */ referenceMap: { - [key: Long]: Reference; + [key: bigint]: Reference; }; /** * A map from expression ids to types. @@ -211,7 +211,7 @@ export interface CheckedExpr { * space. */ typeMap: { - [key: Long]: Type; + [key: bigint]: Type; }; /** * The source info derived from input that generated the parsed `expr` and @@ -298,10 +298,10 @@ export interface CheckedExprAminoMsg { /** A CEL expression which has been successfully type checked. */ export interface CheckedExprSDKType { reference_map: { - [key: Long]: ReferenceSDKType; + [key: bigint]: ReferenceSDKType; }; type_map: { - [key: Long]: TypeSDKType; + [key: bigint]: TypeSDKType; }; source_info: SourceInfoSDKType; expr_version: string; @@ -900,13 +900,13 @@ export interface ReferenceSDKType { } function createBaseCheckedExpr_ReferenceMapEntry(): CheckedExpr_ReferenceMapEntry { return { - key: Long.ZERO, + key: BigInt(0), value: Reference.fromPartial({}) }; } export const CheckedExpr_ReferenceMapEntry = { - encode(message: CheckedExpr_ReferenceMapEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.key.isZero()) { + encode(message: CheckedExpr_ReferenceMapEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.key !== BigInt(0)) { writer.uint32(8).int64(message.key); } if (message.value !== undefined) { @@ -914,15 +914,15 @@ export const CheckedExpr_ReferenceMapEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckedExpr_ReferenceMapEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckedExpr_ReferenceMapEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckedExpr_ReferenceMapEntry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.key = (reader.int64() as Long); + message.key = reader.int64(); break; case 2: message.value = Reference.decode(reader, reader.uint32()); @@ -935,21 +935,25 @@ export const CheckedExpr_ReferenceMapEntry = { return message; }, fromJSON(object: any): CheckedExpr_ReferenceMapEntry { - return { - key: isSet(object.key) ? Long.fromValue(object.key) : Long.ZERO, - value: isSet(object.value) ? Reference.fromJSON(object.value) : undefined - }; + const obj = createBaseCheckedExpr_ReferenceMapEntry(); + if (isSet(object.key)) obj.key = BigInt(object.key.toString()); + if (isSet(object.value)) obj.value = Reference.fromJSON(object.value); + return obj; }, toJSON(message: CheckedExpr_ReferenceMapEntry): unknown { const obj: any = {}; - message.key !== undefined && (obj.key = (message.key || Long.ZERO).toString()); + message.key !== undefined && (obj.key = (message.key || BigInt(0)).toString()); message.value !== undefined && (obj.value = message.value ? Reference.toJSON(message.value) : undefined); return obj; }, fromPartial(object: DeepPartial): CheckedExpr_ReferenceMapEntry { const message = createBaseCheckedExpr_ReferenceMapEntry(); - message.key = object.key !== undefined && object.key !== null ? Long.fromValue(object.key) : Long.ZERO; - message.value = object.value !== undefined && object.value !== null ? Reference.fromPartial(object.value) : undefined; + if (object.key !== undefined && object.key !== null) { + message.key = BigInt(object.key.toString()); + } + if (object.value !== undefined && object.value !== null) { + message.value = Reference.fromPartial(object.value); + } return message; }, fromSDK(object: CheckedExpr_ReferenceMapEntrySDKType): CheckedExpr_ReferenceMapEntry { @@ -966,7 +970,7 @@ export const CheckedExpr_ReferenceMapEntry = { }, fromAmino(object: CheckedExpr_ReferenceMapEntryAmino): CheckedExpr_ReferenceMapEntry { return { - key: Long.fromString(object.key), + key: BigInt(object.key), value: object?.value ? Reference.fromAmino(object.value) : undefined }; }, @@ -988,13 +992,13 @@ export const CheckedExpr_ReferenceMapEntry = { }; function createBaseCheckedExpr_TypeMapEntry(): CheckedExpr_TypeMapEntry { return { - key: Long.ZERO, + key: BigInt(0), value: Type.fromPartial({}) }; } export const CheckedExpr_TypeMapEntry = { - encode(message: CheckedExpr_TypeMapEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.key.isZero()) { + encode(message: CheckedExpr_TypeMapEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.key !== BigInt(0)) { writer.uint32(8).int64(message.key); } if (message.value !== undefined) { @@ -1002,15 +1006,15 @@ export const CheckedExpr_TypeMapEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckedExpr_TypeMapEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckedExpr_TypeMapEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckedExpr_TypeMapEntry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.key = (reader.int64() as Long); + message.key = reader.int64(); break; case 2: message.value = Type.decode(reader, reader.uint32()); @@ -1023,21 +1027,25 @@ export const CheckedExpr_TypeMapEntry = { return message; }, fromJSON(object: any): CheckedExpr_TypeMapEntry { - return { - key: isSet(object.key) ? Long.fromValue(object.key) : Long.ZERO, - value: isSet(object.value) ? Type.fromJSON(object.value) : undefined - }; + const obj = createBaseCheckedExpr_TypeMapEntry(); + if (isSet(object.key)) obj.key = BigInt(object.key.toString()); + if (isSet(object.value)) obj.value = Type.fromJSON(object.value); + return obj; }, toJSON(message: CheckedExpr_TypeMapEntry): unknown { const obj: any = {}; - message.key !== undefined && (obj.key = (message.key || Long.ZERO).toString()); + message.key !== undefined && (obj.key = (message.key || BigInt(0)).toString()); message.value !== undefined && (obj.value = message.value ? Type.toJSON(message.value) : undefined); return obj; }, fromPartial(object: DeepPartial): CheckedExpr_TypeMapEntry { const message = createBaseCheckedExpr_TypeMapEntry(); - message.key = object.key !== undefined && object.key !== null ? Long.fromValue(object.key) : Long.ZERO; - message.value = object.value !== undefined && object.value !== null ? Type.fromPartial(object.value) : undefined; + if (object.key !== undefined && object.key !== null) { + message.key = BigInt(object.key.toString()); + } + if (object.value !== undefined && object.value !== null) { + message.value = Type.fromPartial(object.value); + } return message; }, fromSDK(object: CheckedExpr_TypeMapEntrySDKType): CheckedExpr_TypeMapEntry { @@ -1054,7 +1062,7 @@ export const CheckedExpr_TypeMapEntry = { }, fromAmino(object: CheckedExpr_TypeMapEntryAmino): CheckedExpr_TypeMapEntry { return { - key: Long.fromString(object.key), + key: BigInt(object.key), value: object?.value ? Type.fromAmino(object.value) : undefined }; }, @@ -1085,7 +1093,7 @@ function createBaseCheckedExpr(): CheckedExpr { } export const CheckedExpr = { typeUrl: "/google.api.expr.v1alpha1.CheckedExpr", - encode(message: CheckedExpr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckedExpr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.referenceMap).forEach(([key, value]) => { CheckedExpr_ReferenceMapEntry.encode({ key: (key as any), @@ -1109,8 +1117,8 @@ export const CheckedExpr = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckedExpr { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckedExpr { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckedExpr(); while (reader.pos < end) { @@ -1145,23 +1153,23 @@ export const CheckedExpr = { return message; }, fromJSON(object: any): CheckedExpr { - return { - referenceMap: isObject(object.referenceMap) ? Object.entries(object.referenceMap).reduce<{ - [key: Long]: Reference; - }>((acc, [key, value]) => { - acc[Number(key)] = Reference.fromJSON(value); - return acc; - }, {}) : {}, - typeMap: isObject(object.typeMap) ? Object.entries(object.typeMap).reduce<{ - [key: Long]: Type; - }>((acc, [key, value]) => { - acc[Number(key)] = Type.fromJSON(value); - return acc; - }, {}) : {}, - sourceInfo: isSet(object.sourceInfo) ? SourceInfo.fromJSON(object.sourceInfo) : undefined, - exprVersion: isSet(object.exprVersion) ? String(object.exprVersion) : "", - expr: isSet(object.expr) ? Expr.fromJSON(object.expr) : undefined - }; + const obj = createBaseCheckedExpr(); + if (isObject(object.referenceMap)) obj.referenceMap = Object.entries(object.referenceMap).reduce<{ + [key: bigint]: Reference; + }>((acc, [key, value]) => { + acc[Number(key)] = Reference.fromJSON(value); + return acc; + }, {}); + if (isObject(object.typeMap)) obj.typeMap = Object.entries(object.typeMap).reduce<{ + [key: bigint]: Type; + }>((acc, [key, value]) => { + acc[Number(key)] = Type.fromJSON(value); + return acc; + }, {}); + if (isSet(object.sourceInfo)) obj.sourceInfo = SourceInfo.fromJSON(object.sourceInfo); + if (isSet(object.exprVersion)) obj.exprVersion = String(object.exprVersion); + if (isSet(object.expr)) obj.expr = Expr.fromJSON(object.expr); + return obj; }, toJSON(message: CheckedExpr): unknown { const obj: any = {}; @@ -1185,7 +1193,7 @@ export const CheckedExpr = { fromPartial(object: DeepPartial): CheckedExpr { const message = createBaseCheckedExpr(); message.referenceMap = Object.entries(object.referenceMap ?? {}).reduce<{ - [key: Long]: Reference; + [key: bigint]: Reference; }>((acc, [key, value]) => { if (value !== undefined) { acc[Number(key)] = Reference.fromPartial(value); @@ -1193,28 +1201,32 @@ export const CheckedExpr = { return acc; }, {}); message.typeMap = Object.entries(object.typeMap ?? {}).reduce<{ - [key: Long]: Type; + [key: bigint]: Type; }>((acc, [key, value]) => { if (value !== undefined) { acc[Number(key)] = Type.fromPartial(value); } return acc; }, {}); - message.sourceInfo = object.sourceInfo !== undefined && object.sourceInfo !== null ? SourceInfo.fromPartial(object.sourceInfo) : undefined; + if (object.sourceInfo !== undefined && object.sourceInfo !== null) { + message.sourceInfo = SourceInfo.fromPartial(object.sourceInfo); + } message.exprVersion = object.exprVersion ?? ""; - message.expr = object.expr !== undefined && object.expr !== null ? Expr.fromPartial(object.expr) : undefined; + if (object.expr !== undefined && object.expr !== null) { + message.expr = Expr.fromPartial(object.expr); + } return message; }, fromSDK(object: CheckedExprSDKType): CheckedExpr { return { referenceMap: isObject(object.reference_map) ? Object.entries(object.reference_map).reduce<{ - [key: Long]: Reference; + [key: bigint]: Reference; }>((acc, [key, value]) => { acc[Number(key)] = Reference.fromSDK(value); return acc; }, {}) : {}, typeMap: isObject(object.type_map) ? Object.entries(object.type_map).reduce<{ - [key: Long]: Type; + [key: bigint]: Type; }>((acc, [key, value]) => { acc[Number(key)] = Type.fromSDK(value); return acc; @@ -1246,13 +1258,13 @@ export const CheckedExpr = { fromAmino(object: CheckedExprAmino): CheckedExpr { return { referenceMap: isObject(object.reference_map) ? Object.entries(object.reference_map).reduce<{ - [key: Long]: Reference; + [key: bigint]: Reference; }>((acc, [key, value]) => { acc[Number(key)] = Reference.fromAmino(value); return acc; }, {}) : {}, typeMap: isObject(object.type_map) ? Object.entries(object.type_map).reduce<{ - [key: Long]: Type; + [key: bigint]: Type; }>((acc, [key, value]) => { acc[Number(key)] = Type.fromAmino(value); return acc; @@ -1316,7 +1328,7 @@ function createBaseType(): Type { } export const Type = { typeUrl: "/google.api.expr.v1alpha1.Type", - encode(message: Type, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Type, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.dyn !== undefined) { Empty.encode(message.dyn, writer.uint32(10).fork()).ldelim(); } @@ -1358,8 +1370,8 @@ export const Type = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Type { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Type { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseType(); while (reader.pos < end) { @@ -1412,21 +1424,21 @@ export const Type = { return message; }, fromJSON(object: any): Type { - return { - dyn: isSet(object.dyn) ? Empty.fromJSON(object.dyn) : undefined, - null: isSet(object.null) ? nullValueFromJSON(object.null) : undefined, - primitive: isSet(object.primitive) ? type_PrimitiveTypeFromJSON(object.primitive) : undefined, - wrapper: isSet(object.wrapper) ? type_PrimitiveTypeFromJSON(object.wrapper) : undefined, - wellKnown: isSet(object.wellKnown) ? type_WellKnownTypeFromJSON(object.wellKnown) : undefined, - listType: isSet(object.listType) ? Type_ListType.fromJSON(object.listType) : undefined, - mapType: isSet(object.mapType) ? Type_MapType.fromJSON(object.mapType) : undefined, - function: isSet(object.function) ? Type_FunctionType.fromJSON(object.function) : undefined, - messageType: isSet(object.messageType) ? String(object.messageType) : undefined, - typeParam: isSet(object.typeParam) ? String(object.typeParam) : undefined, - type: isSet(object.type) ? Type.fromJSON(object.type) : undefined, - error: isSet(object.error) ? Empty.fromJSON(object.error) : undefined, - abstractType: isSet(object.abstractType) ? Type_AbstractType.fromJSON(object.abstractType) : undefined - }; + const obj = createBaseType(); + if (isSet(object.dyn)) obj.dyn = Empty.fromJSON(object.dyn); + if (isSet(object.null)) obj.null = nullValueFromJSON(object.null); + if (isSet(object.primitive)) obj.primitive = type_PrimitiveTypeFromJSON(object.primitive); + if (isSet(object.wrapper)) obj.wrapper = type_PrimitiveTypeFromJSON(object.wrapper); + if (isSet(object.wellKnown)) obj.wellKnown = type_WellKnownTypeFromJSON(object.wellKnown); + if (isSet(object.listType)) obj.listType = Type_ListType.fromJSON(object.listType); + if (isSet(object.mapType)) obj.mapType = Type_MapType.fromJSON(object.mapType); + if (isSet(object.function)) obj.function = Type_FunctionType.fromJSON(object.function); + if (isSet(object.messageType)) obj.messageType = String(object.messageType); + if (isSet(object.typeParam)) obj.typeParam = String(object.typeParam); + if (isSet(object.type)) obj.type = Type.fromJSON(object.type); + if (isSet(object.error)) obj.error = Empty.fromJSON(object.error); + if (isSet(object.abstractType)) obj.abstractType = Type_AbstractType.fromJSON(object.abstractType); + return obj; }, toJSON(message: Type): unknown { const obj: any = {}; @@ -1447,19 +1459,33 @@ export const Type = { }, fromPartial(object: DeepPartial): Type { const message = createBaseType(); - message.dyn = object.dyn !== undefined && object.dyn !== null ? Empty.fromPartial(object.dyn) : undefined; + if (object.dyn !== undefined && object.dyn !== null) { + message.dyn = Empty.fromPartial(object.dyn); + } message.null = object.null ?? undefined; message.primitive = object.primitive ?? undefined; message.wrapper = object.wrapper ?? undefined; message.wellKnown = object.wellKnown ?? undefined; - message.listType = object.listType !== undefined && object.listType !== null ? Type_ListType.fromPartial(object.listType) : undefined; - message.mapType = object.mapType !== undefined && object.mapType !== null ? Type_MapType.fromPartial(object.mapType) : undefined; - message.function = object.function !== undefined && object.function !== null ? Type_FunctionType.fromPartial(object.function) : undefined; + if (object.listType !== undefined && object.listType !== null) { + message.listType = Type_ListType.fromPartial(object.listType); + } + if (object.mapType !== undefined && object.mapType !== null) { + message.mapType = Type_MapType.fromPartial(object.mapType); + } + if (object.function !== undefined && object.function !== null) { + message.function = Type_FunctionType.fromPartial(object.function); + } message.messageType = object.messageType ?? undefined; message.typeParam = object.typeParam ?? undefined; - message.type = object.type !== undefined && object.type !== null ? Type.fromPartial(object.type) : undefined; - message.error = object.error !== undefined && object.error !== null ? Empty.fromPartial(object.error) : undefined; - message.abstractType = object.abstractType !== undefined && object.abstractType !== null ? Type_AbstractType.fromPartial(object.abstractType) : undefined; + if (object.type !== undefined && object.type !== null) { + message.type = Type.fromPartial(object.type); + } + if (object.error !== undefined && object.error !== null) { + message.error = Empty.fromPartial(object.error); + } + if (object.abstractType !== undefined && object.abstractType !== null) { + message.abstractType = Type_AbstractType.fromPartial(object.abstractType); + } return message; }, fromSDK(object: TypeSDKType): Type { @@ -1553,14 +1579,14 @@ function createBaseType_ListType(): Type_ListType { } export const Type_ListType = { typeUrl: "/google.api.expr.v1alpha1.ListType", - encode(message: Type_ListType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Type_ListType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.elemType !== undefined) { Type.encode(message.elemType, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Type_ListType { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Type_ListType { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseType_ListType(); while (reader.pos < end) { @@ -1577,9 +1603,9 @@ export const Type_ListType = { return message; }, fromJSON(object: any): Type_ListType { - return { - elemType: isSet(object.elemType) ? Type.fromJSON(object.elemType) : undefined - }; + const obj = createBaseType_ListType(); + if (isSet(object.elemType)) obj.elemType = Type.fromJSON(object.elemType); + return obj; }, toJSON(message: Type_ListType): unknown { const obj: any = {}; @@ -1588,7 +1614,9 @@ export const Type_ListType = { }, fromPartial(object: DeepPartial): Type_ListType { const message = createBaseType_ListType(); - message.elemType = object.elemType !== undefined && object.elemType !== null ? Type.fromPartial(object.elemType) : undefined; + if (object.elemType !== undefined && object.elemType !== null) { + message.elemType = Type.fromPartial(object.elemType); + } return message; }, fromSDK(object: Type_ListTypeSDKType): Type_ListType { @@ -1635,7 +1663,7 @@ function createBaseType_MapType(): Type_MapType { } export const Type_MapType = { typeUrl: "/google.api.expr.v1alpha1.MapType", - encode(message: Type_MapType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Type_MapType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.keyType !== undefined) { Type.encode(message.keyType, writer.uint32(10).fork()).ldelim(); } @@ -1644,8 +1672,8 @@ export const Type_MapType = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Type_MapType { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Type_MapType { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseType_MapType(); while (reader.pos < end) { @@ -1665,10 +1693,10 @@ export const Type_MapType = { return message; }, fromJSON(object: any): Type_MapType { - return { - keyType: isSet(object.keyType) ? Type.fromJSON(object.keyType) : undefined, - valueType: isSet(object.valueType) ? Type.fromJSON(object.valueType) : undefined - }; + const obj = createBaseType_MapType(); + if (isSet(object.keyType)) obj.keyType = Type.fromJSON(object.keyType); + if (isSet(object.valueType)) obj.valueType = Type.fromJSON(object.valueType); + return obj; }, toJSON(message: Type_MapType): unknown { const obj: any = {}; @@ -1678,8 +1706,12 @@ export const Type_MapType = { }, fromPartial(object: DeepPartial): Type_MapType { const message = createBaseType_MapType(); - message.keyType = object.keyType !== undefined && object.keyType !== null ? Type.fromPartial(object.keyType) : undefined; - message.valueType = object.valueType !== undefined && object.valueType !== null ? Type.fromPartial(object.valueType) : undefined; + if (object.keyType !== undefined && object.keyType !== null) { + message.keyType = Type.fromPartial(object.keyType); + } + if (object.valueType !== undefined && object.valueType !== null) { + message.valueType = Type.fromPartial(object.valueType); + } return message; }, fromSDK(object: Type_MapTypeSDKType): Type_MapType { @@ -1730,7 +1762,7 @@ function createBaseType_FunctionType(): Type_FunctionType { } export const Type_FunctionType = { typeUrl: "/google.api.expr.v1alpha1.FunctionType", - encode(message: Type_FunctionType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Type_FunctionType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.resultType !== undefined) { Type.encode(message.resultType, writer.uint32(10).fork()).ldelim(); } @@ -1739,8 +1771,8 @@ export const Type_FunctionType = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Type_FunctionType { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Type_FunctionType { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseType_FunctionType(); while (reader.pos < end) { @@ -1760,10 +1792,10 @@ export const Type_FunctionType = { return message; }, fromJSON(object: any): Type_FunctionType { - return { - resultType: isSet(object.resultType) ? Type.fromJSON(object.resultType) : undefined, - argTypes: Array.isArray(object?.argTypes) ? object.argTypes.map((e: any) => Type.fromJSON(e)) : [] - }; + const obj = createBaseType_FunctionType(); + if (isSet(object.resultType)) obj.resultType = Type.fromJSON(object.resultType); + if (Array.isArray(object?.argTypes)) object.argTypes.map((e: any) => Type.fromJSON(e)); + return obj; }, toJSON(message: Type_FunctionType): unknown { const obj: any = {}; @@ -1777,7 +1809,9 @@ export const Type_FunctionType = { }, fromPartial(object: DeepPartial): Type_FunctionType { const message = createBaseType_FunctionType(); - message.resultType = object.resultType !== undefined && object.resultType !== null ? Type.fromPartial(object.resultType) : undefined; + if (object.resultType !== undefined && object.resultType !== null) { + message.resultType = Type.fromPartial(object.resultType); + } message.argTypes = object.argTypes?.map(e => Type.fromPartial(e)) || []; return message; }, @@ -1837,7 +1871,7 @@ function createBaseType_AbstractType(): Type_AbstractType { } export const Type_AbstractType = { typeUrl: "/google.api.expr.v1alpha1.AbstractType", - encode(message: Type_AbstractType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Type_AbstractType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1846,8 +1880,8 @@ export const Type_AbstractType = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Type_AbstractType { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Type_AbstractType { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseType_AbstractType(); while (reader.pos < end) { @@ -1867,10 +1901,10 @@ export const Type_AbstractType = { return message; }, fromJSON(object: any): Type_AbstractType { - return { - name: isSet(object.name) ? String(object.name) : "", - parameterTypes: Array.isArray(object?.parameterTypes) ? object.parameterTypes.map((e: any) => Type.fromJSON(e)) : [] - }; + const obj = createBaseType_AbstractType(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.parameterTypes)) object.parameterTypes.map((e: any) => Type.fromJSON(e)); + return obj; }, toJSON(message: Type_AbstractType): unknown { const obj: any = {}; @@ -1945,7 +1979,7 @@ function createBaseDecl(): Decl { } export const Decl = { typeUrl: "/google.api.expr.v1alpha1.Decl", - encode(message: Decl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Decl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1957,8 +1991,8 @@ export const Decl = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Decl { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Decl { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecl(); while (reader.pos < end) { @@ -1981,11 +2015,11 @@ export const Decl = { return message; }, fromJSON(object: any): Decl { - return { - name: isSet(object.name) ? String(object.name) : "", - ident: isSet(object.ident) ? Decl_IdentDecl.fromJSON(object.ident) : undefined, - function: isSet(object.function) ? Decl_FunctionDecl.fromJSON(object.function) : undefined - }; + const obj = createBaseDecl(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.ident)) obj.ident = Decl_IdentDecl.fromJSON(object.ident); + if (isSet(object.function)) obj.function = Decl_FunctionDecl.fromJSON(object.function); + return obj; }, toJSON(message: Decl): unknown { const obj: any = {}; @@ -1997,8 +2031,12 @@ export const Decl = { fromPartial(object: DeepPartial): Decl { const message = createBaseDecl(); message.name = object.name ?? ""; - message.ident = object.ident !== undefined && object.ident !== null ? Decl_IdentDecl.fromPartial(object.ident) : undefined; - message.function = object.function !== undefined && object.function !== null ? Decl_FunctionDecl.fromPartial(object.function) : undefined; + if (object.ident !== undefined && object.ident !== null) { + message.ident = Decl_IdentDecl.fromPartial(object.ident); + } + if (object.function !== undefined && object.function !== null) { + message.function = Decl_FunctionDecl.fromPartial(object.function); + } return message; }, fromSDK(object: DeclSDKType): Decl { @@ -2054,7 +2092,7 @@ function createBaseDecl_IdentDecl(): Decl_IdentDecl { } export const Decl_IdentDecl = { typeUrl: "/google.api.expr.v1alpha1.IdentDecl", - encode(message: Decl_IdentDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Decl_IdentDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== undefined) { Type.encode(message.type, writer.uint32(10).fork()).ldelim(); } @@ -2066,8 +2104,8 @@ export const Decl_IdentDecl = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Decl_IdentDecl { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Decl_IdentDecl { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecl_IdentDecl(); while (reader.pos < end) { @@ -2090,11 +2128,11 @@ export const Decl_IdentDecl = { return message; }, fromJSON(object: any): Decl_IdentDecl { - return { - type: isSet(object.type) ? Type.fromJSON(object.type) : undefined, - value: isSet(object.value) ? Constant.fromJSON(object.value) : undefined, - doc: isSet(object.doc) ? String(object.doc) : "" - }; + const obj = createBaseDecl_IdentDecl(); + if (isSet(object.type)) obj.type = Type.fromJSON(object.type); + if (isSet(object.value)) obj.value = Constant.fromJSON(object.value); + if (isSet(object.doc)) obj.doc = String(object.doc); + return obj; }, toJSON(message: Decl_IdentDecl): unknown { const obj: any = {}; @@ -2105,8 +2143,12 @@ export const Decl_IdentDecl = { }, fromPartial(object: DeepPartial): Decl_IdentDecl { const message = createBaseDecl_IdentDecl(); - message.type = object.type !== undefined && object.type !== null ? Type.fromPartial(object.type) : undefined; - message.value = object.value !== undefined && object.value !== null ? Constant.fromPartial(object.value) : undefined; + if (object.type !== undefined && object.type !== null) { + message.type = Type.fromPartial(object.type); + } + if (object.value !== undefined && object.value !== null) { + message.value = Constant.fromPartial(object.value); + } message.doc = object.doc ?? ""; return message; }, @@ -2161,14 +2203,14 @@ function createBaseDecl_FunctionDecl(): Decl_FunctionDecl { } export const Decl_FunctionDecl = { typeUrl: "/google.api.expr.v1alpha1.FunctionDecl", - encode(message: Decl_FunctionDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Decl_FunctionDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overloads) { Decl_FunctionDecl_Overload.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Decl_FunctionDecl { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Decl_FunctionDecl { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecl_FunctionDecl(); while (reader.pos < end) { @@ -2185,9 +2227,9 @@ export const Decl_FunctionDecl = { return message; }, fromJSON(object: any): Decl_FunctionDecl { - return { - overloads: Array.isArray(object?.overloads) ? object.overloads.map((e: any) => Decl_FunctionDecl_Overload.fromJSON(e)) : [] - }; + const obj = createBaseDecl_FunctionDecl(); + if (Array.isArray(object?.overloads)) object.overloads.map((e: any) => Decl_FunctionDecl_Overload.fromJSON(e)); + return obj; }, toJSON(message: Decl_FunctionDecl): unknown { const obj: any = {}; @@ -2259,7 +2301,7 @@ function createBaseDecl_FunctionDecl_Overload(): Decl_FunctionDecl_Overload { } export const Decl_FunctionDecl_Overload = { typeUrl: "/google.api.expr.v1alpha1.Overload", - encode(message: Decl_FunctionDecl_Overload, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Decl_FunctionDecl_Overload, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.overloadId !== "") { writer.uint32(10).string(message.overloadId); } @@ -2280,8 +2322,8 @@ export const Decl_FunctionDecl_Overload = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Decl_FunctionDecl_Overload { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Decl_FunctionDecl_Overload { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecl_FunctionDecl_Overload(); while (reader.pos < end) { @@ -2313,14 +2355,14 @@ export const Decl_FunctionDecl_Overload = { return message; }, fromJSON(object: any): Decl_FunctionDecl_Overload { - return { - overloadId: isSet(object.overloadId) ? String(object.overloadId) : "", - params: Array.isArray(object?.params) ? object.params.map((e: any) => Type.fromJSON(e)) : [], - typeParams: Array.isArray(object?.typeParams) ? object.typeParams.map((e: any) => String(e)) : [], - resultType: isSet(object.resultType) ? Type.fromJSON(object.resultType) : undefined, - isInstanceFunction: isSet(object.isInstanceFunction) ? Boolean(object.isInstanceFunction) : false, - doc: isSet(object.doc) ? String(object.doc) : "" - }; + const obj = createBaseDecl_FunctionDecl_Overload(); + if (isSet(object.overloadId)) obj.overloadId = String(object.overloadId); + if (Array.isArray(object?.params)) object.params.map((e: any) => Type.fromJSON(e)); + if (Array.isArray(object?.typeParams)) object.typeParams.map((e: any) => String(e)); + if (isSet(object.resultType)) obj.resultType = Type.fromJSON(object.resultType); + if (isSet(object.isInstanceFunction)) obj.isInstanceFunction = Boolean(object.isInstanceFunction); + if (isSet(object.doc)) obj.doc = String(object.doc); + return obj; }, toJSON(message: Decl_FunctionDecl_Overload): unknown { const obj: any = {}; @@ -2345,7 +2387,9 @@ export const Decl_FunctionDecl_Overload = { message.overloadId = object.overloadId ?? ""; message.params = object.params?.map(e => Type.fromPartial(e)) || []; message.typeParams = object.typeParams?.map(e => e) || []; - message.resultType = object.resultType !== undefined && object.resultType !== null ? Type.fromPartial(object.resultType) : undefined; + if (object.resultType !== undefined && object.resultType !== null) { + message.resultType = Type.fromPartial(object.resultType); + } message.isInstanceFunction = object.isInstanceFunction ?? false; message.doc = object.doc ?? ""; return message; @@ -2431,7 +2475,7 @@ function createBaseReference(): Reference { } export const Reference = { typeUrl: "/google.api.expr.v1alpha1.Reference", - encode(message: Reference, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Reference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2443,8 +2487,8 @@ export const Reference = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Reference { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Reference { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseReference(); while (reader.pos < end) { @@ -2467,11 +2511,11 @@ export const Reference = { return message; }, fromJSON(object: any): Reference { - return { - name: isSet(object.name) ? String(object.name) : "", - overloadId: Array.isArray(object?.overloadId) ? object.overloadId.map((e: any) => String(e)) : [], - value: isSet(object.value) ? Constant.fromJSON(object.value) : undefined - }; + const obj = createBaseReference(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.overloadId)) object.overloadId.map((e: any) => String(e)); + if (isSet(object.value)) obj.value = Constant.fromJSON(object.value); + return obj; }, toJSON(message: Reference): unknown { const obj: any = {}; @@ -2488,7 +2532,9 @@ export const Reference = { const message = createBaseReference(); message.name = object.name ?? ""; message.overloadId = object.overloadId?.map(e => e) || []; - message.value = object.value !== undefined && object.value !== null ? Constant.fromPartial(object.value) : undefined; + if (object.value !== undefined && object.value !== null) { + message.value = Constant.fromPartial(object.value); + } return message; }, fromSDK(object: ReferenceSDKType): Reference { diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/eval.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/eval.ts index 2fed27afab..a0e1364114 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/eval.ts @@ -1,7 +1,7 @@ import { Value, ValueAmino, ValueSDKType } from "./value"; import { Status, StatusAmino, StatusSDKType } from "../../../rpc/status"; -import { Long, DeepPartial, isSet } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { DeepPartial, isSet } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; /** * The state of an evaluation. @@ -55,9 +55,9 @@ export interface EvalStateSDKType { /** A single evalution result. */ export interface EvalState_Result { /** The id of the expression this result if for. */ - expr: Long; + expr: bigint; /** The index in `values` of the resulting value. */ - value: Long; + value: bigint; } export interface EvalState_ResultProtoMsg { typeUrl: "/google.api.expr.v1alpha1.Result"; @@ -76,8 +76,8 @@ export interface EvalState_ResultAminoMsg { } /** A single evalution result. */ export interface EvalState_ResultSDKType { - expr: Long; - value: Long; + expr: bigint; + value: bigint; } /** The value of an evaluated expression. */ export interface ExprValue { @@ -236,7 +236,7 @@ export interface ErrorSetSDKType { */ export interface UnknownSet { /** The ids of the expressions with unknown values. */ - exprs: Long[]; + exprs: bigint[]; } export interface UnknownSetProtoMsg { typeUrl: "/google.api.expr.v1alpha1.UnknownSet"; @@ -261,7 +261,7 @@ export interface UnknownSetAminoMsg { * The unknowns included depend on the context. See `ExprValue.unknown`. */ export interface UnknownSetSDKType { - exprs: Long[]; + exprs: bigint[]; } function createBaseEvalState(): EvalState { return { @@ -271,7 +271,7 @@ function createBaseEvalState(): EvalState { } export const EvalState = { typeUrl: "/google.api.expr.v1alpha1.EvalState", - encode(message: EvalState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EvalState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { ExprValue.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -280,8 +280,8 @@ export const EvalState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalState(); while (reader.pos < end) { @@ -301,10 +301,10 @@ export const EvalState = { return message; }, fromJSON(object: any): EvalState { - return { - values: Array.isArray(object?.values) ? object.values.map((e: any) => ExprValue.fromJSON(e)) : [], - results: Array.isArray(object?.results) ? object.results.map((e: any) => EvalState_Result.fromJSON(e)) : [] - }; + const obj = createBaseEvalState(); + if (Array.isArray(object?.values)) object.values.map((e: any) => ExprValue.fromJSON(e)); + if (Array.isArray(object?.results)) object.results.map((e: any) => EvalState_Result.fromJSON(e)); + return obj; }, toJSON(message: EvalState): unknown { const obj: any = {}; @@ -384,33 +384,33 @@ export const EvalState = { }; function createBaseEvalState_Result(): EvalState_Result { return { - expr: Long.ZERO, - value: Long.ZERO + expr: BigInt(0), + value: BigInt(0) }; } export const EvalState_Result = { typeUrl: "/google.api.expr.v1alpha1.Result", - encode(message: EvalState_Result, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.expr.isZero()) { + encode(message: EvalState_Result, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.expr !== BigInt(0)) { writer.uint32(8).int64(message.expr); } - if (!message.value.isZero()) { + if (message.value !== BigInt(0)) { writer.uint32(16).int64(message.value); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalState_Result { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalState_Result { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalState_Result(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.expr = (reader.int64() as Long); + message.expr = reader.int64(); break; case 2: - message.value = (reader.int64() as Long); + message.value = reader.int64(); break; default: reader.skipType(tag & 7); @@ -420,21 +420,25 @@ export const EvalState_Result = { return message; }, fromJSON(object: any): EvalState_Result { - return { - expr: isSet(object.expr) ? Long.fromValue(object.expr) : Long.ZERO, - value: isSet(object.value) ? Long.fromValue(object.value) : Long.ZERO - }; + const obj = createBaseEvalState_Result(); + if (isSet(object.expr)) obj.expr = BigInt(object.expr.toString()); + if (isSet(object.value)) obj.value = BigInt(object.value.toString()); + return obj; }, toJSON(message: EvalState_Result): unknown { const obj: any = {}; - message.expr !== undefined && (obj.expr = (message.expr || Long.ZERO).toString()); - message.value !== undefined && (obj.value = (message.value || Long.ZERO).toString()); + message.expr !== undefined && (obj.expr = (message.expr || BigInt(0)).toString()); + message.value !== undefined && (obj.value = (message.value || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): EvalState_Result { const message = createBaseEvalState_Result(); - message.expr = object.expr !== undefined && object.expr !== null ? Long.fromValue(object.expr) : Long.ZERO; - message.value = object.value !== undefined && object.value !== null ? Long.fromValue(object.value) : Long.ZERO; + if (object.expr !== undefined && object.expr !== null) { + message.expr = BigInt(object.expr.toString()); + } + if (object.value !== undefined && object.value !== null) { + message.value = BigInt(object.value.toString()); + } return message; }, fromSDK(object: EvalState_ResultSDKType): EvalState_Result { @@ -451,8 +455,8 @@ export const EvalState_Result = { }, fromAmino(object: EvalState_ResultAmino): EvalState_Result { return { - expr: Long.fromString(object.expr), - value: Long.fromString(object.value) + expr: BigInt(object.expr), + value: BigInt(object.value) }; }, toAmino(message: EvalState_Result): EvalState_ResultAmino { @@ -486,7 +490,7 @@ function createBaseExprValue(): ExprValue { } export const ExprValue = { typeUrl: "/google.api.expr.v1alpha1.ExprValue", - encode(message: ExprValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ExprValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== undefined) { Value.encode(message.value, writer.uint32(10).fork()).ldelim(); } @@ -498,8 +502,8 @@ export const ExprValue = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ExprValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ExprValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExprValue(); while (reader.pos < end) { @@ -522,11 +526,11 @@ export const ExprValue = { return message; }, fromJSON(object: any): ExprValue { - return { - value: isSet(object.value) ? Value.fromJSON(object.value) : undefined, - error: isSet(object.error) ? ErrorSet.fromJSON(object.error) : undefined, - unknown: isSet(object.unknown) ? UnknownSet.fromJSON(object.unknown) : undefined - }; + const obj = createBaseExprValue(); + if (isSet(object.value)) obj.value = Value.fromJSON(object.value); + if (isSet(object.error)) obj.error = ErrorSet.fromJSON(object.error); + if (isSet(object.unknown)) obj.unknown = UnknownSet.fromJSON(object.unknown); + return obj; }, toJSON(message: ExprValue): unknown { const obj: any = {}; @@ -537,9 +541,15 @@ export const ExprValue = { }, fromPartial(object: DeepPartial): ExprValue { const message = createBaseExprValue(); - message.value = object.value !== undefined && object.value !== null ? Value.fromPartial(object.value) : undefined; - message.error = object.error !== undefined && object.error !== null ? ErrorSet.fromPartial(object.error) : undefined; - message.unknown = object.unknown !== undefined && object.unknown !== null ? UnknownSet.fromPartial(object.unknown) : undefined; + if (object.value !== undefined && object.value !== null) { + message.value = Value.fromPartial(object.value); + } + if (object.error !== undefined && object.error !== null) { + message.error = ErrorSet.fromPartial(object.error); + } + if (object.unknown !== undefined && object.unknown !== null) { + message.unknown = UnknownSet.fromPartial(object.unknown); + } return message; }, fromSDK(object: ExprValueSDKType): ExprValue { @@ -593,14 +603,14 @@ function createBaseErrorSet(): ErrorSet { } export const ErrorSet = { typeUrl: "/google.api.expr.v1alpha1.ErrorSet", - encode(message: ErrorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ErrorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.errors) { Status.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ErrorSet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ErrorSet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseErrorSet(); while (reader.pos < end) { @@ -617,9 +627,9 @@ export const ErrorSet = { return message; }, fromJSON(object: any): ErrorSet { - return { - errors: Array.isArray(object?.errors) ? object.errors.map((e: any) => Status.fromJSON(e)) : [] - }; + const obj = createBaseErrorSet(); + if (Array.isArray(object?.errors)) object.errors.map((e: any) => Status.fromJSON(e)); + return obj; }, toJSON(message: ErrorSet): unknown { const obj: any = {}; @@ -686,7 +696,7 @@ function createBaseUnknownSet(): UnknownSet { } export const UnknownSet = { typeUrl: "/google.api.expr.v1alpha1.UnknownSet", - encode(message: UnknownSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UnknownSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.exprs) { writer.int64(v); @@ -694,8 +704,8 @@ export const UnknownSet = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UnknownSet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UnknownSet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUnknownSet(); while (reader.pos < end) { @@ -705,10 +715,10 @@ export const UnknownSet = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.exprs.push((reader.int64() as Long)); + message.exprs.push(reader.int64()); } } else { - message.exprs.push((reader.int64() as Long)); + message.exprs.push(reader.int64()); } break; default: @@ -719,14 +729,14 @@ export const UnknownSet = { return message; }, fromJSON(object: any): UnknownSet { - return { - exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => Long.fromValue(e)) : [] - }; + const obj = createBaseUnknownSet(); + if (Array.isArray(object?.exprs)) object.exprs.map((e: any) => BigInt(e.toString())); + return obj; }, toJSON(message: UnknownSet): unknown { const obj: any = {}; if (message.exprs) { - obj.exprs = message.exprs.map(e => (e || Long.ZERO).toString()); + obj.exprs = message.exprs.map(e => (e || BigInt(0)).toString()); } else { obj.exprs = []; } @@ -734,7 +744,7 @@ export const UnknownSet = { }, fromPartial(object: DeepPartial): UnknownSet { const message = createBaseUnknownSet(); - message.exprs = object.exprs?.map(e => Long.fromValue(e)) || []; + message.exprs = object.exprs?.map(e => BigInt(e.toString())) || []; return message; }, fromSDK(object: UnknownSetSDKType): UnknownSet { @@ -753,13 +763,13 @@ export const UnknownSet = { }, fromAmino(object: UnknownSetAmino): UnknownSet { return { - exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => e) : [] + exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => BigInt(e)) : [] }; }, toAmino(message: UnknownSet): UnknownSetAmino { const obj: any = {}; if (message.exprs) { - obj.exprs = message.exprs.map(e => e); + obj.exprs = message.exprs.map(e => e.toString()); } else { obj.exprs = []; } diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/explain.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/explain.ts index acaf777e53..e124884866 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/explain.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/explain.ts @@ -1,6 +1,6 @@ import { Value, ValueAmino, ValueSDKType } from "./value"; -import { Long, DeepPartial, isSet } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { DeepPartial, isSet } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; /** * Values of intermediate expressions produced when evaluating expression. @@ -66,7 +66,7 @@ export interface ExplainSDKType { /** ID and value index of one step. */ export interface Explain_ExprStep { /** ID of corresponding Expr node. */ - id: Long; + id: bigint; /** Index of the value in the values list. */ valueIndex: number; } @@ -87,7 +87,7 @@ export interface Explain_ExprStepAminoMsg { } /** ID and value index of one step. */ export interface Explain_ExprStepSDKType { - id: Long; + id: bigint; value_index: number; } function createBaseExplain(): Explain { @@ -98,7 +98,7 @@ function createBaseExplain(): Explain { } export const Explain = { typeUrl: "/google.api.expr.v1alpha1.Explain", - encode(message: Explain, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Explain, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -107,8 +107,8 @@ export const Explain = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Explain { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Explain { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExplain(); while (reader.pos < end) { @@ -128,10 +128,10 @@ export const Explain = { return message; }, fromJSON(object: any): Explain { - return { - values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromJSON(e)) : [], - exprSteps: Array.isArray(object?.exprSteps) ? object.exprSteps.map((e: any) => Explain_ExprStep.fromJSON(e)) : [] - }; + const obj = createBaseExplain(); + if (Array.isArray(object?.values)) object.values.map((e: any) => Value.fromJSON(e)); + if (Array.isArray(object?.exprSteps)) object.exprSteps.map((e: any) => Explain_ExprStep.fromJSON(e)); + return obj; }, toJSON(message: Explain): unknown { const obj: any = {}; @@ -211,14 +211,14 @@ export const Explain = { }; function createBaseExplain_ExprStep(): Explain_ExprStep { return { - id: Long.ZERO, + id: BigInt(0), valueIndex: 0 }; } export const Explain_ExprStep = { typeUrl: "/google.api.expr.v1alpha1.ExprStep", - encode(message: Explain_ExprStep, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.id.isZero()) { + encode(message: Explain_ExprStep, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.id !== BigInt(0)) { writer.uint32(8).int64(message.id); } if (message.valueIndex !== 0) { @@ -226,15 +226,15 @@ export const Explain_ExprStep = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Explain_ExprStep { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Explain_ExprStep { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExplain_ExprStep(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.id = (reader.int64() as Long); + message.id = reader.int64(); break; case 2: message.valueIndex = reader.int32(); @@ -247,20 +247,22 @@ export const Explain_ExprStep = { return message; }, fromJSON(object: any): Explain_ExprStep { - return { - id: isSet(object.id) ? Long.fromValue(object.id) : Long.ZERO, - valueIndex: isSet(object.valueIndex) ? Number(object.valueIndex) : 0 - }; + const obj = createBaseExplain_ExprStep(); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + if (isSet(object.valueIndex)) obj.valueIndex = Number(object.valueIndex); + return obj; }, toJSON(message: Explain_ExprStep): unknown { const obj: any = {}; - message.id !== undefined && (obj.id = (message.id || Long.ZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); message.valueIndex !== undefined && (obj.valueIndex = Math.round(message.valueIndex)); return obj; }, fromPartial(object: DeepPartial): Explain_ExprStep { const message = createBaseExplain_ExprStep(); - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.ZERO; + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } message.valueIndex = object.valueIndex ?? 0; return message; }, @@ -278,7 +280,7 @@ export const Explain_ExprStep = { }, fromAmino(object: Explain_ExprStepAmino): Explain_ExprStep { return { - id: Long.fromString(object.id), + id: BigInt(object.id), valueIndex: object.value_index }; }, diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/syntax.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/syntax.ts index 3096e87e9b..66d745e5f3 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/syntax.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/syntax.ts @@ -1,8 +1,8 @@ import { NullValue, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; import { Duration, DurationAmino, DurationSDKType } from "../../../protobuf/duration"; import { Timestamp } from "../../../protobuf/timestamp"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp, bytesFromBase64, base64FromBytes, isObject } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp, bytesFromBase64, base64FromBytes, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; /** An expression together with source information as returned by the parser. */ export interface ParsedExpr { @@ -54,7 +54,7 @@ export interface Expr { * given expression tree. This is used to associate type information and other * attributes to a node in the parse tree. */ - id: Long; + id: bigint; /** A literal expression. */ constExpr?: Constant; /** An identifier expression. */ @@ -135,7 +135,7 @@ export interface ExprAminoMsg { * the function declaration `startsWith`. */ export interface ExprSDKType { - id: Long; + id: bigint; const_expr?: ConstantSDKType; ident_expr?: Expr_IdentSDKType; select_expr?: Expr_SelectSDKType; @@ -381,7 +381,7 @@ export interface Expr_CreateStruct_Entry { * in a given expression tree. This is used to associate type * information and other attributes to the node. */ - id: Long; + id: bigint; /** The field key for a message creator statement. */ fieldKey?: string; /** The key expression for a map creation statement. */ @@ -414,7 +414,7 @@ export interface Expr_CreateStruct_EntryAminoMsg { } /** Represents an entry. */ export interface Expr_CreateStruct_EntrySDKType { - id: Long; + id: bigint; field_key?: string; map_key?: ExprSDKType; value: ExprSDKType; @@ -599,9 +599,9 @@ export interface Constant { /** boolean value. */ boolValue?: boolean; /** int64 value. */ - int64Value?: Long; + int64Value?: bigint; /** uint64 value. */ - uint64Value?: Long; + uint64Value?: bigint; /** double value. */ doubleValue?: number; /** string value. */ @@ -694,8 +694,8 @@ export interface ConstantAminoMsg { export interface ConstantSDKType { null_value?: NullValue; bool_value?: boolean; - int64_value?: Long; - uint64_value?: Long; + int64_value?: bigint; + uint64_value?: bigint; double_value?: number; string_value?: string; bytes_value?: Uint8Array; @@ -705,7 +705,7 @@ export interface ConstantSDKType { timestamp_value?: Date; } export interface SourceInfo_PositionsEntry { - key: Long; + key: bigint; value: number; } export interface SourceInfo_PositionsEntryProtoMsg { @@ -721,11 +721,11 @@ export interface SourceInfo_PositionsEntryAminoMsg { value: SourceInfo_PositionsEntryAmino; } export interface SourceInfo_PositionsEntrySDKType { - key: Long; + key: bigint; value: number; } export interface SourceInfo_MacroCallsEntry { - key: Long; + key: bigint; value: Expr; } export interface SourceInfo_MacroCallsEntryProtoMsg { @@ -741,7 +741,7 @@ export interface SourceInfo_MacroCallsEntryAminoMsg { value: SourceInfo_MacroCallsEntryAmino; } export interface SourceInfo_MacroCallsEntrySDKType { - key: Long; + key: bigint; value: ExprSDKType; } /** Source information collected at parse time. */ @@ -770,7 +770,7 @@ export interface SourceInfo { * within the source. */ positions: { - [key: Long]: number; + [key: bigint]: number; }; /** * A map from the parse node id where a macro replacement was made to the @@ -783,7 +783,7 @@ export interface SourceInfo { * value is the call `Expr` that was replaced. */ macroCalls: { - [key: Long]: Expr; + [key: bigint]: Expr; }; } export interface SourceInfoProtoMsg { @@ -842,10 +842,10 @@ export interface SourceInfoSDKType { location: string; line_offsets: number[]; positions: { - [key: Long]: number; + [key: bigint]: number; }; macro_calls: { - [key: Long]: ExprSDKType; + [key: bigint]: ExprSDKType; }; } /** A specific position in source. */ @@ -905,7 +905,7 @@ function createBaseParsedExpr(): ParsedExpr { } export const ParsedExpr = { typeUrl: "/google.api.expr.v1alpha1.ParsedExpr", - encode(message: ParsedExpr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ParsedExpr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== undefined) { Expr.encode(message.expr, writer.uint32(18).fork()).ldelim(); } @@ -914,8 +914,8 @@ export const ParsedExpr = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ParsedExpr { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ParsedExpr { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParsedExpr(); while (reader.pos < end) { @@ -935,10 +935,10 @@ export const ParsedExpr = { return message; }, fromJSON(object: any): ParsedExpr { - return { - expr: isSet(object.expr) ? Expr.fromJSON(object.expr) : undefined, - sourceInfo: isSet(object.sourceInfo) ? SourceInfo.fromJSON(object.sourceInfo) : undefined - }; + const obj = createBaseParsedExpr(); + if (isSet(object.expr)) obj.expr = Expr.fromJSON(object.expr); + if (isSet(object.sourceInfo)) obj.sourceInfo = SourceInfo.fromJSON(object.sourceInfo); + return obj; }, toJSON(message: ParsedExpr): unknown { const obj: any = {}; @@ -948,8 +948,12 @@ export const ParsedExpr = { }, fromPartial(object: DeepPartial): ParsedExpr { const message = createBaseParsedExpr(); - message.expr = object.expr !== undefined && object.expr !== null ? Expr.fromPartial(object.expr) : undefined; - message.sourceInfo = object.sourceInfo !== undefined && object.sourceInfo !== null ? SourceInfo.fromPartial(object.sourceInfo) : undefined; + if (object.expr !== undefined && object.expr !== null) { + message.expr = Expr.fromPartial(object.expr); + } + if (object.sourceInfo !== undefined && object.sourceInfo !== null) { + message.sourceInfo = SourceInfo.fromPartial(object.sourceInfo); + } return message; }, fromSDK(object: ParsedExprSDKType): ParsedExpr { @@ -994,7 +998,7 @@ export const ParsedExpr = { }; function createBaseExpr(): Expr { return { - id: Long.ZERO, + id: BigInt(0), constExpr: undefined, identExpr: undefined, selectExpr: undefined, @@ -1006,8 +1010,8 @@ function createBaseExpr(): Expr { } export const Expr = { typeUrl: "/google.api.expr.v1alpha1.Expr", - encode(message: Expr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.id.isZero()) { + encode(message: Expr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.id !== BigInt(0)) { writer.uint32(16).int64(message.id); } if (message.constExpr !== undefined) { @@ -1033,15 +1037,15 @@ export const Expr = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 2: - message.id = (reader.int64() as Long); + message.id = reader.int64(); break; case 3: message.constExpr = Constant.decode(reader, reader.uint32()); @@ -1072,20 +1076,20 @@ export const Expr = { return message; }, fromJSON(object: any): Expr { - return { - id: isSet(object.id) ? Long.fromValue(object.id) : Long.ZERO, - constExpr: isSet(object.constExpr) ? Constant.fromJSON(object.constExpr) : undefined, - identExpr: isSet(object.identExpr) ? Expr_Ident.fromJSON(object.identExpr) : undefined, - selectExpr: isSet(object.selectExpr) ? Expr_Select.fromJSON(object.selectExpr) : undefined, - callExpr: isSet(object.callExpr) ? Expr_Call.fromJSON(object.callExpr) : undefined, - listExpr: isSet(object.listExpr) ? Expr_CreateList.fromJSON(object.listExpr) : undefined, - structExpr: isSet(object.structExpr) ? Expr_CreateStruct.fromJSON(object.structExpr) : undefined, - comprehensionExpr: isSet(object.comprehensionExpr) ? Expr_Comprehension.fromJSON(object.comprehensionExpr) : undefined - }; + const obj = createBaseExpr(); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + if (isSet(object.constExpr)) obj.constExpr = Constant.fromJSON(object.constExpr); + if (isSet(object.identExpr)) obj.identExpr = Expr_Ident.fromJSON(object.identExpr); + if (isSet(object.selectExpr)) obj.selectExpr = Expr_Select.fromJSON(object.selectExpr); + if (isSet(object.callExpr)) obj.callExpr = Expr_Call.fromJSON(object.callExpr); + if (isSet(object.listExpr)) obj.listExpr = Expr_CreateList.fromJSON(object.listExpr); + if (isSet(object.structExpr)) obj.structExpr = Expr_CreateStruct.fromJSON(object.structExpr); + if (isSet(object.comprehensionExpr)) obj.comprehensionExpr = Expr_Comprehension.fromJSON(object.comprehensionExpr); + return obj; }, toJSON(message: Expr): unknown { const obj: any = {}; - message.id !== undefined && (obj.id = (message.id || Long.ZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); message.constExpr !== undefined && (obj.constExpr = message.constExpr ? Constant.toJSON(message.constExpr) : undefined); message.identExpr !== undefined && (obj.identExpr = message.identExpr ? Expr_Ident.toJSON(message.identExpr) : undefined); message.selectExpr !== undefined && (obj.selectExpr = message.selectExpr ? Expr_Select.toJSON(message.selectExpr) : undefined); @@ -1097,14 +1101,30 @@ export const Expr = { }, fromPartial(object: DeepPartial): Expr { const message = createBaseExpr(); - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.ZERO; - message.constExpr = object.constExpr !== undefined && object.constExpr !== null ? Constant.fromPartial(object.constExpr) : undefined; - message.identExpr = object.identExpr !== undefined && object.identExpr !== null ? Expr_Ident.fromPartial(object.identExpr) : undefined; - message.selectExpr = object.selectExpr !== undefined && object.selectExpr !== null ? Expr_Select.fromPartial(object.selectExpr) : undefined; - message.callExpr = object.callExpr !== undefined && object.callExpr !== null ? Expr_Call.fromPartial(object.callExpr) : undefined; - message.listExpr = object.listExpr !== undefined && object.listExpr !== null ? Expr_CreateList.fromPartial(object.listExpr) : undefined; - message.structExpr = object.structExpr !== undefined && object.structExpr !== null ? Expr_CreateStruct.fromPartial(object.structExpr) : undefined; - message.comprehensionExpr = object.comprehensionExpr !== undefined && object.comprehensionExpr !== null ? Expr_Comprehension.fromPartial(object.comprehensionExpr) : undefined; + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } + if (object.constExpr !== undefined && object.constExpr !== null) { + message.constExpr = Constant.fromPartial(object.constExpr); + } + if (object.identExpr !== undefined && object.identExpr !== null) { + message.identExpr = Expr_Ident.fromPartial(object.identExpr); + } + if (object.selectExpr !== undefined && object.selectExpr !== null) { + message.selectExpr = Expr_Select.fromPartial(object.selectExpr); + } + if (object.callExpr !== undefined && object.callExpr !== null) { + message.callExpr = Expr_Call.fromPartial(object.callExpr); + } + if (object.listExpr !== undefined && object.listExpr !== null) { + message.listExpr = Expr_CreateList.fromPartial(object.listExpr); + } + if (object.structExpr !== undefined && object.structExpr !== null) { + message.structExpr = Expr_CreateStruct.fromPartial(object.structExpr); + } + if (object.comprehensionExpr !== undefined && object.comprehensionExpr !== null) { + message.comprehensionExpr = Expr_Comprehension.fromPartial(object.comprehensionExpr); + } return message; }, fromSDK(object: ExprSDKType): Expr { @@ -1133,7 +1153,7 @@ export const Expr = { }, fromAmino(object: ExprAmino): Expr { return { - id: Long.fromString(object.id), + id: BigInt(object.id), constExpr: object?.const_expr ? Constant.fromAmino(object.const_expr) : undefined, identExpr: object?.ident_expr ? Expr_Ident.fromAmino(object.ident_expr) : undefined, selectExpr: object?.select_expr ? Expr_Select.fromAmino(object.select_expr) : undefined, @@ -1178,14 +1198,14 @@ function createBaseExpr_Ident(): Expr_Ident { } export const Expr_Ident = { typeUrl: "/google.api.expr.v1alpha1.Ident", - encode(message: Expr_Ident, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Ident, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Ident { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Ident { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Ident(); while (reader.pos < end) { @@ -1202,9 +1222,9 @@ export const Expr_Ident = { return message; }, fromJSON(object: any): Expr_Ident { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseExpr_Ident(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: Expr_Ident): unknown { const obj: any = {}; @@ -1261,7 +1281,7 @@ function createBaseExpr_Select(): Expr_Select { } export const Expr_Select = { typeUrl: "/google.api.expr.v1alpha1.Select", - encode(message: Expr_Select, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Select, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operand !== undefined) { Expr.encode(message.operand, writer.uint32(10).fork()).ldelim(); } @@ -1273,8 +1293,8 @@ export const Expr_Select = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Select { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Select { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Select(); while (reader.pos < end) { @@ -1297,11 +1317,11 @@ export const Expr_Select = { return message; }, fromJSON(object: any): Expr_Select { - return { - operand: isSet(object.operand) ? Expr.fromJSON(object.operand) : undefined, - field: isSet(object.field) ? String(object.field) : "", - testOnly: isSet(object.testOnly) ? Boolean(object.testOnly) : false - }; + const obj = createBaseExpr_Select(); + if (isSet(object.operand)) obj.operand = Expr.fromJSON(object.operand); + if (isSet(object.field)) obj.field = String(object.field); + if (isSet(object.testOnly)) obj.testOnly = Boolean(object.testOnly); + return obj; }, toJSON(message: Expr_Select): unknown { const obj: any = {}; @@ -1312,7 +1332,9 @@ export const Expr_Select = { }, fromPartial(object: DeepPartial): Expr_Select { const message = createBaseExpr_Select(); - message.operand = object.operand !== undefined && object.operand !== null ? Expr.fromPartial(object.operand) : undefined; + if (object.operand !== undefined && object.operand !== null) { + message.operand = Expr.fromPartial(object.operand); + } message.field = object.field ?? ""; message.testOnly = object.testOnly ?? false; return message; @@ -1370,7 +1392,7 @@ function createBaseExpr_Call(): Expr_Call { } export const Expr_Call = { typeUrl: "/google.api.expr.v1alpha1.Call", - encode(message: Expr_Call, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Call, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.target !== undefined) { Expr.encode(message.target, writer.uint32(10).fork()).ldelim(); } @@ -1382,8 +1404,8 @@ export const Expr_Call = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Call { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Call { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Call(); while (reader.pos < end) { @@ -1406,11 +1428,11 @@ export const Expr_Call = { return message; }, fromJSON(object: any): Expr_Call { - return { - target: isSet(object.target) ? Expr.fromJSON(object.target) : undefined, - function: isSet(object.function) ? String(object.function) : "", - args: Array.isArray(object?.args) ? object.args.map((e: any) => Expr.fromJSON(e)) : [] - }; + const obj = createBaseExpr_Call(); + if (isSet(object.target)) obj.target = Expr.fromJSON(object.target); + if (isSet(object.function)) obj.function = String(object.function); + if (Array.isArray(object?.args)) object.args.map((e: any) => Expr.fromJSON(e)); + return obj; }, toJSON(message: Expr_Call): unknown { const obj: any = {}; @@ -1425,7 +1447,9 @@ export const Expr_Call = { }, fromPartial(object: DeepPartial): Expr_Call { const message = createBaseExpr_Call(); - message.target = object.target !== undefined && object.target !== null ? Expr.fromPartial(object.target) : undefined; + if (object.target !== undefined && object.target !== null) { + message.target = Expr.fromPartial(object.target); + } message.function = object.function ?? ""; message.args = object.args?.map(e => Expr.fromPartial(e)) || []; return message; @@ -1489,14 +1513,14 @@ function createBaseExpr_CreateList(): Expr_CreateList { } export const Expr_CreateList = { typeUrl: "/google.api.expr.v1alpha1.CreateList", - encode(message: Expr_CreateList, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_CreateList, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.elements) { Expr.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_CreateList { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_CreateList { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_CreateList(); while (reader.pos < end) { @@ -1513,9 +1537,9 @@ export const Expr_CreateList = { return message; }, fromJSON(object: any): Expr_CreateList { - return { - elements: Array.isArray(object?.elements) ? object.elements.map((e: any) => Expr.fromJSON(e)) : [] - }; + const obj = createBaseExpr_CreateList(); + if (Array.isArray(object?.elements)) object.elements.map((e: any) => Expr.fromJSON(e)); + return obj; }, toJSON(message: Expr_CreateList): unknown { const obj: any = {}; @@ -1583,7 +1607,7 @@ function createBaseExpr_CreateStruct(): Expr_CreateStruct { } export const Expr_CreateStruct = { typeUrl: "/google.api.expr.v1alpha1.CreateStruct", - encode(message: Expr_CreateStruct, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_CreateStruct, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.messageName !== "") { writer.uint32(10).string(message.messageName); } @@ -1592,8 +1616,8 @@ export const Expr_CreateStruct = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_CreateStruct { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_CreateStruct { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_CreateStruct(); while (reader.pos < end) { @@ -1613,10 +1637,10 @@ export const Expr_CreateStruct = { return message; }, fromJSON(object: any): Expr_CreateStruct { - return { - messageName: isSet(object.messageName) ? String(object.messageName) : "", - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => Expr_CreateStruct_Entry.fromJSON(e)) : [] - }; + const obj = createBaseExpr_CreateStruct(); + if (isSet(object.messageName)) obj.messageName = String(object.messageName); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => Expr_CreateStruct_Entry.fromJSON(e)); + return obj; }, toJSON(message: Expr_CreateStruct): unknown { const obj: any = {}; @@ -1684,7 +1708,7 @@ export const Expr_CreateStruct = { }; function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { return { - id: Long.ZERO, + id: BigInt(0), fieldKey: undefined, mapKey: undefined, value: Expr.fromPartial({}) @@ -1692,8 +1716,8 @@ function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { } export const Expr_CreateStruct_Entry = { typeUrl: "/google.api.expr.v1alpha1.Entry", - encode(message: Expr_CreateStruct_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.id.isZero()) { + encode(message: Expr_CreateStruct_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.id !== BigInt(0)) { writer.uint32(8).int64(message.id); } if (message.fieldKey !== undefined) { @@ -1707,15 +1731,15 @@ export const Expr_CreateStruct_Entry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_CreateStruct_Entry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_CreateStruct_Entry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_CreateStruct_Entry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.id = (reader.int64() as Long); + message.id = reader.int64(); break; case 2: message.fieldKey = reader.string(); @@ -1734,16 +1758,16 @@ export const Expr_CreateStruct_Entry = { return message; }, fromJSON(object: any): Expr_CreateStruct_Entry { - return { - id: isSet(object.id) ? Long.fromValue(object.id) : Long.ZERO, - fieldKey: isSet(object.fieldKey) ? String(object.fieldKey) : undefined, - mapKey: isSet(object.mapKey) ? Expr.fromJSON(object.mapKey) : undefined, - value: isSet(object.value) ? Expr.fromJSON(object.value) : undefined - }; + const obj = createBaseExpr_CreateStruct_Entry(); + if (isSet(object.id)) obj.id = BigInt(object.id.toString()); + if (isSet(object.fieldKey)) obj.fieldKey = String(object.fieldKey); + if (isSet(object.mapKey)) obj.mapKey = Expr.fromJSON(object.mapKey); + if (isSet(object.value)) obj.value = Expr.fromJSON(object.value); + return obj; }, toJSON(message: Expr_CreateStruct_Entry): unknown { const obj: any = {}; - message.id !== undefined && (obj.id = (message.id || Long.ZERO).toString()); + message.id !== undefined && (obj.id = (message.id || BigInt(0)).toString()); message.fieldKey !== undefined && (obj.fieldKey = message.fieldKey); message.mapKey !== undefined && (obj.mapKey = message.mapKey ? Expr.toJSON(message.mapKey) : undefined); message.value !== undefined && (obj.value = message.value ? Expr.toJSON(message.value) : undefined); @@ -1751,10 +1775,16 @@ export const Expr_CreateStruct_Entry = { }, fromPartial(object: DeepPartial): Expr_CreateStruct_Entry { const message = createBaseExpr_CreateStruct_Entry(); - message.id = object.id !== undefined && object.id !== null ? Long.fromValue(object.id) : Long.ZERO; + if (object.id !== undefined && object.id !== null) { + message.id = BigInt(object.id.toString()); + } message.fieldKey = object.fieldKey ?? undefined; - message.mapKey = object.mapKey !== undefined && object.mapKey !== null ? Expr.fromPartial(object.mapKey) : undefined; - message.value = object.value !== undefined && object.value !== null ? Expr.fromPartial(object.value) : undefined; + if (object.mapKey !== undefined && object.mapKey !== null) { + message.mapKey = Expr.fromPartial(object.mapKey); + } + if (object.value !== undefined && object.value !== null) { + message.value = Expr.fromPartial(object.value); + } return message; }, fromSDK(object: Expr_CreateStruct_EntrySDKType): Expr_CreateStruct_Entry { @@ -1775,7 +1805,7 @@ export const Expr_CreateStruct_Entry = { }, fromAmino(object: Expr_CreateStruct_EntryAmino): Expr_CreateStruct_Entry { return { - id: Long.fromString(object.id), + id: BigInt(object.id), fieldKey: object?.field_key, mapKey: object?.map_key ? Expr.fromAmino(object.map_key) : undefined, value: object?.value ? Expr.fromAmino(object.value) : undefined @@ -1818,7 +1848,7 @@ function createBaseExpr_Comprehension(): Expr_Comprehension { } export const Expr_Comprehension = { typeUrl: "/google.api.expr.v1alpha1.Comprehension", - encode(message: Expr_Comprehension, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Comprehension, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.iterVar !== "") { writer.uint32(10).string(message.iterVar); } @@ -1842,8 +1872,8 @@ export const Expr_Comprehension = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Comprehension { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Comprehension { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Comprehension(); while (reader.pos < end) { @@ -1878,15 +1908,15 @@ export const Expr_Comprehension = { return message; }, fromJSON(object: any): Expr_Comprehension { - return { - iterVar: isSet(object.iterVar) ? String(object.iterVar) : "", - iterRange: isSet(object.iterRange) ? Expr.fromJSON(object.iterRange) : undefined, - accuVar: isSet(object.accuVar) ? String(object.accuVar) : "", - accuInit: isSet(object.accuInit) ? Expr.fromJSON(object.accuInit) : undefined, - loopCondition: isSet(object.loopCondition) ? Expr.fromJSON(object.loopCondition) : undefined, - loopStep: isSet(object.loopStep) ? Expr.fromJSON(object.loopStep) : undefined, - result: isSet(object.result) ? Expr.fromJSON(object.result) : undefined - }; + const obj = createBaseExpr_Comprehension(); + if (isSet(object.iterVar)) obj.iterVar = String(object.iterVar); + if (isSet(object.iterRange)) obj.iterRange = Expr.fromJSON(object.iterRange); + if (isSet(object.accuVar)) obj.accuVar = String(object.accuVar); + if (isSet(object.accuInit)) obj.accuInit = Expr.fromJSON(object.accuInit); + if (isSet(object.loopCondition)) obj.loopCondition = Expr.fromJSON(object.loopCondition); + if (isSet(object.loopStep)) obj.loopStep = Expr.fromJSON(object.loopStep); + if (isSet(object.result)) obj.result = Expr.fromJSON(object.result); + return obj; }, toJSON(message: Expr_Comprehension): unknown { const obj: any = {}; @@ -1902,12 +1932,22 @@ export const Expr_Comprehension = { fromPartial(object: DeepPartial): Expr_Comprehension { const message = createBaseExpr_Comprehension(); message.iterVar = object.iterVar ?? ""; - message.iterRange = object.iterRange !== undefined && object.iterRange !== null ? Expr.fromPartial(object.iterRange) : undefined; + if (object.iterRange !== undefined && object.iterRange !== null) { + message.iterRange = Expr.fromPartial(object.iterRange); + } message.accuVar = object.accuVar ?? ""; - message.accuInit = object.accuInit !== undefined && object.accuInit !== null ? Expr.fromPartial(object.accuInit) : undefined; - message.loopCondition = object.loopCondition !== undefined && object.loopCondition !== null ? Expr.fromPartial(object.loopCondition) : undefined; - message.loopStep = object.loopStep !== undefined && object.loopStep !== null ? Expr.fromPartial(object.loopStep) : undefined; - message.result = object.result !== undefined && object.result !== null ? Expr.fromPartial(object.result) : undefined; + if (object.accuInit !== undefined && object.accuInit !== null) { + message.accuInit = Expr.fromPartial(object.accuInit); + } + if (object.loopCondition !== undefined && object.loopCondition !== null) { + message.loopCondition = Expr.fromPartial(object.loopCondition); + } + if (object.loopStep !== undefined && object.loopStep !== null) { + message.loopStep = Expr.fromPartial(object.loopStep); + } + if (object.result !== undefined && object.result !== null) { + message.result = Expr.fromPartial(object.result); + } return message; }, fromSDK(object: Expr_ComprehensionSDKType): Expr_Comprehension { @@ -1985,7 +2025,7 @@ function createBaseConstant(): Constant { } export const Constant = { typeUrl: "/google.api.expr.v1alpha1.Constant", - encode(message: Constant, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Constant, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); } @@ -2015,8 +2055,8 @@ export const Constant = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Constant { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Constant { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConstant(); while (reader.pos < end) { @@ -2029,10 +2069,10 @@ export const Constant = { message.boolValue = reader.bool(); break; case 3: - message.int64Value = (reader.int64() as Long); + message.int64Value = reader.int64(); break; case 4: - message.uint64Value = (reader.uint64() as Long); + message.uint64Value = reader.uint64(); break; case 5: message.doubleValue = reader.double(); @@ -2057,17 +2097,17 @@ export const Constant = { return message; }, fromJSON(object: any): Constant { - return { - nullValue: isSet(object.nullValue) ? nullValueFromJSON(object.nullValue) : undefined, - boolValue: isSet(object.boolValue) ? Boolean(object.boolValue) : undefined, - int64Value: isSet(object.int64Value) ? Long.fromValue(object.int64Value) : undefined, - uint64Value: isSet(object.uint64Value) ? Long.fromValue(object.uint64Value) : undefined, - doubleValue: isSet(object.doubleValue) ? Number(object.doubleValue) : undefined, - stringValue: isSet(object.stringValue) ? String(object.stringValue) : undefined, - bytesValue: isSet(object.bytesValue) ? bytesFromBase64(object.bytesValue) : undefined, - durationValue: isSet(object.durationValue) ? Duration.fromJSON(object.durationValue) : undefined, - timestampValue: isSet(object.timestampValue) ? new Date(object.timestampValue) : undefined - }; + const obj = createBaseConstant(); + if (isSet(object.nullValue)) obj.nullValue = nullValueFromJSON(object.nullValue); + if (isSet(object.boolValue)) obj.boolValue = Boolean(object.boolValue); + if (isSet(object.int64Value)) obj.int64Value = BigInt(object.int64Value.toString()); + if (isSet(object.uint64Value)) obj.uint64Value = BigInt(object.uint64Value.toString()); + if (isSet(object.doubleValue)) obj.doubleValue = Number(object.doubleValue); + if (isSet(object.stringValue)) obj.stringValue = String(object.stringValue); + if (isSet(object.bytesValue)) obj.bytesValue = bytesFromBase64(object.bytesValue); + if (isSet(object.durationValue)) obj.durationValue = Duration.fromJSON(object.durationValue); + if (isSet(object.timestampValue)) obj.timestampValue = new Date(object.timestampValue); + return obj; }, toJSON(message: Constant): unknown { const obj: any = {}; @@ -2086,12 +2126,18 @@ export const Constant = { const message = createBaseConstant(); message.nullValue = object.nullValue ?? undefined; message.boolValue = object.boolValue ?? undefined; - message.int64Value = object.int64Value !== undefined && object.int64Value !== null ? Long.fromValue(object.int64Value) : undefined; - message.uint64Value = object.uint64Value !== undefined && object.uint64Value !== null ? Long.fromValue(object.uint64Value) : undefined; + if (object.int64Value !== undefined && object.int64Value !== null) { + message.int64Value = BigInt(object.int64Value.toString()); + } + if (object.uint64Value !== undefined && object.uint64Value !== null) { + message.uint64Value = BigInt(object.uint64Value.toString()); + } message.doubleValue = object.doubleValue ?? undefined; message.stringValue = object.stringValue ?? undefined; message.bytesValue = object.bytesValue ?? undefined; - message.durationValue = object.durationValue !== undefined && object.durationValue !== null ? Duration.fromPartial(object.durationValue) : undefined; + if (object.durationValue !== undefined && object.durationValue !== null) { + message.durationValue = Duration.fromPartial(object.durationValue); + } message.timestampValue = object.timestampValue ?? undefined; return message; }, @@ -2125,8 +2171,8 @@ export const Constant = { return { nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, boolValue: object?.bool_value, - int64Value: object?.int64_value ? Long.fromString(object.int64_value) : undefined, - uint64Value: object?.uint64_value ? Long.fromString(object.uint64_value) : undefined, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, doubleValue: object?.double_value, stringValue: object?.string_value, bytesValue: object?.bytes_value, @@ -2165,13 +2211,13 @@ export const Constant = { }; function createBaseSourceInfo_PositionsEntry(): SourceInfo_PositionsEntry { return { - key: Long.ZERO, + key: BigInt(0), value: 0 }; } export const SourceInfo_PositionsEntry = { - encode(message: SourceInfo_PositionsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.key.isZero()) { + encode(message: SourceInfo_PositionsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.key !== BigInt(0)) { writer.uint32(8).int64(message.key); } if (message.value !== 0) { @@ -2179,15 +2225,15 @@ export const SourceInfo_PositionsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceInfo_PositionsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceInfo_PositionsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceInfo_PositionsEntry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.key = (reader.int64() as Long); + message.key = reader.int64(); break; case 2: message.value = reader.int32(); @@ -2200,20 +2246,22 @@ export const SourceInfo_PositionsEntry = { return message; }, fromJSON(object: any): SourceInfo_PositionsEntry { - return { - key: isSet(object.key) ? Long.fromValue(object.key) : Long.ZERO, - value: isSet(object.value) ? Number(object.value) : 0 - }; + const obj = createBaseSourceInfo_PositionsEntry(); + if (isSet(object.key)) obj.key = BigInt(object.key.toString()); + if (isSet(object.value)) obj.value = Number(object.value); + return obj; }, toJSON(message: SourceInfo_PositionsEntry): unknown { const obj: any = {}; - message.key !== undefined && (obj.key = (message.key || Long.ZERO).toString()); + message.key !== undefined && (obj.key = (message.key || BigInt(0)).toString()); message.value !== undefined && (obj.value = Math.round(message.value)); return obj; }, fromPartial(object: DeepPartial): SourceInfo_PositionsEntry { const message = createBaseSourceInfo_PositionsEntry(); - message.key = object.key !== undefined && object.key !== null ? Long.fromValue(object.key) : Long.ZERO; + if (object.key !== undefined && object.key !== null) { + message.key = BigInt(object.key.toString()); + } message.value = object.value ?? 0; return message; }, @@ -2231,7 +2279,7 @@ export const SourceInfo_PositionsEntry = { }, fromAmino(object: SourceInfo_PositionsEntryAmino): SourceInfo_PositionsEntry { return { - key: Long.fromString(object.key), + key: BigInt(object.key), value: object.value }; }, @@ -2253,13 +2301,13 @@ export const SourceInfo_PositionsEntry = { }; function createBaseSourceInfo_MacroCallsEntry(): SourceInfo_MacroCallsEntry { return { - key: Long.ZERO, + key: BigInt(0), value: Expr.fromPartial({}) }; } export const SourceInfo_MacroCallsEntry = { - encode(message: SourceInfo_MacroCallsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.key.isZero()) { + encode(message: SourceInfo_MacroCallsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.key !== BigInt(0)) { writer.uint32(8).int64(message.key); } if (message.value !== undefined) { @@ -2267,15 +2315,15 @@ export const SourceInfo_MacroCallsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceInfo_MacroCallsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceInfo_MacroCallsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceInfo_MacroCallsEntry(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.key = (reader.int64() as Long); + message.key = reader.int64(); break; case 2: message.value = Expr.decode(reader, reader.uint32()); @@ -2288,21 +2336,25 @@ export const SourceInfo_MacroCallsEntry = { return message; }, fromJSON(object: any): SourceInfo_MacroCallsEntry { - return { - key: isSet(object.key) ? Long.fromValue(object.key) : Long.ZERO, - value: isSet(object.value) ? Expr.fromJSON(object.value) : undefined - }; + const obj = createBaseSourceInfo_MacroCallsEntry(); + if (isSet(object.key)) obj.key = BigInt(object.key.toString()); + if (isSet(object.value)) obj.value = Expr.fromJSON(object.value); + return obj; }, toJSON(message: SourceInfo_MacroCallsEntry): unknown { const obj: any = {}; - message.key !== undefined && (obj.key = (message.key || Long.ZERO).toString()); + message.key !== undefined && (obj.key = (message.key || BigInt(0)).toString()); message.value !== undefined && (obj.value = message.value ? Expr.toJSON(message.value) : undefined); return obj; }, fromPartial(object: DeepPartial): SourceInfo_MacroCallsEntry { const message = createBaseSourceInfo_MacroCallsEntry(); - message.key = object.key !== undefined && object.key !== null ? Long.fromValue(object.key) : Long.ZERO; - message.value = object.value !== undefined && object.value !== null ? Expr.fromPartial(object.value) : undefined; + if (object.key !== undefined && object.key !== null) { + message.key = BigInt(object.key.toString()); + } + if (object.value !== undefined && object.value !== null) { + message.value = Expr.fromPartial(object.value); + } return message; }, fromSDK(object: SourceInfo_MacroCallsEntrySDKType): SourceInfo_MacroCallsEntry { @@ -2319,7 +2371,7 @@ export const SourceInfo_MacroCallsEntry = { }, fromAmino(object: SourceInfo_MacroCallsEntryAmino): SourceInfo_MacroCallsEntry { return { - key: Long.fromString(object.key), + key: BigInt(object.key), value: object?.value ? Expr.fromAmino(object.value) : undefined }; }, @@ -2350,7 +2402,7 @@ function createBaseSourceInfo(): SourceInfo { } export const SourceInfo = { typeUrl: "/google.api.expr.v1alpha1.SourceInfo", - encode(message: SourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.syntaxVersion !== "") { writer.uint32(10).string(message.syntaxVersion); } @@ -2376,8 +2428,8 @@ export const SourceInfo = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceInfo(); while (reader.pos < end) { @@ -2419,23 +2471,23 @@ export const SourceInfo = { return message; }, fromJSON(object: any): SourceInfo { - return { - syntaxVersion: isSet(object.syntaxVersion) ? String(object.syntaxVersion) : "", - location: isSet(object.location) ? String(object.location) : "", - lineOffsets: Array.isArray(object?.lineOffsets) ? object.lineOffsets.map((e: any) => Number(e)) : [], - positions: isObject(object.positions) ? Object.entries(object.positions).reduce<{ - [key: Long]: number; - }>((acc, [key, value]) => { - acc[Number(key)] = Number(value); - return acc; - }, {}) : {}, - macroCalls: isObject(object.macroCalls) ? Object.entries(object.macroCalls).reduce<{ - [key: Long]: Expr; - }>((acc, [key, value]) => { - acc[Number(key)] = Expr.fromJSON(value); - return acc; - }, {}) : {} - }; + const obj = createBaseSourceInfo(); + if (isSet(object.syntaxVersion)) obj.syntaxVersion = String(object.syntaxVersion); + if (isSet(object.location)) obj.location = String(object.location); + if (Array.isArray(object?.lineOffsets)) object.lineOffsets.map((e: any) => Number(e)); + if (isObject(object.positions)) obj.positions = Object.entries(object.positions).reduce<{ + [key: bigint]: number; + }>((acc, [key, value]) => { + acc[Number(key)] = Number(value); + return acc; + }, {}); + if (isObject(object.macroCalls)) obj.macroCalls = Object.entries(object.macroCalls).reduce<{ + [key: bigint]: Expr; + }>((acc, [key, value]) => { + acc[Number(key)] = Expr.fromJSON(value); + return acc; + }, {}); + return obj; }, toJSON(message: SourceInfo): unknown { const obj: any = {}; @@ -2466,7 +2518,7 @@ export const SourceInfo = { message.location = object.location ?? ""; message.lineOffsets = object.lineOffsets?.map(e => e) || []; message.positions = Object.entries(object.positions ?? {}).reduce<{ - [key: Long]: number; + [key: bigint]: number; }>((acc, [key, value]) => { if (value !== undefined) { acc[Number(key)] = Number(value); @@ -2474,7 +2526,7 @@ export const SourceInfo = { return acc; }, {}); message.macroCalls = Object.entries(object.macroCalls ?? {}).reduce<{ - [key: Long]: Expr; + [key: bigint]: Expr; }>((acc, [key, value]) => { if (value !== undefined) { acc[Number(key)] = Expr.fromPartial(value); @@ -2489,13 +2541,13 @@ export const SourceInfo = { location: object?.location, lineOffsets: Array.isArray(object?.line_offsets) ? object.line_offsets.map((e: any) => e) : [], positions: isObject(object.positions) ? Object.entries(object.positions).reduce<{ - [key: Long]: number; + [key: bigint]: number; }>((acc, [key, value]) => { acc[Number(key)] = Number(value); return acc; }, {}) : {}, macroCalls: isObject(object.macro_calls) ? Object.entries(object.macro_calls).reduce<{ - [key: Long]: Expr; + [key: bigint]: Expr; }>((acc, [key, value]) => { acc[Number(key)] = Expr.fromSDK(value); return acc; @@ -2531,13 +2583,13 @@ export const SourceInfo = { location: object.location, lineOffsets: Array.isArray(object?.line_offsets) ? object.line_offsets.map((e: any) => e) : [], positions: isObject(object.positions) ? Object.entries(object.positions).reduce<{ - [key: Long]: number; + [key: bigint]: number; }>((acc, [key, value]) => { acc[Number(key)] = Number(value); return acc; }, {}) : {}, macroCalls: isObject(object.macro_calls) ? Object.entries(object.macro_calls).reduce<{ - [key: Long]: Expr; + [key: bigint]: Expr; }>((acc, [key, value]) => { acc[Number(key)] = Expr.fromAmino(value); return acc; @@ -2593,7 +2645,7 @@ function createBaseSourcePosition(): SourcePosition { } export const SourcePosition = { typeUrl: "/google.api.expr.v1alpha1.SourcePosition", - encode(message: SourcePosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourcePosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(10).string(message.location); } @@ -2608,8 +2660,8 @@ export const SourcePosition = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourcePosition { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourcePosition { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourcePosition(); while (reader.pos < end) { @@ -2635,12 +2687,12 @@ export const SourcePosition = { return message; }, fromJSON(object: any): SourcePosition { - return { - location: isSet(object.location) ? String(object.location) : "", - offset: isSet(object.offset) ? Number(object.offset) : 0, - line: isSet(object.line) ? Number(object.line) : 0, - column: isSet(object.column) ? Number(object.column) : 0 - }; + const obj = createBaseSourcePosition(); + if (isSet(object.location)) obj.location = String(object.location); + if (isSet(object.offset)) obj.offset = Number(object.offset); + if (isSet(object.line)) obj.line = Number(object.line); + if (isSet(object.column)) obj.column = Number(object.column); + return obj; }, toJSON(message: SourcePosition): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/value.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/value.ts index 164b9f4845..9dd7255101 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/value.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1alpha1/value.ts @@ -1,7 +1,7 @@ import { NullValue, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; /** * Represents a CEL value. @@ -15,9 +15,9 @@ export interface Value { /** Boolean value. */ boolValue?: boolean; /** Signed integer value. */ - int64Value?: Long; + int64Value?: bigint; /** Unsigned integer value. */ - uint64Value?: Long; + uint64Value?: bigint; /** Floating point value. */ doubleValue?: number; /** UTF-8 string value. */ @@ -84,8 +84,8 @@ export interface ValueAminoMsg { export interface ValueSDKType { null_value?: NullValue; bool_value?: boolean; - int64_value?: Long; - uint64_value?: Long; + int64_value?: bigint; + uint64_value?: bigint; double_value?: number; string_value?: string; bytes_value?: Uint8Array; @@ -261,7 +261,7 @@ function createBaseValue(): Value { } export const Value = { typeUrl: "/google.api.expr.v1alpha1.Value", - encode(message: Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); } @@ -300,8 +300,8 @@ export const Value = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Value { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Value { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValue(); while (reader.pos < end) { @@ -314,10 +314,10 @@ export const Value = { message.boolValue = reader.bool(); break; case 3: - message.int64Value = (reader.int64() as Long); + message.int64Value = reader.int64(); break; case 4: - message.uint64Value = (reader.uint64() as Long); + message.uint64Value = reader.uint64(); break; case 5: message.doubleValue = reader.double(); @@ -351,20 +351,20 @@ export const Value = { return message; }, fromJSON(object: any): Value { - return { - nullValue: isSet(object.nullValue) ? nullValueFromJSON(object.nullValue) : undefined, - boolValue: isSet(object.boolValue) ? Boolean(object.boolValue) : undefined, - int64Value: isSet(object.int64Value) ? Long.fromValue(object.int64Value) : undefined, - uint64Value: isSet(object.uint64Value) ? Long.fromValue(object.uint64Value) : undefined, - doubleValue: isSet(object.doubleValue) ? Number(object.doubleValue) : undefined, - stringValue: isSet(object.stringValue) ? String(object.stringValue) : undefined, - bytesValue: isSet(object.bytesValue) ? bytesFromBase64(object.bytesValue) : undefined, - enumValue: isSet(object.enumValue) ? EnumValue.fromJSON(object.enumValue) : undefined, - objectValue: isSet(object.objectValue) ? Any.fromJSON(object.objectValue) : undefined, - mapValue: isSet(object.mapValue) ? MapValue.fromJSON(object.mapValue) : undefined, - listValue: isSet(object.listValue) ? ListValue.fromJSON(object.listValue) : undefined, - typeValue: isSet(object.typeValue) ? String(object.typeValue) : undefined - }; + const obj = createBaseValue(); + if (isSet(object.nullValue)) obj.nullValue = nullValueFromJSON(object.nullValue); + if (isSet(object.boolValue)) obj.boolValue = Boolean(object.boolValue); + if (isSet(object.int64Value)) obj.int64Value = BigInt(object.int64Value.toString()); + if (isSet(object.uint64Value)) obj.uint64Value = BigInt(object.uint64Value.toString()); + if (isSet(object.doubleValue)) obj.doubleValue = Number(object.doubleValue); + if (isSet(object.stringValue)) obj.stringValue = String(object.stringValue); + if (isSet(object.bytesValue)) obj.bytesValue = bytesFromBase64(object.bytesValue); + if (isSet(object.enumValue)) obj.enumValue = EnumValue.fromJSON(object.enumValue); + if (isSet(object.objectValue)) obj.objectValue = Any.fromJSON(object.objectValue); + if (isSet(object.mapValue)) obj.mapValue = MapValue.fromJSON(object.mapValue); + if (isSet(object.listValue)) obj.listValue = ListValue.fromJSON(object.listValue); + if (isSet(object.typeValue)) obj.typeValue = String(object.typeValue); + return obj; }, toJSON(message: Value): unknown { const obj: any = {}; @@ -386,15 +386,27 @@ export const Value = { const message = createBaseValue(); message.nullValue = object.nullValue ?? undefined; message.boolValue = object.boolValue ?? undefined; - message.int64Value = object.int64Value !== undefined && object.int64Value !== null ? Long.fromValue(object.int64Value) : undefined; - message.uint64Value = object.uint64Value !== undefined && object.uint64Value !== null ? Long.fromValue(object.uint64Value) : undefined; + if (object.int64Value !== undefined && object.int64Value !== null) { + message.int64Value = BigInt(object.int64Value.toString()); + } + if (object.uint64Value !== undefined && object.uint64Value !== null) { + message.uint64Value = BigInt(object.uint64Value.toString()); + } message.doubleValue = object.doubleValue ?? undefined; message.stringValue = object.stringValue ?? undefined; message.bytesValue = object.bytesValue ?? undefined; - message.enumValue = object.enumValue !== undefined && object.enumValue !== null ? EnumValue.fromPartial(object.enumValue) : undefined; - message.objectValue = object.objectValue !== undefined && object.objectValue !== null ? Any.fromPartial(object.objectValue) : undefined; - message.mapValue = object.mapValue !== undefined && object.mapValue !== null ? MapValue.fromPartial(object.mapValue) : undefined; - message.listValue = object.listValue !== undefined && object.listValue !== null ? ListValue.fromPartial(object.listValue) : undefined; + if (object.enumValue !== undefined && object.enumValue !== null) { + message.enumValue = EnumValue.fromPartial(object.enumValue); + } + if (object.objectValue !== undefined && object.objectValue !== null) { + message.objectValue = Any.fromPartial(object.objectValue); + } + if (object.mapValue !== undefined && object.mapValue !== null) { + message.mapValue = MapValue.fromPartial(object.mapValue); + } + if (object.listValue !== undefined && object.listValue !== null) { + message.listValue = ListValue.fromPartial(object.listValue); + } message.typeValue = object.typeValue ?? undefined; return message; }, @@ -434,8 +446,8 @@ export const Value = { return { nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, boolValue: object?.bool_value, - int64Value: object?.int64_value ? Long.fromString(object.int64_value) : undefined, - uint64Value: object?.uint64_value ? Long.fromString(object.uint64_value) : undefined, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, doubleValue: object?.double_value, stringValue: object?.string_value, bytesValue: object?.bytes_value, @@ -486,7 +498,7 @@ function createBaseEnumValue(): EnumValue { } export const EnumValue = { typeUrl: "/google.api.expr.v1alpha1.EnumValue", - encode(message: EnumValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -495,8 +507,8 @@ export const EnumValue = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumValue(); while (reader.pos < end) { @@ -516,10 +528,10 @@ export const EnumValue = { return message; }, fromJSON(object: any): EnumValue { - return { - type: isSet(object.type) ? String(object.type) : "", - value: isSet(object.value) ? Number(object.value) : 0 - }; + const obj = createBaseEnumValue(); + if (isSet(object.type)) obj.type = String(object.type); + if (isSet(object.value)) obj.value = Number(object.value); + return obj; }, toJSON(message: EnumValue): unknown { const obj: any = {}; @@ -580,14 +592,14 @@ function createBaseListValue(): ListValue { } export const ListValue = { typeUrl: "/google.api.expr.v1alpha1.ListValue", - encode(message: ListValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListValue(); while (reader.pos < end) { @@ -604,9 +616,9 @@ export const ListValue = { return message; }, fromJSON(object: any): ListValue { - return { - values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromJSON(e)) : [] - }; + const obj = createBaseListValue(); + if (Array.isArray(object?.values)) object.values.map((e: any) => Value.fromJSON(e)); + return obj; }, toJSON(message: ListValue): unknown { const obj: any = {}; @@ -673,14 +685,14 @@ function createBaseMapValue(): MapValue { } export const MapValue = { typeUrl: "/google.api.expr.v1alpha1.MapValue", - encode(message: MapValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MapValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { MapValue_Entry.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MapValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MapValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMapValue(); while (reader.pos < end) { @@ -697,9 +709,9 @@ export const MapValue = { return message; }, fromJSON(object: any): MapValue { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => MapValue_Entry.fromJSON(e)) : [] - }; + const obj = createBaseMapValue(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => MapValue_Entry.fromJSON(e)); + return obj; }, toJSON(message: MapValue): unknown { const obj: any = {}; @@ -767,7 +779,7 @@ function createBaseMapValue_Entry(): MapValue_Entry { } export const MapValue_Entry = { typeUrl: "/google.api.expr.v1alpha1.Entry", - encode(message: MapValue_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MapValue_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== undefined) { Value.encode(message.key, writer.uint32(10).fork()).ldelim(); } @@ -776,8 +788,8 @@ export const MapValue_Entry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MapValue_Entry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MapValue_Entry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMapValue_Entry(); while (reader.pos < end) { @@ -797,10 +809,10 @@ export const MapValue_Entry = { return message; }, fromJSON(object: any): MapValue_Entry { - return { - key: isSet(object.key) ? Value.fromJSON(object.key) : undefined, - value: isSet(object.value) ? Value.fromJSON(object.value) : undefined - }; + const obj = createBaseMapValue_Entry(); + if (isSet(object.key)) obj.key = Value.fromJSON(object.key); + if (isSet(object.value)) obj.value = Value.fromJSON(object.value); + return obj; }, toJSON(message: MapValue_Entry): unknown { const obj: any = {}; @@ -810,8 +822,12 @@ export const MapValue_Entry = { }, fromPartial(object: DeepPartial): MapValue_Entry { const message = createBaseMapValue_Entry(); - message.key = object.key !== undefined && object.key !== null ? Value.fromPartial(object.key) : undefined; - message.value = object.value !== undefined && object.value !== null ? Value.fromPartial(object.value) : undefined; + if (object.key !== undefined && object.key !== null) { + message.key = Value.fromPartial(object.key); + } + if (object.value !== undefined && object.value !== null) { + message.value = Value.fromPartial(object.value); + } return message; }, fromSDK(object: MapValue_EntrySDKType): MapValue_Entry { diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/decl.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/decl.ts index e86ad432a9..40aeffc05e 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/decl.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/decl.ts @@ -1,5 +1,5 @@ import { Expr, ExprAmino, ExprSDKType } from "./expr"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; /** A declaration. */ @@ -167,7 +167,7 @@ function createBaseDecl(): Decl { } export const Decl = { typeUrl: "/google.api.expr.v1beta1.Decl", - encode(message: Decl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Decl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); } @@ -185,8 +185,8 @@ export const Decl = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Decl { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Decl { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDecl(); while (reader.pos < end) { @@ -215,13 +215,13 @@ export const Decl = { return message; }, fromJSON(object: any): Decl { - return { - id: isSet(object.id) ? Number(object.id) : 0, - name: isSet(object.name) ? String(object.name) : "", - doc: isSet(object.doc) ? String(object.doc) : "", - ident: isSet(object.ident) ? IdentDecl.fromJSON(object.ident) : undefined, - function: isSet(object.function) ? FunctionDecl.fromJSON(object.function) : undefined - }; + const obj = createBaseDecl(); + if (isSet(object.id)) obj.id = Number(object.id); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.doc)) obj.doc = String(object.doc); + if (isSet(object.ident)) obj.ident = IdentDecl.fromJSON(object.ident); + if (isSet(object.function)) obj.function = FunctionDecl.fromJSON(object.function); + return obj; }, toJSON(message: Decl): unknown { const obj: any = {}; @@ -237,8 +237,12 @@ export const Decl = { message.id = object.id ?? 0; message.name = object.name ?? ""; message.doc = object.doc ?? ""; - message.ident = object.ident !== undefined && object.ident !== null ? IdentDecl.fromPartial(object.ident) : undefined; - message.function = object.function !== undefined && object.function !== null ? FunctionDecl.fromPartial(object.function) : undefined; + if (object.ident !== undefined && object.ident !== null) { + message.ident = IdentDecl.fromPartial(object.ident); + } + if (object.function !== undefined && object.function !== null) { + message.function = FunctionDecl.fromPartial(object.function); + } return message; }, fromSDK(object: DeclSDKType): Decl { @@ -302,7 +306,7 @@ function createBaseDeclType(): DeclType { } export const DeclType = { typeUrl: "/google.api.expr.v1beta1.DeclType", - encode(message: DeclType, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeclType, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); } @@ -314,8 +318,8 @@ export const DeclType = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeclType { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeclType { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeclType(); while (reader.pos < end) { @@ -338,11 +342,11 @@ export const DeclType = { return message; }, fromJSON(object: any): DeclType { - return { - id: isSet(object.id) ? Number(object.id) : 0, - type: isSet(object.type) ? String(object.type) : "", - typeParams: Array.isArray(object?.typeParams) ? object.typeParams.map((e: any) => DeclType.fromJSON(e)) : [] - }; + const obj = createBaseDeclType(); + if (isSet(object.id)) obj.id = Number(object.id); + if (isSet(object.type)) obj.type = String(object.type); + if (Array.isArray(object?.typeParams)) object.typeParams.map((e: any) => DeclType.fromJSON(e)); + return obj; }, toJSON(message: DeclType): unknown { const obj: any = {}; @@ -422,7 +426,7 @@ function createBaseIdentDecl(): IdentDecl { } export const IdentDecl = { typeUrl: "/google.api.expr.v1beta1.IdentDecl", - encode(message: IdentDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: IdentDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== undefined) { DeclType.encode(message.type, writer.uint32(26).fork()).ldelim(); } @@ -431,8 +435,8 @@ export const IdentDecl = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): IdentDecl { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): IdentDecl { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseIdentDecl(); while (reader.pos < end) { @@ -452,10 +456,10 @@ export const IdentDecl = { return message; }, fromJSON(object: any): IdentDecl { - return { - type: isSet(object.type) ? DeclType.fromJSON(object.type) : undefined, - value: isSet(object.value) ? Expr.fromJSON(object.value) : undefined - }; + const obj = createBaseIdentDecl(); + if (isSet(object.type)) obj.type = DeclType.fromJSON(object.type); + if (isSet(object.value)) obj.value = Expr.fromJSON(object.value); + return obj; }, toJSON(message: IdentDecl): unknown { const obj: any = {}; @@ -465,8 +469,12 @@ export const IdentDecl = { }, fromPartial(object: DeepPartial): IdentDecl { const message = createBaseIdentDecl(); - message.type = object.type !== undefined && object.type !== null ? DeclType.fromPartial(object.type) : undefined; - message.value = object.value !== undefined && object.value !== null ? Expr.fromPartial(object.value) : undefined; + if (object.type !== undefined && object.type !== null) { + message.type = DeclType.fromPartial(object.type); + } + if (object.value !== undefined && object.value !== null) { + message.value = Expr.fromPartial(object.value); + } return message; }, fromSDK(object: IdentDeclSDKType): IdentDecl { @@ -518,7 +526,7 @@ function createBaseFunctionDecl(): FunctionDecl { } export const FunctionDecl = { typeUrl: "/google.api.expr.v1beta1.FunctionDecl", - encode(message: FunctionDecl, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FunctionDecl, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.args) { IdentDecl.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -530,8 +538,8 @@ export const FunctionDecl = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FunctionDecl { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FunctionDecl { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFunctionDecl(); while (reader.pos < end) { @@ -554,11 +562,11 @@ export const FunctionDecl = { return message; }, fromJSON(object: any): FunctionDecl { - return { - args: Array.isArray(object?.args) ? object.args.map((e: any) => IdentDecl.fromJSON(e)) : [], - returnType: isSet(object.returnType) ? DeclType.fromJSON(object.returnType) : undefined, - receiverFunction: isSet(object.receiverFunction) ? Boolean(object.receiverFunction) : false - }; + const obj = createBaseFunctionDecl(); + if (Array.isArray(object?.args)) object.args.map((e: any) => IdentDecl.fromJSON(e)); + if (isSet(object.returnType)) obj.returnType = DeclType.fromJSON(object.returnType); + if (isSet(object.receiverFunction)) obj.receiverFunction = Boolean(object.receiverFunction); + return obj; }, toJSON(message: FunctionDecl): unknown { const obj: any = {}; @@ -574,7 +582,9 @@ export const FunctionDecl = { fromPartial(object: DeepPartial): FunctionDecl { const message = createBaseFunctionDecl(); message.args = object.args?.map(e => IdentDecl.fromPartial(e)) || []; - message.returnType = object.returnType !== undefined && object.returnType !== null ? DeclType.fromPartial(object.returnType) : undefined; + if (object.returnType !== undefined && object.returnType !== null) { + message.returnType = DeclType.fromPartial(object.returnType); + } message.receiverFunction = object.receiverFunction ?? false; return message; }, diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/eval.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/eval.ts index b720211e28..8b9f3719eb 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/eval.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/eval.ts @@ -1,6 +1,6 @@ import { Value, ValueAmino, ValueSDKType } from "./value"; import { Status, StatusAmino, StatusSDKType } from "../../../rpc/status"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { DeepPartial, isSet } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; /** @@ -293,7 +293,7 @@ function createBaseEvalState(): EvalState { } export const EvalState = { typeUrl: "/google.api.expr.v1beta1.EvalState", - encode(message: EvalState, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EvalState, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { ExprValue.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -302,8 +302,8 @@ export const EvalState = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalState { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalState { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalState(); while (reader.pos < end) { @@ -323,10 +323,10 @@ export const EvalState = { return message; }, fromJSON(object: any): EvalState { - return { - values: Array.isArray(object?.values) ? object.values.map((e: any) => ExprValue.fromJSON(e)) : [], - results: Array.isArray(object?.results) ? object.results.map((e: any) => EvalState_Result.fromJSON(e)) : [] - }; + const obj = createBaseEvalState(); + if (Array.isArray(object?.values)) object.values.map((e: any) => ExprValue.fromJSON(e)); + if (Array.isArray(object?.results)) object.results.map((e: any) => EvalState_Result.fromJSON(e)); + return obj; }, toJSON(message: EvalState): unknown { const obj: any = {}; @@ -412,7 +412,7 @@ function createBaseEvalState_Result(): EvalState_Result { } export const EvalState_Result = { typeUrl: "/google.api.expr.v1beta1.Result", - encode(message: EvalState_Result, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EvalState_Result, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== undefined) { IdRef.encode(message.expr, writer.uint32(10).fork()).ldelim(); } @@ -421,8 +421,8 @@ export const EvalState_Result = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EvalState_Result { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EvalState_Result { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEvalState_Result(); while (reader.pos < end) { @@ -442,10 +442,10 @@ export const EvalState_Result = { return message; }, fromJSON(object: any): EvalState_Result { - return { - expr: isSet(object.expr) ? IdRef.fromJSON(object.expr) : undefined, - value: isSet(object.value) ? Number(object.value) : 0 - }; + const obj = createBaseEvalState_Result(); + if (isSet(object.expr)) obj.expr = IdRef.fromJSON(object.expr); + if (isSet(object.value)) obj.value = Number(object.value); + return obj; }, toJSON(message: EvalState_Result): unknown { const obj: any = {}; @@ -455,7 +455,9 @@ export const EvalState_Result = { }, fromPartial(object: DeepPartial): EvalState_Result { const message = createBaseEvalState_Result(); - message.expr = object.expr !== undefined && object.expr !== null ? IdRef.fromPartial(object.expr) : undefined; + if (object.expr !== undefined && object.expr !== null) { + message.expr = IdRef.fromPartial(object.expr); + } message.value = object.value ?? 0; return message; }, @@ -508,7 +510,7 @@ function createBaseExprValue(): ExprValue { } export const ExprValue = { typeUrl: "/google.api.expr.v1beta1.ExprValue", - encode(message: ExprValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ExprValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.value !== undefined) { Value.encode(message.value, writer.uint32(10).fork()).ldelim(); } @@ -520,8 +522,8 @@ export const ExprValue = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ExprValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ExprValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExprValue(); while (reader.pos < end) { @@ -544,11 +546,11 @@ export const ExprValue = { return message; }, fromJSON(object: any): ExprValue { - return { - value: isSet(object.value) ? Value.fromJSON(object.value) : undefined, - error: isSet(object.error) ? ErrorSet.fromJSON(object.error) : undefined, - unknown: isSet(object.unknown) ? UnknownSet.fromJSON(object.unknown) : undefined - }; + const obj = createBaseExprValue(); + if (isSet(object.value)) obj.value = Value.fromJSON(object.value); + if (isSet(object.error)) obj.error = ErrorSet.fromJSON(object.error); + if (isSet(object.unknown)) obj.unknown = UnknownSet.fromJSON(object.unknown); + return obj; }, toJSON(message: ExprValue): unknown { const obj: any = {}; @@ -559,9 +561,15 @@ export const ExprValue = { }, fromPartial(object: DeepPartial): ExprValue { const message = createBaseExprValue(); - message.value = object.value !== undefined && object.value !== null ? Value.fromPartial(object.value) : undefined; - message.error = object.error !== undefined && object.error !== null ? ErrorSet.fromPartial(object.error) : undefined; - message.unknown = object.unknown !== undefined && object.unknown !== null ? UnknownSet.fromPartial(object.unknown) : undefined; + if (object.value !== undefined && object.value !== null) { + message.value = Value.fromPartial(object.value); + } + if (object.error !== undefined && object.error !== null) { + message.error = ErrorSet.fromPartial(object.error); + } + if (object.unknown !== undefined && object.unknown !== null) { + message.unknown = UnknownSet.fromPartial(object.unknown); + } return message; }, fromSDK(object: ExprValueSDKType): ExprValue { @@ -615,14 +623,14 @@ function createBaseErrorSet(): ErrorSet { } export const ErrorSet = { typeUrl: "/google.api.expr.v1beta1.ErrorSet", - encode(message: ErrorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ErrorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.errors) { Status.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ErrorSet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ErrorSet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseErrorSet(); while (reader.pos < end) { @@ -639,9 +647,9 @@ export const ErrorSet = { return message; }, fromJSON(object: any): ErrorSet { - return { - errors: Array.isArray(object?.errors) ? object.errors.map((e: any) => Status.fromJSON(e)) : [] - }; + const obj = createBaseErrorSet(); + if (Array.isArray(object?.errors)) object.errors.map((e: any) => Status.fromJSON(e)); + return obj; }, toJSON(message: ErrorSet): unknown { const obj: any = {}; @@ -708,14 +716,14 @@ function createBaseUnknownSet(): UnknownSet { } export const UnknownSet = { typeUrl: "/google.api.expr.v1beta1.UnknownSet", - encode(message: UnknownSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UnknownSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.exprs) { IdRef.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UnknownSet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UnknownSet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUnknownSet(); while (reader.pos < end) { @@ -732,9 +740,9 @@ export const UnknownSet = { return message; }, fromJSON(object: any): UnknownSet { - return { - exprs: Array.isArray(object?.exprs) ? object.exprs.map((e: any) => IdRef.fromJSON(e)) : [] - }; + const obj = createBaseUnknownSet(); + if (Array.isArray(object?.exprs)) object.exprs.map((e: any) => IdRef.fromJSON(e)); + return obj; }, toJSON(message: UnknownSet): unknown { const obj: any = {}; @@ -801,14 +809,14 @@ function createBaseIdRef(): IdRef { } export const IdRef = { typeUrl: "/google.api.expr.v1beta1.IdRef", - encode(message: IdRef, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: IdRef, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): IdRef { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): IdRef { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseIdRef(); while (reader.pos < end) { @@ -825,9 +833,9 @@ export const IdRef = { return message; }, fromJSON(object: any): IdRef { - return { - id: isSet(object.id) ? Number(object.id) : 0 - }; + const obj = createBaseIdRef(); + if (isSet(object.id)) obj.id = Number(object.id); + return obj; }, toJSON(message: IdRef): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/expr.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/expr.ts index e02f154958..00ec6177d3 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/expr.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/expr.ts @@ -1,7 +1,7 @@ import { SourceInfo, SourceInfoAmino, SourceInfoSDKType } from "./source"; import { NullValue, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; -import { Long, isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, bytesFromBase64, base64FromBytes } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; /** An expression together with source information as returned by the parser. */ export interface ParsedExpr { @@ -601,9 +601,9 @@ export interface Literal { /** boolean value. */ boolValue?: boolean; /** int64 value. */ - int64Value?: Long; + int64Value?: bigint; /** uint64 value. */ - uint64Value?: Long; + uint64Value?: bigint; /** double value. */ doubleValue?: number; /** string value. */ @@ -664,8 +664,8 @@ export interface LiteralAminoMsg { export interface LiteralSDKType { null_value?: NullValue; bool_value?: boolean; - int64_value?: Long; - uint64_value?: Long; + int64_value?: bigint; + uint64_value?: bigint; double_value?: number; string_value?: string; bytes_value?: Uint8Array; @@ -679,7 +679,7 @@ function createBaseParsedExpr(): ParsedExpr { } export const ParsedExpr = { typeUrl: "/google.api.expr.v1beta1.ParsedExpr", - encode(message: ParsedExpr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ParsedExpr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.expr !== undefined) { Expr.encode(message.expr, writer.uint32(18).fork()).ldelim(); } @@ -691,8 +691,8 @@ export const ParsedExpr = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ParsedExpr { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ParsedExpr { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseParsedExpr(); while (reader.pos < end) { @@ -715,11 +715,11 @@ export const ParsedExpr = { return message; }, fromJSON(object: any): ParsedExpr { - return { - expr: isSet(object.expr) ? Expr.fromJSON(object.expr) : undefined, - sourceInfo: isSet(object.sourceInfo) ? SourceInfo.fromJSON(object.sourceInfo) : undefined, - syntaxVersion: isSet(object.syntaxVersion) ? String(object.syntaxVersion) : "" - }; + const obj = createBaseParsedExpr(); + if (isSet(object.expr)) obj.expr = Expr.fromJSON(object.expr); + if (isSet(object.sourceInfo)) obj.sourceInfo = SourceInfo.fromJSON(object.sourceInfo); + if (isSet(object.syntaxVersion)) obj.syntaxVersion = String(object.syntaxVersion); + return obj; }, toJSON(message: ParsedExpr): unknown { const obj: any = {}; @@ -730,8 +730,12 @@ export const ParsedExpr = { }, fromPartial(object: DeepPartial): ParsedExpr { const message = createBaseParsedExpr(); - message.expr = object.expr !== undefined && object.expr !== null ? Expr.fromPartial(object.expr) : undefined; - message.sourceInfo = object.sourceInfo !== undefined && object.sourceInfo !== null ? SourceInfo.fromPartial(object.sourceInfo) : undefined; + if (object.expr !== undefined && object.expr !== null) { + message.expr = Expr.fromPartial(object.expr); + } + if (object.sourceInfo !== undefined && object.sourceInfo !== null) { + message.sourceInfo = SourceInfo.fromPartial(object.sourceInfo); + } message.syntaxVersion = object.syntaxVersion ?? ""; return message; }, @@ -793,7 +797,7 @@ function createBaseExpr(): Expr { } export const Expr = { typeUrl: "/google.api.expr.v1beta1.Expr", - encode(message: Expr, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(16).int32(message.id); } @@ -820,8 +824,8 @@ export const Expr = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr(); while (reader.pos < end) { @@ -859,16 +863,16 @@ export const Expr = { return message; }, fromJSON(object: any): Expr { - return { - id: isSet(object.id) ? Number(object.id) : 0, - literalExpr: isSet(object.literalExpr) ? Literal.fromJSON(object.literalExpr) : undefined, - identExpr: isSet(object.identExpr) ? Expr_Ident.fromJSON(object.identExpr) : undefined, - selectExpr: isSet(object.selectExpr) ? Expr_Select.fromJSON(object.selectExpr) : undefined, - callExpr: isSet(object.callExpr) ? Expr_Call.fromJSON(object.callExpr) : undefined, - listExpr: isSet(object.listExpr) ? Expr_CreateList.fromJSON(object.listExpr) : undefined, - structExpr: isSet(object.structExpr) ? Expr_CreateStruct.fromJSON(object.structExpr) : undefined, - comprehensionExpr: isSet(object.comprehensionExpr) ? Expr_Comprehension.fromJSON(object.comprehensionExpr) : undefined - }; + const obj = createBaseExpr(); + if (isSet(object.id)) obj.id = Number(object.id); + if (isSet(object.literalExpr)) obj.literalExpr = Literal.fromJSON(object.literalExpr); + if (isSet(object.identExpr)) obj.identExpr = Expr_Ident.fromJSON(object.identExpr); + if (isSet(object.selectExpr)) obj.selectExpr = Expr_Select.fromJSON(object.selectExpr); + if (isSet(object.callExpr)) obj.callExpr = Expr_Call.fromJSON(object.callExpr); + if (isSet(object.listExpr)) obj.listExpr = Expr_CreateList.fromJSON(object.listExpr); + if (isSet(object.structExpr)) obj.structExpr = Expr_CreateStruct.fromJSON(object.structExpr); + if (isSet(object.comprehensionExpr)) obj.comprehensionExpr = Expr_Comprehension.fromJSON(object.comprehensionExpr); + return obj; }, toJSON(message: Expr): unknown { const obj: any = {}; @@ -885,13 +889,27 @@ export const Expr = { fromPartial(object: DeepPartial): Expr { const message = createBaseExpr(); message.id = object.id ?? 0; - message.literalExpr = object.literalExpr !== undefined && object.literalExpr !== null ? Literal.fromPartial(object.literalExpr) : undefined; - message.identExpr = object.identExpr !== undefined && object.identExpr !== null ? Expr_Ident.fromPartial(object.identExpr) : undefined; - message.selectExpr = object.selectExpr !== undefined && object.selectExpr !== null ? Expr_Select.fromPartial(object.selectExpr) : undefined; - message.callExpr = object.callExpr !== undefined && object.callExpr !== null ? Expr_Call.fromPartial(object.callExpr) : undefined; - message.listExpr = object.listExpr !== undefined && object.listExpr !== null ? Expr_CreateList.fromPartial(object.listExpr) : undefined; - message.structExpr = object.structExpr !== undefined && object.structExpr !== null ? Expr_CreateStruct.fromPartial(object.structExpr) : undefined; - message.comprehensionExpr = object.comprehensionExpr !== undefined && object.comprehensionExpr !== null ? Expr_Comprehension.fromPartial(object.comprehensionExpr) : undefined; + if (object.literalExpr !== undefined && object.literalExpr !== null) { + message.literalExpr = Literal.fromPartial(object.literalExpr); + } + if (object.identExpr !== undefined && object.identExpr !== null) { + message.identExpr = Expr_Ident.fromPartial(object.identExpr); + } + if (object.selectExpr !== undefined && object.selectExpr !== null) { + message.selectExpr = Expr_Select.fromPartial(object.selectExpr); + } + if (object.callExpr !== undefined && object.callExpr !== null) { + message.callExpr = Expr_Call.fromPartial(object.callExpr); + } + if (object.listExpr !== undefined && object.listExpr !== null) { + message.listExpr = Expr_CreateList.fromPartial(object.listExpr); + } + if (object.structExpr !== undefined && object.structExpr !== null) { + message.structExpr = Expr_CreateStruct.fromPartial(object.structExpr); + } + if (object.comprehensionExpr !== undefined && object.comprehensionExpr !== null) { + message.comprehensionExpr = Expr_Comprehension.fromPartial(object.comprehensionExpr); + } return message; }, fromSDK(object: ExprSDKType): Expr { @@ -965,14 +983,14 @@ function createBaseExpr_Ident(): Expr_Ident { } export const Expr_Ident = { typeUrl: "/google.api.expr.v1beta1.Ident", - encode(message: Expr_Ident, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Ident, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Ident { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Ident { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Ident(); while (reader.pos < end) { @@ -989,9 +1007,9 @@ export const Expr_Ident = { return message; }, fromJSON(object: any): Expr_Ident { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseExpr_Ident(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: Expr_Ident): unknown { const obj: any = {}; @@ -1048,7 +1066,7 @@ function createBaseExpr_Select(): Expr_Select { } export const Expr_Select = { typeUrl: "/google.api.expr.v1beta1.Select", - encode(message: Expr_Select, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Select, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operand !== undefined) { Expr.encode(message.operand, writer.uint32(10).fork()).ldelim(); } @@ -1060,8 +1078,8 @@ export const Expr_Select = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Select { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Select { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Select(); while (reader.pos < end) { @@ -1084,11 +1102,11 @@ export const Expr_Select = { return message; }, fromJSON(object: any): Expr_Select { - return { - operand: isSet(object.operand) ? Expr.fromJSON(object.operand) : undefined, - field: isSet(object.field) ? String(object.field) : "", - testOnly: isSet(object.testOnly) ? Boolean(object.testOnly) : false - }; + const obj = createBaseExpr_Select(); + if (isSet(object.operand)) obj.operand = Expr.fromJSON(object.operand); + if (isSet(object.field)) obj.field = String(object.field); + if (isSet(object.testOnly)) obj.testOnly = Boolean(object.testOnly); + return obj; }, toJSON(message: Expr_Select): unknown { const obj: any = {}; @@ -1099,7 +1117,9 @@ export const Expr_Select = { }, fromPartial(object: DeepPartial): Expr_Select { const message = createBaseExpr_Select(); - message.operand = object.operand !== undefined && object.operand !== null ? Expr.fromPartial(object.operand) : undefined; + if (object.operand !== undefined && object.operand !== null) { + message.operand = Expr.fromPartial(object.operand); + } message.field = object.field ?? ""; message.testOnly = object.testOnly ?? false; return message; @@ -1157,7 +1177,7 @@ function createBaseExpr_Call(): Expr_Call { } export const Expr_Call = { typeUrl: "/google.api.expr.v1beta1.Call", - encode(message: Expr_Call, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Call, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.target !== undefined) { Expr.encode(message.target, writer.uint32(10).fork()).ldelim(); } @@ -1169,8 +1189,8 @@ export const Expr_Call = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Call { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Call { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Call(); while (reader.pos < end) { @@ -1193,11 +1213,11 @@ export const Expr_Call = { return message; }, fromJSON(object: any): Expr_Call { - return { - target: isSet(object.target) ? Expr.fromJSON(object.target) : undefined, - function: isSet(object.function) ? String(object.function) : "", - args: Array.isArray(object?.args) ? object.args.map((e: any) => Expr.fromJSON(e)) : [] - }; + const obj = createBaseExpr_Call(); + if (isSet(object.target)) obj.target = Expr.fromJSON(object.target); + if (isSet(object.function)) obj.function = String(object.function); + if (Array.isArray(object?.args)) object.args.map((e: any) => Expr.fromJSON(e)); + return obj; }, toJSON(message: Expr_Call): unknown { const obj: any = {}; @@ -1212,7 +1232,9 @@ export const Expr_Call = { }, fromPartial(object: DeepPartial): Expr_Call { const message = createBaseExpr_Call(); - message.target = object.target !== undefined && object.target !== null ? Expr.fromPartial(object.target) : undefined; + if (object.target !== undefined && object.target !== null) { + message.target = Expr.fromPartial(object.target); + } message.function = object.function ?? ""; message.args = object.args?.map(e => Expr.fromPartial(e)) || []; return message; @@ -1276,14 +1298,14 @@ function createBaseExpr_CreateList(): Expr_CreateList { } export const Expr_CreateList = { typeUrl: "/google.api.expr.v1beta1.CreateList", - encode(message: Expr_CreateList, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_CreateList, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.elements) { Expr.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_CreateList { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_CreateList { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_CreateList(); while (reader.pos < end) { @@ -1300,9 +1322,9 @@ export const Expr_CreateList = { return message; }, fromJSON(object: any): Expr_CreateList { - return { - elements: Array.isArray(object?.elements) ? object.elements.map((e: any) => Expr.fromJSON(e)) : [] - }; + const obj = createBaseExpr_CreateList(); + if (Array.isArray(object?.elements)) object.elements.map((e: any) => Expr.fromJSON(e)); + return obj; }, toJSON(message: Expr_CreateList): unknown { const obj: any = {}; @@ -1370,7 +1392,7 @@ function createBaseExpr_CreateStruct(): Expr_CreateStruct { } export const Expr_CreateStruct = { typeUrl: "/google.api.expr.v1beta1.CreateStruct", - encode(message: Expr_CreateStruct, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_CreateStruct, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -1379,8 +1401,8 @@ export const Expr_CreateStruct = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_CreateStruct { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_CreateStruct { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_CreateStruct(); while (reader.pos < end) { @@ -1400,10 +1422,10 @@ export const Expr_CreateStruct = { return message; }, fromJSON(object: any): Expr_CreateStruct { - return { - type: isSet(object.type) ? String(object.type) : "", - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => Expr_CreateStruct_Entry.fromJSON(e)) : [] - }; + const obj = createBaseExpr_CreateStruct(); + if (isSet(object.type)) obj.type = String(object.type); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => Expr_CreateStruct_Entry.fromJSON(e)); + return obj; }, toJSON(message: Expr_CreateStruct): unknown { const obj: any = {}; @@ -1479,7 +1501,7 @@ function createBaseExpr_CreateStruct_Entry(): Expr_CreateStruct_Entry { } export const Expr_CreateStruct_Entry = { typeUrl: "/google.api.expr.v1beta1.Entry", - encode(message: Expr_CreateStruct_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_CreateStruct_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== 0) { writer.uint32(8).int32(message.id); } @@ -1494,8 +1516,8 @@ export const Expr_CreateStruct_Entry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_CreateStruct_Entry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_CreateStruct_Entry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_CreateStruct_Entry(); while (reader.pos < end) { @@ -1521,12 +1543,12 @@ export const Expr_CreateStruct_Entry = { return message; }, fromJSON(object: any): Expr_CreateStruct_Entry { - return { - id: isSet(object.id) ? Number(object.id) : 0, - fieldKey: isSet(object.fieldKey) ? String(object.fieldKey) : undefined, - mapKey: isSet(object.mapKey) ? Expr.fromJSON(object.mapKey) : undefined, - value: isSet(object.value) ? Expr.fromJSON(object.value) : undefined - }; + const obj = createBaseExpr_CreateStruct_Entry(); + if (isSet(object.id)) obj.id = Number(object.id); + if (isSet(object.fieldKey)) obj.fieldKey = String(object.fieldKey); + if (isSet(object.mapKey)) obj.mapKey = Expr.fromJSON(object.mapKey); + if (isSet(object.value)) obj.value = Expr.fromJSON(object.value); + return obj; }, toJSON(message: Expr_CreateStruct_Entry): unknown { const obj: any = {}; @@ -1540,8 +1562,12 @@ export const Expr_CreateStruct_Entry = { const message = createBaseExpr_CreateStruct_Entry(); message.id = object.id ?? 0; message.fieldKey = object.fieldKey ?? undefined; - message.mapKey = object.mapKey !== undefined && object.mapKey !== null ? Expr.fromPartial(object.mapKey) : undefined; - message.value = object.value !== undefined && object.value !== null ? Expr.fromPartial(object.value) : undefined; + if (object.mapKey !== undefined && object.mapKey !== null) { + message.mapKey = Expr.fromPartial(object.mapKey); + } + if (object.value !== undefined && object.value !== null) { + message.value = Expr.fromPartial(object.value); + } return message; }, fromSDK(object: Expr_CreateStruct_EntrySDKType): Expr_CreateStruct_Entry { @@ -1605,7 +1631,7 @@ function createBaseExpr_Comprehension(): Expr_Comprehension { } export const Expr_Comprehension = { typeUrl: "/google.api.expr.v1beta1.Comprehension", - encode(message: Expr_Comprehension, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Expr_Comprehension, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.iterVar !== "") { writer.uint32(10).string(message.iterVar); } @@ -1629,8 +1655,8 @@ export const Expr_Comprehension = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Expr_Comprehension { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Expr_Comprehension { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExpr_Comprehension(); while (reader.pos < end) { @@ -1665,15 +1691,15 @@ export const Expr_Comprehension = { return message; }, fromJSON(object: any): Expr_Comprehension { - return { - iterVar: isSet(object.iterVar) ? String(object.iterVar) : "", - iterRange: isSet(object.iterRange) ? Expr.fromJSON(object.iterRange) : undefined, - accuVar: isSet(object.accuVar) ? String(object.accuVar) : "", - accuInit: isSet(object.accuInit) ? Expr.fromJSON(object.accuInit) : undefined, - loopCondition: isSet(object.loopCondition) ? Expr.fromJSON(object.loopCondition) : undefined, - loopStep: isSet(object.loopStep) ? Expr.fromJSON(object.loopStep) : undefined, - result: isSet(object.result) ? Expr.fromJSON(object.result) : undefined - }; + const obj = createBaseExpr_Comprehension(); + if (isSet(object.iterVar)) obj.iterVar = String(object.iterVar); + if (isSet(object.iterRange)) obj.iterRange = Expr.fromJSON(object.iterRange); + if (isSet(object.accuVar)) obj.accuVar = String(object.accuVar); + if (isSet(object.accuInit)) obj.accuInit = Expr.fromJSON(object.accuInit); + if (isSet(object.loopCondition)) obj.loopCondition = Expr.fromJSON(object.loopCondition); + if (isSet(object.loopStep)) obj.loopStep = Expr.fromJSON(object.loopStep); + if (isSet(object.result)) obj.result = Expr.fromJSON(object.result); + return obj; }, toJSON(message: Expr_Comprehension): unknown { const obj: any = {}; @@ -1689,12 +1715,22 @@ export const Expr_Comprehension = { fromPartial(object: DeepPartial): Expr_Comprehension { const message = createBaseExpr_Comprehension(); message.iterVar = object.iterVar ?? ""; - message.iterRange = object.iterRange !== undefined && object.iterRange !== null ? Expr.fromPartial(object.iterRange) : undefined; + if (object.iterRange !== undefined && object.iterRange !== null) { + message.iterRange = Expr.fromPartial(object.iterRange); + } message.accuVar = object.accuVar ?? ""; - message.accuInit = object.accuInit !== undefined && object.accuInit !== null ? Expr.fromPartial(object.accuInit) : undefined; - message.loopCondition = object.loopCondition !== undefined && object.loopCondition !== null ? Expr.fromPartial(object.loopCondition) : undefined; - message.loopStep = object.loopStep !== undefined && object.loopStep !== null ? Expr.fromPartial(object.loopStep) : undefined; - message.result = object.result !== undefined && object.result !== null ? Expr.fromPartial(object.result) : undefined; + if (object.accuInit !== undefined && object.accuInit !== null) { + message.accuInit = Expr.fromPartial(object.accuInit); + } + if (object.loopCondition !== undefined && object.loopCondition !== null) { + message.loopCondition = Expr.fromPartial(object.loopCondition); + } + if (object.loopStep !== undefined && object.loopStep !== null) { + message.loopStep = Expr.fromPartial(object.loopStep); + } + if (object.result !== undefined && object.result !== null) { + message.result = Expr.fromPartial(object.result); + } return message; }, fromSDK(object: Expr_ComprehensionSDKType): Expr_Comprehension { @@ -1770,7 +1806,7 @@ function createBaseLiteral(): Literal { } export const Literal = { typeUrl: "/google.api.expr.v1beta1.Literal", - encode(message: Literal, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Literal, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); } @@ -1794,8 +1830,8 @@ export const Literal = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Literal { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Literal { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLiteral(); while (reader.pos < end) { @@ -1808,10 +1844,10 @@ export const Literal = { message.boolValue = reader.bool(); break; case 3: - message.int64Value = (reader.int64() as Long); + message.int64Value = reader.int64(); break; case 4: - message.uint64Value = (reader.uint64() as Long); + message.uint64Value = reader.uint64(); break; case 5: message.doubleValue = reader.double(); @@ -1830,15 +1866,15 @@ export const Literal = { return message; }, fromJSON(object: any): Literal { - return { - nullValue: isSet(object.nullValue) ? nullValueFromJSON(object.nullValue) : undefined, - boolValue: isSet(object.boolValue) ? Boolean(object.boolValue) : undefined, - int64Value: isSet(object.int64Value) ? Long.fromValue(object.int64Value) : undefined, - uint64Value: isSet(object.uint64Value) ? Long.fromValue(object.uint64Value) : undefined, - doubleValue: isSet(object.doubleValue) ? Number(object.doubleValue) : undefined, - stringValue: isSet(object.stringValue) ? String(object.stringValue) : undefined, - bytesValue: isSet(object.bytesValue) ? bytesFromBase64(object.bytesValue) : undefined - }; + const obj = createBaseLiteral(); + if (isSet(object.nullValue)) obj.nullValue = nullValueFromJSON(object.nullValue); + if (isSet(object.boolValue)) obj.boolValue = Boolean(object.boolValue); + if (isSet(object.int64Value)) obj.int64Value = BigInt(object.int64Value.toString()); + if (isSet(object.uint64Value)) obj.uint64Value = BigInt(object.uint64Value.toString()); + if (isSet(object.doubleValue)) obj.doubleValue = Number(object.doubleValue); + if (isSet(object.stringValue)) obj.stringValue = String(object.stringValue); + if (isSet(object.bytesValue)) obj.bytesValue = bytesFromBase64(object.bytesValue); + return obj; }, toJSON(message: Literal): unknown { const obj: any = {}; @@ -1855,8 +1891,12 @@ export const Literal = { const message = createBaseLiteral(); message.nullValue = object.nullValue ?? undefined; message.boolValue = object.boolValue ?? undefined; - message.int64Value = object.int64Value !== undefined && object.int64Value !== null ? Long.fromValue(object.int64Value) : undefined; - message.uint64Value = object.uint64Value !== undefined && object.uint64Value !== null ? Long.fromValue(object.uint64Value) : undefined; + if (object.int64Value !== undefined && object.int64Value !== null) { + message.int64Value = BigInt(object.int64Value.toString()); + } + if (object.uint64Value !== undefined && object.uint64Value !== null) { + message.uint64Value = BigInt(object.uint64Value.toString()); + } message.doubleValue = object.doubleValue ?? undefined; message.stringValue = object.stringValue ?? undefined; message.bytesValue = object.bytesValue ?? undefined; @@ -1888,8 +1928,8 @@ export const Literal = { return { nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, boolValue: object?.bool_value, - int64Value: object?.int64_value ? Long.fromString(object.int64_value) : undefined, - uint64Value: object?.uint64_value ? Long.fromString(object.uint64_value) : undefined, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, doubleValue: object?.double_value, stringValue: object?.string_value, bytesValue: object?.bytes_value diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/source.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/source.ts index 4a84450997..e9614e6af7 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/source.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/source.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; export interface SourceInfo_PositionsEntry { @@ -145,7 +145,7 @@ function createBaseSourceInfo_PositionsEntry(): SourceInfo_PositionsEntry { }; } export const SourceInfo_PositionsEntry = { - encode(message: SourceInfo_PositionsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceInfo_PositionsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== 0) { writer.uint32(8).int32(message.key); } @@ -154,8 +154,8 @@ export const SourceInfo_PositionsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceInfo_PositionsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceInfo_PositionsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceInfo_PositionsEntry(); while (reader.pos < end) { @@ -175,10 +175,10 @@ export const SourceInfo_PositionsEntry = { return message; }, fromJSON(object: any): SourceInfo_PositionsEntry { - return { - key: isSet(object.key) ? Number(object.key) : 0, - value: isSet(object.value) ? Number(object.value) : 0 - }; + const obj = createBaseSourceInfo_PositionsEntry(); + if (isSet(object.key)) obj.key = Number(object.key); + if (isSet(object.value)) obj.value = Number(object.value); + return obj; }, toJSON(message: SourceInfo_PositionsEntry): unknown { const obj: any = {}; @@ -235,7 +235,7 @@ function createBaseSourceInfo(): SourceInfo { } export const SourceInfo = { typeUrl: "/google.api.expr.v1beta1.SourceInfo", - encode(message: SourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(18).string(message.location); } @@ -252,8 +252,8 @@ export const SourceInfo = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceInfo(); while (reader.pos < end) { @@ -286,16 +286,16 @@ export const SourceInfo = { return message; }, fromJSON(object: any): SourceInfo { - return { - location: isSet(object.location) ? String(object.location) : "", - lineOffsets: Array.isArray(object?.lineOffsets) ? object.lineOffsets.map((e: any) => Number(e)) : [], - positions: isObject(object.positions) ? Object.entries(object.positions).reduce<{ - [key: number]: number; - }>((acc, [key, value]) => { - acc[Number(key)] = Number(value); - return acc; - }, {}) : {} - }; + const obj = createBaseSourceInfo(); + if (isSet(object.location)) obj.location = String(object.location); + if (Array.isArray(object?.lineOffsets)) object.lineOffsets.map((e: any) => Number(e)); + if (isObject(object.positions)) obj.positions = Object.entries(object.positions).reduce<{ + [key: number]: number; + }>((acc, [key, value]) => { + acc[Number(key)] = Number(value); + return acc; + }, {}); + return obj; }, toJSON(message: SourceInfo): unknown { const obj: any = {}; @@ -409,7 +409,7 @@ function createBaseSourcePosition(): SourcePosition { } export const SourcePosition = { typeUrl: "/google.api.expr.v1beta1.SourcePosition", - encode(message: SourcePosition, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourcePosition, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(10).string(message.location); } @@ -424,8 +424,8 @@ export const SourcePosition = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourcePosition { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourcePosition { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourcePosition(); while (reader.pos < end) { @@ -451,12 +451,12 @@ export const SourcePosition = { return message; }, fromJSON(object: any): SourcePosition { - return { - location: isSet(object.location) ? String(object.location) : "", - offset: isSet(object.offset) ? Number(object.offset) : 0, - line: isSet(object.line) ? Number(object.line) : 0, - column: isSet(object.column) ? Number(object.column) : 0 - }; + const obj = createBaseSourcePosition(); + if (isSet(object.location)) obj.location = String(object.location); + if (isSet(object.offset)) obj.offset = Number(object.offset); + if (isSet(object.line)) obj.line = Number(object.line); + if (isSet(object.column)) obj.column = Number(object.column); + return obj; }, toJSON(message: SourcePosition): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/value.ts b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/value.ts index 731f193885..086aa09ed2 100644 --- a/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/value.ts +++ b/__fixtures__/v-next/outputv2/google/api/expr/v1beta1/value.ts @@ -1,7 +1,7 @@ import { NullValue, nullValueFromJSON, nullValueToJSON } from "../../../protobuf/struct"; import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; -import { Long, isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1beta1"; /** * Represents a CEL value. @@ -15,9 +15,9 @@ export interface Value { /** Boolean value. */ boolValue?: boolean; /** Signed integer value. */ - int64Value?: Long; + int64Value?: bigint; /** Unsigned integer value. */ - uint64Value?: Long; + uint64Value?: bigint; /** Floating point value. */ doubleValue?: number; /** UTF-8 string value. */ @@ -84,8 +84,8 @@ export interface ValueAminoMsg { export interface ValueSDKType { null_value?: NullValue; bool_value?: boolean; - int64_value?: Long; - uint64_value?: Long; + int64_value?: bigint; + uint64_value?: bigint; double_value?: number; string_value?: string; bytes_value?: Uint8Array; @@ -261,7 +261,7 @@ function createBaseValue(): Value { } export const Value = { typeUrl: "/google.api.expr.v1beta1.Value", - encode(message: Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); } @@ -300,8 +300,8 @@ export const Value = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Value { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Value { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValue(); while (reader.pos < end) { @@ -314,10 +314,10 @@ export const Value = { message.boolValue = reader.bool(); break; case 3: - message.int64Value = (reader.int64() as Long); + message.int64Value = reader.int64(); break; case 4: - message.uint64Value = (reader.uint64() as Long); + message.uint64Value = reader.uint64(); break; case 5: message.doubleValue = reader.double(); @@ -351,20 +351,20 @@ export const Value = { return message; }, fromJSON(object: any): Value { - return { - nullValue: isSet(object.nullValue) ? nullValueFromJSON(object.nullValue) : undefined, - boolValue: isSet(object.boolValue) ? Boolean(object.boolValue) : undefined, - int64Value: isSet(object.int64Value) ? Long.fromValue(object.int64Value) : undefined, - uint64Value: isSet(object.uint64Value) ? Long.fromValue(object.uint64Value) : undefined, - doubleValue: isSet(object.doubleValue) ? Number(object.doubleValue) : undefined, - stringValue: isSet(object.stringValue) ? String(object.stringValue) : undefined, - bytesValue: isSet(object.bytesValue) ? bytesFromBase64(object.bytesValue) : undefined, - enumValue: isSet(object.enumValue) ? EnumValue.fromJSON(object.enumValue) : undefined, - objectValue: isSet(object.objectValue) ? Any.fromJSON(object.objectValue) : undefined, - mapValue: isSet(object.mapValue) ? MapValue.fromJSON(object.mapValue) : undefined, - listValue: isSet(object.listValue) ? ListValue.fromJSON(object.listValue) : undefined, - typeValue: isSet(object.typeValue) ? String(object.typeValue) : undefined - }; + const obj = createBaseValue(); + if (isSet(object.nullValue)) obj.nullValue = nullValueFromJSON(object.nullValue); + if (isSet(object.boolValue)) obj.boolValue = Boolean(object.boolValue); + if (isSet(object.int64Value)) obj.int64Value = BigInt(object.int64Value.toString()); + if (isSet(object.uint64Value)) obj.uint64Value = BigInt(object.uint64Value.toString()); + if (isSet(object.doubleValue)) obj.doubleValue = Number(object.doubleValue); + if (isSet(object.stringValue)) obj.stringValue = String(object.stringValue); + if (isSet(object.bytesValue)) obj.bytesValue = bytesFromBase64(object.bytesValue); + if (isSet(object.enumValue)) obj.enumValue = EnumValue.fromJSON(object.enumValue); + if (isSet(object.objectValue)) obj.objectValue = Any.fromJSON(object.objectValue); + if (isSet(object.mapValue)) obj.mapValue = MapValue.fromJSON(object.mapValue); + if (isSet(object.listValue)) obj.listValue = ListValue.fromJSON(object.listValue); + if (isSet(object.typeValue)) obj.typeValue = String(object.typeValue); + return obj; }, toJSON(message: Value): unknown { const obj: any = {}; @@ -386,15 +386,27 @@ export const Value = { const message = createBaseValue(); message.nullValue = object.nullValue ?? undefined; message.boolValue = object.boolValue ?? undefined; - message.int64Value = object.int64Value !== undefined && object.int64Value !== null ? Long.fromValue(object.int64Value) : undefined; - message.uint64Value = object.uint64Value !== undefined && object.uint64Value !== null ? Long.fromValue(object.uint64Value) : undefined; + if (object.int64Value !== undefined && object.int64Value !== null) { + message.int64Value = BigInt(object.int64Value.toString()); + } + if (object.uint64Value !== undefined && object.uint64Value !== null) { + message.uint64Value = BigInt(object.uint64Value.toString()); + } message.doubleValue = object.doubleValue ?? undefined; message.stringValue = object.stringValue ?? undefined; message.bytesValue = object.bytesValue ?? undefined; - message.enumValue = object.enumValue !== undefined && object.enumValue !== null ? EnumValue.fromPartial(object.enumValue) : undefined; - message.objectValue = object.objectValue !== undefined && object.objectValue !== null ? Any.fromPartial(object.objectValue) : undefined; - message.mapValue = object.mapValue !== undefined && object.mapValue !== null ? MapValue.fromPartial(object.mapValue) : undefined; - message.listValue = object.listValue !== undefined && object.listValue !== null ? ListValue.fromPartial(object.listValue) : undefined; + if (object.enumValue !== undefined && object.enumValue !== null) { + message.enumValue = EnumValue.fromPartial(object.enumValue); + } + if (object.objectValue !== undefined && object.objectValue !== null) { + message.objectValue = Any.fromPartial(object.objectValue); + } + if (object.mapValue !== undefined && object.mapValue !== null) { + message.mapValue = MapValue.fromPartial(object.mapValue); + } + if (object.listValue !== undefined && object.listValue !== null) { + message.listValue = ListValue.fromPartial(object.listValue); + } message.typeValue = object.typeValue ?? undefined; return message; }, @@ -434,8 +446,8 @@ export const Value = { return { nullValue: isSet(object.null_value) ? nullValueFromJSON(object.null_value) : undefined, boolValue: object?.bool_value, - int64Value: object?.int64_value ? Long.fromString(object.int64_value) : undefined, - uint64Value: object?.uint64_value ? Long.fromString(object.uint64_value) : undefined, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, + uint64Value: object?.uint64_value ? BigInt(object.uint64_value) : undefined, doubleValue: object?.double_value, stringValue: object?.string_value, bytesValue: object?.bytes_value, @@ -486,7 +498,7 @@ function createBaseEnumValue(): EnumValue { } export const EnumValue = { typeUrl: "/google.api.expr.v1beta1.EnumValue", - encode(message: EnumValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -495,8 +507,8 @@ export const EnumValue = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumValue(); while (reader.pos < end) { @@ -516,10 +528,10 @@ export const EnumValue = { return message; }, fromJSON(object: any): EnumValue { - return { - type: isSet(object.type) ? String(object.type) : "", - value: isSet(object.value) ? Number(object.value) : 0 - }; + const obj = createBaseEnumValue(); + if (isSet(object.type)) obj.type = String(object.type); + if (isSet(object.value)) obj.value = Number(object.value); + return obj; }, toJSON(message: EnumValue): unknown { const obj: any = {}; @@ -580,14 +592,14 @@ function createBaseListValue(): ListValue { } export const ListValue = { typeUrl: "/google.api.expr.v1beta1.ListValue", - encode(message: ListValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListValue(); while (reader.pos < end) { @@ -604,9 +616,9 @@ export const ListValue = { return message; }, fromJSON(object: any): ListValue { - return { - values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromJSON(e)) : [] - }; + const obj = createBaseListValue(); + if (Array.isArray(object?.values)) object.values.map((e: any) => Value.fromJSON(e)); + return obj; }, toJSON(message: ListValue): unknown { const obj: any = {}; @@ -673,14 +685,14 @@ function createBaseMapValue(): MapValue { } export const MapValue = { typeUrl: "/google.api.expr.v1beta1.MapValue", - encode(message: MapValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MapValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { MapValue_Entry.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MapValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MapValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMapValue(); while (reader.pos < end) { @@ -697,9 +709,9 @@ export const MapValue = { return message; }, fromJSON(object: any): MapValue { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => MapValue_Entry.fromJSON(e)) : [] - }; + const obj = createBaseMapValue(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => MapValue_Entry.fromJSON(e)); + return obj; }, toJSON(message: MapValue): unknown { const obj: any = {}; @@ -767,7 +779,7 @@ function createBaseMapValue_Entry(): MapValue_Entry { } export const MapValue_Entry = { typeUrl: "/google.api.expr.v1beta1.Entry", - encode(message: MapValue_Entry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MapValue_Entry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== undefined) { Value.encode(message.key, writer.uint32(10).fork()).ldelim(); } @@ -776,8 +788,8 @@ export const MapValue_Entry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MapValue_Entry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MapValue_Entry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMapValue_Entry(); while (reader.pos < end) { @@ -797,10 +809,10 @@ export const MapValue_Entry = { return message; }, fromJSON(object: any): MapValue_Entry { - return { - key: isSet(object.key) ? Value.fromJSON(object.key) : undefined, - value: isSet(object.value) ? Value.fromJSON(object.value) : undefined - }; + const obj = createBaseMapValue_Entry(); + if (isSet(object.key)) obj.key = Value.fromJSON(object.key); + if (isSet(object.value)) obj.value = Value.fromJSON(object.value); + return obj; }, toJSON(message: MapValue_Entry): unknown { const obj: any = {}; @@ -810,8 +822,12 @@ export const MapValue_Entry = { }, fromPartial(object: DeepPartial): MapValue_Entry { const message = createBaseMapValue_Entry(); - message.key = object.key !== undefined && object.key !== null ? Value.fromPartial(object.key) : undefined; - message.value = object.value !== undefined && object.value !== null ? Value.fromPartial(object.value) : undefined; + if (object.key !== undefined && object.key !== null) { + message.key = Value.fromPartial(object.key); + } + if (object.value !== undefined && object.value !== null) { + message.value = Value.fromPartial(object.value); + } return message; }, fromSDK(object: MapValue_EntrySDKType): MapValue_Entry { diff --git a/__fixtures__/v-next/outputv2/google/api/http.ts b/__fixtures__/v-next/outputv2/google/api/http.ts index b2b67b3505..3c8ee76933 100644 --- a/__fixtures__/v-next/outputv2/google/api/http.ts +++ b/__fixtures__/v-next/outputv2/google/api/http.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -1034,7 +1034,7 @@ function createBaseHttp(): Http { } export const Http = { typeUrl: "/google.api.Http", - encode(message: Http, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Http, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { HttpRule.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1043,8 +1043,8 @@ export const Http = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Http { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Http { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseHttp(); while (reader.pos < end) { @@ -1064,10 +1064,10 @@ export const Http = { return message; }, fromJSON(object: any): Http { - return { - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => HttpRule.fromJSON(e)) : [], - fullyDecodeReservedExpansion: isSet(object.fullyDecodeReservedExpansion) ? Boolean(object.fullyDecodeReservedExpansion) : false - }; + const obj = createBaseHttp(); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => HttpRule.fromJSON(e)); + if (isSet(object.fullyDecodeReservedExpansion)) obj.fullyDecodeReservedExpansion = Boolean(object.fullyDecodeReservedExpansion); + return obj; }, toJSON(message: Http): unknown { const obj: any = {}; @@ -1149,7 +1149,7 @@ function createBaseHttpRule(): HttpRule { } export const HttpRule = { typeUrl: "/google.api.HttpRule", - encode(message: HttpRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: HttpRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -1182,8 +1182,8 @@ export const HttpRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): HttpRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): HttpRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseHttpRule(); while (reader.pos < end) { @@ -1227,18 +1227,18 @@ export const HttpRule = { return message; }, fromJSON(object: any): HttpRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - get: isSet(object.get) ? String(object.get) : undefined, - put: isSet(object.put) ? String(object.put) : undefined, - post: isSet(object.post) ? String(object.post) : undefined, - delete: isSet(object.delete) ? String(object.delete) : undefined, - patch: isSet(object.patch) ? String(object.patch) : undefined, - custom: isSet(object.custom) ? CustomHttpPattern.fromJSON(object.custom) : undefined, - body: isSet(object.body) ? String(object.body) : "", - responseBody: isSet(object.responseBody) ? String(object.responseBody) : "", - additionalBindings: Array.isArray(object?.additionalBindings) ? object.additionalBindings.map((e: any) => HttpRule.fromJSON(e)) : [] - }; + const obj = createBaseHttpRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isSet(object.get)) obj.get = String(object.get); + if (isSet(object.put)) obj.put = String(object.put); + if (isSet(object.post)) obj.post = String(object.post); + if (isSet(object.delete)) obj.delete = String(object.delete); + if (isSet(object.patch)) obj.patch = String(object.patch); + if (isSet(object.custom)) obj.custom = CustomHttpPattern.fromJSON(object.custom); + if (isSet(object.body)) obj.body = String(object.body); + if (isSet(object.responseBody)) obj.responseBody = String(object.responseBody); + if (Array.isArray(object?.additionalBindings)) object.additionalBindings.map((e: any) => HttpRule.fromJSON(e)); + return obj; }, toJSON(message: HttpRule): unknown { const obj: any = {}; @@ -1266,7 +1266,9 @@ export const HttpRule = { message.post = object.post ?? undefined; message.delete = object.delete ?? undefined; message.patch = object.patch ?? undefined; - message.custom = object.custom !== undefined && object.custom !== null ? CustomHttpPattern.fromPartial(object.custom) : undefined; + if (object.custom !== undefined && object.custom !== null) { + message.custom = CustomHttpPattern.fromPartial(object.custom); + } message.body = object.body ?? ""; message.responseBody = object.responseBody ?? ""; message.additionalBindings = object.additionalBindings?.map(e => HttpRule.fromPartial(e)) || []; @@ -1360,7 +1362,7 @@ function createBaseCustomHttpPattern(): CustomHttpPattern { } export const CustomHttpPattern = { typeUrl: "/google.api.CustomHttpPattern", - encode(message: CustomHttpPattern, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CustomHttpPattern, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== "") { writer.uint32(10).string(message.kind); } @@ -1369,8 +1371,8 @@ export const CustomHttpPattern = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CustomHttpPattern { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CustomHttpPattern { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCustomHttpPattern(); while (reader.pos < end) { @@ -1390,10 +1392,10 @@ export const CustomHttpPattern = { return message; }, fromJSON(object: any): CustomHttpPattern { - return { - kind: isSet(object.kind) ? String(object.kind) : "", - path: isSet(object.path) ? String(object.path) : "" - }; + const obj = createBaseCustomHttpPattern(); + if (isSet(object.kind)) obj.kind = String(object.kind); + if (isSet(object.path)) obj.path = String(object.path); + return obj; }, toJSON(message: CustomHttpPattern): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/httpbody.ts b/__fixtures__/v-next/outputv2/google/api/httpbody.ts index 4fb38b2343..ef2cf5b448 100644 --- a/__fixtures__/v-next/outputv2/google/api/httpbody.ts +++ b/__fixtures__/v-next/outputv2/google/api/httpbody.ts @@ -1,5 +1,5 @@ import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -181,7 +181,7 @@ function createBaseHttpBody(): HttpBody { } export const HttpBody = { typeUrl: "/google.api.HttpBody", - encode(message: HttpBody, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: HttpBody, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.contentType !== "") { writer.uint32(10).string(message.contentType); } @@ -193,8 +193,8 @@ export const HttpBody = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): HttpBody { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): HttpBody { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseHttpBody(); while (reader.pos < end) { @@ -217,11 +217,11 @@ export const HttpBody = { return message; }, fromJSON(object: any): HttpBody { - return { - contentType: isSet(object.contentType) ? String(object.contentType) : "", - data: isSet(object.data) ? bytesFromBase64(object.data) : new Uint8Array(), - extensions: Array.isArray(object?.extensions) ? object.extensions.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseHttpBody(); + if (isSet(object.contentType)) obj.contentType = String(object.contentType); + if (isSet(object.data)) obj.data = bytesFromBase64(object.data); + if (Array.isArray(object?.extensions)) object.extensions.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: HttpBody): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/label.ts b/__fixtures__/v-next/outputv2/google/api/label.ts index 566006d8ed..e6a5bdd780 100644 --- a/__fixtures__/v-next/outputv2/google/api/label.ts +++ b/__fixtures__/v-next/outputv2/google/api/label.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** Value types that can be used as label values. */ @@ -84,7 +84,7 @@ function createBaseLabelDescriptor(): LabelDescriptor { } export const LabelDescriptor = { typeUrl: "/google.api.LabelDescriptor", - encode(message: LabelDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LabelDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -96,8 +96,8 @@ export const LabelDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LabelDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LabelDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLabelDescriptor(); while (reader.pos < end) { @@ -120,11 +120,11 @@ export const LabelDescriptor = { return message; }, fromJSON(object: any): LabelDescriptor { - return { - key: isSet(object.key) ? String(object.key) : "", - valueType: isSet(object.valueType) ? labelDescriptor_ValueTypeFromJSON(object.valueType) : -1, - description: isSet(object.description) ? String(object.description) : "" - }; + const obj = createBaseLabelDescriptor(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.valueType)) obj.valueType = labelDescriptor_ValueTypeFromJSON(object.valueType); + if (isSet(object.description)) obj.description = String(object.description); + return obj; }, toJSON(message: LabelDescriptor): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/log.ts b/__fixtures__/v-next/outputv2/google/api/log.ts index 9eab1d1dd9..8b7bd51b2f 100644 --- a/__fixtures__/v-next/outputv2/google/api/log.ts +++ b/__fixtures__/v-next/outputv2/google/api/log.ts @@ -1,5 +1,5 @@ import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -106,7 +106,7 @@ function createBaseLogDescriptor(): LogDescriptor { } export const LogDescriptor = { typeUrl: "/google.api.LogDescriptor", - encode(message: LogDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -121,8 +121,8 @@ export const LogDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogDescriptor(); while (reader.pos < end) { @@ -148,12 +148,12 @@ export const LogDescriptor = { return message; }, fromJSON(object: any): LogDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - labels: Array.isArray(object?.labels) ? object.labels.map((e: any) => LabelDescriptor.fromJSON(e)) : [], - description: isSet(object.description) ? String(object.description) : "", - displayName: isSet(object.displayName) ? String(object.displayName) : "" - }; + const obj = createBaseLogDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.labels)) object.labels.map((e: any) => LabelDescriptor.fromJSON(e)); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.displayName)) obj.displayName = String(object.displayName); + return obj; }, toJSON(message: LogDescriptor): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/logging.ts b/__fixtures__/v-next/outputv2/google/api/logging.ts index 052ff3acd2..db651bf628 100644 --- a/__fixtures__/v-next/outputv2/google/api/logging.ts +++ b/__fixtures__/v-next/outputv2/google/api/logging.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -198,7 +198,7 @@ function createBaseLogging(): Logging { } export const Logging = { typeUrl: "/google.api.Logging", - encode(message: Logging, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Logging, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.producerDestinations) { Logging_LoggingDestination.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -207,8 +207,8 @@ export const Logging = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Logging { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Logging { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogging(); while (reader.pos < end) { @@ -228,10 +228,10 @@ export const Logging = { return message; }, fromJSON(object: any): Logging { - return { - producerDestinations: Array.isArray(object?.producerDestinations) ? object.producerDestinations.map((e: any) => Logging_LoggingDestination.fromJSON(e)) : [], - consumerDestinations: Array.isArray(object?.consumerDestinations) ? object.consumerDestinations.map((e: any) => Logging_LoggingDestination.fromJSON(e)) : [] - }; + const obj = createBaseLogging(); + if (Array.isArray(object?.producerDestinations)) object.producerDestinations.map((e: any) => Logging_LoggingDestination.fromJSON(e)); + if (Array.isArray(object?.consumerDestinations)) object.consumerDestinations.map((e: any) => Logging_LoggingDestination.fromJSON(e)); + return obj; }, toJSON(message: Logging): unknown { const obj: any = {}; @@ -317,7 +317,7 @@ function createBaseLogging_LoggingDestination(): Logging_LoggingDestination { } export const Logging_LoggingDestination = { typeUrl: "/google.api.LoggingDestination", - encode(message: Logging_LoggingDestination, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Logging_LoggingDestination, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.monitoredResource !== "") { writer.uint32(26).string(message.monitoredResource); } @@ -326,8 +326,8 @@ export const Logging_LoggingDestination = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Logging_LoggingDestination { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Logging_LoggingDestination { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogging_LoggingDestination(); while (reader.pos < end) { @@ -347,10 +347,10 @@ export const Logging_LoggingDestination = { return message; }, fromJSON(object: any): Logging_LoggingDestination { - return { - monitoredResource: isSet(object.monitoredResource) ? String(object.monitoredResource) : "", - logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => String(e)) : [] - }; + const obj = createBaseLogging_LoggingDestination(); + if (isSet(object.monitoredResource)) obj.monitoredResource = String(object.monitoredResource); + if (Array.isArray(object?.logs)) object.logs.map((e: any) => String(e)); + return obj; }, toJSON(message: Logging_LoggingDestination): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/metric.ts b/__fixtures__/v-next/outputv2/google/api/metric.ts index 353e1c1846..809ac7a679 100644 --- a/__fixtures__/v-next/outputv2/google/api/metric.ts +++ b/__fixtures__/v-next/outputv2/google/api/metric.ts @@ -1,7 +1,7 @@ import { LaunchStage, launchStageFromJSON, launchStageToJSON } from "./launch_stage"; import { Duration, DurationAmino, DurationSDKType } from "../protobuf/duration"; import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial, isObject } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -639,7 +639,7 @@ function createBaseMetricDescriptor(): MetricDescriptor { } export const MetricDescriptor = { typeUrl: "/google.api.MetricDescriptor", - encode(message: MetricDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -675,8 +675,8 @@ export const MetricDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricDescriptor(); while (reader.pos < end) { @@ -723,19 +723,19 @@ export const MetricDescriptor = { return message; }, fromJSON(object: any): MetricDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - type: isSet(object.type) ? String(object.type) : "", - labels: Array.isArray(object?.labels) ? object.labels.map((e: any) => LabelDescriptor.fromJSON(e)) : [], - metricKind: isSet(object.metricKind) ? metricDescriptor_MetricKindFromJSON(object.metricKind) : -1, - valueType: isSet(object.valueType) ? metricDescriptor_ValueTypeFromJSON(object.valueType) : -1, - unit: isSet(object.unit) ? String(object.unit) : "", - description: isSet(object.description) ? String(object.description) : "", - displayName: isSet(object.displayName) ? String(object.displayName) : "", - metadata: isSet(object.metadata) ? MetricDescriptor_MetricDescriptorMetadata.fromJSON(object.metadata) : undefined, - launchStage: isSet(object.launchStage) ? launchStageFromJSON(object.launchStage) : -1, - monitoredResourceTypes: Array.isArray(object?.monitoredResourceTypes) ? object.monitoredResourceTypes.map((e: any) => String(e)) : [] - }; + const obj = createBaseMetricDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.type)) obj.type = String(object.type); + if (Array.isArray(object?.labels)) object.labels.map((e: any) => LabelDescriptor.fromJSON(e)); + if (isSet(object.metricKind)) obj.metricKind = metricDescriptor_MetricKindFromJSON(object.metricKind); + if (isSet(object.valueType)) obj.valueType = metricDescriptor_ValueTypeFromJSON(object.valueType); + if (isSet(object.unit)) obj.unit = String(object.unit); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.displayName)) obj.displayName = String(object.displayName); + if (isSet(object.metadata)) obj.metadata = MetricDescriptor_MetricDescriptorMetadata.fromJSON(object.metadata); + if (isSet(object.launchStage)) obj.launchStage = launchStageFromJSON(object.launchStage); + if (Array.isArray(object?.monitoredResourceTypes)) object.monitoredResourceTypes.map((e: any) => String(e)); + return obj; }, toJSON(message: MetricDescriptor): unknown { const obj: any = {}; @@ -770,7 +770,9 @@ export const MetricDescriptor = { message.unit = object.unit ?? ""; message.description = object.description ?? ""; message.displayName = object.displayName ?? ""; - message.metadata = object.metadata !== undefined && object.metadata !== null ? MetricDescriptor_MetricDescriptorMetadata.fromPartial(object.metadata) : undefined; + if (object.metadata !== undefined && object.metadata !== null) { + message.metadata = MetricDescriptor_MetricDescriptorMetadata.fromPartial(object.metadata); + } message.launchStage = object.launchStage ?? 0; message.monitoredResourceTypes = object.monitoredResourceTypes?.map(e => e) || []; return message; @@ -876,7 +878,7 @@ function createBaseMetricDescriptor_MetricDescriptorMetadata(): MetricDescriptor } export const MetricDescriptor_MetricDescriptorMetadata = { typeUrl: "/google.api.MetricDescriptorMetadata", - encode(message: MetricDescriptor_MetricDescriptorMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricDescriptor_MetricDescriptorMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.launchStage !== 0) { writer.uint32(8).int32(message.launchStage); } @@ -888,8 +890,8 @@ export const MetricDescriptor_MetricDescriptorMetadata = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricDescriptor_MetricDescriptorMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricDescriptor_MetricDescriptorMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); while (reader.pos < end) { @@ -912,11 +914,11 @@ export const MetricDescriptor_MetricDescriptorMetadata = { return message; }, fromJSON(object: any): MetricDescriptor_MetricDescriptorMetadata { - return { - launchStage: isSet(object.launchStage) ? launchStageFromJSON(object.launchStage) : -1, - samplePeriod: isSet(object.samplePeriod) ? Duration.fromJSON(object.samplePeriod) : undefined, - ingestDelay: isSet(object.ingestDelay) ? Duration.fromJSON(object.ingestDelay) : undefined - }; + const obj = createBaseMetricDescriptor_MetricDescriptorMetadata(); + if (isSet(object.launchStage)) obj.launchStage = launchStageFromJSON(object.launchStage); + if (isSet(object.samplePeriod)) obj.samplePeriod = Duration.fromJSON(object.samplePeriod); + if (isSet(object.ingestDelay)) obj.ingestDelay = Duration.fromJSON(object.ingestDelay); + return obj; }, toJSON(message: MetricDescriptor_MetricDescriptorMetadata): unknown { const obj: any = {}; @@ -928,8 +930,12 @@ export const MetricDescriptor_MetricDescriptorMetadata = { fromPartial(object: DeepPartial): MetricDescriptor_MetricDescriptorMetadata { const message = createBaseMetricDescriptor_MetricDescriptorMetadata(); message.launchStage = object.launchStage ?? 0; - message.samplePeriod = object.samplePeriod !== undefined && object.samplePeriod !== null ? Duration.fromPartial(object.samplePeriod) : undefined; - message.ingestDelay = object.ingestDelay !== undefined && object.ingestDelay !== null ? Duration.fromPartial(object.ingestDelay) : undefined; + if (object.samplePeriod !== undefined && object.samplePeriod !== null) { + message.samplePeriod = Duration.fromPartial(object.samplePeriod); + } + if (object.ingestDelay !== undefined && object.ingestDelay !== null) { + message.ingestDelay = Duration.fromPartial(object.ingestDelay); + } return message; }, fromSDK(object: MetricDescriptor_MetricDescriptorMetadataSDKType): MetricDescriptor_MetricDescriptorMetadata { @@ -983,7 +989,7 @@ function createBaseMetric_LabelsEntry(): Metric_LabelsEntry { }; } export const Metric_LabelsEntry = { - encode(message: Metric_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Metric_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -992,8 +998,8 @@ export const Metric_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Metric_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Metric_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetric_LabelsEntry(); while (reader.pos < end) { @@ -1013,10 +1019,10 @@ export const Metric_LabelsEntry = { return message; }, fromJSON(object: any): Metric_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseMetric_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: Metric_LabelsEntry): unknown { const obj: any = {}; @@ -1072,7 +1078,7 @@ function createBaseMetric(): Metric { } export const Metric = { typeUrl: "/google.api.Metric", - encode(message: Metric, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Metric, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(26).string(message.type); } @@ -1084,8 +1090,8 @@ export const Metric = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Metric { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Metric { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetric(); while (reader.pos < end) { @@ -1108,15 +1114,15 @@ export const Metric = { return message; }, fromJSON(object: any): Metric { - return { - type: isSet(object.type) ? String(object.type) : "", - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {} - }; + const obj = createBaseMetric(); + if (isSet(object.type)) obj.type = String(object.type); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + return obj; }, toJSON(message: Metric): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts b/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts index d8965159e4..ce87f10238 100644 --- a/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts +++ b/__fixtures__/v-next/outputv2/google/api/monitored_resource.ts @@ -1,7 +1,7 @@ import { LabelDescriptor, LabelDescriptorAmino, LabelDescriptorSDKType } from "./label"; import { LaunchStage, launchStageFromJSON, launchStageToJSON } from "./launch_stage"; import { Struct, StructAmino, StructSDKType } from "../protobuf/struct"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial, isObject } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -344,7 +344,7 @@ function createBaseMonitoredResourceDescriptor(): MonitoredResourceDescriptor { } export const MonitoredResourceDescriptor = { typeUrl: "/google.api.MonitoredResourceDescriptor", - encode(message: MonitoredResourceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MonitoredResourceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(42).string(message.name); } @@ -365,8 +365,8 @@ export const MonitoredResourceDescriptor = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MonitoredResourceDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MonitoredResourceDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoredResourceDescriptor(); while (reader.pos < end) { @@ -398,14 +398,14 @@ export const MonitoredResourceDescriptor = { return message; }, fromJSON(object: any): MonitoredResourceDescriptor { - return { - name: isSet(object.name) ? String(object.name) : "", - type: isSet(object.type) ? String(object.type) : "", - displayName: isSet(object.displayName) ? String(object.displayName) : "", - description: isSet(object.description) ? String(object.description) : "", - labels: Array.isArray(object?.labels) ? object.labels.map((e: any) => LabelDescriptor.fromJSON(e)) : [], - launchStage: isSet(object.launchStage) ? launchStageFromJSON(object.launchStage) : -1 - }; + const obj = createBaseMonitoredResourceDescriptor(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.type)) obj.type = String(object.type); + if (isSet(object.displayName)) obj.displayName = String(object.displayName); + if (isSet(object.description)) obj.description = String(object.description); + if (Array.isArray(object?.labels)) object.labels.map((e: any) => LabelDescriptor.fromJSON(e)); + if (isSet(object.launchStage)) obj.launchStage = launchStageFromJSON(object.launchStage); + return obj; }, toJSON(message: MonitoredResourceDescriptor): unknown { const obj: any = {}; @@ -502,7 +502,7 @@ function createBaseMonitoredResource_LabelsEntry(): MonitoredResource_LabelsEntr }; } export const MonitoredResource_LabelsEntry = { - encode(message: MonitoredResource_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MonitoredResource_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -511,8 +511,8 @@ export const MonitoredResource_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MonitoredResource_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MonitoredResource_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoredResource_LabelsEntry(); while (reader.pos < end) { @@ -532,10 +532,10 @@ export const MonitoredResource_LabelsEntry = { return message; }, fromJSON(object: any): MonitoredResource_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseMonitoredResource_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: MonitoredResource_LabelsEntry): unknown { const obj: any = {}; @@ -591,7 +591,7 @@ function createBaseMonitoredResource(): MonitoredResource { } export const MonitoredResource = { typeUrl: "/google.api.MonitoredResource", - encode(message: MonitoredResource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MonitoredResource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -603,8 +603,8 @@ export const MonitoredResource = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MonitoredResource { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MonitoredResource { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoredResource(); while (reader.pos < end) { @@ -627,15 +627,15 @@ export const MonitoredResource = { return message; }, fromJSON(object: any): MonitoredResource { - return { - type: isSet(object.type) ? String(object.type) : "", - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {} - }; + const obj = createBaseMonitoredResource(); + if (isSet(object.type)) obj.type = String(object.type); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + return obj; }, toJSON(message: MonitoredResource): unknown { const obj: any = {}; @@ -728,7 +728,7 @@ function createBaseMonitoredResourceMetadata_UserLabelsEntry(): MonitoredResourc }; } export const MonitoredResourceMetadata_UserLabelsEntry = { - encode(message: MonitoredResourceMetadata_UserLabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MonitoredResourceMetadata_UserLabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -737,8 +737,8 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MonitoredResourceMetadata_UserLabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MonitoredResourceMetadata_UserLabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoredResourceMetadata_UserLabelsEntry(); while (reader.pos < end) { @@ -758,10 +758,10 @@ export const MonitoredResourceMetadata_UserLabelsEntry = { return message; }, fromJSON(object: any): MonitoredResourceMetadata_UserLabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseMonitoredResourceMetadata_UserLabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: MonitoredResourceMetadata_UserLabelsEntry): unknown { const obj: any = {}; @@ -817,7 +817,7 @@ function createBaseMonitoredResourceMetadata(): MonitoredResourceMetadata { } export const MonitoredResourceMetadata = { typeUrl: "/google.api.MonitoredResourceMetadata", - encode(message: MonitoredResourceMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MonitoredResourceMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.systemLabels !== undefined) { Struct.encode(message.systemLabels, writer.uint32(10).fork()).ldelim(); } @@ -829,8 +829,8 @@ export const MonitoredResourceMetadata = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MonitoredResourceMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MonitoredResourceMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoredResourceMetadata(); while (reader.pos < end) { @@ -853,15 +853,15 @@ export const MonitoredResourceMetadata = { return message; }, fromJSON(object: any): MonitoredResourceMetadata { - return { - systemLabels: isSet(object.systemLabels) ? Struct.fromJSON(object.systemLabels) : undefined, - userLabels: isObject(object.userLabels) ? Object.entries(object.userLabels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {} - }; + const obj = createBaseMonitoredResourceMetadata(); + if (isSet(object.systemLabels)) obj.systemLabels = Struct.fromJSON(object.systemLabels); + if (isObject(object.userLabels)) obj.userLabels = Object.entries(object.userLabels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + return obj; }, toJSON(message: MonitoredResourceMetadata): unknown { const obj: any = {}; @@ -876,7 +876,9 @@ export const MonitoredResourceMetadata = { }, fromPartial(object: DeepPartial): MonitoredResourceMetadata { const message = createBaseMonitoredResourceMetadata(); - message.systemLabels = object.systemLabels !== undefined && object.systemLabels !== null ? Struct.fromPartial(object.systemLabels) : undefined; + if (object.systemLabels !== undefined && object.systemLabels !== null) { + message.systemLabels = Struct.fromPartial(object.systemLabels); + } message.userLabels = Object.entries(object.userLabels ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { diff --git a/__fixtures__/v-next/outputv2/google/api/monitoring.ts b/__fixtures__/v-next/outputv2/google/api/monitoring.ts index 9730c065e4..c304e1d67e 100644 --- a/__fixtures__/v-next/outputv2/google/api/monitoring.ts +++ b/__fixtures__/v-next/outputv2/google/api/monitoring.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -271,7 +271,7 @@ function createBaseMonitoring(): Monitoring { } export const Monitoring = { typeUrl: "/google.api.Monitoring", - encode(message: Monitoring, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Monitoring, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.producerDestinations) { Monitoring_MonitoringDestination.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -280,8 +280,8 @@ export const Monitoring = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Monitoring { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Monitoring { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoring(); while (reader.pos < end) { @@ -301,10 +301,10 @@ export const Monitoring = { return message; }, fromJSON(object: any): Monitoring { - return { - producerDestinations: Array.isArray(object?.producerDestinations) ? object.producerDestinations.map((e: any) => Monitoring_MonitoringDestination.fromJSON(e)) : [], - consumerDestinations: Array.isArray(object?.consumerDestinations) ? object.consumerDestinations.map((e: any) => Monitoring_MonitoringDestination.fromJSON(e)) : [] - }; + const obj = createBaseMonitoring(); + if (Array.isArray(object?.producerDestinations)) object.producerDestinations.map((e: any) => Monitoring_MonitoringDestination.fromJSON(e)); + if (Array.isArray(object?.consumerDestinations)) object.consumerDestinations.map((e: any) => Monitoring_MonitoringDestination.fromJSON(e)); + return obj; }, toJSON(message: Monitoring): unknown { const obj: any = {}; @@ -390,7 +390,7 @@ function createBaseMonitoring_MonitoringDestination(): Monitoring_MonitoringDest } export const Monitoring_MonitoringDestination = { typeUrl: "/google.api.MonitoringDestination", - encode(message: Monitoring_MonitoringDestination, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Monitoring_MonitoringDestination, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.monitoredResource !== "") { writer.uint32(10).string(message.monitoredResource); } @@ -399,8 +399,8 @@ export const Monitoring_MonitoringDestination = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Monitoring_MonitoringDestination { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Monitoring_MonitoringDestination { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMonitoring_MonitoringDestination(); while (reader.pos < end) { @@ -420,10 +420,10 @@ export const Monitoring_MonitoringDestination = { return message; }, fromJSON(object: any): Monitoring_MonitoringDestination { - return { - monitoredResource: isSet(object.monitoredResource) ? String(object.monitoredResource) : "", - metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => String(e)) : [] - }; + const obj = createBaseMonitoring_MonitoringDestination(); + if (isSet(object.monitoredResource)) obj.monitoredResource = String(object.monitoredResource); + if (Array.isArray(object?.metrics)) object.metrics.map((e: any) => String(e)); + return obj; }, toJSON(message: Monitoring_MonitoringDestination): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/quota.ts b/__fixtures__/v-next/outputv2/google/api/quota.ts index a02cf58cd3..478b3b9aff 100644 --- a/__fixtures__/v-next/outputv2/google/api/quota.ts +++ b/__fixtures__/v-next/outputv2/google/api/quota.ts @@ -1,5 +1,5 @@ -import { Long, DeepPartial, isSet, isObject } from "../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; +import { DeepPartial, isSet, isObject } from "../../helpers"; export const protobufPackage = "google.api"; /** * Quota configuration helps to achieve fairness and budgeting in service @@ -186,7 +186,7 @@ export interface QuotaSDKType { } export interface MetricRule_MetricCostsEntry { key: string; - value: Long; + value: bigint; } export interface MetricRule_MetricCostsEntryProtoMsg { typeUrl: string; @@ -202,7 +202,7 @@ export interface MetricRule_MetricCostsEntryAminoMsg { } export interface MetricRule_MetricCostsEntrySDKType { key: string; - value: Long; + value: bigint; } /** * Bind API methods to metrics. Binding a method to a metric causes that @@ -224,7 +224,7 @@ export interface MetricRule { * The value must not be negative. */ metricCosts: { - [key: string]: Long; + [key: string]: bigint; }; } export interface MetricRuleProtoMsg { @@ -265,12 +265,12 @@ export interface MetricRuleAminoMsg { export interface MetricRuleSDKType { selector: string; metric_costs: { - [key: string]: Long; + [key: string]: bigint; }; } export interface QuotaLimit_ValuesEntry { key: string; - value: Long; + value: bigint; } export interface QuotaLimit_ValuesEntryProtoMsg { typeUrl: string; @@ -286,7 +286,7 @@ export interface QuotaLimit_ValuesEntryAminoMsg { } export interface QuotaLimit_ValuesEntrySDKType { key: string; - value: Long; + value: bigint; } /** * `QuotaLimit` defines a specific limit that applies over a specified duration @@ -321,7 +321,7 @@ export interface QuotaLimit { * * Used by group-based quotas only. */ - defaultLimit: Long; + defaultLimit: bigint; /** * Maximum number of tokens that can be consumed during the specified * duration. Client application developers can override the default limit up @@ -333,7 +333,7 @@ export interface QuotaLimit { * * Used by group-based quotas only. */ - maxLimit: Long; + maxLimit: bigint; /** * Free tier value displayed in the Developers Console for this limit. * The free tier is the number of tokens that will be subtracted from the @@ -344,7 +344,7 @@ export interface QuotaLimit { * * Used by group-based quotas only. */ - freeTier: Long; + freeTier: bigint; /** * Duration of this limit in textual notation. Must be "100s" or "1d". * @@ -375,7 +375,7 @@ export interface QuotaLimit { * specified unit. Currently only STANDARD is supported. */ values: { - [key: string]: Long; + [key: string]: bigint; }; /** * User-visible display name for this limit. @@ -498,14 +498,14 @@ export interface QuotaLimitAminoMsg { export interface QuotaLimitSDKType { name: string; description: string; - default_limit: Long; - max_limit: Long; - free_tier: Long; + default_limit: bigint; + max_limit: bigint; + free_tier: bigint; duration: string; metric: string; unit: string; values: { - [key: string]: Long; + [key: string]: bigint; }; display_name: string; } @@ -517,7 +517,7 @@ function createBaseQuota(): Quota { } export const Quota = { typeUrl: "/google.api.Quota", - encode(message: Quota, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Quota, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.limits) { QuotaLimit.encode(v!, writer.uint32(26).fork()).ldelim(); } @@ -526,8 +526,8 @@ export const Quota = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Quota { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Quota { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuota(); while (reader.pos < end) { @@ -547,10 +547,10 @@ export const Quota = { return message; }, fromJSON(object: any): Quota { - return { - limits: Array.isArray(object?.limits) ? object.limits.map((e: any) => QuotaLimit.fromJSON(e)) : [], - metricRules: Array.isArray(object?.metricRules) ? object.metricRules.map((e: any) => MetricRule.fromJSON(e)) : [] - }; + const obj = createBaseQuota(); + if (Array.isArray(object?.limits)) object.limits.map((e: any) => QuotaLimit.fromJSON(e)); + if (Array.isArray(object?.metricRules)) object.metricRules.map((e: any) => MetricRule.fromJSON(e)); + return obj; }, toJSON(message: Quota): unknown { const obj: any = {}; @@ -631,21 +631,21 @@ export const Quota = { function createBaseMetricRule_MetricCostsEntry(): MetricRule_MetricCostsEntry { return { key: "", - value: Long.ZERO + value: BigInt(0) }; } export const MetricRule_MetricCostsEntry = { - encode(message: MetricRule_MetricCostsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricRule_MetricCostsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } - if (!message.value.isZero()) { + if (message.value !== BigInt(0)) { writer.uint32(16).int64(message.value); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricRule_MetricCostsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricRule_MetricCostsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricRule_MetricCostsEntry(); while (reader.pos < end) { @@ -655,7 +655,7 @@ export const MetricRule_MetricCostsEntry = { message.key = reader.string(); break; case 2: - message.value = (reader.int64() as Long); + message.value = reader.int64(); break; default: reader.skipType(tag & 7); @@ -665,21 +665,23 @@ export const MetricRule_MetricCostsEntry = { return message; }, fromJSON(object: any): MetricRule_MetricCostsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? Long.fromValue(object.value) : Long.ZERO - }; + const obj = createBaseMetricRule_MetricCostsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = BigInt(object.value.toString()); + return obj; }, toJSON(message: MetricRule_MetricCostsEntry): unknown { const obj: any = {}; message.key !== undefined && (obj.key = message.key); - message.value !== undefined && (obj.value = (message.value || Long.ZERO).toString()); + message.value !== undefined && (obj.value = (message.value || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): MetricRule_MetricCostsEntry { const message = createBaseMetricRule_MetricCostsEntry(); message.key = object.key ?? ""; - message.value = object.value !== undefined && object.value !== null ? Long.fromValue(object.value) : Long.ZERO; + if (object.value !== undefined && object.value !== null) { + message.value = BigInt(object.value.toString()); + } return message; }, fromSDK(object: MetricRule_MetricCostsEntrySDKType): MetricRule_MetricCostsEntry { @@ -697,7 +699,7 @@ export const MetricRule_MetricCostsEntry = { fromAmino(object: MetricRule_MetricCostsEntryAmino): MetricRule_MetricCostsEntry { return { key: object.key, - value: Long.fromString(object.value) + value: BigInt(object.value) }; }, toAmino(message: MetricRule_MetricCostsEntry): MetricRule_MetricCostsEntryAmino { @@ -724,7 +726,7 @@ function createBaseMetricRule(): MetricRule { } export const MetricRule = { typeUrl: "/google.api.MetricRule", - encode(message: MetricRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -736,8 +738,8 @@ export const MetricRule = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricRule(); while (reader.pos < end) { @@ -760,15 +762,15 @@ export const MetricRule = { return message; }, fromJSON(object: any): MetricRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - metricCosts: isObject(object.metricCosts) ? Object.entries(object.metricCosts).reduce<{ - [key: string]: Long; - }>((acc, [key, value]) => { - acc[key] = Long.fromValue((value as Long | string)); - return acc; - }, {}) : {} - }; + const obj = createBaseMetricRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isObject(object.metricCosts)) obj.metricCosts = Object.entries(object.metricCosts).reduce<{ + [key: string]: bigint; + }>((acc, [key, value]) => { + acc[key] = BigInt((value as bigint | string).toString()); + return acc; + }, {}); + return obj; }, toJSON(message: MetricRule): unknown { const obj: any = {}; @@ -785,10 +787,10 @@ export const MetricRule = { const message = createBaseMetricRule(); message.selector = object.selector ?? ""; message.metricCosts = Object.entries(object.metricCosts ?? {}).reduce<{ - [key: string]: Long; + [key: string]: bigint; }>((acc, [key, value]) => { if (value !== undefined) { - acc[key] = Long.fromValue(value); + acc[key] = BigInt(value.toString()); } return acc; }, {}); @@ -798,9 +800,9 @@ export const MetricRule = { return { selector: object?.selector, metricCosts: isObject(object.metric_costs) ? Object.entries(object.metric_costs).reduce<{ - [key: string]: Long; + [key: string]: bigint; }>((acc, [key, value]) => { - acc[key] = Long.fromValue((value as Long | string)); + acc[key] = BigInt((value as bigint | string).toString()); return acc; }, {}) : {} }; @@ -820,9 +822,9 @@ export const MetricRule = { return { selector: object.selector, metricCosts: isObject(object.metric_costs) ? Object.entries(object.metric_costs).reduce<{ - [key: string]: Long; + [key: string]: bigint; }>((acc, [key, value]) => { - acc[key] = Long.fromValue((value as Long | string)); + acc[key] = BigInt((value as bigint | string).toString()); return acc; }, {}) : {} }; @@ -857,21 +859,21 @@ export const MetricRule = { function createBaseQuotaLimit_ValuesEntry(): QuotaLimit_ValuesEntry { return { key: "", - value: Long.ZERO + value: BigInt(0) }; } export const QuotaLimit_ValuesEntry = { - encode(message: QuotaLimit_ValuesEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaLimit_ValuesEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } - if (!message.value.isZero()) { + if (message.value !== BigInt(0)) { writer.uint32(16).int64(message.value); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaLimit_ValuesEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaLimit_ValuesEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaLimit_ValuesEntry(); while (reader.pos < end) { @@ -881,7 +883,7 @@ export const QuotaLimit_ValuesEntry = { message.key = reader.string(); break; case 2: - message.value = (reader.int64() as Long); + message.value = reader.int64(); break; default: reader.skipType(tag & 7); @@ -891,21 +893,23 @@ export const QuotaLimit_ValuesEntry = { return message; }, fromJSON(object: any): QuotaLimit_ValuesEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? Long.fromValue(object.value) : Long.ZERO - }; + const obj = createBaseQuotaLimit_ValuesEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = BigInt(object.value.toString()); + return obj; }, toJSON(message: QuotaLimit_ValuesEntry): unknown { const obj: any = {}; message.key !== undefined && (obj.key = message.key); - message.value !== undefined && (obj.value = (message.value || Long.ZERO).toString()); + message.value !== undefined && (obj.value = (message.value || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): QuotaLimit_ValuesEntry { const message = createBaseQuotaLimit_ValuesEntry(); message.key = object.key ?? ""; - message.value = object.value !== undefined && object.value !== null ? Long.fromValue(object.value) : Long.ZERO; + if (object.value !== undefined && object.value !== null) { + message.value = BigInt(object.value.toString()); + } return message; }, fromSDK(object: QuotaLimit_ValuesEntrySDKType): QuotaLimit_ValuesEntry { @@ -923,7 +927,7 @@ export const QuotaLimit_ValuesEntry = { fromAmino(object: QuotaLimit_ValuesEntryAmino): QuotaLimit_ValuesEntry { return { key: object.key, - value: Long.fromString(object.value) + value: BigInt(object.value) }; }, toAmino(message: QuotaLimit_ValuesEntry): QuotaLimit_ValuesEntryAmino { @@ -946,9 +950,9 @@ function createBaseQuotaLimit(): QuotaLimit { return { name: "", description: "", - defaultLimit: Long.ZERO, - maxLimit: Long.ZERO, - freeTier: Long.ZERO, + defaultLimit: BigInt(0), + maxLimit: BigInt(0), + freeTier: BigInt(0), duration: "", metric: "", unit: "", @@ -958,20 +962,20 @@ function createBaseQuotaLimit(): QuotaLimit { } export const QuotaLimit = { typeUrl: "/google.api.QuotaLimit", - encode(message: QuotaLimit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(50).string(message.name); } if (message.description !== "") { writer.uint32(18).string(message.description); } - if (!message.defaultLimit.isZero()) { + if (message.defaultLimit !== BigInt(0)) { writer.uint32(24).int64(message.defaultLimit); } - if (!message.maxLimit.isZero()) { + if (message.maxLimit !== BigInt(0)) { writer.uint32(32).int64(message.maxLimit); } - if (!message.freeTier.isZero()) { + if (message.freeTier !== BigInt(0)) { writer.uint32(56).int64(message.freeTier); } if (message.duration !== "") { @@ -994,8 +998,8 @@ export const QuotaLimit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaLimit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaLimit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaLimit(); while (reader.pos < end) { @@ -1008,13 +1012,13 @@ export const QuotaLimit = { message.description = reader.string(); break; case 3: - message.defaultLimit = (reader.int64() as Long); + message.defaultLimit = reader.int64(); break; case 4: - message.maxLimit = (reader.int64() as Long); + message.maxLimit = reader.int64(); break; case 7: - message.freeTier = (reader.int64() as Long); + message.freeTier = reader.int64(); break; case 5: message.duration = reader.string(); @@ -1042,31 +1046,31 @@ export const QuotaLimit = { return message; }, fromJSON(object: any): QuotaLimit { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "", - defaultLimit: isSet(object.defaultLimit) ? Long.fromValue(object.defaultLimit) : Long.ZERO, - maxLimit: isSet(object.maxLimit) ? Long.fromValue(object.maxLimit) : Long.ZERO, - freeTier: isSet(object.freeTier) ? Long.fromValue(object.freeTier) : Long.ZERO, - duration: isSet(object.duration) ? String(object.duration) : "", - metric: isSet(object.metric) ? String(object.metric) : "", - unit: isSet(object.unit) ? String(object.unit) : "", - values: isObject(object.values) ? Object.entries(object.values).reduce<{ - [key: string]: Long; - }>((acc, [key, value]) => { - acc[key] = Long.fromValue((value as Long | string)); - return acc; - }, {}) : {}, - displayName: isSet(object.displayName) ? String(object.displayName) : "" - }; + const obj = createBaseQuotaLimit(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.defaultLimit)) obj.defaultLimit = BigInt(object.defaultLimit.toString()); + if (isSet(object.maxLimit)) obj.maxLimit = BigInt(object.maxLimit.toString()); + if (isSet(object.freeTier)) obj.freeTier = BigInt(object.freeTier.toString()); + if (isSet(object.duration)) obj.duration = String(object.duration); + if (isSet(object.metric)) obj.metric = String(object.metric); + if (isSet(object.unit)) obj.unit = String(object.unit); + if (isObject(object.values)) obj.values = Object.entries(object.values).reduce<{ + [key: string]: bigint; + }>((acc, [key, value]) => { + acc[key] = BigInt((value as bigint | string).toString()); + return acc; + }, {}); + if (isSet(object.displayName)) obj.displayName = String(object.displayName); + return obj; }, toJSON(message: QuotaLimit): unknown { const obj: any = {}; message.name !== undefined && (obj.name = message.name); message.description !== undefined && (obj.description = message.description); - message.defaultLimit !== undefined && (obj.defaultLimit = (message.defaultLimit || Long.ZERO).toString()); - message.maxLimit !== undefined && (obj.maxLimit = (message.maxLimit || Long.ZERO).toString()); - message.freeTier !== undefined && (obj.freeTier = (message.freeTier || Long.ZERO).toString()); + message.defaultLimit !== undefined && (obj.defaultLimit = (message.defaultLimit || BigInt(0)).toString()); + message.maxLimit !== undefined && (obj.maxLimit = (message.maxLimit || BigInt(0)).toString()); + message.freeTier !== undefined && (obj.freeTier = (message.freeTier || BigInt(0)).toString()); message.duration !== undefined && (obj.duration = message.duration); message.metric !== undefined && (obj.metric = message.metric); message.unit !== undefined && (obj.unit = message.unit); @@ -1083,17 +1087,23 @@ export const QuotaLimit = { const message = createBaseQuotaLimit(); message.name = object.name ?? ""; message.description = object.description ?? ""; - message.defaultLimit = object.defaultLimit !== undefined && object.defaultLimit !== null ? Long.fromValue(object.defaultLimit) : Long.ZERO; - message.maxLimit = object.maxLimit !== undefined && object.maxLimit !== null ? Long.fromValue(object.maxLimit) : Long.ZERO; - message.freeTier = object.freeTier !== undefined && object.freeTier !== null ? Long.fromValue(object.freeTier) : Long.ZERO; + if (object.defaultLimit !== undefined && object.defaultLimit !== null) { + message.defaultLimit = BigInt(object.defaultLimit.toString()); + } + if (object.maxLimit !== undefined && object.maxLimit !== null) { + message.maxLimit = BigInt(object.maxLimit.toString()); + } + if (object.freeTier !== undefined && object.freeTier !== null) { + message.freeTier = BigInt(object.freeTier.toString()); + } message.duration = object.duration ?? ""; message.metric = object.metric ?? ""; message.unit = object.unit ?? ""; message.values = Object.entries(object.values ?? {}).reduce<{ - [key: string]: Long; + [key: string]: bigint; }>((acc, [key, value]) => { if (value !== undefined) { - acc[key] = Long.fromValue(value); + acc[key] = BigInt(value.toString()); } return acc; }, {}); @@ -1111,9 +1121,9 @@ export const QuotaLimit = { metric: object?.metric, unit: object?.unit, values: isObject(object.values) ? Object.entries(object.values).reduce<{ - [key: string]: Long; + [key: string]: bigint; }>((acc, [key, value]) => { - acc[key] = Long.fromValue((value as Long | string)); + acc[key] = BigInt((value as bigint | string).toString()); return acc; }, {}) : {}, displayName: object?.display_name @@ -1142,16 +1152,16 @@ export const QuotaLimit = { return { name: object.name, description: object.description, - defaultLimit: Long.fromString(object.default_limit), - maxLimit: Long.fromString(object.max_limit), - freeTier: Long.fromString(object.free_tier), + defaultLimit: BigInt(object.default_limit), + maxLimit: BigInt(object.max_limit), + freeTier: BigInt(object.free_tier), duration: object.duration, metric: object.metric, unit: object.unit, values: isObject(object.values) ? Object.entries(object.values).reduce<{ - [key: string]: Long; + [key: string]: bigint; }>((acc, [key, value]) => { - acc[key] = Long.fromValue((value as Long | string)); + acc[key] = BigInt((value as bigint | string).toString()); return acc; }, {}) : {}, displayName: object.display_name diff --git a/__fixtures__/v-next/outputv2/google/api/resource.ts b/__fixtures__/v-next/outputv2/google/api/resource.ts index 8f44975d27..67f2fa6086 100644 --- a/__fixtures__/v-next/outputv2/google/api/resource.ts +++ b/__fixtures__/v-next/outputv2/google/api/resource.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -542,7 +542,7 @@ function createBaseResourceDescriptor(): ResourceDescriptor { } export const ResourceDescriptor = { typeUrl: "/google.api.ResourceDescriptor", - encode(message: ResourceDescriptor, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceDescriptor, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -568,8 +568,8 @@ export const ResourceDescriptor = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceDescriptor { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceDescriptor { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceDescriptor(); while (reader.pos < end) { @@ -611,15 +611,15 @@ export const ResourceDescriptor = { return message; }, fromJSON(object: any): ResourceDescriptor { - return { - type: isSet(object.type) ? String(object.type) : "", - pattern: Array.isArray(object?.pattern) ? object.pattern.map((e: any) => String(e)) : [], - nameField: isSet(object.nameField) ? String(object.nameField) : "", - history: isSet(object.history) ? resourceDescriptor_HistoryFromJSON(object.history) : -1, - plural: isSet(object.plural) ? String(object.plural) : "", - singular: isSet(object.singular) ? String(object.singular) : "", - style: Array.isArray(object?.style) ? object.style.map((e: any) => resourceDescriptor_StyleFromJSON(e)) : [] - }; + const obj = createBaseResourceDescriptor(); + if (isSet(object.type)) obj.type = String(object.type); + if (Array.isArray(object?.pattern)) object.pattern.map((e: any) => String(e)); + if (isSet(object.nameField)) obj.nameField = String(object.nameField); + if (isSet(object.history)) obj.history = resourceDescriptor_HistoryFromJSON(object.history); + if (isSet(object.plural)) obj.plural = String(object.plural); + if (isSet(object.singular)) obj.singular = String(object.singular); + if (Array.isArray(object?.style)) object.style.map((e: any) => resourceDescriptor_StyleFromJSON(e)); + return obj; }, toJSON(message: ResourceDescriptor): unknown { const obj: any = {}; @@ -735,7 +735,7 @@ function createBaseResourceReference(): ResourceReference { } export const ResourceReference = { typeUrl: "/google.api.ResourceReference", - encode(message: ResourceReference, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceReference, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.type !== "") { writer.uint32(10).string(message.type); } @@ -744,8 +744,8 @@ export const ResourceReference = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceReference { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceReference { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceReference(); while (reader.pos < end) { @@ -765,10 +765,10 @@ export const ResourceReference = { return message; }, fromJSON(object: any): ResourceReference { - return { - type: isSet(object.type) ? String(object.type) : "", - childType: isSet(object.childType) ? String(object.childType) : "" - }; + const obj = createBaseResourceReference(); + if (isSet(object.type)) obj.type = String(object.type); + if (isSet(object.childType)) obj.childType = String(object.childType); + return obj; }, toJSON(message: ResourceReference): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/routing.ts b/__fixtures__/v-next/outputv2/google/api/routing.ts index 53468b6bd2..f3d3b6ef53 100644 --- a/__fixtures__/v-next/outputv2/google/api/routing.ts +++ b/__fixtures__/v-next/outputv2/google/api/routing.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -1261,14 +1261,14 @@ function createBaseRoutingRule(): RoutingRule { } export const RoutingRule = { typeUrl: "/google.api.RoutingRule", - encode(message: RoutingRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RoutingRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.routingParameters) { RoutingParameter.encode(v!, writer.uint32(18).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RoutingRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RoutingRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRoutingRule(); while (reader.pos < end) { @@ -1285,9 +1285,9 @@ export const RoutingRule = { return message; }, fromJSON(object: any): RoutingRule { - return { - routingParameters: Array.isArray(object?.routingParameters) ? object.routingParameters.map((e: any) => RoutingParameter.fromJSON(e)) : [] - }; + const obj = createBaseRoutingRule(); + if (Array.isArray(object?.routingParameters)) object.routingParameters.map((e: any) => RoutingParameter.fromJSON(e)); + return obj; }, toJSON(message: RoutingRule): unknown { const obj: any = {}; @@ -1355,7 +1355,7 @@ function createBaseRoutingParameter(): RoutingParameter { } export const RoutingParameter = { typeUrl: "/google.api.RoutingParameter", - encode(message: RoutingParameter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: RoutingParameter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.field !== "") { writer.uint32(10).string(message.field); } @@ -1364,8 +1364,8 @@ export const RoutingParameter = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): RoutingParameter { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): RoutingParameter { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRoutingParameter(); while (reader.pos < end) { @@ -1385,10 +1385,10 @@ export const RoutingParameter = { return message; }, fromJSON(object: any): RoutingParameter { - return { - field: isSet(object.field) ? String(object.field) : "", - pathTemplate: isSet(object.pathTemplate) ? String(object.pathTemplate) : "" - }; + const obj = createBaseRoutingParameter(); + if (isSet(object.field)) obj.field = String(object.field); + if (isSet(object.pathTemplate)) obj.pathTemplate = String(object.pathTemplate); + return obj; }, toJSON(message: RoutingParameter): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/service.ts b/__fixtures__/v-next/outputv2/google/api/service.ts index 0831a26c01..1058242f70 100644 --- a/__fixtures__/v-next/outputv2/google/api/service.ts +++ b/__fixtures__/v-next/outputv2/google/api/service.ts @@ -18,7 +18,7 @@ import { Monitoring, MonitoringAmino, MonitoringSDKType } from "./monitoring"; import { SystemParameters, SystemParametersAmino, SystemParametersSDKType } from "./system_parameter"; import { SourceInfo, SourceInfoAmino, SourceInfoSDKType } from "./source_info"; import { UInt32Value, UInt32ValueAmino, UInt32ValueSDKType } from "../protobuf/wrappers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -356,7 +356,7 @@ function createBaseService(): Service { } export const Service = { typeUrl: "/google.api.Service", - encode(message: Service, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Service, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -434,8 +434,8 @@ export const Service = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Service { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Service { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseService(); while (reader.pos < end) { @@ -524,33 +524,33 @@ export const Service = { return message; }, fromJSON(object: any): Service { - return { - name: isSet(object.name) ? String(object.name) : "", - title: isSet(object.title) ? String(object.title) : "", - producerProjectId: isSet(object.producerProjectId) ? String(object.producerProjectId) : "", - id: isSet(object.id) ? String(object.id) : "", - apis: Array.isArray(object?.apis) ? object.apis.map((e: any) => Api.fromJSON(e)) : [], - types: Array.isArray(object?.types) ? object.types.map((e: any) => Type.fromJSON(e)) : [], - enums: Array.isArray(object?.enums) ? object.enums.map((e: any) => Enum.fromJSON(e)) : [], - documentation: isSet(object.documentation) ? Documentation.fromJSON(object.documentation) : undefined, - backend: isSet(object.backend) ? Backend.fromJSON(object.backend) : undefined, - http: isSet(object.http) ? Http.fromJSON(object.http) : undefined, - quota: isSet(object.quota) ? Quota.fromJSON(object.quota) : undefined, - authentication: isSet(object.authentication) ? Authentication.fromJSON(object.authentication) : undefined, - context: isSet(object.context) ? Context.fromJSON(object.context) : undefined, - usage: isSet(object.usage) ? Usage.fromJSON(object.usage) : undefined, - endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromJSON(e)) : [], - control: isSet(object.control) ? Control.fromJSON(object.control) : undefined, - logs: Array.isArray(object?.logs) ? object.logs.map((e: any) => LogDescriptor.fromJSON(e)) : [], - metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => MetricDescriptor.fromJSON(e)) : [], - monitoredResources: Array.isArray(object?.monitoredResources) ? object.monitoredResources.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)) : [], - billing: isSet(object.billing) ? Billing.fromJSON(object.billing) : undefined, - logging: isSet(object.logging) ? Logging.fromJSON(object.logging) : undefined, - monitoring: isSet(object.monitoring) ? Monitoring.fromJSON(object.monitoring) : undefined, - systemParameters: isSet(object.systemParameters) ? SystemParameters.fromJSON(object.systemParameters) : undefined, - sourceInfo: isSet(object.sourceInfo) ? SourceInfo.fromJSON(object.sourceInfo) : undefined, - configVersion: isSet(object.configVersion) ? UInt32Value.fromJSON(object.configVersion) : undefined - }; + const obj = createBaseService(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.title)) obj.title = String(object.title); + if (isSet(object.producerProjectId)) obj.producerProjectId = String(object.producerProjectId); + if (isSet(object.id)) obj.id = String(object.id); + if (Array.isArray(object?.apis)) object.apis.map((e: any) => Api.fromJSON(e)); + if (Array.isArray(object?.types)) object.types.map((e: any) => Type.fromJSON(e)); + if (Array.isArray(object?.enums)) object.enums.map((e: any) => Enum.fromJSON(e)); + if (isSet(object.documentation)) obj.documentation = Documentation.fromJSON(object.documentation); + if (isSet(object.backend)) obj.backend = Backend.fromJSON(object.backend); + if (isSet(object.http)) obj.http = Http.fromJSON(object.http); + if (isSet(object.quota)) obj.quota = Quota.fromJSON(object.quota); + if (isSet(object.authentication)) obj.authentication = Authentication.fromJSON(object.authentication); + if (isSet(object.context)) obj.context = Context.fromJSON(object.context); + if (isSet(object.usage)) obj.usage = Usage.fromJSON(object.usage); + if (Array.isArray(object?.endpoints)) object.endpoints.map((e: any) => Endpoint.fromJSON(e)); + if (isSet(object.control)) obj.control = Control.fromJSON(object.control); + if (Array.isArray(object?.logs)) object.logs.map((e: any) => LogDescriptor.fromJSON(e)); + if (Array.isArray(object?.metrics)) object.metrics.map((e: any) => MetricDescriptor.fromJSON(e)); + if (Array.isArray(object?.monitoredResources)) object.monitoredResources.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)); + if (isSet(object.billing)) obj.billing = Billing.fromJSON(object.billing); + if (isSet(object.logging)) obj.logging = Logging.fromJSON(object.logging); + if (isSet(object.monitoring)) obj.monitoring = Monitoring.fromJSON(object.monitoring); + if (isSet(object.systemParameters)) obj.systemParameters = SystemParameters.fromJSON(object.systemParameters); + if (isSet(object.sourceInfo)) obj.sourceInfo = SourceInfo.fromJSON(object.sourceInfo); + if (isSet(object.configVersion)) obj.configVersion = UInt32Value.fromJSON(object.configVersion); + return obj; }, toJSON(message: Service): unknown { const obj: any = {}; @@ -618,24 +618,52 @@ export const Service = { message.apis = object.apis?.map(e => Api.fromPartial(e)) || []; message.types = object.types?.map(e => Type.fromPartial(e)) || []; message.enums = object.enums?.map(e => Enum.fromPartial(e)) || []; - message.documentation = object.documentation !== undefined && object.documentation !== null ? Documentation.fromPartial(object.documentation) : undefined; - message.backend = object.backend !== undefined && object.backend !== null ? Backend.fromPartial(object.backend) : undefined; - message.http = object.http !== undefined && object.http !== null ? Http.fromPartial(object.http) : undefined; - message.quota = object.quota !== undefined && object.quota !== null ? Quota.fromPartial(object.quota) : undefined; - message.authentication = object.authentication !== undefined && object.authentication !== null ? Authentication.fromPartial(object.authentication) : undefined; - message.context = object.context !== undefined && object.context !== null ? Context.fromPartial(object.context) : undefined; - message.usage = object.usage !== undefined && object.usage !== null ? Usage.fromPartial(object.usage) : undefined; + if (object.documentation !== undefined && object.documentation !== null) { + message.documentation = Documentation.fromPartial(object.documentation); + } + if (object.backend !== undefined && object.backend !== null) { + message.backend = Backend.fromPartial(object.backend); + } + if (object.http !== undefined && object.http !== null) { + message.http = Http.fromPartial(object.http); + } + if (object.quota !== undefined && object.quota !== null) { + message.quota = Quota.fromPartial(object.quota); + } + if (object.authentication !== undefined && object.authentication !== null) { + message.authentication = Authentication.fromPartial(object.authentication); + } + if (object.context !== undefined && object.context !== null) { + message.context = Context.fromPartial(object.context); + } + if (object.usage !== undefined && object.usage !== null) { + message.usage = Usage.fromPartial(object.usage); + } message.endpoints = object.endpoints?.map(e => Endpoint.fromPartial(e)) || []; - message.control = object.control !== undefined && object.control !== null ? Control.fromPartial(object.control) : undefined; + if (object.control !== undefined && object.control !== null) { + message.control = Control.fromPartial(object.control); + } message.logs = object.logs?.map(e => LogDescriptor.fromPartial(e)) || []; message.metrics = object.metrics?.map(e => MetricDescriptor.fromPartial(e)) || []; message.monitoredResources = object.monitoredResources?.map(e => MonitoredResourceDescriptor.fromPartial(e)) || []; - message.billing = object.billing !== undefined && object.billing !== null ? Billing.fromPartial(object.billing) : undefined; - message.logging = object.logging !== undefined && object.logging !== null ? Logging.fromPartial(object.logging) : undefined; - message.monitoring = object.monitoring !== undefined && object.monitoring !== null ? Monitoring.fromPartial(object.monitoring) : undefined; - message.systemParameters = object.systemParameters !== undefined && object.systemParameters !== null ? SystemParameters.fromPartial(object.systemParameters) : undefined; - message.sourceInfo = object.sourceInfo !== undefined && object.sourceInfo !== null ? SourceInfo.fromPartial(object.sourceInfo) : undefined; - message.configVersion = object.configVersion !== undefined && object.configVersion !== null ? UInt32Value.fromPartial(object.configVersion) : undefined; + if (object.billing !== undefined && object.billing !== null) { + message.billing = Billing.fromPartial(object.billing); + } + if (object.logging !== undefined && object.logging !== null) { + message.logging = Logging.fromPartial(object.logging); + } + if (object.monitoring !== undefined && object.monitoring !== null) { + message.monitoring = Monitoring.fromPartial(object.monitoring); + } + if (object.systemParameters !== undefined && object.systemParameters !== null) { + message.systemParameters = SystemParameters.fromPartial(object.systemParameters); + } + if (object.sourceInfo !== undefined && object.sourceInfo !== null) { + message.sourceInfo = SourceInfo.fromPartial(object.sourceInfo); + } + if (object.configVersion !== undefined && object.configVersion !== null) { + message.configVersion = UInt32Value.fromPartial(object.configVersion); + } return message; }, fromSDK(object: ServiceSDKType): Service { diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/check_error.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/check_error.ts index f84fb7ac3a..e9ab0462d3 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/check_error.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/check_error.ts @@ -1,5 +1,5 @@ import { Status, StatusAmino, StatusSDKType } from "../../../rpc/status"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; /** Error codes for Check responses. */ @@ -269,7 +269,7 @@ function createBaseCheckError(): CheckError { } export const CheckError = { typeUrl: "/google.api.servicecontrol.v1.CheckError", - encode(message: CheckError, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckError, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).int32(message.code); } @@ -284,8 +284,8 @@ export const CheckError = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckError { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckError { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckError(); while (reader.pos < end) { @@ -311,12 +311,12 @@ export const CheckError = { return message; }, fromJSON(object: any): CheckError { - return { - code: isSet(object.code) ? checkError_CodeFromJSON(object.code) : -1, - subject: isSet(object.subject) ? String(object.subject) : "", - detail: isSet(object.detail) ? String(object.detail) : "", - status: isSet(object.status) ? Status.fromJSON(object.status) : undefined - }; + const obj = createBaseCheckError(); + if (isSet(object.code)) obj.code = checkError_CodeFromJSON(object.code); + if (isSet(object.subject)) obj.subject = String(object.subject); + if (isSet(object.detail)) obj.detail = String(object.detail); + if (isSet(object.status)) obj.status = Status.fromJSON(object.status); + return obj; }, toJSON(message: CheckError): unknown { const obj: any = {}; @@ -331,7 +331,9 @@ export const CheckError = { message.code = object.code ?? 0; message.subject = object.subject ?? ""; message.detail = object.detail ?? ""; - message.status = object.status !== undefined && object.status !== null ? Status.fromPartial(object.status) : undefined; + if (object.status !== undefined && object.status !== null) { + message.status = Status.fromPartial(object.status); + } return message; }, fromSDK(object: CheckErrorSDKType): CheckError { diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/distribution.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/distribution.ts index b993a1c4fc..7cfcf4aba2 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/distribution.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/distribution.ts @@ -1,6 +1,6 @@ import { Distribution_Exemplar } from "../../distribution"; -import { Long, isSet, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; /** * Distribution represents a frequency distribution of double-valued sample @@ -14,7 +14,7 @@ export const protobufPackage = "google.api.servicecontrol.v1"; */ export interface Distribution { /** The total number of samples in the distribution. Must be >= 0. */ - count: Long; + count: bigint; /** * The arithmetic mean of the samples in the distribution. If `count` is * zero then this field must be zero. @@ -44,7 +44,7 @@ export interface Distribution { * * Any suffix of trailing zeros may be omitted. */ - bucketCounts: Long[]; + bucketCounts: bigint[]; /** Buckets with constant width. */ linearBuckets?: Distribution_LinearBuckets; /** Buckets with exponentially growing width. */ @@ -125,12 +125,12 @@ export interface DistributionAminoMsg { * * a histogram of the values of the sample points */ export interface DistributionSDKType { - count: Long; + count: bigint; mean: number; minimum: number; maximum: number; sum_of_squared_deviation: number; - bucket_counts: Long[]; + bucket_counts: bigint[]; linear_buckets?: Distribution_LinearBucketsSDKType; exponential_buckets?: Distribution_ExponentialBucketsSDKType; explicit_buckets?: Distribution_ExplicitBucketsSDKType; @@ -310,7 +310,7 @@ export interface Distribution_ExplicitBucketsSDKType { } function createBaseDistribution(): Distribution { return { - count: Long.ZERO, + count: BigInt(0), mean: 0, minimum: 0, maximum: 0, @@ -324,8 +324,8 @@ function createBaseDistribution(): Distribution { } export const Distribution = { typeUrl: "/google.api.servicecontrol.v1.Distribution", - encode(message: Distribution, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.count.isZero()) { + encode(message: Distribution, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.count !== BigInt(0)) { writer.uint32(8).int64(message.count); } if (message.mean !== 0) { @@ -359,15 +359,15 @@ export const Distribution = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.count = (reader.int64() as Long); + message.count = reader.int64(); break; case 2: message.mean = reader.double(); @@ -385,10 +385,10 @@ export const Distribution = { if ((tag & 7) === 2) { const end2 = reader.uint32() + reader.pos; while (reader.pos < end2) { - message.bucketCounts.push((reader.int64() as Long)); + message.bucketCounts.push(reader.int64()); } } else { - message.bucketCounts.push((reader.int64() as Long)); + message.bucketCounts.push(reader.int64()); } break; case 7: @@ -411,28 +411,28 @@ export const Distribution = { return message; }, fromJSON(object: any): Distribution { - return { - count: isSet(object.count) ? Long.fromValue(object.count) : Long.ZERO, - mean: isSet(object.mean) ? Number(object.mean) : 0, - minimum: isSet(object.minimum) ? Number(object.minimum) : 0, - maximum: isSet(object.maximum) ? Number(object.maximum) : 0, - sumOfSquaredDeviation: isSet(object.sumOfSquaredDeviation) ? Number(object.sumOfSquaredDeviation) : 0, - bucketCounts: Array.isArray(object?.bucketCounts) ? object.bucketCounts.map((e: any) => Long.fromValue(e)) : [], - linearBuckets: isSet(object.linearBuckets) ? Distribution_LinearBuckets.fromJSON(object.linearBuckets) : undefined, - exponentialBuckets: isSet(object.exponentialBuckets) ? Distribution_ExponentialBuckets.fromJSON(object.exponentialBuckets) : undefined, - explicitBuckets: isSet(object.explicitBuckets) ? Distribution_ExplicitBuckets.fromJSON(object.explicitBuckets) : undefined, - exemplars: Array.isArray(object?.exemplars) ? object.exemplars.map((e: any) => Distribution_Exemplar.fromJSON(e)) : [] - }; + const obj = createBaseDistribution(); + if (isSet(object.count)) obj.count = BigInt(object.count.toString()); + if (isSet(object.mean)) obj.mean = Number(object.mean); + if (isSet(object.minimum)) obj.minimum = Number(object.minimum); + if (isSet(object.maximum)) obj.maximum = Number(object.maximum); + if (isSet(object.sumOfSquaredDeviation)) obj.sumOfSquaredDeviation = Number(object.sumOfSquaredDeviation); + if (Array.isArray(object?.bucketCounts)) object.bucketCounts.map((e: any) => BigInt(e.toString())); + if (isSet(object.linearBuckets)) obj.linearBuckets = Distribution_LinearBuckets.fromJSON(object.linearBuckets); + if (isSet(object.exponentialBuckets)) obj.exponentialBuckets = Distribution_ExponentialBuckets.fromJSON(object.exponentialBuckets); + if (isSet(object.explicitBuckets)) obj.explicitBuckets = Distribution_ExplicitBuckets.fromJSON(object.explicitBuckets); + if (Array.isArray(object?.exemplars)) object.exemplars.map((e: any) => Distribution_Exemplar.fromJSON(e)); + return obj; }, toJSON(message: Distribution): unknown { const obj: any = {}; - message.count !== undefined && (obj.count = (message.count || Long.ZERO).toString()); + message.count !== undefined && (obj.count = (message.count || BigInt(0)).toString()); message.mean !== undefined && (obj.mean = message.mean); message.minimum !== undefined && (obj.minimum = message.minimum); message.maximum !== undefined && (obj.maximum = message.maximum); message.sumOfSquaredDeviation !== undefined && (obj.sumOfSquaredDeviation = message.sumOfSquaredDeviation); if (message.bucketCounts) { - obj.bucketCounts = message.bucketCounts.map(e => (e || Long.ZERO).toString()); + obj.bucketCounts = message.bucketCounts.map(e => (e || BigInt(0)).toString()); } else { obj.bucketCounts = []; } @@ -448,15 +448,23 @@ export const Distribution = { }, fromPartial(object: DeepPartial): Distribution { const message = createBaseDistribution(); - message.count = object.count !== undefined && object.count !== null ? Long.fromValue(object.count) : Long.ZERO; + if (object.count !== undefined && object.count !== null) { + message.count = BigInt(object.count.toString()); + } message.mean = object.mean ?? 0; message.minimum = object.minimum ?? 0; message.maximum = object.maximum ?? 0; message.sumOfSquaredDeviation = object.sumOfSquaredDeviation ?? 0; - message.bucketCounts = object.bucketCounts?.map(e => Long.fromValue(e)) || []; - message.linearBuckets = object.linearBuckets !== undefined && object.linearBuckets !== null ? Distribution_LinearBuckets.fromPartial(object.linearBuckets) : undefined; - message.exponentialBuckets = object.exponentialBuckets !== undefined && object.exponentialBuckets !== null ? Distribution_ExponentialBuckets.fromPartial(object.exponentialBuckets) : undefined; - message.explicitBuckets = object.explicitBuckets !== undefined && object.explicitBuckets !== null ? Distribution_ExplicitBuckets.fromPartial(object.explicitBuckets) : undefined; + message.bucketCounts = object.bucketCounts?.map(e => BigInt(e.toString())) || []; + if (object.linearBuckets !== undefined && object.linearBuckets !== null) { + message.linearBuckets = Distribution_LinearBuckets.fromPartial(object.linearBuckets); + } + if (object.exponentialBuckets !== undefined && object.exponentialBuckets !== null) { + message.exponentialBuckets = Distribution_ExponentialBuckets.fromPartial(object.exponentialBuckets); + } + if (object.explicitBuckets !== undefined && object.explicitBuckets !== null) { + message.explicitBuckets = Distribution_ExplicitBuckets.fromPartial(object.explicitBuckets); + } message.exemplars = object.exemplars?.map(e => Distribution_Exemplar.fromPartial(e)) || []; return message; }, @@ -498,12 +506,12 @@ export const Distribution = { }, fromAmino(object: DistributionAmino): Distribution { return { - count: Long.fromString(object.count), + count: BigInt(object.count), mean: object.mean, minimum: object.minimum, maximum: object.maximum, sumOfSquaredDeviation: object.sum_of_squared_deviation, - bucketCounts: Array.isArray(object?.bucket_counts) ? object.bucket_counts.map((e: any) => e) : [], + bucketCounts: Array.isArray(object?.bucket_counts) ? object.bucket_counts.map((e: any) => BigInt(e)) : [], linearBuckets: object?.linear_buckets ? Distribution_LinearBuckets.fromAmino(object.linear_buckets) : undefined, exponentialBuckets: object?.exponential_buckets ? Distribution_ExponentialBuckets.fromAmino(object.exponential_buckets) : undefined, explicitBuckets: object?.explicit_buckets ? Distribution_ExplicitBuckets.fromAmino(object.explicit_buckets) : undefined, @@ -518,7 +526,7 @@ export const Distribution = { obj.maximum = message.maximum; obj.sum_of_squared_deviation = message.sumOfSquaredDeviation; if (message.bucketCounts) { - obj.bucket_counts = message.bucketCounts.map(e => e); + obj.bucket_counts = message.bucketCounts.map(e => e.toString()); } else { obj.bucket_counts = []; } @@ -557,7 +565,7 @@ function createBaseDistribution_LinearBuckets(): Distribution_LinearBuckets { } export const Distribution_LinearBuckets = { typeUrl: "/google.api.servicecontrol.v1.LinearBuckets", - encode(message: Distribution_LinearBuckets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_LinearBuckets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); } @@ -569,8 +577,8 @@ export const Distribution_LinearBuckets = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_LinearBuckets { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_LinearBuckets { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_LinearBuckets(); while (reader.pos < end) { @@ -593,11 +601,11 @@ export const Distribution_LinearBuckets = { return message; }, fromJSON(object: any): Distribution_LinearBuckets { - return { - numFiniteBuckets: isSet(object.numFiniteBuckets) ? Number(object.numFiniteBuckets) : 0, - width: isSet(object.width) ? Number(object.width) : 0, - offset: isSet(object.offset) ? Number(object.offset) : 0 - }; + const obj = createBaseDistribution_LinearBuckets(); + if (isSet(object.numFiniteBuckets)) obj.numFiniteBuckets = Number(object.numFiniteBuckets); + if (isSet(object.width)) obj.width = Number(object.width); + if (isSet(object.offset)) obj.offset = Number(object.offset); + return obj; }, toJSON(message: Distribution_LinearBuckets): unknown { const obj: any = {}; @@ -666,7 +674,7 @@ function createBaseDistribution_ExponentialBuckets(): Distribution_ExponentialBu } export const Distribution_ExponentialBuckets = { typeUrl: "/google.api.servicecontrol.v1.ExponentialBuckets", - encode(message: Distribution_ExponentialBuckets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_ExponentialBuckets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.numFiniteBuckets !== 0) { writer.uint32(8).int32(message.numFiniteBuckets); } @@ -678,8 +686,8 @@ export const Distribution_ExponentialBuckets = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_ExponentialBuckets { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_ExponentialBuckets { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_ExponentialBuckets(); while (reader.pos < end) { @@ -702,11 +710,11 @@ export const Distribution_ExponentialBuckets = { return message; }, fromJSON(object: any): Distribution_ExponentialBuckets { - return { - numFiniteBuckets: isSet(object.numFiniteBuckets) ? Number(object.numFiniteBuckets) : 0, - growthFactor: isSet(object.growthFactor) ? Number(object.growthFactor) : 0, - scale: isSet(object.scale) ? Number(object.scale) : 0 - }; + const obj = createBaseDistribution_ExponentialBuckets(); + if (isSet(object.numFiniteBuckets)) obj.numFiniteBuckets = Number(object.numFiniteBuckets); + if (isSet(object.growthFactor)) obj.growthFactor = Number(object.growthFactor); + if (isSet(object.scale)) obj.scale = Number(object.scale); + return obj; }, toJSON(message: Distribution_ExponentialBuckets): unknown { const obj: any = {}; @@ -773,7 +781,7 @@ function createBaseDistribution_ExplicitBuckets(): Distribution_ExplicitBuckets } export const Distribution_ExplicitBuckets = { typeUrl: "/google.api.servicecontrol.v1.ExplicitBuckets", - encode(message: Distribution_ExplicitBuckets, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Distribution_ExplicitBuckets, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.bounds) { writer.double(v); @@ -781,8 +789,8 @@ export const Distribution_ExplicitBuckets = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Distribution_ExplicitBuckets { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Distribution_ExplicitBuckets { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDistribution_ExplicitBuckets(); while (reader.pos < end) { @@ -806,9 +814,9 @@ export const Distribution_ExplicitBuckets = { return message; }, fromJSON(object: any): Distribution_ExplicitBuckets { - return { - bounds: Array.isArray(object?.bounds) ? object.bounds.map((e: any) => Number(e)) : [] - }; + const obj = createBaseDistribution_ExplicitBuckets(); + if (Array.isArray(object?.bounds)) object.bounds.map((e: any) => Number(e)); + return obj; }, toJSON(message: Distribution_ExplicitBuckets): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/http_request.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/http_request.ts index 45c64e1a24..1d06492261 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/http_request.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/http_request.ts @@ -1,6 +1,6 @@ import { Duration, DurationAmino, DurationSDKType } from "../../../protobuf/duration"; -import { Long, isSet, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; /** * A common proto for logging HTTP requests. Only contains semantics @@ -20,7 +20,7 @@ export interface HttpRequest { * The size of the HTTP request message in bytes, including the request * headers and the request body. */ - requestSize: Long; + requestSize: bigint; /** * The response code indicating the status of the response. * Examples: 200, 404. @@ -30,7 +30,7 @@ export interface HttpRequest { * The size of the HTTP response message sent back to the client, in bytes, * including the response headers and the response body. */ - responseSize: Long; + responseSize: bigint; /** * The user agent sent by the client. Example: * `"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Q312461; .NET @@ -75,7 +75,7 @@ export interface HttpRequest { * The number of HTTP response bytes inserted into cache. Set only when a * cache fill was attempted. */ - cacheFillBytes: Long; + cacheFillBytes: bigint; /** Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket" */ protocol: string; } @@ -172,9 +172,9 @@ export interface HttpRequestAminoMsg { export interface HttpRequestSDKType { request_method: string; request_url: string; - request_size: Long; + request_size: bigint; status: number; - response_size: Long; + response_size: bigint; user_agent: string; remote_ip: string; server_ip: string; @@ -183,16 +183,16 @@ export interface HttpRequestSDKType { cache_lookup: boolean; cache_hit: boolean; cache_validated_with_origin_server: boolean; - cache_fill_bytes: Long; + cache_fill_bytes: bigint; protocol: string; } function createBaseHttpRequest(): HttpRequest { return { requestMethod: "", requestUrl: "", - requestSize: Long.ZERO, + requestSize: BigInt(0), status: 0, - responseSize: Long.ZERO, + responseSize: BigInt(0), userAgent: "", remoteIp: "", serverIp: "", @@ -201,26 +201,26 @@ function createBaseHttpRequest(): HttpRequest { cacheLookup: false, cacheHit: false, cacheValidatedWithOriginServer: false, - cacheFillBytes: Long.ZERO, + cacheFillBytes: BigInt(0), protocol: "" }; } export const HttpRequest = { typeUrl: "/google.api.servicecontrol.v1.HttpRequest", - encode(message: HttpRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: HttpRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.requestMethod !== "") { writer.uint32(10).string(message.requestMethod); } if (message.requestUrl !== "") { writer.uint32(18).string(message.requestUrl); } - if (!message.requestSize.isZero()) { + if (message.requestSize !== BigInt(0)) { writer.uint32(24).int64(message.requestSize); } if (message.status !== 0) { writer.uint32(32).int32(message.status); } - if (!message.responseSize.isZero()) { + if (message.responseSize !== BigInt(0)) { writer.uint32(40).int64(message.responseSize); } if (message.userAgent !== "") { @@ -247,7 +247,7 @@ export const HttpRequest = { if (message.cacheValidatedWithOriginServer === true) { writer.uint32(80).bool(message.cacheValidatedWithOriginServer); } - if (!message.cacheFillBytes.isZero()) { + if (message.cacheFillBytes !== BigInt(0)) { writer.uint32(96).int64(message.cacheFillBytes); } if (message.protocol !== "") { @@ -255,8 +255,8 @@ export const HttpRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): HttpRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): HttpRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseHttpRequest(); while (reader.pos < end) { @@ -269,13 +269,13 @@ export const HttpRequest = { message.requestUrl = reader.string(); break; case 3: - message.requestSize = (reader.int64() as Long); + message.requestSize = reader.int64(); break; case 4: message.status = reader.int32(); break; case 5: - message.responseSize = (reader.int64() as Long); + message.responseSize = reader.int64(); break; case 6: message.userAgent = reader.string(); @@ -302,7 +302,7 @@ export const HttpRequest = { message.cacheValidatedWithOriginServer = reader.bool(); break; case 12: - message.cacheFillBytes = (reader.int64() as Long); + message.cacheFillBytes = reader.int64(); break; case 15: message.protocol = reader.string(); @@ -315,31 +315,31 @@ export const HttpRequest = { return message; }, fromJSON(object: any): HttpRequest { - return { - requestMethod: isSet(object.requestMethod) ? String(object.requestMethod) : "", - requestUrl: isSet(object.requestUrl) ? String(object.requestUrl) : "", - requestSize: isSet(object.requestSize) ? Long.fromValue(object.requestSize) : Long.ZERO, - status: isSet(object.status) ? Number(object.status) : 0, - responseSize: isSet(object.responseSize) ? Long.fromValue(object.responseSize) : Long.ZERO, - userAgent: isSet(object.userAgent) ? String(object.userAgent) : "", - remoteIp: isSet(object.remoteIp) ? String(object.remoteIp) : "", - serverIp: isSet(object.serverIp) ? String(object.serverIp) : "", - referer: isSet(object.referer) ? String(object.referer) : "", - latency: isSet(object.latency) ? Duration.fromJSON(object.latency) : undefined, - cacheLookup: isSet(object.cacheLookup) ? Boolean(object.cacheLookup) : false, - cacheHit: isSet(object.cacheHit) ? Boolean(object.cacheHit) : false, - cacheValidatedWithOriginServer: isSet(object.cacheValidatedWithOriginServer) ? Boolean(object.cacheValidatedWithOriginServer) : false, - cacheFillBytes: isSet(object.cacheFillBytes) ? Long.fromValue(object.cacheFillBytes) : Long.ZERO, - protocol: isSet(object.protocol) ? String(object.protocol) : "" - }; + const obj = createBaseHttpRequest(); + if (isSet(object.requestMethod)) obj.requestMethod = String(object.requestMethod); + if (isSet(object.requestUrl)) obj.requestUrl = String(object.requestUrl); + if (isSet(object.requestSize)) obj.requestSize = BigInt(object.requestSize.toString()); + if (isSet(object.status)) obj.status = Number(object.status); + if (isSet(object.responseSize)) obj.responseSize = BigInt(object.responseSize.toString()); + if (isSet(object.userAgent)) obj.userAgent = String(object.userAgent); + if (isSet(object.remoteIp)) obj.remoteIp = String(object.remoteIp); + if (isSet(object.serverIp)) obj.serverIp = String(object.serverIp); + if (isSet(object.referer)) obj.referer = String(object.referer); + if (isSet(object.latency)) obj.latency = Duration.fromJSON(object.latency); + if (isSet(object.cacheLookup)) obj.cacheLookup = Boolean(object.cacheLookup); + if (isSet(object.cacheHit)) obj.cacheHit = Boolean(object.cacheHit); + if (isSet(object.cacheValidatedWithOriginServer)) obj.cacheValidatedWithOriginServer = Boolean(object.cacheValidatedWithOriginServer); + if (isSet(object.cacheFillBytes)) obj.cacheFillBytes = BigInt(object.cacheFillBytes.toString()); + if (isSet(object.protocol)) obj.protocol = String(object.protocol); + return obj; }, toJSON(message: HttpRequest): unknown { const obj: any = {}; message.requestMethod !== undefined && (obj.requestMethod = message.requestMethod); message.requestUrl !== undefined && (obj.requestUrl = message.requestUrl); - message.requestSize !== undefined && (obj.requestSize = (message.requestSize || Long.ZERO).toString()); + message.requestSize !== undefined && (obj.requestSize = (message.requestSize || BigInt(0)).toString()); message.status !== undefined && (obj.status = Math.round(message.status)); - message.responseSize !== undefined && (obj.responseSize = (message.responseSize || Long.ZERO).toString()); + message.responseSize !== undefined && (obj.responseSize = (message.responseSize || BigInt(0)).toString()); message.userAgent !== undefined && (obj.userAgent = message.userAgent); message.remoteIp !== undefined && (obj.remoteIp = message.remoteIp); message.serverIp !== undefined && (obj.serverIp = message.serverIp); @@ -348,7 +348,7 @@ export const HttpRequest = { message.cacheLookup !== undefined && (obj.cacheLookup = message.cacheLookup); message.cacheHit !== undefined && (obj.cacheHit = message.cacheHit); message.cacheValidatedWithOriginServer !== undefined && (obj.cacheValidatedWithOriginServer = message.cacheValidatedWithOriginServer); - message.cacheFillBytes !== undefined && (obj.cacheFillBytes = (message.cacheFillBytes || Long.ZERO).toString()); + message.cacheFillBytes !== undefined && (obj.cacheFillBytes = (message.cacheFillBytes || BigInt(0)).toString()); message.protocol !== undefined && (obj.protocol = message.protocol); return obj; }, @@ -356,18 +356,26 @@ export const HttpRequest = { const message = createBaseHttpRequest(); message.requestMethod = object.requestMethod ?? ""; message.requestUrl = object.requestUrl ?? ""; - message.requestSize = object.requestSize !== undefined && object.requestSize !== null ? Long.fromValue(object.requestSize) : Long.ZERO; + if (object.requestSize !== undefined && object.requestSize !== null) { + message.requestSize = BigInt(object.requestSize.toString()); + } message.status = object.status ?? 0; - message.responseSize = object.responseSize !== undefined && object.responseSize !== null ? Long.fromValue(object.responseSize) : Long.ZERO; + if (object.responseSize !== undefined && object.responseSize !== null) { + message.responseSize = BigInt(object.responseSize.toString()); + } message.userAgent = object.userAgent ?? ""; message.remoteIp = object.remoteIp ?? ""; message.serverIp = object.serverIp ?? ""; message.referer = object.referer ?? ""; - message.latency = object.latency !== undefined && object.latency !== null ? Duration.fromPartial(object.latency) : undefined; + if (object.latency !== undefined && object.latency !== null) { + message.latency = Duration.fromPartial(object.latency); + } message.cacheLookup = object.cacheLookup ?? false; message.cacheHit = object.cacheHit ?? false; message.cacheValidatedWithOriginServer = object.cacheValidatedWithOriginServer ?? false; - message.cacheFillBytes = object.cacheFillBytes !== undefined && object.cacheFillBytes !== null ? Long.fromValue(object.cacheFillBytes) : Long.ZERO; + if (object.cacheFillBytes !== undefined && object.cacheFillBytes !== null) { + message.cacheFillBytes = BigInt(object.cacheFillBytes.toString()); + } message.protocol = object.protocol ?? ""; return message; }, @@ -413,9 +421,9 @@ export const HttpRequest = { return { requestMethod: object.request_method, requestUrl: object.request_url, - requestSize: Long.fromString(object.request_size), + requestSize: BigInt(object.request_size), status: object.status, - responseSize: Long.fromString(object.response_size), + responseSize: BigInt(object.response_size), userAgent: object.user_agent, remoteIp: object.remote_ip, serverIp: object.server_ip, @@ -424,7 +432,7 @@ export const HttpRequest = { cacheLookup: object.cache_lookup, cacheHit: object.cache_hit, cacheValidatedWithOriginServer: object.cache_validated_with_origin_server, - cacheFillBytes: Long.fromString(object.cache_fill_bytes), + cacheFillBytes: BigInt(object.cache_fill_bytes), protocol: object.protocol }; }, diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/log_entry.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/log_entry.ts index 06b791f8f4..3a4368a542 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/log_entry.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/log_entry.ts @@ -3,8 +3,8 @@ import { LogSeverity, logSeverityFromJSON, logSeverityToJSON } from "../../../lo import { HttpRequest, HttpRequestAmino, HttpRequestSDKType } from "./http_request"; import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; import { Struct, StructAmino, StructSDKType } from "../../../protobuf/struct"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; export interface LogEntry_LabelsEntry { key: string; @@ -255,7 +255,7 @@ export interface LogEntrySourceLocation { * Optional. Line within the source file. 1-based; 0 indicates no line number * available. */ - line: Long; + line: bigint; /** * Optional. Human-readable name of the function or method being invoked, with * optional context such as the class or package name. This information may be @@ -305,7 +305,7 @@ export interface LogEntrySourceLocationAminoMsg { */ export interface LogEntrySourceLocationSDKType { file: string; - line: Long; + line: bigint; function: string; } function createBaseLogEntry_LabelsEntry(): LogEntry_LabelsEntry { @@ -315,7 +315,7 @@ function createBaseLogEntry_LabelsEntry(): LogEntry_LabelsEntry { }; } export const LogEntry_LabelsEntry = { - encode(message: LogEntry_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntry_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -324,8 +324,8 @@ export const LogEntry_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntry_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntry_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntry_LabelsEntry(); while (reader.pos < end) { @@ -345,10 +345,10 @@ export const LogEntry_LabelsEntry = { return message; }, fromJSON(object: any): LogEntry_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseLogEntry_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: LogEntry_LabelsEntry): unknown { const obj: any = {}; @@ -414,7 +414,7 @@ function createBaseLogEntry(): LogEntry { } export const LogEntry = { typeUrl: "/google.api.servicecontrol.v1.LogEntry", - encode(message: LogEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(82).string(message.name); } @@ -456,8 +456,8 @@ export const LogEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntry(); while (reader.pos < end) { @@ -510,25 +510,25 @@ export const LogEntry = { return message; }, fromJSON(object: any): LogEntry { - return { - name: isSet(object.name) ? String(object.name) : "", - timestamp: isSet(object.timestamp) ? new Date(object.timestamp) : undefined, - severity: isSet(object.severity) ? logSeverityFromJSON(object.severity) : -1, - httpRequest: isSet(object.httpRequest) ? HttpRequest.fromJSON(object.httpRequest) : undefined, - trace: isSet(object.trace) ? String(object.trace) : "", - insertId: isSet(object.insertId) ? String(object.insertId) : "", - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - protoPayload: isSet(object.protoPayload) ? Any.fromJSON(object.protoPayload) : undefined, - textPayload: isSet(object.textPayload) ? String(object.textPayload) : undefined, - structPayload: isSet(object.structPayload) ? Struct.fromJSON(object.structPayload) : undefined, - operation: isSet(object.operation) ? LogEntryOperation.fromJSON(object.operation) : undefined, - sourceLocation: isSet(object.sourceLocation) ? LogEntrySourceLocation.fromJSON(object.sourceLocation) : undefined - }; + const obj = createBaseLogEntry(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.timestamp)) obj.timestamp = new Date(object.timestamp); + if (isSet(object.severity)) obj.severity = logSeverityFromJSON(object.severity); + if (isSet(object.httpRequest)) obj.httpRequest = HttpRequest.fromJSON(object.httpRequest); + if (isSet(object.trace)) obj.trace = String(object.trace); + if (isSet(object.insertId)) obj.insertId = String(object.insertId); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (isSet(object.protoPayload)) obj.protoPayload = Any.fromJSON(object.protoPayload); + if (isSet(object.textPayload)) obj.textPayload = String(object.textPayload); + if (isSet(object.structPayload)) obj.structPayload = Struct.fromJSON(object.structPayload); + if (isSet(object.operation)) obj.operation = LogEntryOperation.fromJSON(object.operation); + if (isSet(object.sourceLocation)) obj.sourceLocation = LogEntrySourceLocation.fromJSON(object.sourceLocation); + return obj; }, toJSON(message: LogEntry): unknown { const obj: any = {}; @@ -556,7 +556,9 @@ export const LogEntry = { message.name = object.name ?? ""; message.timestamp = object.timestamp ?? undefined; message.severity = object.severity ?? 0; - message.httpRequest = object.httpRequest !== undefined && object.httpRequest !== null ? HttpRequest.fromPartial(object.httpRequest) : undefined; + if (object.httpRequest !== undefined && object.httpRequest !== null) { + message.httpRequest = HttpRequest.fromPartial(object.httpRequest); + } message.trace = object.trace ?? ""; message.insertId = object.insertId ?? ""; message.labels = Object.entries(object.labels ?? {}).reduce<{ @@ -567,11 +569,19 @@ export const LogEntry = { } return acc; }, {}); - message.protoPayload = object.protoPayload !== undefined && object.protoPayload !== null ? Any.fromPartial(object.protoPayload) : undefined; + if (object.protoPayload !== undefined && object.protoPayload !== null) { + message.protoPayload = Any.fromPartial(object.protoPayload); + } message.textPayload = object.textPayload ?? undefined; - message.structPayload = object.structPayload !== undefined && object.structPayload !== null ? Struct.fromPartial(object.structPayload) : undefined; - message.operation = object.operation !== undefined && object.operation !== null ? LogEntryOperation.fromPartial(object.operation) : undefined; - message.sourceLocation = object.sourceLocation !== undefined && object.sourceLocation !== null ? LogEntrySourceLocation.fromPartial(object.sourceLocation) : undefined; + if (object.structPayload !== undefined && object.structPayload !== null) { + message.structPayload = Struct.fromPartial(object.structPayload); + } + if (object.operation !== undefined && object.operation !== null) { + message.operation = LogEntryOperation.fromPartial(object.operation); + } + if (object.sourceLocation !== undefined && object.sourceLocation !== null) { + message.sourceLocation = LogEntrySourceLocation.fromPartial(object.sourceLocation); + } return message; }, fromSDK(object: LogEntrySDKType): LogEntry { @@ -684,7 +694,7 @@ function createBaseLogEntryOperation(): LogEntryOperation { } export const LogEntryOperation = { typeUrl: "/google.api.servicecontrol.v1.LogEntryOperation", - encode(message: LogEntryOperation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntryOperation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); } @@ -699,8 +709,8 @@ export const LogEntryOperation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntryOperation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntryOperation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntryOperation(); while (reader.pos < end) { @@ -726,12 +736,12 @@ export const LogEntryOperation = { return message; }, fromJSON(object: any): LogEntryOperation { - return { - id: isSet(object.id) ? String(object.id) : "", - producer: isSet(object.producer) ? String(object.producer) : "", - first: isSet(object.first) ? Boolean(object.first) : false, - last: isSet(object.last) ? Boolean(object.last) : false - }; + const obj = createBaseLogEntryOperation(); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.producer)) obj.producer = String(object.producer); + if (isSet(object.first)) obj.first = Boolean(object.first); + if (isSet(object.last)) obj.last = Boolean(object.last); + return obj; }, toJSON(message: LogEntryOperation): unknown { const obj: any = {}; @@ -800,17 +810,17 @@ export const LogEntryOperation = { function createBaseLogEntrySourceLocation(): LogEntrySourceLocation { return { file: "", - line: Long.ZERO, + line: BigInt(0), function: "" }; } export const LogEntrySourceLocation = { typeUrl: "/google.api.servicecontrol.v1.LogEntrySourceLocation", - encode(message: LogEntrySourceLocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntrySourceLocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.file !== "") { writer.uint32(10).string(message.file); } - if (!message.line.isZero()) { + if (message.line !== BigInt(0)) { writer.uint32(16).int64(message.line); } if (message.function !== "") { @@ -818,8 +828,8 @@ export const LogEntrySourceLocation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntrySourceLocation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntrySourceLocation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntrySourceLocation(); while (reader.pos < end) { @@ -829,7 +839,7 @@ export const LogEntrySourceLocation = { message.file = reader.string(); break; case 2: - message.line = (reader.int64() as Long); + message.line = reader.int64(); break; case 3: message.function = reader.string(); @@ -842,23 +852,25 @@ export const LogEntrySourceLocation = { return message; }, fromJSON(object: any): LogEntrySourceLocation { - return { - file: isSet(object.file) ? String(object.file) : "", - line: isSet(object.line) ? Long.fromValue(object.line) : Long.ZERO, - function: isSet(object.function) ? String(object.function) : "" - }; + const obj = createBaseLogEntrySourceLocation(); + if (isSet(object.file)) obj.file = String(object.file); + if (isSet(object.line)) obj.line = BigInt(object.line.toString()); + if (isSet(object.function)) obj.function = String(object.function); + return obj; }, toJSON(message: LogEntrySourceLocation): unknown { const obj: any = {}; message.file !== undefined && (obj.file = message.file); - message.line !== undefined && (obj.line = (message.line || Long.ZERO).toString()); + message.line !== undefined && (obj.line = (message.line || BigInt(0)).toString()); message.function !== undefined && (obj.function = message.function); return obj; }, fromPartial(object: DeepPartial): LogEntrySourceLocation { const message = createBaseLogEntrySourceLocation(); message.file = object.file ?? ""; - message.line = object.line !== undefined && object.line !== null ? Long.fromValue(object.line) : Long.ZERO; + if (object.line !== undefined && object.line !== null) { + message.line = BigInt(object.line.toString()); + } message.function = object.function ?? ""; return message; }, @@ -879,7 +891,7 @@ export const LogEntrySourceLocation = { fromAmino(object: LogEntrySourceLocationAmino): LogEntrySourceLocation { return { file: object.file, - line: Long.fromString(object.line), + line: BigInt(object.line), function: object.function }; }, diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/metric_value.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/metric_value.ts index 6d6dce9f00..e48348f8e7 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/metric_value.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/metric_value.ts @@ -1,7 +1,7 @@ import { Timestamp } from "../../../protobuf/timestamp"; import { Distribution, DistributionAmino, DistributionSDKType } from "./distribution"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; export interface MetricValue_LabelsEntry { key: string; @@ -51,7 +51,7 @@ export interface MetricValue { /** A boolean value. */ boolValue?: boolean; /** A signed 64-bit integer value. */ - int64Value?: Long; + int64Value?: bigint; /** A double precision floating point value. */ doubleValue?: number; /** A text string value. */ @@ -111,7 +111,7 @@ export interface MetricValueSDKType { start_time: Date; end_time: Date; bool_value?: boolean; - int64_value?: Long; + int64_value?: bigint; double_value?: number; string_value?: string; distribution_value?: DistributionSDKType; @@ -162,7 +162,7 @@ function createBaseMetricValue_LabelsEntry(): MetricValue_LabelsEntry { }; } export const MetricValue_LabelsEntry = { - encode(message: MetricValue_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricValue_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -171,8 +171,8 @@ export const MetricValue_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricValue_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricValue_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricValue_LabelsEntry(); while (reader.pos < end) { @@ -192,10 +192,10 @@ export const MetricValue_LabelsEntry = { return message; }, fromJSON(object: any): MetricValue_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseMetricValue_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: MetricValue_LabelsEntry): unknown { const obj: any = {}; @@ -257,7 +257,7 @@ function createBaseMetricValue(): MetricValue { } export const MetricValue = { typeUrl: "/google.api.servicecontrol.v1.MetricValue", - encode(message: MetricValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.labels).forEach(([key, value]) => { MetricValue_LabelsEntry.encode({ key: (key as any), @@ -287,8 +287,8 @@ export const MetricValue = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricValue(); while (reader.pos < end) { @@ -310,7 +310,7 @@ export const MetricValue = { message.boolValue = reader.bool(); break; case 5: - message.int64Value = (reader.int64() as Long); + message.int64Value = reader.int64(); break; case 6: message.doubleValue = reader.double(); @@ -329,21 +329,21 @@ export const MetricValue = { return message; }, fromJSON(object: any): MetricValue { - return { - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - endTime: isSet(object.endTime) ? new Date(object.endTime) : undefined, - boolValue: isSet(object.boolValue) ? Boolean(object.boolValue) : undefined, - int64Value: isSet(object.int64Value) ? Long.fromValue(object.int64Value) : undefined, - doubleValue: isSet(object.doubleValue) ? Number(object.doubleValue) : undefined, - stringValue: isSet(object.stringValue) ? String(object.stringValue) : undefined, - distributionValue: isSet(object.distributionValue) ? Distribution.fromJSON(object.distributionValue) : undefined - }; + const obj = createBaseMetricValue(); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); + if (isSet(object.boolValue)) obj.boolValue = Boolean(object.boolValue); + if (isSet(object.int64Value)) obj.int64Value = BigInt(object.int64Value.toString()); + if (isSet(object.doubleValue)) obj.doubleValue = Number(object.doubleValue); + if (isSet(object.stringValue)) obj.stringValue = String(object.stringValue); + if (isSet(object.distributionValue)) obj.distributionValue = Distribution.fromJSON(object.distributionValue); + return obj; }, toJSON(message: MetricValue): unknown { const obj: any = {}; @@ -375,10 +375,14 @@ export const MetricValue = { message.startTime = object.startTime ?? undefined; message.endTime = object.endTime ?? undefined; message.boolValue = object.boolValue ?? undefined; - message.int64Value = object.int64Value !== undefined && object.int64Value !== null ? Long.fromValue(object.int64Value) : undefined; + if (object.int64Value !== undefined && object.int64Value !== null) { + message.int64Value = BigInt(object.int64Value.toString()); + } message.doubleValue = object.doubleValue ?? undefined; message.stringValue = object.stringValue ?? undefined; - message.distributionValue = object.distributionValue !== undefined && object.distributionValue !== null ? Distribution.fromPartial(object.distributionValue) : undefined; + if (object.distributionValue !== undefined && object.distributionValue !== null) { + message.distributionValue = Distribution.fromPartial(object.distributionValue); + } return message; }, fromSDK(object: MetricValueSDKType): MetricValue { @@ -426,7 +430,7 @@ export const MetricValue = { startTime: object.start_time, endTime: object.end_time, boolValue: object?.bool_value, - int64Value: object?.int64_value ? Long.fromString(object.int64_value) : undefined, + int64Value: object?.int64_value ? BigInt(object.int64_value) : undefined, doubleValue: object?.double_value, stringValue: object?.string_value, distributionValue: object?.distribution_value ? Distribution.fromAmino(object.distribution_value) : undefined @@ -473,7 +477,7 @@ function createBaseMetricValueSet(): MetricValueSet { } export const MetricValueSet = { typeUrl: "/google.api.servicecontrol.v1.MetricValueSet", - encode(message: MetricValueSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MetricValueSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); } @@ -482,8 +486,8 @@ export const MetricValueSet = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MetricValueSet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MetricValueSet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMetricValueSet(); while (reader.pos < end) { @@ -503,10 +507,10 @@ export const MetricValueSet = { return message; }, fromJSON(object: any): MetricValueSet { - return { - metricName: isSet(object.metricName) ? String(object.metricName) : "", - metricValues: Array.isArray(object?.metricValues) ? object.metricValues.map((e: any) => MetricValue.fromJSON(e)) : [] - }; + const obj = createBaseMetricValueSet(); + if (isSet(object.metricName)) obj.metricName = String(object.metricName); + if (Array.isArray(object?.metricValues)) object.metricValues.map((e: any) => MetricValue.fromJSON(e)); + return obj; }, toJSON(message: MetricValueSet): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/operation.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/operation.ts index 17fc6e1257..a268ca142a 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/operation.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/operation.ts @@ -2,7 +2,7 @@ import { Timestamp } from "../../../protobuf/timestamp"; import { MetricValueSet, MetricValueSetAmino, MetricValueSetSDKType } from "./metric_value"; import { LogEntry, LogEntryAmino, LogEntrySDKType } from "./log_entry"; import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; /** Defines the importance of the data contained in the operation. */ @@ -261,7 +261,7 @@ function createBaseOperation_LabelsEntry(): Operation_LabelsEntry { }; } export const Operation_LabelsEntry = { - encode(message: Operation_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Operation_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -270,8 +270,8 @@ export const Operation_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Operation_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Operation_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperation_LabelsEntry(); while (reader.pos < end) { @@ -291,10 +291,10 @@ export const Operation_LabelsEntry = { return message; }, fromJSON(object: any): Operation_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseOperation_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: Operation_LabelsEntry): unknown { const obj: any = {}; @@ -358,7 +358,7 @@ function createBaseOperation(): Operation { } export const Operation = { typeUrl: "/google.api.servicecontrol.v1.Operation", - encode(message: Operation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Operation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); } @@ -394,8 +394,8 @@ export const Operation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Operation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Operation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperation(); while (reader.pos < end) { @@ -442,23 +442,23 @@ export const Operation = { return message; }, fromJSON(object: any): Operation { - return { - operationId: isSet(object.operationId) ? String(object.operationId) : "", - operationName: isSet(object.operationName) ? String(object.operationName) : "", - consumerId: isSet(object.consumerId) ? String(object.consumerId) : "", - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - endTime: isSet(object.endTime) ? new Date(object.endTime) : undefined, - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - metricValueSets: Array.isArray(object?.metricValueSets) ? object.metricValueSets.map((e: any) => MetricValueSet.fromJSON(e)) : [], - logEntries: Array.isArray(object?.logEntries) ? object.logEntries.map((e: any) => LogEntry.fromJSON(e)) : [], - importance: isSet(object.importance) ? operation_ImportanceFromJSON(object.importance) : -1, - extensions: Array.isArray(object?.extensions) ? object.extensions.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseOperation(); + if (isSet(object.operationId)) obj.operationId = String(object.operationId); + if (isSet(object.operationName)) obj.operationName = String(object.operationName); + if (isSet(object.consumerId)) obj.consumerId = String(object.consumerId); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (Array.isArray(object?.metricValueSets)) object.metricValueSets.map((e: any) => MetricValueSet.fromJSON(e)); + if (Array.isArray(object?.logEntries)) object.logEntries.map((e: any) => LogEntry.fromJSON(e)); + if (isSet(object.importance)) obj.importance = operation_ImportanceFromJSON(object.importance); + if (Array.isArray(object?.extensions)) object.extensions.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: Operation): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/quota_controller.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/quota_controller.ts index e54ac17549..ac38c2aaf6 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/quota_controller.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/quota_controller.ts @@ -1,6 +1,6 @@ import { MetricValueSet, MetricValueSetAmino, MetricValueSetSDKType } from "./metric_value"; import { Status, StatusAmino, StatusSDKType } from "../../../rpc/status"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; /** Supported quota modes. */ @@ -505,7 +505,7 @@ function createBaseAllocateQuotaRequest(): AllocateQuotaRequest { } export const AllocateQuotaRequest = { typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaRequest", - encode(message: AllocateQuotaRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AllocateQuotaRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -517,8 +517,8 @@ export const AllocateQuotaRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AllocateQuotaRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AllocateQuotaRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAllocateQuotaRequest(); while (reader.pos < end) { @@ -541,11 +541,11 @@ export const AllocateQuotaRequest = { return message; }, fromJSON(object: any): AllocateQuotaRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - allocateOperation: isSet(object.allocateOperation) ? QuotaOperation.fromJSON(object.allocateOperation) : undefined, - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "" - }; + const obj = createBaseAllocateQuotaRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.allocateOperation)) obj.allocateOperation = QuotaOperation.fromJSON(object.allocateOperation); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + return obj; }, toJSON(message: AllocateQuotaRequest): unknown { const obj: any = {}; @@ -557,7 +557,9 @@ export const AllocateQuotaRequest = { fromPartial(object: DeepPartial): AllocateQuotaRequest { const message = createBaseAllocateQuotaRequest(); message.serviceName = object.serviceName ?? ""; - message.allocateOperation = object.allocateOperation !== undefined && object.allocateOperation !== null ? QuotaOperation.fromPartial(object.allocateOperation) : undefined; + if (object.allocateOperation !== undefined && object.allocateOperation !== null) { + message.allocateOperation = QuotaOperation.fromPartial(object.allocateOperation); + } message.serviceConfigId = object.serviceConfigId ?? ""; return message; }, @@ -612,7 +614,7 @@ function createBaseQuotaOperation_LabelsEntry(): QuotaOperation_LabelsEntry { }; } export const QuotaOperation_LabelsEntry = { - encode(message: QuotaOperation_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaOperation_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -621,8 +623,8 @@ export const QuotaOperation_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaOperation_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaOperation_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaOperation_LabelsEntry(); while (reader.pos < end) { @@ -642,10 +644,10 @@ export const QuotaOperation_LabelsEntry = { return message; }, fromJSON(object: any): QuotaOperation_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseQuotaOperation_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: QuotaOperation_LabelsEntry): unknown { const obj: any = {}; @@ -705,7 +707,7 @@ function createBaseQuotaOperation(): QuotaOperation { } export const QuotaOperation = { typeUrl: "/google.api.servicecontrol.v1.QuotaOperation", - encode(message: QuotaOperation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaOperation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); } @@ -729,8 +731,8 @@ export const QuotaOperation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaOperation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaOperation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaOperation(); while (reader.pos < end) { @@ -765,19 +767,19 @@ export const QuotaOperation = { return message; }, fromJSON(object: any): QuotaOperation { - return { - operationId: isSet(object.operationId) ? String(object.operationId) : "", - methodName: isSet(object.methodName) ? String(object.methodName) : "", - consumerId: isSet(object.consumerId) ? String(object.consumerId) : "", - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - quotaMetrics: Array.isArray(object?.quotaMetrics) ? object.quotaMetrics.map((e: any) => MetricValueSet.fromJSON(e)) : [], - quotaMode: isSet(object.quotaMode) ? quotaOperation_QuotaModeFromJSON(object.quotaMode) : -1 - }; + const obj = createBaseQuotaOperation(); + if (isSet(object.operationId)) obj.operationId = String(object.operationId); + if (isSet(object.methodName)) obj.methodName = String(object.methodName); + if (isSet(object.consumerId)) obj.consumerId = String(object.consumerId); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (Array.isArray(object?.quotaMetrics)) object.quotaMetrics.map((e: any) => MetricValueSet.fromJSON(e)); + if (isSet(object.quotaMode)) obj.quotaMode = quotaOperation_QuotaModeFromJSON(object.quotaMode); + return obj; }, toJSON(message: QuotaOperation): unknown { const obj: any = {}; @@ -909,7 +911,7 @@ function createBaseAllocateQuotaResponse(): AllocateQuotaResponse { } export const AllocateQuotaResponse = { typeUrl: "/google.api.servicecontrol.v1.AllocateQuotaResponse", - encode(message: AllocateQuotaResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AllocateQuotaResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); } @@ -924,8 +926,8 @@ export const AllocateQuotaResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AllocateQuotaResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AllocateQuotaResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAllocateQuotaResponse(); while (reader.pos < end) { @@ -951,12 +953,12 @@ export const AllocateQuotaResponse = { return message; }, fromJSON(object: any): AllocateQuotaResponse { - return { - operationId: isSet(object.operationId) ? String(object.operationId) : "", - allocateErrors: Array.isArray(object?.allocateErrors) ? object.allocateErrors.map((e: any) => QuotaError.fromJSON(e)) : [], - quotaMetrics: Array.isArray(object?.quotaMetrics) ? object.quotaMetrics.map((e: any) => MetricValueSet.fromJSON(e)) : [], - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "" - }; + const obj = createBaseAllocateQuotaResponse(); + if (isSet(object.operationId)) obj.operationId = String(object.operationId); + if (Array.isArray(object?.allocateErrors)) object.allocateErrors.map((e: any) => QuotaError.fromJSON(e)); + if (Array.isArray(object?.quotaMetrics)) object.quotaMetrics.map((e: any) => MetricValueSet.fromJSON(e)); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + return obj; }, toJSON(message: AllocateQuotaResponse): unknown { const obj: any = {}; @@ -1056,7 +1058,7 @@ function createBaseQuotaError(): QuotaError { } export const QuotaError = { typeUrl: "/google.api.servicecontrol.v1.QuotaError", - encode(message: QuotaError, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaError, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.code !== 0) { writer.uint32(8).int32(message.code); } @@ -1071,8 +1073,8 @@ export const QuotaError = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaError { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaError { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaError(); while (reader.pos < end) { @@ -1098,12 +1100,12 @@ export const QuotaError = { return message; }, fromJSON(object: any): QuotaError { - return { - code: isSet(object.code) ? quotaError_CodeFromJSON(object.code) : -1, - subject: isSet(object.subject) ? String(object.subject) : "", - description: isSet(object.description) ? String(object.description) : "", - status: isSet(object.status) ? Status.fromJSON(object.status) : undefined - }; + const obj = createBaseQuotaError(); + if (isSet(object.code)) obj.code = quotaError_CodeFromJSON(object.code); + if (isSet(object.subject)) obj.subject = String(object.subject); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.status)) obj.status = Status.fromJSON(object.status); + return obj; }, toJSON(message: QuotaError): unknown { const obj: any = {}; @@ -1118,7 +1120,9 @@ export const QuotaError = { message.code = object.code ?? 0; message.subject = object.subject ?? ""; message.description = object.description ?? ""; - message.status = object.status !== undefined && object.status !== null ? Status.fromPartial(object.status) : undefined; + if (object.status !== undefined && object.status !== null) { + message.status = Status.fromPartial(object.status); + } return message; }, fromSDK(object: QuotaErrorSDKType): QuotaError { diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/service_controller.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/service_controller.ts index ff6782a601..8d881c9864 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/service_controller.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v1/service_controller.ts @@ -1,8 +1,8 @@ import { Operation, OperationAmino, OperationSDKType } from "./operation"; import { CheckError, CheckErrorAmino, CheckErrorSDKType } from "./check_error"; import { Status, StatusAmino, StatusSDKType } from "../../../rpc/status"; -import { Long, isSet, DeepPartial } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v1"; /** * The type of the consumer as defined in @@ -231,7 +231,7 @@ export interface CheckResponse_ConsumerInfo { * NOTE: This field is deprecated after we support flexible consumer * id. New code should not depend on this field anymore. */ - projectNumber: Long; + projectNumber: bigint; /** * The type of the consumer which should have been defined in * [Google Resource Manager](https://cloud.google.com/resource-manager/). @@ -242,7 +242,7 @@ export interface CheckResponse_ConsumerInfo { * number or organization number e.g. 1234567890. A value of 0 indicates no * consumer number is found. */ - consumerNumber: Long; + consumerNumber: bigint; } export interface CheckResponse_ConsumerInfoProtoMsg { typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo"; @@ -276,9 +276,9 @@ export interface CheckResponse_ConsumerInfoAminoMsg { } /** `ConsumerInfo` provides information about the consumer. */ export interface CheckResponse_ConsumerInfoSDKType { - project_number: Long; + project_number: bigint; type: CheckResponse_ConsumerInfo_ConsumerType; - consumer_number: Long; + consumer_number: bigint; } /** Request message for the Report method. */ export interface ReportRequest { @@ -483,7 +483,7 @@ function createBaseCheckRequest(): CheckRequest { } export const CheckRequest = { typeUrl: "/google.api.servicecontrol.v1.CheckRequest", - encode(message: CheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -495,8 +495,8 @@ export const CheckRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckRequest(); while (reader.pos < end) { @@ -519,11 +519,11 @@ export const CheckRequest = { return message; }, fromJSON(object: any): CheckRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - operation: isSet(object.operation) ? Operation.fromJSON(object.operation) : undefined, - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "" - }; + const obj = createBaseCheckRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.operation)) obj.operation = Operation.fromJSON(object.operation); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + return obj; }, toJSON(message: CheckRequest): unknown { const obj: any = {}; @@ -535,7 +535,9 @@ export const CheckRequest = { fromPartial(object: DeepPartial): CheckRequest { const message = createBaseCheckRequest(); message.serviceName = object.serviceName ?? ""; - message.operation = object.operation !== undefined && object.operation !== null ? Operation.fromPartial(object.operation) : undefined; + if (object.operation !== undefined && object.operation !== null) { + message.operation = Operation.fromPartial(object.operation); + } message.serviceConfigId = object.serviceConfigId ?? ""; return message; }, @@ -594,7 +596,7 @@ function createBaseCheckResponse(): CheckResponse { } export const CheckResponse = { typeUrl: "/google.api.servicecontrol.v1.CheckResponse", - encode(message: CheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); } @@ -612,8 +614,8 @@ export const CheckResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckResponse(); while (reader.pos < end) { @@ -642,13 +644,13 @@ export const CheckResponse = { return message; }, fromJSON(object: any): CheckResponse { - return { - operationId: isSet(object.operationId) ? String(object.operationId) : "", - checkErrors: Array.isArray(object?.checkErrors) ? object.checkErrors.map((e: any) => CheckError.fromJSON(e)) : [], - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "", - serviceRolloutId: isSet(object.serviceRolloutId) ? String(object.serviceRolloutId) : "", - checkInfo: isSet(object.checkInfo) ? CheckResponse_CheckInfo.fromJSON(object.checkInfo) : undefined - }; + const obj = createBaseCheckResponse(); + if (isSet(object.operationId)) obj.operationId = String(object.operationId); + if (Array.isArray(object?.checkErrors)) object.checkErrors.map((e: any) => CheckError.fromJSON(e)); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + if (isSet(object.serviceRolloutId)) obj.serviceRolloutId = String(object.serviceRolloutId); + if (isSet(object.checkInfo)) obj.checkInfo = CheckResponse_CheckInfo.fromJSON(object.checkInfo); + return obj; }, toJSON(message: CheckResponse): unknown { const obj: any = {}; @@ -669,7 +671,9 @@ export const CheckResponse = { message.checkErrors = object.checkErrors?.map(e => CheckError.fromPartial(e)) || []; message.serviceConfigId = object.serviceConfigId ?? ""; message.serviceRolloutId = object.serviceRolloutId ?? ""; - message.checkInfo = object.checkInfo !== undefined && object.checkInfo !== null ? CheckResponse_CheckInfo.fromPartial(object.checkInfo) : undefined; + if (object.checkInfo !== undefined && object.checkInfo !== null) { + message.checkInfo = CheckResponse_CheckInfo.fromPartial(object.checkInfo); + } return message; }, fromSDK(object: CheckResponseSDKType): CheckResponse { @@ -740,7 +744,7 @@ function createBaseCheckResponse_CheckInfo(): CheckResponse_CheckInfo { } export const CheckResponse_CheckInfo = { typeUrl: "/google.api.servicecontrol.v1.CheckInfo", - encode(message: CheckResponse_CheckInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckResponse_CheckInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.unusedArguments) { writer.uint32(10).string(v!); } @@ -749,8 +753,8 @@ export const CheckResponse_CheckInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckResponse_CheckInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckResponse_CheckInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckResponse_CheckInfo(); while (reader.pos < end) { @@ -770,10 +774,10 @@ export const CheckResponse_CheckInfo = { return message; }, fromJSON(object: any): CheckResponse_CheckInfo { - return { - unusedArguments: Array.isArray(object?.unusedArguments) ? object.unusedArguments.map((e: any) => String(e)) : [], - consumerInfo: isSet(object.consumerInfo) ? CheckResponse_ConsumerInfo.fromJSON(object.consumerInfo) : undefined - }; + const obj = createBaseCheckResponse_CheckInfo(); + if (Array.isArray(object?.unusedArguments)) object.unusedArguments.map((e: any) => String(e)); + if (isSet(object.consumerInfo)) obj.consumerInfo = CheckResponse_ConsumerInfo.fromJSON(object.consumerInfo); + return obj; }, toJSON(message: CheckResponse_CheckInfo): unknown { const obj: any = {}; @@ -788,7 +792,9 @@ export const CheckResponse_CheckInfo = { fromPartial(object: DeepPartial): CheckResponse_CheckInfo { const message = createBaseCheckResponse_CheckInfo(); message.unusedArguments = object.unusedArguments?.map(e => e) || []; - message.consumerInfo = object.consumerInfo !== undefined && object.consumerInfo !== null ? CheckResponse_ConsumerInfo.fromPartial(object.consumerInfo) : undefined; + if (object.consumerInfo !== undefined && object.consumerInfo !== null) { + message.consumerInfo = CheckResponse_ConsumerInfo.fromPartial(object.consumerInfo); + } return message; }, fromSDK(object: CheckResponse_CheckInfoSDKType): CheckResponse_CheckInfo { @@ -841,40 +847,40 @@ export const CheckResponse_CheckInfo = { }; function createBaseCheckResponse_ConsumerInfo(): CheckResponse_ConsumerInfo { return { - projectNumber: Long.ZERO, + projectNumber: BigInt(0), type: 0, - consumerNumber: Long.ZERO + consumerNumber: BigInt(0) }; } export const CheckResponse_ConsumerInfo = { typeUrl: "/google.api.servicecontrol.v1.ConsumerInfo", - encode(message: CheckResponse_ConsumerInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.projectNumber.isZero()) { + encode(message: CheckResponse_ConsumerInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.projectNumber !== BigInt(0)) { writer.uint32(8).int64(message.projectNumber); } if (message.type !== 0) { writer.uint32(16).int32(message.type); } - if (!message.consumerNumber.isZero()) { + if (message.consumerNumber !== BigInt(0)) { writer.uint32(24).int64(message.consumerNumber); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckResponse_ConsumerInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckResponse_ConsumerInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckResponse_ConsumerInfo(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.projectNumber = (reader.int64() as Long); + message.projectNumber = reader.int64(); break; case 2: message.type = (reader.int32() as any); break; case 3: - message.consumerNumber = (reader.int64() as Long); + message.consumerNumber = reader.int64(); break; default: reader.skipType(tag & 7); @@ -884,24 +890,28 @@ export const CheckResponse_ConsumerInfo = { return message; }, fromJSON(object: any): CheckResponse_ConsumerInfo { - return { - projectNumber: isSet(object.projectNumber) ? Long.fromValue(object.projectNumber) : Long.ZERO, - type: isSet(object.type) ? checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type) : -1, - consumerNumber: isSet(object.consumerNumber) ? Long.fromValue(object.consumerNumber) : Long.ZERO - }; + const obj = createBaseCheckResponse_ConsumerInfo(); + if (isSet(object.projectNumber)) obj.projectNumber = BigInt(object.projectNumber.toString()); + if (isSet(object.type)) obj.type = checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type); + if (isSet(object.consumerNumber)) obj.consumerNumber = BigInt(object.consumerNumber.toString()); + return obj; }, toJSON(message: CheckResponse_ConsumerInfo): unknown { const obj: any = {}; - message.projectNumber !== undefined && (obj.projectNumber = (message.projectNumber || Long.ZERO).toString()); + message.projectNumber !== undefined && (obj.projectNumber = (message.projectNumber || BigInt(0)).toString()); message.type !== undefined && (obj.type = checkResponse_ConsumerInfo_ConsumerTypeToJSON(message.type)); - message.consumerNumber !== undefined && (obj.consumerNumber = (message.consumerNumber || Long.ZERO).toString()); + message.consumerNumber !== undefined && (obj.consumerNumber = (message.consumerNumber || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): CheckResponse_ConsumerInfo { const message = createBaseCheckResponse_ConsumerInfo(); - message.projectNumber = object.projectNumber !== undefined && object.projectNumber !== null ? Long.fromValue(object.projectNumber) : Long.ZERO; + if (object.projectNumber !== undefined && object.projectNumber !== null) { + message.projectNumber = BigInt(object.projectNumber.toString()); + } message.type = object.type ?? 0; - message.consumerNumber = object.consumerNumber !== undefined && object.consumerNumber !== null ? Long.fromValue(object.consumerNumber) : Long.ZERO; + if (object.consumerNumber !== undefined && object.consumerNumber !== null) { + message.consumerNumber = BigInt(object.consumerNumber.toString()); + } return message; }, fromSDK(object: CheckResponse_ConsumerInfoSDKType): CheckResponse_ConsumerInfo { @@ -920,9 +930,9 @@ export const CheckResponse_ConsumerInfo = { }, fromAmino(object: CheckResponse_ConsumerInfoAmino): CheckResponse_ConsumerInfo { return { - projectNumber: Long.fromString(object.project_number), + projectNumber: BigInt(object.project_number), type: isSet(object.type) ? checkResponse_ConsumerInfo_ConsumerTypeFromJSON(object.type) : -1, - consumerNumber: Long.fromString(object.consumer_number) + consumerNumber: BigInt(object.consumer_number) }; }, toAmino(message: CheckResponse_ConsumerInfo): CheckResponse_ConsumerInfoAmino { @@ -957,7 +967,7 @@ function createBaseReportRequest(): ReportRequest { } export const ReportRequest = { typeUrl: "/google.api.servicecontrol.v1.ReportRequest", - encode(message: ReportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ReportRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -969,8 +979,8 @@ export const ReportRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ReportRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ReportRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseReportRequest(); while (reader.pos < end) { @@ -993,11 +1003,11 @@ export const ReportRequest = { return message; }, fromJSON(object: any): ReportRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - operations: Array.isArray(object?.operations) ? object.operations.map((e: any) => Operation.fromJSON(e)) : [], - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "" - }; + const obj = createBaseReportRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (Array.isArray(object?.operations)) object.operations.map((e: any) => Operation.fromJSON(e)); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + return obj; }, toJSON(message: ReportRequest): unknown { const obj: any = {}; @@ -1078,7 +1088,7 @@ function createBaseReportResponse(): ReportResponse { } export const ReportResponse = { typeUrl: "/google.api.servicecontrol.v1.ReportResponse", - encode(message: ReportResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ReportResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.reportErrors) { ReportResponse_ReportError.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1090,8 +1100,8 @@ export const ReportResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ReportResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ReportResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseReportResponse(); while (reader.pos < end) { @@ -1114,11 +1124,11 @@ export const ReportResponse = { return message; }, fromJSON(object: any): ReportResponse { - return { - reportErrors: Array.isArray(object?.reportErrors) ? object.reportErrors.map((e: any) => ReportResponse_ReportError.fromJSON(e)) : [], - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "", - serviceRolloutId: isSet(object.serviceRolloutId) ? String(object.serviceRolloutId) : "" - }; + const obj = createBaseReportResponse(); + if (Array.isArray(object?.reportErrors)) object.reportErrors.map((e: any) => ReportResponse_ReportError.fromJSON(e)); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + if (isSet(object.serviceRolloutId)) obj.serviceRolloutId = String(object.serviceRolloutId); + return obj; }, toJSON(message: ReportResponse): unknown { const obj: any = {}; @@ -1198,7 +1208,7 @@ function createBaseReportResponse_ReportError(): ReportResponse_ReportError { } export const ReportResponse_ReportError = { typeUrl: "/google.api.servicecontrol.v1.ReportError", - encode(message: ReportResponse_ReportError, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ReportResponse_ReportError, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.operationId !== "") { writer.uint32(10).string(message.operationId); } @@ -1207,8 +1217,8 @@ export const ReportResponse_ReportError = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ReportResponse_ReportError { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ReportResponse_ReportError { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseReportResponse_ReportError(); while (reader.pos < end) { @@ -1228,10 +1238,10 @@ export const ReportResponse_ReportError = { return message; }, fromJSON(object: any): ReportResponse_ReportError { - return { - operationId: isSet(object.operationId) ? String(object.operationId) : "", - status: isSet(object.status) ? Status.fromJSON(object.status) : undefined - }; + const obj = createBaseReportResponse_ReportError(); + if (isSet(object.operationId)) obj.operationId = String(object.operationId); + if (isSet(object.status)) obj.status = Status.fromJSON(object.status); + return obj; }, toJSON(message: ReportResponse_ReportError): unknown { const obj: any = {}; @@ -1242,7 +1252,9 @@ export const ReportResponse_ReportError = { fromPartial(object: DeepPartial): ReportResponse_ReportError { const message = createBaseReportResponse_ReportError(); message.operationId = object.operationId ?? ""; - message.status = object.status !== undefined && object.status !== null ? Status.fromPartial(object.status) : undefined; + if (object.status !== undefined && object.status !== null) { + message.status = Status.fromPartial(object.status); + } return message; }, fromSDK(object: ReportResponse_ReportErrorSDKType): ReportResponse_ReportError { diff --git a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v2/service_controller.ts b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v2/service_controller.ts index 382b909788..b995227095 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicecontrol/v2/service_controller.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicecontrol/v2/service_controller.ts @@ -1,6 +1,6 @@ import { AttributeContext, AttributeContextAmino, AttributeContextSDKType } from "../../../rpc/context/attribute_context"; import { Status, StatusAmino, StatusSDKType } from "../../../rpc/status"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicecontrol.v2"; /** Request message for the Check method. */ @@ -298,7 +298,7 @@ function createBaseCheckRequest(): CheckRequest { } export const CheckRequest = { typeUrl: "/google.api.servicecontrol.v2.CheckRequest", - encode(message: CheckRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -316,8 +316,8 @@ export const CheckRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckRequest(); while (reader.pos < end) { @@ -346,13 +346,13 @@ export const CheckRequest = { return message; }, fromJSON(object: any): CheckRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "", - attributes: isSet(object.attributes) ? AttributeContext.fromJSON(object.attributes) : undefined, - resources: Array.isArray(object?.resources) ? object.resources.map((e: any) => ResourceInfo.fromJSON(e)) : [], - flags: isSet(object.flags) ? String(object.flags) : "" - }; + const obj = createBaseCheckRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + if (isSet(object.attributes)) obj.attributes = AttributeContext.fromJSON(object.attributes); + if (Array.isArray(object?.resources)) object.resources.map((e: any) => ResourceInfo.fromJSON(e)); + if (isSet(object.flags)) obj.flags = String(object.flags); + return obj; }, toJSON(message: CheckRequest): unknown { const obj: any = {}; @@ -371,7 +371,9 @@ export const CheckRequest = { const message = createBaseCheckRequest(); message.serviceName = object.serviceName ?? ""; message.serviceConfigId = object.serviceConfigId ?? ""; - message.attributes = object.attributes !== undefined && object.attributes !== null ? AttributeContext.fromPartial(object.attributes) : undefined; + if (object.attributes !== undefined && object.attributes !== null) { + message.attributes = AttributeContext.fromPartial(object.attributes); + } message.resources = object.resources?.map(e => ResourceInfo.fromPartial(e)) || []; message.flags = object.flags ?? ""; return message; @@ -447,7 +449,7 @@ function createBaseResourceInfo(): ResourceInfo { } export const ResourceInfo = { typeUrl: "/google.api.servicecontrol.v2.ResourceInfo", - encode(message: ResourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ResourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -465,8 +467,8 @@ export const ResourceInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ResourceInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ResourceInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseResourceInfo(); while (reader.pos < end) { @@ -495,13 +497,13 @@ export const ResourceInfo = { return message; }, fromJSON(object: any): ResourceInfo { - return { - name: isSet(object.name) ? String(object.name) : "", - type: isSet(object.type) ? String(object.type) : "", - permission: isSet(object.permission) ? String(object.permission) : "", - container: isSet(object.container) ? String(object.container) : "", - location: isSet(object.location) ? String(object.location) : "" - }; + const obj = createBaseResourceInfo(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.type)) obj.type = String(object.type); + if (isSet(object.permission)) obj.permission = String(object.permission); + if (isSet(object.container)) obj.container = String(object.container); + if (isSet(object.location)) obj.location = String(object.location); + return obj; }, toJSON(message: ResourceInfo): unknown { const obj: any = {}; @@ -580,7 +582,7 @@ function createBaseCheckResponse_HeadersEntry(): CheckResponse_HeadersEntry { }; } export const CheckResponse_HeadersEntry = { - encode(message: CheckResponse_HeadersEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckResponse_HeadersEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -589,8 +591,8 @@ export const CheckResponse_HeadersEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckResponse_HeadersEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckResponse_HeadersEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckResponse_HeadersEntry(); while (reader.pos < end) { @@ -610,10 +612,10 @@ export const CheckResponse_HeadersEntry = { return message; }, fromJSON(object: any): CheckResponse_HeadersEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseCheckResponse_HeadersEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: CheckResponse_HeadersEntry): unknown { const obj: any = {}; @@ -669,7 +671,7 @@ function createBaseCheckResponse(): CheckResponse { } export const CheckResponse = { typeUrl: "/google.api.servicecontrol.v2.CheckResponse", - encode(message: CheckResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CheckResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.status !== undefined) { Status.encode(message.status, writer.uint32(10).fork()).ldelim(); } @@ -681,8 +683,8 @@ export const CheckResponse = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CheckResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CheckResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCheckResponse(); while (reader.pos < end) { @@ -705,15 +707,15 @@ export const CheckResponse = { return message; }, fromJSON(object: any): CheckResponse { - return { - status: isSet(object.status) ? Status.fromJSON(object.status) : undefined, - headers: isObject(object.headers) ? Object.entries(object.headers).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {} - }; + const obj = createBaseCheckResponse(); + if (isSet(object.status)) obj.status = Status.fromJSON(object.status); + if (isObject(object.headers)) obj.headers = Object.entries(object.headers).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + return obj; }, toJSON(message: CheckResponse): unknown { const obj: any = {}; @@ -728,7 +730,9 @@ export const CheckResponse = { }, fromPartial(object: DeepPartial): CheckResponse { const message = createBaseCheckResponse(); - message.status = object.status !== undefined && object.status !== null ? Status.fromPartial(object.status) : undefined; + if (object.status !== undefined && object.status !== null) { + message.status = Status.fromPartial(object.status); + } message.headers = Object.entries(object.headers ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -808,7 +812,7 @@ function createBaseReportRequest(): ReportRequest { } export const ReportRequest = { typeUrl: "/google.api.servicecontrol.v2.ReportRequest", - encode(message: ReportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ReportRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -820,8 +824,8 @@ export const ReportRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ReportRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ReportRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseReportRequest(); while (reader.pos < end) { @@ -844,11 +848,11 @@ export const ReportRequest = { return message; }, fromJSON(object: any): ReportRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - serviceConfigId: isSet(object.serviceConfigId) ? String(object.serviceConfigId) : "", - operations: Array.isArray(object?.operations) ? object.operations.map((e: any) => AttributeContext.fromJSON(e)) : [] - }; + const obj = createBaseReportRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.serviceConfigId)) obj.serviceConfigId = String(object.serviceConfigId); + if (Array.isArray(object?.operations)) object.operations.map((e: any) => AttributeContext.fromJSON(e)); + return obj; }, toJSON(message: ReportRequest): unknown { const obj: any = {}; @@ -925,11 +929,11 @@ function createBaseReportResponse(): ReportResponse { } export const ReportResponse = { typeUrl: "/google.api.servicecontrol.v2.ReportResponse", - encode(_: ReportResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: ReportResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ReportResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ReportResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseReportResponse(); while (reader.pos < end) { @@ -943,7 +947,8 @@ export const ReportResponse = { return message; }, fromJSON(_: any): ReportResponse { - return {}; + const obj = createBaseReportResponse(); + return obj; }, toJSON(_: ReportResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/resources.ts b/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/resources.ts index 70723a9d79..e4fc2f6fa2 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/resources.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/resources.ts @@ -1,6 +1,6 @@ import { Timestamp } from "../../../protobuf/timestamp"; import { ConfigChange, ConfigChangeAmino, ConfigChangeSDKType } from "../../config_change"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, bytesFromBase64, base64FromBytes, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.servicemanagement.v1"; /** Code describes the status of the operation (or one of its steps). */ @@ -841,7 +841,7 @@ function createBaseManagedService(): ManagedService { } export const ManagedService = { typeUrl: "/google.api.servicemanagement.v1.ManagedService", - encode(message: ManagedService, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ManagedService, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(18).string(message.serviceName); } @@ -850,8 +850,8 @@ export const ManagedService = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ManagedService { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ManagedService { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseManagedService(); while (reader.pos < end) { @@ -871,10 +871,10 @@ export const ManagedService = { return message; }, fromJSON(object: any): ManagedService { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - producerProjectId: isSet(object.producerProjectId) ? String(object.producerProjectId) : "" - }; + const obj = createBaseManagedService(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.producerProjectId)) obj.producerProjectId = String(object.producerProjectId); + return obj; }, toJSON(message: ManagedService): unknown { const obj: any = {}; @@ -938,7 +938,7 @@ function createBaseOperationMetadata(): OperationMetadata { } export const OperationMetadata = { typeUrl: "/google.api.servicemanagement.v1.OperationMetadata", - encode(message: OperationMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OperationMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(10).string(v!); } @@ -953,8 +953,8 @@ export const OperationMetadata = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OperationMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OperationMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperationMetadata(); while (reader.pos < end) { @@ -980,12 +980,12 @@ export const OperationMetadata = { return message; }, fromJSON(object: any): OperationMetadata { - return { - resourceNames: Array.isArray(object?.resourceNames) ? object.resourceNames.map((e: any) => String(e)) : [], - steps: Array.isArray(object?.steps) ? object.steps.map((e: any) => OperationMetadata_Step.fromJSON(e)) : [], - progressPercentage: isSet(object.progressPercentage) ? Number(object.progressPercentage) : 0, - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined - }; + const obj = createBaseOperationMetadata(); + if (Array.isArray(object?.resourceNames)) object.resourceNames.map((e: any) => String(e)); + if (Array.isArray(object?.steps)) object.steps.map((e: any) => OperationMetadata_Step.fromJSON(e)); + if (isSet(object.progressPercentage)) obj.progressPercentage = Number(object.progressPercentage); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + return obj; }, toJSON(message: OperationMetadata): unknown { const obj: any = {}; @@ -1083,7 +1083,7 @@ function createBaseOperationMetadata_Step(): OperationMetadata_Step { } export const OperationMetadata_Step = { typeUrl: "/google.api.servicemanagement.v1.Step", - encode(message: OperationMetadata_Step, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OperationMetadata_Step, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.description !== "") { writer.uint32(18).string(message.description); } @@ -1092,8 +1092,8 @@ export const OperationMetadata_Step = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OperationMetadata_Step { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OperationMetadata_Step { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperationMetadata_Step(); while (reader.pos < end) { @@ -1113,10 +1113,10 @@ export const OperationMetadata_Step = { return message; }, fromJSON(object: any): OperationMetadata_Step { - return { - description: isSet(object.description) ? String(object.description) : "", - status: isSet(object.status) ? operationMetadata_StatusFromJSON(object.status) : -1 - }; + const obj = createBaseOperationMetadata_Step(); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.status)) obj.status = operationMetadata_StatusFromJSON(object.status); + return obj; }, toJSON(message: OperationMetadata_Step): unknown { const obj: any = {}; @@ -1179,7 +1179,7 @@ function createBaseDiagnostic(): Diagnostic { } export const Diagnostic = { typeUrl: "/google.api.servicemanagement.v1.Diagnostic", - encode(message: Diagnostic, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Diagnostic, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.location !== "") { writer.uint32(10).string(message.location); } @@ -1191,8 +1191,8 @@ export const Diagnostic = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Diagnostic { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Diagnostic { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDiagnostic(); while (reader.pos < end) { @@ -1215,11 +1215,11 @@ export const Diagnostic = { return message; }, fromJSON(object: any): Diagnostic { - return { - location: isSet(object.location) ? String(object.location) : "", - kind: isSet(object.kind) ? diagnostic_KindFromJSON(object.kind) : -1, - message: isSet(object.message) ? String(object.message) : "" - }; + const obj = createBaseDiagnostic(); + if (isSet(object.location)) obj.location = String(object.location); + if (isSet(object.kind)) obj.kind = diagnostic_KindFromJSON(object.kind); + if (isSet(object.message)) obj.message = String(object.message); + return obj; }, toJSON(message: Diagnostic): unknown { const obj: any = {}; @@ -1287,7 +1287,7 @@ function createBaseConfigSource(): ConfigSource { } export const ConfigSource = { typeUrl: "/google.api.servicemanagement.v1.ConfigSource", - encode(message: ConfigSource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConfigSource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(42).string(message.id); } @@ -1296,8 +1296,8 @@ export const ConfigSource = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConfigSource { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConfigSource { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConfigSource(); while (reader.pos < end) { @@ -1317,10 +1317,10 @@ export const ConfigSource = { return message; }, fromJSON(object: any): ConfigSource { - return { - id: isSet(object.id) ? String(object.id) : "", - files: Array.isArray(object?.files) ? object.files.map((e: any) => ConfigFile.fromJSON(e)) : [] - }; + const obj = createBaseConfigSource(); + if (isSet(object.id)) obj.id = String(object.id); + if (Array.isArray(object?.files)) object.files.map((e: any) => ConfigFile.fromJSON(e)); + return obj; }, toJSON(message: ConfigSource): unknown { const obj: any = {}; @@ -1395,7 +1395,7 @@ function createBaseConfigFile(): ConfigFile { } export const ConfigFile = { typeUrl: "/google.api.servicemanagement.v1.ConfigFile", - encode(message: ConfigFile, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConfigFile, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.filePath !== "") { writer.uint32(10).string(message.filePath); } @@ -1407,8 +1407,8 @@ export const ConfigFile = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConfigFile { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConfigFile { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConfigFile(); while (reader.pos < end) { @@ -1431,11 +1431,11 @@ export const ConfigFile = { return message; }, fromJSON(object: any): ConfigFile { - return { - filePath: isSet(object.filePath) ? String(object.filePath) : "", - fileContents: isSet(object.fileContents) ? bytesFromBase64(object.fileContents) : new Uint8Array(), - fileType: isSet(object.fileType) ? configFile_FileTypeFromJSON(object.fileType) : -1 - }; + const obj = createBaseConfigFile(); + if (isSet(object.filePath)) obj.filePath = String(object.filePath); + if (isSet(object.fileContents)) obj.fileContents = bytesFromBase64(object.fileContents); + if (isSet(object.fileType)) obj.fileType = configFile_FileTypeFromJSON(object.fileType); + return obj; }, toJSON(message: ConfigFile): unknown { const obj: any = {}; @@ -1502,14 +1502,14 @@ function createBaseConfigRef(): ConfigRef { } export const ConfigRef = { typeUrl: "/google.api.servicemanagement.v1.ConfigRef", - encode(message: ConfigRef, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConfigRef, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConfigRef { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConfigRef { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConfigRef(); while (reader.pos < end) { @@ -1526,9 +1526,9 @@ export const ConfigRef = { return message; }, fromJSON(object: any): ConfigRef { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseConfigRef(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: ConfigRef): unknown { const obj: any = {}; @@ -1583,14 +1583,14 @@ function createBaseChangeReport(): ChangeReport { } export const ChangeReport = { typeUrl: "/google.api.servicemanagement.v1.ChangeReport", - encode(message: ChangeReport, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ChangeReport, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.configChanges) { ConfigChange.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ChangeReport { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ChangeReport { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseChangeReport(); while (reader.pos < end) { @@ -1607,9 +1607,9 @@ export const ChangeReport = { return message; }, fromJSON(object: any): ChangeReport { - return { - configChanges: Array.isArray(object?.configChanges) ? object.configChanges.map((e: any) => ConfigChange.fromJSON(e)) : [] - }; + const obj = createBaseChangeReport(); + if (Array.isArray(object?.configChanges)) object.configChanges.map((e: any) => ConfigChange.fromJSON(e)); + return obj; }, toJSON(message: ChangeReport): unknown { const obj: any = {}; @@ -1682,7 +1682,7 @@ function createBaseRollout(): Rollout { } export const Rollout = { typeUrl: "/google.api.servicemanagement.v1.Rollout", - encode(message: Rollout, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Rollout, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.rolloutId !== "") { writer.uint32(10).string(message.rolloutId); } @@ -1706,8 +1706,8 @@ export const Rollout = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Rollout { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Rollout { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRollout(); while (reader.pos < end) { @@ -1742,15 +1742,15 @@ export const Rollout = { return message; }, fromJSON(object: any): Rollout { - return { - rolloutId: isSet(object.rolloutId) ? String(object.rolloutId) : "", - createTime: isSet(object.createTime) ? new Date(object.createTime) : undefined, - createdBy: isSet(object.createdBy) ? String(object.createdBy) : "", - status: isSet(object.status) ? rollout_RolloutStatusFromJSON(object.status) : -1, - trafficPercentStrategy: isSet(object.trafficPercentStrategy) ? Rollout_TrafficPercentStrategy.fromJSON(object.trafficPercentStrategy) : undefined, - deleteServiceStrategy: isSet(object.deleteServiceStrategy) ? Rollout_DeleteServiceStrategy.fromJSON(object.deleteServiceStrategy) : undefined, - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "" - }; + const obj = createBaseRollout(); + if (isSet(object.rolloutId)) obj.rolloutId = String(object.rolloutId); + if (isSet(object.createTime)) obj.createTime = new Date(object.createTime); + if (isSet(object.createdBy)) obj.createdBy = String(object.createdBy); + if (isSet(object.status)) obj.status = rollout_RolloutStatusFromJSON(object.status); + if (isSet(object.trafficPercentStrategy)) obj.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromJSON(object.trafficPercentStrategy); + if (isSet(object.deleteServiceStrategy)) obj.deleteServiceStrategy = Rollout_DeleteServiceStrategy.fromJSON(object.deleteServiceStrategy); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + return obj; }, toJSON(message: Rollout): unknown { const obj: any = {}; @@ -1769,8 +1769,12 @@ export const Rollout = { message.createTime = object.createTime ?? undefined; message.createdBy = object.createdBy ?? ""; message.status = object.status ?? 0; - message.trafficPercentStrategy = object.trafficPercentStrategy !== undefined && object.trafficPercentStrategy !== null ? Rollout_TrafficPercentStrategy.fromPartial(object.trafficPercentStrategy) : undefined; - message.deleteServiceStrategy = object.deleteServiceStrategy !== undefined && object.deleteServiceStrategy !== null ? Rollout_DeleteServiceStrategy.fromPartial(object.deleteServiceStrategy) : undefined; + if (object.trafficPercentStrategy !== undefined && object.trafficPercentStrategy !== null) { + message.trafficPercentStrategy = Rollout_TrafficPercentStrategy.fromPartial(object.trafficPercentStrategy); + } + if (object.deleteServiceStrategy !== undefined && object.deleteServiceStrategy !== null) { + message.deleteServiceStrategy = Rollout_DeleteServiceStrategy.fromPartial(object.deleteServiceStrategy); + } message.serviceName = object.serviceName ?? ""; return message; }, @@ -1841,7 +1845,7 @@ function createBaseRollout_TrafficPercentStrategy_PercentagesEntry(): Rollout_Tr }; } export const Rollout_TrafficPercentStrategy_PercentagesEntry = { - encode(message: Rollout_TrafficPercentStrategy_PercentagesEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Rollout_TrafficPercentStrategy_PercentagesEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -1850,8 +1854,8 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Rollout_TrafficPercentStrategy_PercentagesEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Rollout_TrafficPercentStrategy_PercentagesEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRollout_TrafficPercentStrategy_PercentagesEntry(); while (reader.pos < end) { @@ -1871,10 +1875,10 @@ export const Rollout_TrafficPercentStrategy_PercentagesEntry = { return message; }, fromJSON(object: any): Rollout_TrafficPercentStrategy_PercentagesEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? Number(object.value) : 0 - }; + const obj = createBaseRollout_TrafficPercentStrategy_PercentagesEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = Number(object.value); + return obj; }, toJSON(message: Rollout_TrafficPercentStrategy_PercentagesEntry): unknown { const obj: any = {}; @@ -1929,7 +1933,7 @@ function createBaseRollout_TrafficPercentStrategy(): Rollout_TrafficPercentStrat } export const Rollout_TrafficPercentStrategy = { typeUrl: "/google.api.servicemanagement.v1.TrafficPercentStrategy", - encode(message: Rollout_TrafficPercentStrategy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Rollout_TrafficPercentStrategy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.percentages).forEach(([key, value]) => { Rollout_TrafficPercentStrategy_PercentagesEntry.encode({ key: (key as any), @@ -1938,8 +1942,8 @@ export const Rollout_TrafficPercentStrategy = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Rollout_TrafficPercentStrategy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Rollout_TrafficPercentStrategy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRollout_TrafficPercentStrategy(); while (reader.pos < end) { @@ -1959,14 +1963,14 @@ export const Rollout_TrafficPercentStrategy = { return message; }, fromJSON(object: any): Rollout_TrafficPercentStrategy { - return { - percentages: isObject(object.percentages) ? Object.entries(object.percentages).reduce<{ - [key: string]: double; - }>((acc, [key, value]) => { - acc[key] = double.fromJSON(value); - return acc; - }, {}) : {} - }; + const obj = createBaseRollout_TrafficPercentStrategy(); + if (isObject(object.percentages)) obj.percentages = Object.entries(object.percentages).reduce<{ + [key: string]: double; + }>((acc, [key, value]) => { + acc[key] = double.fromJSON(value); + return acc; + }, {}); + return obj; }, toJSON(message: Rollout_TrafficPercentStrategy): unknown { const obj: any = {}; @@ -2051,11 +2055,11 @@ function createBaseRollout_DeleteServiceStrategy(): Rollout_DeleteServiceStrateg } export const Rollout_DeleteServiceStrategy = { typeUrl: "/google.api.servicemanagement.v1.DeleteServiceStrategy", - encode(_: Rollout_DeleteServiceStrategy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: Rollout_DeleteServiceStrategy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Rollout_DeleteServiceStrategy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Rollout_DeleteServiceStrategy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseRollout_DeleteServiceStrategy(); while (reader.pos < end) { @@ -2069,7 +2073,8 @@ export const Rollout_DeleteServiceStrategy = { return message; }, fromJSON(_: any): Rollout_DeleteServiceStrategy { - return {}; + const obj = createBaseRollout_DeleteServiceStrategy(); + return obj; }, toJSON(_: Rollout_DeleteServiceStrategy): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/servicemanager.ts b/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/servicemanager.ts index 57c3a96572..581aaecdfc 100644 --- a/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/servicemanager.ts +++ b/__fixtures__/v-next/outputv2/google/api/servicemanagement/v1/servicemanager.ts @@ -1,7 +1,7 @@ import { ManagedService, ManagedServiceAmino, ManagedServiceSDKType, ConfigSource, ConfigSourceAmino, ConfigSourceSDKType, Rollout, RolloutAmino, RolloutSDKType, ChangeReport, ChangeReportAmino, ChangeReportSDKType, Diagnostic, DiagnosticAmino, DiagnosticSDKType } from "./resources"; import { Service, ServiceAmino, ServiceSDKType } from "../../service"; import { Any, AnyAmino, AnySDKType } from "../../../protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.servicemanagement.v1"; export enum GetServiceConfigRequest_ConfigView { @@ -760,7 +760,7 @@ function createBaseListServicesRequest(): ListServicesRequest { } export const ListServicesRequest = { typeUrl: "/google.api.servicemanagement.v1.ListServicesRequest", - encode(message: ListServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.producerProjectId !== "") { writer.uint32(10).string(message.producerProjectId); } @@ -775,8 +775,8 @@ export const ListServicesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServicesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServicesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServicesRequest(); while (reader.pos < end) { @@ -802,12 +802,12 @@ export const ListServicesRequest = { return message; }, fromJSON(object: any): ListServicesRequest { - return { - producerProjectId: isSet(object.producerProjectId) ? String(object.producerProjectId) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - consumerId: isSet(object.consumerId) ? String(object.consumerId) : "" - }; + const obj = createBaseListServicesRequest(); + if (isSet(object.producerProjectId)) obj.producerProjectId = String(object.producerProjectId); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.consumerId)) obj.consumerId = String(object.consumerId); + return obj; }, toJSON(message: ListServicesRequest): unknown { const obj: any = {}; @@ -881,7 +881,7 @@ function createBaseListServicesResponse(): ListServicesResponse { } export const ListServicesResponse = { typeUrl: "/google.api.servicemanagement.v1.ListServicesResponse", - encode(message: ListServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { ManagedService.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -890,8 +890,8 @@ export const ListServicesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServicesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServicesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServicesResponse(); while (reader.pos < end) { @@ -911,10 +911,10 @@ export const ListServicesResponse = { return message; }, fromJSON(object: any): ListServicesResponse { - return { - services: Array.isArray(object?.services) ? object.services.map((e: any) => ManagedService.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListServicesResponse(); + if (Array.isArray(object?.services)) object.services.map((e: any) => ManagedService.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListServicesResponse): unknown { const obj: any = {}; @@ -987,14 +987,14 @@ function createBaseGetServiceRequest(): GetServiceRequest { } export const GetServiceRequest = { typeUrl: "/google.api.servicemanagement.v1.GetServiceRequest", - encode(message: GetServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceRequest(); while (reader.pos < end) { @@ -1011,9 +1011,9 @@ export const GetServiceRequest = { return message; }, fromJSON(object: any): GetServiceRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "" - }; + const obj = createBaseGetServiceRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + return obj; }, toJSON(message: GetServiceRequest): unknown { const obj: any = {}; @@ -1068,14 +1068,14 @@ function createBaseCreateServiceRequest(): CreateServiceRequest { } export const CreateServiceRequest = { typeUrl: "/google.api.servicemanagement.v1.CreateServiceRequest", - encode(message: CreateServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { ManagedService.encode(message.service, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateServiceRequest(); while (reader.pos < end) { @@ -1092,9 +1092,9 @@ export const CreateServiceRequest = { return message; }, fromJSON(object: any): CreateServiceRequest { - return { - service: isSet(object.service) ? ManagedService.fromJSON(object.service) : undefined - }; + const obj = createBaseCreateServiceRequest(); + if (isSet(object.service)) obj.service = ManagedService.fromJSON(object.service); + return obj; }, toJSON(message: CreateServiceRequest): unknown { const obj: any = {}; @@ -1103,7 +1103,9 @@ export const CreateServiceRequest = { }, fromPartial(object: DeepPartial): CreateServiceRequest { const message = createBaseCreateServiceRequest(); - message.service = object.service !== undefined && object.service !== null ? ManagedService.fromPartial(object.service) : undefined; + if (object.service !== undefined && object.service !== null) { + message.service = ManagedService.fromPartial(object.service); + } return message; }, fromSDK(object: CreateServiceRequestSDKType): CreateServiceRequest { @@ -1149,14 +1151,14 @@ function createBaseDeleteServiceRequest(): DeleteServiceRequest { } export const DeleteServiceRequest = { typeUrl: "/google.api.servicemanagement.v1.DeleteServiceRequest", - encode(message: DeleteServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteServiceRequest(); while (reader.pos < end) { @@ -1173,9 +1175,9 @@ export const DeleteServiceRequest = { return message; }, fromJSON(object: any): DeleteServiceRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "" - }; + const obj = createBaseDeleteServiceRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + return obj; }, toJSON(message: DeleteServiceRequest): unknown { const obj: any = {}; @@ -1230,14 +1232,14 @@ function createBaseUndeleteServiceRequest(): UndeleteServiceRequest { } export const UndeleteServiceRequest = { typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceRequest", - encode(message: UndeleteServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UndeleteServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UndeleteServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UndeleteServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUndeleteServiceRequest(); while (reader.pos < end) { @@ -1254,9 +1256,9 @@ export const UndeleteServiceRequest = { return message; }, fromJSON(object: any): UndeleteServiceRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "" - }; + const obj = createBaseUndeleteServiceRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + return obj; }, toJSON(message: UndeleteServiceRequest): unknown { const obj: any = {}; @@ -1311,14 +1313,14 @@ function createBaseUndeleteServiceResponse(): UndeleteServiceResponse { } export const UndeleteServiceResponse = { typeUrl: "/google.api.servicemanagement.v1.UndeleteServiceResponse", - encode(message: UndeleteServiceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UndeleteServiceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { ManagedService.encode(message.service, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UndeleteServiceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UndeleteServiceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUndeleteServiceResponse(); while (reader.pos < end) { @@ -1335,9 +1337,9 @@ export const UndeleteServiceResponse = { return message; }, fromJSON(object: any): UndeleteServiceResponse { - return { - service: isSet(object.service) ? ManagedService.fromJSON(object.service) : undefined - }; + const obj = createBaseUndeleteServiceResponse(); + if (isSet(object.service)) obj.service = ManagedService.fromJSON(object.service); + return obj; }, toJSON(message: UndeleteServiceResponse): unknown { const obj: any = {}; @@ -1346,7 +1348,9 @@ export const UndeleteServiceResponse = { }, fromPartial(object: DeepPartial): UndeleteServiceResponse { const message = createBaseUndeleteServiceResponse(); - message.service = object.service !== undefined && object.service !== null ? ManagedService.fromPartial(object.service) : undefined; + if (object.service !== undefined && object.service !== null) { + message.service = ManagedService.fromPartial(object.service); + } return message; }, fromSDK(object: UndeleteServiceResponseSDKType): UndeleteServiceResponse { @@ -1394,7 +1398,7 @@ function createBaseGetServiceConfigRequest(): GetServiceConfigRequest { } export const GetServiceConfigRequest = { typeUrl: "/google.api.servicemanagement.v1.GetServiceConfigRequest", - encode(message: GetServiceConfigRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetServiceConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -1406,8 +1410,8 @@ export const GetServiceConfigRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceConfigRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceConfigRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceConfigRequest(); while (reader.pos < end) { @@ -1430,11 +1434,11 @@ export const GetServiceConfigRequest = { return message; }, fromJSON(object: any): GetServiceConfigRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - configId: isSet(object.configId) ? String(object.configId) : "", - view: isSet(object.view) ? getServiceConfigRequest_ConfigViewFromJSON(object.view) : -1 - }; + const obj = createBaseGetServiceConfigRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.configId)) obj.configId = String(object.configId); + if (isSet(object.view)) obj.view = getServiceConfigRequest_ConfigViewFromJSON(object.view); + return obj; }, toJSON(message: GetServiceConfigRequest): unknown { const obj: any = {}; @@ -1503,7 +1507,7 @@ function createBaseListServiceConfigsRequest(): ListServiceConfigsRequest { } export const ListServiceConfigsRequest = { typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsRequest", - encode(message: ListServiceConfigsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServiceConfigsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -1515,8 +1519,8 @@ export const ListServiceConfigsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServiceConfigsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServiceConfigsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServiceConfigsRequest(); while (reader.pos < end) { @@ -1539,11 +1543,11 @@ export const ListServiceConfigsRequest = { return message; }, fromJSON(object: any): ListServiceConfigsRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0 - }; + const obj = createBaseListServiceConfigsRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + return obj; }, toJSON(message: ListServiceConfigsRequest): unknown { const obj: any = {}; @@ -1611,7 +1615,7 @@ function createBaseListServiceConfigsResponse(): ListServiceConfigsResponse { } export const ListServiceConfigsResponse = { typeUrl: "/google.api.servicemanagement.v1.ListServiceConfigsResponse", - encode(message: ListServiceConfigsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServiceConfigsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.serviceConfigs) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1620,8 +1624,8 @@ export const ListServiceConfigsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServiceConfigsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServiceConfigsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServiceConfigsResponse(); while (reader.pos < end) { @@ -1641,10 +1645,10 @@ export const ListServiceConfigsResponse = { return message; }, fromJSON(object: any): ListServiceConfigsResponse { - return { - serviceConfigs: Array.isArray(object?.serviceConfigs) ? object.serviceConfigs.map((e: any) => Service.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListServiceConfigsResponse(); + if (Array.isArray(object?.serviceConfigs)) object.serviceConfigs.map((e: any) => Service.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListServiceConfigsResponse): unknown { const obj: any = {}; @@ -1718,7 +1722,7 @@ function createBaseCreateServiceConfigRequest(): CreateServiceConfigRequest { } export const CreateServiceConfigRequest = { typeUrl: "/google.api.servicemanagement.v1.CreateServiceConfigRequest", - encode(message: CreateServiceConfigRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateServiceConfigRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -1727,8 +1731,8 @@ export const CreateServiceConfigRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateServiceConfigRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateServiceConfigRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateServiceConfigRequest(); while (reader.pos < end) { @@ -1748,10 +1752,10 @@ export const CreateServiceConfigRequest = { return message; }, fromJSON(object: any): CreateServiceConfigRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - serviceConfig: isSet(object.serviceConfig) ? Service.fromJSON(object.serviceConfig) : undefined - }; + const obj = createBaseCreateServiceConfigRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.serviceConfig)) obj.serviceConfig = Service.fromJSON(object.serviceConfig); + return obj; }, toJSON(message: CreateServiceConfigRequest): unknown { const obj: any = {}; @@ -1762,7 +1766,9 @@ export const CreateServiceConfigRequest = { fromPartial(object: DeepPartial): CreateServiceConfigRequest { const message = createBaseCreateServiceConfigRequest(); message.serviceName = object.serviceName ?? ""; - message.serviceConfig = object.serviceConfig !== undefined && object.serviceConfig !== null ? Service.fromPartial(object.serviceConfig) : undefined; + if (object.serviceConfig !== undefined && object.serviceConfig !== null) { + message.serviceConfig = Service.fromPartial(object.serviceConfig); + } return message; }, fromSDK(object: CreateServiceConfigRequestSDKType): CreateServiceConfigRequest { @@ -1814,7 +1820,7 @@ function createBaseSubmitConfigSourceRequest(): SubmitConfigSourceRequest { } export const SubmitConfigSourceRequest = { typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceRequest", - encode(message: SubmitConfigSourceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SubmitConfigSourceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -1826,8 +1832,8 @@ export const SubmitConfigSourceRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SubmitConfigSourceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SubmitConfigSourceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSubmitConfigSourceRequest(); while (reader.pos < end) { @@ -1850,11 +1856,11 @@ export const SubmitConfigSourceRequest = { return message; }, fromJSON(object: any): SubmitConfigSourceRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - configSource: isSet(object.configSource) ? ConfigSource.fromJSON(object.configSource) : undefined, - validateOnly: isSet(object.validateOnly) ? Boolean(object.validateOnly) : false - }; + const obj = createBaseSubmitConfigSourceRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.configSource)) obj.configSource = ConfigSource.fromJSON(object.configSource); + if (isSet(object.validateOnly)) obj.validateOnly = Boolean(object.validateOnly); + return obj; }, toJSON(message: SubmitConfigSourceRequest): unknown { const obj: any = {}; @@ -1866,7 +1872,9 @@ export const SubmitConfigSourceRequest = { fromPartial(object: DeepPartial): SubmitConfigSourceRequest { const message = createBaseSubmitConfigSourceRequest(); message.serviceName = object.serviceName ?? ""; - message.configSource = object.configSource !== undefined && object.configSource !== null ? ConfigSource.fromPartial(object.configSource) : undefined; + if (object.configSource !== undefined && object.configSource !== null) { + message.configSource = ConfigSource.fromPartial(object.configSource); + } message.validateOnly = object.validateOnly ?? false; return message; }, @@ -1921,14 +1929,14 @@ function createBaseSubmitConfigSourceResponse(): SubmitConfigSourceResponse { } export const SubmitConfigSourceResponse = { typeUrl: "/google.api.servicemanagement.v1.SubmitConfigSourceResponse", - encode(message: SubmitConfigSourceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SubmitConfigSourceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceConfig !== undefined) { Service.encode(message.serviceConfig, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SubmitConfigSourceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SubmitConfigSourceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSubmitConfigSourceResponse(); while (reader.pos < end) { @@ -1945,9 +1953,9 @@ export const SubmitConfigSourceResponse = { return message; }, fromJSON(object: any): SubmitConfigSourceResponse { - return { - serviceConfig: isSet(object.serviceConfig) ? Service.fromJSON(object.serviceConfig) : undefined - }; + const obj = createBaseSubmitConfigSourceResponse(); + if (isSet(object.serviceConfig)) obj.serviceConfig = Service.fromJSON(object.serviceConfig); + return obj; }, toJSON(message: SubmitConfigSourceResponse): unknown { const obj: any = {}; @@ -1956,7 +1964,9 @@ export const SubmitConfigSourceResponse = { }, fromPartial(object: DeepPartial): SubmitConfigSourceResponse { const message = createBaseSubmitConfigSourceResponse(); - message.serviceConfig = object.serviceConfig !== undefined && object.serviceConfig !== null ? Service.fromPartial(object.serviceConfig) : undefined; + if (object.serviceConfig !== undefined && object.serviceConfig !== null) { + message.serviceConfig = Service.fromPartial(object.serviceConfig); + } return message; }, fromSDK(object: SubmitConfigSourceResponseSDKType): SubmitConfigSourceResponse { @@ -2003,7 +2013,7 @@ function createBaseCreateServiceRolloutRequest(): CreateServiceRolloutRequest { } export const CreateServiceRolloutRequest = { typeUrl: "/google.api.servicemanagement.v1.CreateServiceRolloutRequest", - encode(message: CreateServiceRolloutRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateServiceRolloutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -2012,8 +2022,8 @@ export const CreateServiceRolloutRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateServiceRolloutRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateServiceRolloutRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateServiceRolloutRequest(); while (reader.pos < end) { @@ -2033,10 +2043,10 @@ export const CreateServiceRolloutRequest = { return message; }, fromJSON(object: any): CreateServiceRolloutRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - rollout: isSet(object.rollout) ? Rollout.fromJSON(object.rollout) : undefined - }; + const obj = createBaseCreateServiceRolloutRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.rollout)) obj.rollout = Rollout.fromJSON(object.rollout); + return obj; }, toJSON(message: CreateServiceRolloutRequest): unknown { const obj: any = {}; @@ -2047,7 +2057,9 @@ export const CreateServiceRolloutRequest = { fromPartial(object: DeepPartial): CreateServiceRolloutRequest { const message = createBaseCreateServiceRolloutRequest(); message.serviceName = object.serviceName ?? ""; - message.rollout = object.rollout !== undefined && object.rollout !== null ? Rollout.fromPartial(object.rollout) : undefined; + if (object.rollout !== undefined && object.rollout !== null) { + message.rollout = Rollout.fromPartial(object.rollout); + } return message; }, fromSDK(object: CreateServiceRolloutRequestSDKType): CreateServiceRolloutRequest { @@ -2100,7 +2112,7 @@ function createBaseListServiceRolloutsRequest(): ListServiceRolloutsRequest { } export const ListServiceRolloutsRequest = { typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsRequest", - encode(message: ListServiceRolloutsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServiceRolloutsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -2115,8 +2127,8 @@ export const ListServiceRolloutsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServiceRolloutsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServiceRolloutsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServiceRolloutsRequest(); while (reader.pos < end) { @@ -2142,12 +2154,12 @@ export const ListServiceRolloutsRequest = { return message; }, fromJSON(object: any): ListServiceRolloutsRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - filter: isSet(object.filter) ? String(object.filter) : "" - }; + const obj = createBaseListServiceRolloutsRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.filter)) obj.filter = String(object.filter); + return obj; }, toJSON(message: ListServiceRolloutsRequest): unknown { const obj: any = {}; @@ -2221,7 +2233,7 @@ function createBaseListServiceRolloutsResponse(): ListServiceRolloutsResponse { } export const ListServiceRolloutsResponse = { typeUrl: "/google.api.servicemanagement.v1.ListServiceRolloutsResponse", - encode(message: ListServiceRolloutsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServiceRolloutsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rollouts) { Rollout.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2230,8 +2242,8 @@ export const ListServiceRolloutsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServiceRolloutsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServiceRolloutsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServiceRolloutsResponse(); while (reader.pos < end) { @@ -2251,10 +2263,10 @@ export const ListServiceRolloutsResponse = { return message; }, fromJSON(object: any): ListServiceRolloutsResponse { - return { - rollouts: Array.isArray(object?.rollouts) ? object.rollouts.map((e: any) => Rollout.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListServiceRolloutsResponse(); + if (Array.isArray(object?.rollouts)) object.rollouts.map((e: any) => Rollout.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListServiceRolloutsResponse): unknown { const obj: any = {}; @@ -2328,7 +2340,7 @@ function createBaseGetServiceRolloutRequest(): GetServiceRolloutRequest { } export const GetServiceRolloutRequest = { typeUrl: "/google.api.servicemanagement.v1.GetServiceRolloutRequest", - encode(message: GetServiceRolloutRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetServiceRolloutRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -2337,8 +2349,8 @@ export const GetServiceRolloutRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceRolloutRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceRolloutRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceRolloutRequest(); while (reader.pos < end) { @@ -2358,10 +2370,10 @@ export const GetServiceRolloutRequest = { return message; }, fromJSON(object: any): GetServiceRolloutRequest { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - rolloutId: isSet(object.rolloutId) ? String(object.rolloutId) : "" - }; + const obj = createBaseGetServiceRolloutRequest(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.rolloutId)) obj.rolloutId = String(object.rolloutId); + return obj; }, toJSON(message: GetServiceRolloutRequest): unknown { const obj: any = {}; @@ -2423,7 +2435,7 @@ function createBaseGenerateConfigReportRequest(): GenerateConfigReportRequest { } export const GenerateConfigReportRequest = { typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportRequest", - encode(message: GenerateConfigReportRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenerateConfigReportRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.newConfig !== undefined) { Any.encode(message.newConfig, writer.uint32(10).fork()).ldelim(); } @@ -2432,8 +2444,8 @@ export const GenerateConfigReportRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenerateConfigReportRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenerateConfigReportRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenerateConfigReportRequest(); while (reader.pos < end) { @@ -2453,10 +2465,10 @@ export const GenerateConfigReportRequest = { return message; }, fromJSON(object: any): GenerateConfigReportRequest { - return { - newConfig: isSet(object.newConfig) ? Any.fromJSON(object.newConfig) : undefined, - oldConfig: isSet(object.oldConfig) ? Any.fromJSON(object.oldConfig) : undefined - }; + const obj = createBaseGenerateConfigReportRequest(); + if (isSet(object.newConfig)) obj.newConfig = Any.fromJSON(object.newConfig); + if (isSet(object.oldConfig)) obj.oldConfig = Any.fromJSON(object.oldConfig); + return obj; }, toJSON(message: GenerateConfigReportRequest): unknown { const obj: any = {}; @@ -2466,8 +2478,12 @@ export const GenerateConfigReportRequest = { }, fromPartial(object: DeepPartial): GenerateConfigReportRequest { const message = createBaseGenerateConfigReportRequest(); - message.newConfig = object.newConfig !== undefined && object.newConfig !== null ? Any.fromPartial(object.newConfig) : undefined; - message.oldConfig = object.oldConfig !== undefined && object.oldConfig !== null ? Any.fromPartial(object.oldConfig) : undefined; + if (object.newConfig !== undefined && object.newConfig !== null) { + message.newConfig = Any.fromPartial(object.newConfig); + } + if (object.oldConfig !== undefined && object.oldConfig !== null) { + message.oldConfig = Any.fromPartial(object.oldConfig); + } return message; }, fromSDK(object: GenerateConfigReportRequestSDKType): GenerateConfigReportRequest { @@ -2520,7 +2536,7 @@ function createBaseGenerateConfigReportResponse(): GenerateConfigReportResponse } export const GenerateConfigReportResponse = { typeUrl: "/google.api.servicemanagement.v1.GenerateConfigReportResponse", - encode(message: GenerateConfigReportResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenerateConfigReportResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceName !== "") { writer.uint32(10).string(message.serviceName); } @@ -2535,8 +2551,8 @@ export const GenerateConfigReportResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenerateConfigReportResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenerateConfigReportResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenerateConfigReportResponse(); while (reader.pos < end) { @@ -2562,12 +2578,12 @@ export const GenerateConfigReportResponse = { return message; }, fromJSON(object: any): GenerateConfigReportResponse { - return { - serviceName: isSet(object.serviceName) ? String(object.serviceName) : "", - id: isSet(object.id) ? String(object.id) : "", - changeReports: Array.isArray(object?.changeReports) ? object.changeReports.map((e: any) => ChangeReport.fromJSON(e)) : [], - diagnostics: Array.isArray(object?.diagnostics) ? object.diagnostics.map((e: any) => Diagnostic.fromJSON(e)) : [] - }; + const obj = createBaseGenerateConfigReportResponse(); + if (isSet(object.serviceName)) obj.serviceName = String(object.serviceName); + if (isSet(object.id)) obj.id = String(object.id); + if (Array.isArray(object?.changeReports)) object.changeReports.map((e: any) => ChangeReport.fromJSON(e)); + if (Array.isArray(object?.diagnostics)) object.diagnostics.map((e: any) => Diagnostic.fromJSON(e)); + return obj; }, toJSON(message: GenerateConfigReportResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/resources.ts b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/resources.ts index 2cf5f80535..a2b78f1443 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/resources.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/resources.ts @@ -6,7 +6,7 @@ import { Usage, UsageAmino, UsageSDKType } from "../../usage"; import { Endpoint, EndpointAmino, EndpointSDKType } from "../../endpoint"; import { MonitoredResourceDescriptor, MonitoredResourceDescriptorAmino, MonitoredResourceDescriptorSDKType } from "../../monitored_resource"; import { Monitoring, MonitoringAmino, MonitoringSDKType } from "../../monitoring"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.serviceusage.v1"; /** Whether or not a service has been enabled for use by a consumer. */ @@ -270,7 +270,7 @@ function createBaseService(): Service { } export const Service = { typeUrl: "/google.api.serviceusage.v1.Service", - encode(message: Service, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Service, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -285,8 +285,8 @@ export const Service = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Service { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Service { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseService(); while (reader.pos < end) { @@ -312,12 +312,12 @@ export const Service = { return message; }, fromJSON(object: any): Service { - return { - name: isSet(object.name) ? String(object.name) : "", - parent: isSet(object.parent) ? String(object.parent) : "", - config: isSet(object.config) ? ServiceConfig.fromJSON(object.config) : undefined, - state: isSet(object.state) ? stateFromJSON(object.state) : -1 - }; + const obj = createBaseService(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.config)) obj.config = ServiceConfig.fromJSON(object.config); + if (isSet(object.state)) obj.state = stateFromJSON(object.state); + return obj; }, toJSON(message: Service): unknown { const obj: any = {}; @@ -331,7 +331,9 @@ export const Service = { const message = createBaseService(); message.name = object.name ?? ""; message.parent = object.parent ?? ""; - message.config = object.config !== undefined && object.config !== null ? ServiceConfig.fromPartial(object.config) : undefined; + if (object.config !== undefined && object.config !== null) { + message.config = ServiceConfig.fromPartial(object.config); + } message.state = object.state ?? 0; return message; }, @@ -399,7 +401,7 @@ function createBaseServiceConfig(): ServiceConfig { } export const ServiceConfig = { typeUrl: "/google.api.serviceusage.v1.ServiceConfig", - encode(message: ServiceConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ServiceConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -432,8 +434,8 @@ export const ServiceConfig = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ServiceConfig { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ServiceConfig { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseServiceConfig(); while (reader.pos < end) { @@ -477,18 +479,18 @@ export const ServiceConfig = { return message; }, fromJSON(object: any): ServiceConfig { - return { - name: isSet(object.name) ? String(object.name) : "", - title: isSet(object.title) ? String(object.title) : "", - apis: Array.isArray(object?.apis) ? object.apis.map((e: any) => Api.fromJSON(e)) : [], - documentation: isSet(object.documentation) ? Documentation.fromJSON(object.documentation) : undefined, - quota: isSet(object.quota) ? Quota.fromJSON(object.quota) : undefined, - authentication: isSet(object.authentication) ? Authentication.fromJSON(object.authentication) : undefined, - usage: isSet(object.usage) ? Usage.fromJSON(object.usage) : undefined, - endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromJSON(e)) : [], - monitoredResources: Array.isArray(object?.monitoredResources) ? object.monitoredResources.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)) : [], - monitoring: isSet(object.monitoring) ? Monitoring.fromJSON(object.monitoring) : undefined - }; + const obj = createBaseServiceConfig(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.title)) obj.title = String(object.title); + if (Array.isArray(object?.apis)) object.apis.map((e: any) => Api.fromJSON(e)); + if (isSet(object.documentation)) obj.documentation = Documentation.fromJSON(object.documentation); + if (isSet(object.quota)) obj.quota = Quota.fromJSON(object.quota); + if (isSet(object.authentication)) obj.authentication = Authentication.fromJSON(object.authentication); + if (isSet(object.usage)) obj.usage = Usage.fromJSON(object.usage); + if (Array.isArray(object?.endpoints)) object.endpoints.map((e: any) => Endpoint.fromJSON(e)); + if (Array.isArray(object?.monitoredResources)) object.monitoredResources.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)); + if (isSet(object.monitoring)) obj.monitoring = Monitoring.fromJSON(object.monitoring); + return obj; }, toJSON(message: ServiceConfig): unknown { const obj: any = {}; @@ -521,13 +523,23 @@ export const ServiceConfig = { message.name = object.name ?? ""; message.title = object.title ?? ""; message.apis = object.apis?.map(e => Api.fromPartial(e)) || []; - message.documentation = object.documentation !== undefined && object.documentation !== null ? Documentation.fromPartial(object.documentation) : undefined; - message.quota = object.quota !== undefined && object.quota !== null ? Quota.fromPartial(object.quota) : undefined; - message.authentication = object.authentication !== undefined && object.authentication !== null ? Authentication.fromPartial(object.authentication) : undefined; - message.usage = object.usage !== undefined && object.usage !== null ? Usage.fromPartial(object.usage) : undefined; + if (object.documentation !== undefined && object.documentation !== null) { + message.documentation = Documentation.fromPartial(object.documentation); + } + if (object.quota !== undefined && object.quota !== null) { + message.quota = Quota.fromPartial(object.quota); + } + if (object.authentication !== undefined && object.authentication !== null) { + message.authentication = Authentication.fromPartial(object.authentication); + } + if (object.usage !== undefined && object.usage !== null) { + message.usage = Usage.fromPartial(object.usage); + } message.endpoints = object.endpoints?.map(e => Endpoint.fromPartial(e)) || []; message.monitoredResources = object.monitoredResources?.map(e => MonitoredResourceDescriptor.fromPartial(e)) || []; - message.monitoring = object.monitoring !== undefined && object.monitoring !== null ? Monitoring.fromPartial(object.monitoring) : undefined; + if (object.monitoring !== undefined && object.monitoring !== null) { + message.monitoring = Monitoring.fromPartial(object.monitoring); + } return message; }, fromSDK(object: ServiceConfigSDKType): ServiceConfig { @@ -633,14 +645,14 @@ function createBaseOperationMetadata(): OperationMetadata { } export const OperationMetadata = { typeUrl: "/google.api.serviceusage.v1.OperationMetadata", - encode(message: OperationMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OperationMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(18).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OperationMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OperationMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperationMetadata(); while (reader.pos < end) { @@ -657,9 +669,9 @@ export const OperationMetadata = { return message; }, fromJSON(object: any): OperationMetadata { - return { - resourceNames: Array.isArray(object?.resourceNames) ? object.resourceNames.map((e: any) => String(e)) : [] - }; + const obj = createBaseOperationMetadata(); + if (Array.isArray(object?.resourceNames)) object.resourceNames.map((e: any) => String(e)); + return obj; }, toJSON(message: OperationMetadata): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/serviceusage.ts b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/serviceusage.ts index de735e9c48..7ff1f80177 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/serviceusage.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1/serviceusage.ts @@ -1,5 +1,5 @@ import { Service, ServiceAmino, ServiceSDKType } from "./resources"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.serviceusage.v1"; /** @@ -578,14 +578,14 @@ function createBaseEnableServiceRequest(): EnableServiceRequest { } export const EnableServiceRequest = { typeUrl: "/google.api.serviceusage.v1.EnableServiceRequest", - encode(message: EnableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnableServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnableServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnableServiceRequest(); while (reader.pos < end) { @@ -602,9 +602,9 @@ export const EnableServiceRequest = { return message; }, fromJSON(object: any): EnableServiceRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseEnableServiceRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: EnableServiceRequest): unknown { const obj: any = {}; @@ -659,14 +659,14 @@ function createBaseEnableServiceResponse(): EnableServiceResponse { } export const EnableServiceResponse = { typeUrl: "/google.api.serviceusage.v1.EnableServiceResponse", - encode(message: EnableServiceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnableServiceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { Service.encode(message.service, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnableServiceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnableServiceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnableServiceResponse(); while (reader.pos < end) { @@ -683,9 +683,9 @@ export const EnableServiceResponse = { return message; }, fromJSON(object: any): EnableServiceResponse { - return { - service: isSet(object.service) ? Service.fromJSON(object.service) : undefined - }; + const obj = createBaseEnableServiceResponse(); + if (isSet(object.service)) obj.service = Service.fromJSON(object.service); + return obj; }, toJSON(message: EnableServiceResponse): unknown { const obj: any = {}; @@ -694,7 +694,9 @@ export const EnableServiceResponse = { }, fromPartial(object: DeepPartial): EnableServiceResponse { const message = createBaseEnableServiceResponse(); - message.service = object.service !== undefined && object.service !== null ? Service.fromPartial(object.service) : undefined; + if (object.service !== undefined && object.service !== null) { + message.service = Service.fromPartial(object.service); + } return message; }, fromSDK(object: EnableServiceResponseSDKType): EnableServiceResponse { @@ -742,7 +744,7 @@ function createBaseDisableServiceRequest(): DisableServiceRequest { } export const DisableServiceRequest = { typeUrl: "/google.api.serviceusage.v1.DisableServiceRequest", - encode(message: DisableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DisableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -754,8 +756,8 @@ export const DisableServiceRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DisableServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DisableServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDisableServiceRequest(); while (reader.pos < end) { @@ -778,11 +780,11 @@ export const DisableServiceRequest = { return message; }, fromJSON(object: any): DisableServiceRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - disableDependentServices: isSet(object.disableDependentServices) ? Boolean(object.disableDependentServices) : false, - checkIfServiceHasUsage: isSet(object.checkIfServiceHasUsage) ? disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.checkIfServiceHasUsage) : -1 - }; + const obj = createBaseDisableServiceRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.disableDependentServices)) obj.disableDependentServices = Boolean(object.disableDependentServices); + if (isSet(object.checkIfServiceHasUsage)) obj.checkIfServiceHasUsage = disableServiceRequest_CheckIfServiceHasUsageFromJSON(object.checkIfServiceHasUsage); + return obj; }, toJSON(message: DisableServiceRequest): unknown { const obj: any = {}; @@ -849,14 +851,14 @@ function createBaseDisableServiceResponse(): DisableServiceResponse { } export const DisableServiceResponse = { typeUrl: "/google.api.serviceusage.v1.DisableServiceResponse", - encode(message: DisableServiceResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DisableServiceResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.service !== undefined) { Service.encode(message.service, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DisableServiceResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DisableServiceResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDisableServiceResponse(); while (reader.pos < end) { @@ -873,9 +875,9 @@ export const DisableServiceResponse = { return message; }, fromJSON(object: any): DisableServiceResponse { - return { - service: isSet(object.service) ? Service.fromJSON(object.service) : undefined - }; + const obj = createBaseDisableServiceResponse(); + if (isSet(object.service)) obj.service = Service.fromJSON(object.service); + return obj; }, toJSON(message: DisableServiceResponse): unknown { const obj: any = {}; @@ -884,7 +886,9 @@ export const DisableServiceResponse = { }, fromPartial(object: DeepPartial): DisableServiceResponse { const message = createBaseDisableServiceResponse(); - message.service = object.service !== undefined && object.service !== null ? Service.fromPartial(object.service) : undefined; + if (object.service !== undefined && object.service !== null) { + message.service = Service.fromPartial(object.service); + } return message; }, fromSDK(object: DisableServiceResponseSDKType): DisableServiceResponse { @@ -930,14 +934,14 @@ function createBaseGetServiceRequest(): GetServiceRequest { } export const GetServiceRequest = { typeUrl: "/google.api.serviceusage.v1.GetServiceRequest", - encode(message: GetServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceRequest(); while (reader.pos < end) { @@ -954,9 +958,9 @@ export const GetServiceRequest = { return message; }, fromJSON(object: any): GetServiceRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetServiceRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetServiceRequest): unknown { const obj: any = {}; @@ -1014,7 +1018,7 @@ function createBaseListServicesRequest(): ListServicesRequest { } export const ListServicesRequest = { typeUrl: "/google.api.serviceusage.v1.ListServicesRequest", - encode(message: ListServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -1029,8 +1033,8 @@ export const ListServicesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServicesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServicesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServicesRequest(); while (reader.pos < end) { @@ -1056,12 +1060,12 @@ export const ListServicesRequest = { return message; }, fromJSON(object: any): ListServicesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - filter: isSet(object.filter) ? String(object.filter) : "" - }; + const obj = createBaseListServicesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.filter)) obj.filter = String(object.filter); + return obj; }, toJSON(message: ListServicesRequest): unknown { const obj: any = {}; @@ -1135,7 +1139,7 @@ function createBaseListServicesResponse(): ListServicesResponse { } export const ListServicesResponse = { typeUrl: "/google.api.serviceusage.v1.ListServicesResponse", - encode(message: ListServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1144,8 +1148,8 @@ export const ListServicesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServicesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServicesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServicesResponse(); while (reader.pos < end) { @@ -1165,10 +1169,10 @@ export const ListServicesResponse = { return message; }, fromJSON(object: any): ListServicesResponse { - return { - services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListServicesResponse(); + if (Array.isArray(object?.services)) object.services.map((e: any) => Service.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListServicesResponse): unknown { const obj: any = {}; @@ -1242,7 +1246,7 @@ function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest { } export const BatchEnableServicesRequest = { typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesRequest", - encode(message: BatchEnableServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchEnableServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -1251,8 +1255,8 @@ export const BatchEnableServicesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchEnableServicesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchEnableServicesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchEnableServicesRequest(); while (reader.pos < end) { @@ -1272,10 +1276,10 @@ export const BatchEnableServicesRequest = { return message; }, fromJSON(object: any): BatchEnableServicesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - serviceIds: Array.isArray(object?.serviceIds) ? object.serviceIds.map((e: any) => String(e)) : [] - }; + const obj = createBaseBatchEnableServicesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (Array.isArray(object?.serviceIds)) object.serviceIds.map((e: any) => String(e)); + return obj; }, toJSON(message: BatchEnableServicesRequest): unknown { const obj: any = {}; @@ -1349,7 +1353,7 @@ function createBaseBatchEnableServicesResponse(): BatchEnableServicesResponse { } export const BatchEnableServicesResponse = { typeUrl: "/google.api.serviceusage.v1.BatchEnableServicesResponse", - encode(message: BatchEnableServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchEnableServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1358,8 +1362,8 @@ export const BatchEnableServicesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchEnableServicesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchEnableServicesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchEnableServicesResponse(); while (reader.pos < end) { @@ -1379,10 +1383,10 @@ export const BatchEnableServicesResponse = { return message; }, fromJSON(object: any): BatchEnableServicesResponse { - return { - services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromJSON(e)) : [], - failures: Array.isArray(object?.failures) ? object.failures.map((e: any) => BatchEnableServicesResponse_EnableFailure.fromJSON(e)) : [] - }; + const obj = createBaseBatchEnableServicesResponse(); + if (Array.isArray(object?.services)) object.services.map((e: any) => Service.fromJSON(e)); + if (Array.isArray(object?.failures)) object.failures.map((e: any) => BatchEnableServicesResponse_EnableFailure.fromJSON(e)); + return obj; }, toJSON(message: BatchEnableServicesResponse): unknown { const obj: any = {}; @@ -1468,7 +1472,7 @@ function createBaseBatchEnableServicesResponse_EnableFailure(): BatchEnableServi } export const BatchEnableServicesResponse_EnableFailure = { typeUrl: "/google.api.serviceusage.v1.EnableFailure", - encode(message: BatchEnableServicesResponse_EnableFailure, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchEnableServicesResponse_EnableFailure, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.serviceId !== "") { writer.uint32(10).string(message.serviceId); } @@ -1477,8 +1481,8 @@ export const BatchEnableServicesResponse_EnableFailure = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchEnableServicesResponse_EnableFailure { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchEnableServicesResponse_EnableFailure { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchEnableServicesResponse_EnableFailure(); while (reader.pos < end) { @@ -1498,10 +1502,10 @@ export const BatchEnableServicesResponse_EnableFailure = { return message; }, fromJSON(object: any): BatchEnableServicesResponse_EnableFailure { - return { - serviceId: isSet(object.serviceId) ? String(object.serviceId) : "", - errorMessage: isSet(object.errorMessage) ? String(object.errorMessage) : "" - }; + const obj = createBaseBatchEnableServicesResponse_EnableFailure(); + if (isSet(object.serviceId)) obj.serviceId = String(object.serviceId); + if (isSet(object.errorMessage)) obj.errorMessage = String(object.errorMessage); + return obj; }, toJSON(message: BatchEnableServicesResponse_EnableFailure): unknown { const obj: any = {}; @@ -1563,7 +1567,7 @@ function createBaseBatchGetServicesRequest(): BatchGetServicesRequest { } export const BatchGetServicesRequest = { typeUrl: "/google.api.serviceusage.v1.BatchGetServicesRequest", - encode(message: BatchGetServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchGetServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -1572,8 +1576,8 @@ export const BatchGetServicesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchGetServicesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchGetServicesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchGetServicesRequest(); while (reader.pos < end) { @@ -1593,10 +1597,10 @@ export const BatchGetServicesRequest = { return message; }, fromJSON(object: any): BatchGetServicesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - names: Array.isArray(object?.names) ? object.names.map((e: any) => String(e)) : [] - }; + const obj = createBaseBatchGetServicesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (Array.isArray(object?.names)) object.names.map((e: any) => String(e)); + return obj; }, toJSON(message: BatchGetServicesRequest): unknown { const obj: any = {}; @@ -1669,14 +1673,14 @@ function createBaseBatchGetServicesResponse(): BatchGetServicesResponse { } export const BatchGetServicesResponse = { typeUrl: "/google.api.serviceusage.v1.BatchGetServicesResponse", - encode(message: BatchGetServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchGetServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchGetServicesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchGetServicesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchGetServicesResponse(); while (reader.pos < end) { @@ -1693,9 +1697,9 @@ export const BatchGetServicesResponse = { return message; }, fromJSON(object: any): BatchGetServicesResponse { - return { - services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromJSON(e)) : [] - }; + const obj = createBaseBatchGetServicesResponse(); + if (Array.isArray(object?.services)) object.services.map((e: any) => Service.fromJSON(e)); + return obj; }, toJSON(message: BatchGetServicesResponse): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/resources.ts b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/resources.ts index 9597ede05e..10fb3f0b55 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/resources.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/resources.ts @@ -6,8 +6,8 @@ import { Usage, UsageAmino, UsageSDKType } from "../../usage"; import { Endpoint, EndpointAmino, EndpointSDKType } from "../../endpoint"; import { MonitoredResourceDescriptor, MonitoredResourceDescriptorAmino, MonitoredResourceDescriptorSDKType } from "../../monitored_resource"; import { Monitoring, MonitoringAmino, MonitoringSDKType } from "../../monitoring"; -import { Long, isSet, DeepPartial, isObject } from "../../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; +import { isSet, DeepPartial, isObject } from "../../../../helpers"; export const protobufPackage = "google.api.serviceusage.v1beta1"; /** Whether or not a service has been enabled for use by a consumer. */ export enum State { @@ -587,12 +587,12 @@ export interface QuotaBucket { * The effective limit of this quota bucket. Equal to default_limit if there * are no overrides. */ - effectiveLimit: Long; + effectiveLimit: bigint; /** * The default limit of this quota bucket, as specified by the service * configuration. */ - defaultLimit: Long; + defaultLimit: bigint; /** Producer override on this quota bucket. */ producerOverride: QuotaOverride; /** Consumer override on this quota bucket. */ @@ -661,8 +661,8 @@ export interface QuotaBucketAminoMsg { } /** A quota bucket is a quota provisioning unit for a specific set of dimensions. */ export interface QuotaBucketSDKType { - effective_limit: Long; - default_limit: Long; + effective_limit: bigint; + default_limit: bigint; producer_override: QuotaOverrideSDKType; consumer_override: QuotaOverrideSDKType; admin_override: QuotaOverrideSDKType; @@ -708,7 +708,7 @@ export interface QuotaOverride { * The overriding quota limit value. * Can be any nonnegative integer, or -1 (unlimited quota). */ - overrideValue: Long; + overrideValue: bigint; /** * If this map is nonempty, then this override applies only to specific values * for dimensions defined in the limit unit. @@ -839,7 +839,7 @@ export interface QuotaOverrideAminoMsg { /** A quota override */ export interface QuotaOverrideSDKType { name: string; - override_value: Long; + override_value: bigint; dimensions: { [key: string]: string; }; @@ -913,7 +913,7 @@ export interface AdminQuotaPolicy { * The quota policy value. * Can be any nonnegative integer, or -1 (unlimited quota). */ - policyValue: Long; + policyValue: bigint; /** * If this map is nonempty, then this policy applies only to specific values * for dimensions defined in the limit unit. @@ -1018,7 +1018,7 @@ export interface AdminQuotaPolicyAminoMsg { /** Quota policy created by quota administrator. */ export interface AdminQuotaPolicySDKType { name: string; - policy_value: Long; + policy_value: bigint; dimensions: { [key: string]: string; }; @@ -1084,7 +1084,7 @@ function createBaseService(): Service { } export const Service = { typeUrl: "/google.api.serviceusage.v1beta1.Service", - encode(message: Service, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Service, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1099,8 +1099,8 @@ export const Service = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Service { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Service { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseService(); while (reader.pos < end) { @@ -1126,12 +1126,12 @@ export const Service = { return message; }, fromJSON(object: any): Service { - return { - name: isSet(object.name) ? String(object.name) : "", - parent: isSet(object.parent) ? String(object.parent) : "", - config: isSet(object.config) ? ServiceConfig.fromJSON(object.config) : undefined, - state: isSet(object.state) ? stateFromJSON(object.state) : -1 - }; + const obj = createBaseService(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.config)) obj.config = ServiceConfig.fromJSON(object.config); + if (isSet(object.state)) obj.state = stateFromJSON(object.state); + return obj; }, toJSON(message: Service): unknown { const obj: any = {}; @@ -1145,7 +1145,9 @@ export const Service = { const message = createBaseService(); message.name = object.name ?? ""; message.parent = object.parent ?? ""; - message.config = object.config !== undefined && object.config !== null ? ServiceConfig.fromPartial(object.config) : undefined; + if (object.config !== undefined && object.config !== null) { + message.config = ServiceConfig.fromPartial(object.config); + } message.state = object.state ?? 0; return message; }, @@ -1213,7 +1215,7 @@ function createBaseServiceConfig(): ServiceConfig { } export const ServiceConfig = { typeUrl: "/google.api.serviceusage.v1beta1.ServiceConfig", - encode(message: ServiceConfig, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ServiceConfig, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1246,8 +1248,8 @@ export const ServiceConfig = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ServiceConfig { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ServiceConfig { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseServiceConfig(); while (reader.pos < end) { @@ -1291,18 +1293,18 @@ export const ServiceConfig = { return message; }, fromJSON(object: any): ServiceConfig { - return { - name: isSet(object.name) ? String(object.name) : "", - title: isSet(object.title) ? String(object.title) : "", - apis: Array.isArray(object?.apis) ? object.apis.map((e: any) => Api.fromJSON(e)) : [], - documentation: isSet(object.documentation) ? Documentation.fromJSON(object.documentation) : undefined, - quota: isSet(object.quota) ? Quota.fromJSON(object.quota) : undefined, - authentication: isSet(object.authentication) ? Authentication.fromJSON(object.authentication) : undefined, - usage: isSet(object.usage) ? Usage.fromJSON(object.usage) : undefined, - endpoints: Array.isArray(object?.endpoints) ? object.endpoints.map((e: any) => Endpoint.fromJSON(e)) : [], - monitoredResources: Array.isArray(object?.monitoredResources) ? object.monitoredResources.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)) : [], - monitoring: isSet(object.monitoring) ? Monitoring.fromJSON(object.monitoring) : undefined - }; + const obj = createBaseServiceConfig(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.title)) obj.title = String(object.title); + if (Array.isArray(object?.apis)) object.apis.map((e: any) => Api.fromJSON(e)); + if (isSet(object.documentation)) obj.documentation = Documentation.fromJSON(object.documentation); + if (isSet(object.quota)) obj.quota = Quota.fromJSON(object.quota); + if (isSet(object.authentication)) obj.authentication = Authentication.fromJSON(object.authentication); + if (isSet(object.usage)) obj.usage = Usage.fromJSON(object.usage); + if (Array.isArray(object?.endpoints)) object.endpoints.map((e: any) => Endpoint.fromJSON(e)); + if (Array.isArray(object?.monitoredResources)) object.monitoredResources.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)); + if (isSet(object.monitoring)) obj.monitoring = Monitoring.fromJSON(object.monitoring); + return obj; }, toJSON(message: ServiceConfig): unknown { const obj: any = {}; @@ -1335,13 +1337,23 @@ export const ServiceConfig = { message.name = object.name ?? ""; message.title = object.title ?? ""; message.apis = object.apis?.map(e => Api.fromPartial(e)) || []; - message.documentation = object.documentation !== undefined && object.documentation !== null ? Documentation.fromPartial(object.documentation) : undefined; - message.quota = object.quota !== undefined && object.quota !== null ? Quota.fromPartial(object.quota) : undefined; - message.authentication = object.authentication !== undefined && object.authentication !== null ? Authentication.fromPartial(object.authentication) : undefined; - message.usage = object.usage !== undefined && object.usage !== null ? Usage.fromPartial(object.usage) : undefined; + if (object.documentation !== undefined && object.documentation !== null) { + message.documentation = Documentation.fromPartial(object.documentation); + } + if (object.quota !== undefined && object.quota !== null) { + message.quota = Quota.fromPartial(object.quota); + } + if (object.authentication !== undefined && object.authentication !== null) { + message.authentication = Authentication.fromPartial(object.authentication); + } + if (object.usage !== undefined && object.usage !== null) { + message.usage = Usage.fromPartial(object.usage); + } message.endpoints = object.endpoints?.map(e => Endpoint.fromPartial(e)) || []; message.monitoredResources = object.monitoredResources?.map(e => MonitoredResourceDescriptor.fromPartial(e)) || []; - message.monitoring = object.monitoring !== undefined && object.monitoring !== null ? Monitoring.fromPartial(object.monitoring) : undefined; + if (object.monitoring !== undefined && object.monitoring !== null) { + message.monitoring = Monitoring.fromPartial(object.monitoring); + } return message; }, fromSDK(object: ServiceConfigSDKType): ServiceConfig { @@ -1447,14 +1459,14 @@ function createBaseOperationMetadata(): OperationMetadata { } export const OperationMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.OperationMetadata", - encode(message: OperationMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OperationMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(18).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OperationMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OperationMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperationMetadata(); while (reader.pos < end) { @@ -1471,9 +1483,9 @@ export const OperationMetadata = { return message; }, fromJSON(object: any): OperationMetadata { - return { - resourceNames: Array.isArray(object?.resourceNames) ? object.resourceNames.map((e: any) => String(e)) : [] - }; + const obj = createBaseOperationMetadata(); + if (Array.isArray(object?.resourceNames)) object.resourceNames.map((e: any) => String(e)); + return obj; }, toJSON(message: OperationMetadata): unknown { const obj: any = {}; @@ -1545,7 +1557,7 @@ function createBaseConsumerQuotaMetric(): ConsumerQuotaMetric { } export const ConsumerQuotaMetric = { typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaMetric", - encode(message: ConsumerQuotaMetric, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConsumerQuotaMetric, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1566,8 +1578,8 @@ export const ConsumerQuotaMetric = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConsumerQuotaMetric { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConsumerQuotaMetric { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConsumerQuotaMetric(); while (reader.pos < end) { @@ -1599,14 +1611,14 @@ export const ConsumerQuotaMetric = { return message; }, fromJSON(object: any): ConsumerQuotaMetric { - return { - name: isSet(object.name) ? String(object.name) : "", - metric: isSet(object.metric) ? String(object.metric) : "", - displayName: isSet(object.displayName) ? String(object.displayName) : "", - consumerQuotaLimits: Array.isArray(object?.consumerQuotaLimits) ? object.consumerQuotaLimits.map((e: any) => ConsumerQuotaLimit.fromJSON(e)) : [], - descendantConsumerQuotaLimits: Array.isArray(object?.descendantConsumerQuotaLimits) ? object.descendantConsumerQuotaLimits.map((e: any) => ConsumerQuotaLimit.fromJSON(e)) : [], - unit: isSet(object.unit) ? String(object.unit) : "" - }; + const obj = createBaseConsumerQuotaMetric(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.metric)) obj.metric = String(object.metric); + if (isSet(object.displayName)) obj.displayName = String(object.displayName); + if (Array.isArray(object?.consumerQuotaLimits)) object.consumerQuotaLimits.map((e: any) => ConsumerQuotaLimit.fromJSON(e)); + if (Array.isArray(object?.descendantConsumerQuotaLimits)) object.descendantConsumerQuotaLimits.map((e: any) => ConsumerQuotaLimit.fromJSON(e)); + if (isSet(object.unit)) obj.unit = String(object.unit); + return obj; }, toJSON(message: ConsumerQuotaMetric): unknown { const obj: any = {}; @@ -1720,7 +1732,7 @@ function createBaseConsumerQuotaLimit(): ConsumerQuotaLimit { } export const ConsumerQuotaLimit = { typeUrl: "/google.api.serviceusage.v1beta1.ConsumerQuotaLimit", - encode(message: ConsumerQuotaLimit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ConsumerQuotaLimit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1741,8 +1753,8 @@ export const ConsumerQuotaLimit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ConsumerQuotaLimit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ConsumerQuotaLimit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseConsumerQuotaLimit(); while (reader.pos < end) { @@ -1774,14 +1786,14 @@ export const ConsumerQuotaLimit = { return message; }, fromJSON(object: any): ConsumerQuotaLimit { - return { - name: isSet(object.name) ? String(object.name) : "", - metric: isSet(object.metric) ? String(object.metric) : "", - unit: isSet(object.unit) ? String(object.unit) : "", - isPrecise: isSet(object.isPrecise) ? Boolean(object.isPrecise) : false, - allowsAdminOverrides: isSet(object.allowsAdminOverrides) ? Boolean(object.allowsAdminOverrides) : false, - quotaBuckets: Array.isArray(object?.quotaBuckets) ? object.quotaBuckets.map((e: any) => QuotaBucket.fromJSON(e)) : [] - }; + const obj = createBaseConsumerQuotaLimit(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.metric)) obj.metric = String(object.metric); + if (isSet(object.unit)) obj.unit = String(object.unit); + if (isSet(object.isPrecise)) obj.isPrecise = Boolean(object.isPrecise); + if (isSet(object.allowsAdminOverrides)) obj.allowsAdminOverrides = Boolean(object.allowsAdminOverrides); + if (Array.isArray(object?.quotaBuckets)) object.quotaBuckets.map((e: any) => QuotaBucket.fromJSON(e)); + return obj; }, toJSON(message: ConsumerQuotaLimit): unknown { const obj: any = {}; @@ -1878,7 +1890,7 @@ function createBaseQuotaBucket_DimensionsEntry(): QuotaBucket_DimensionsEntry { }; } export const QuotaBucket_DimensionsEntry = { - encode(message: QuotaBucket_DimensionsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaBucket_DimensionsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -1887,8 +1899,8 @@ export const QuotaBucket_DimensionsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaBucket_DimensionsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaBucket_DimensionsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaBucket_DimensionsEntry(); while (reader.pos < end) { @@ -1908,10 +1920,10 @@ export const QuotaBucket_DimensionsEntry = { return message; }, fromJSON(object: any): QuotaBucket_DimensionsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseQuotaBucket_DimensionsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: QuotaBucket_DimensionsEntry): unknown { const obj: any = {}; @@ -1961,8 +1973,8 @@ export const QuotaBucket_DimensionsEntry = { }; function createBaseQuotaBucket(): QuotaBucket { return { - effectiveLimit: Long.ZERO, - defaultLimit: Long.ZERO, + effectiveLimit: BigInt(0), + defaultLimit: BigInt(0), producerOverride: QuotaOverride.fromPartial({}), consumerOverride: QuotaOverride.fromPartial({}), adminOverride: QuotaOverride.fromPartial({}), @@ -1971,11 +1983,11 @@ function createBaseQuotaBucket(): QuotaBucket { } export const QuotaBucket = { typeUrl: "/google.api.serviceusage.v1beta1.QuotaBucket", - encode(message: QuotaBucket, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.effectiveLimit.isZero()) { + encode(message: QuotaBucket, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.effectiveLimit !== BigInt(0)) { writer.uint32(8).int64(message.effectiveLimit); } - if (!message.defaultLimit.isZero()) { + if (message.defaultLimit !== BigInt(0)) { writer.uint32(16).int64(message.defaultLimit); } if (message.producerOverride !== undefined) { @@ -1995,18 +2007,18 @@ export const QuotaBucket = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaBucket { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaBucket { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaBucket(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.effectiveLimit = (reader.int64() as Long); + message.effectiveLimit = reader.int64(); break; case 2: - message.defaultLimit = (reader.int64() as Long); + message.defaultLimit = reader.int64(); break; case 3: message.producerOverride = QuotaOverride.decode(reader, reader.uint32()); @@ -2031,24 +2043,24 @@ export const QuotaBucket = { return message; }, fromJSON(object: any): QuotaBucket { - return { - effectiveLimit: isSet(object.effectiveLimit) ? Long.fromValue(object.effectiveLimit) : Long.ZERO, - defaultLimit: isSet(object.defaultLimit) ? Long.fromValue(object.defaultLimit) : Long.ZERO, - producerOverride: isSet(object.producerOverride) ? QuotaOverride.fromJSON(object.producerOverride) : undefined, - consumerOverride: isSet(object.consumerOverride) ? QuotaOverride.fromJSON(object.consumerOverride) : undefined, - adminOverride: isSet(object.adminOverride) ? QuotaOverride.fromJSON(object.adminOverride) : undefined, - dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {} - }; + const obj = createBaseQuotaBucket(); + if (isSet(object.effectiveLimit)) obj.effectiveLimit = BigInt(object.effectiveLimit.toString()); + if (isSet(object.defaultLimit)) obj.defaultLimit = BigInt(object.defaultLimit.toString()); + if (isSet(object.producerOverride)) obj.producerOverride = QuotaOverride.fromJSON(object.producerOverride); + if (isSet(object.consumerOverride)) obj.consumerOverride = QuotaOverride.fromJSON(object.consumerOverride); + if (isSet(object.adminOverride)) obj.adminOverride = QuotaOverride.fromJSON(object.adminOverride); + if (isObject(object.dimensions)) obj.dimensions = Object.entries(object.dimensions).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + return obj; }, toJSON(message: QuotaBucket): unknown { const obj: any = {}; - message.effectiveLimit !== undefined && (obj.effectiveLimit = (message.effectiveLimit || Long.ZERO).toString()); - message.defaultLimit !== undefined && (obj.defaultLimit = (message.defaultLimit || Long.ZERO).toString()); + message.effectiveLimit !== undefined && (obj.effectiveLimit = (message.effectiveLimit || BigInt(0)).toString()); + message.defaultLimit !== undefined && (obj.defaultLimit = (message.defaultLimit || BigInt(0)).toString()); message.producerOverride !== undefined && (obj.producerOverride = message.producerOverride ? QuotaOverride.toJSON(message.producerOverride) : undefined); message.consumerOverride !== undefined && (obj.consumerOverride = message.consumerOverride ? QuotaOverride.toJSON(message.consumerOverride) : undefined); message.adminOverride !== undefined && (obj.adminOverride = message.adminOverride ? QuotaOverride.toJSON(message.adminOverride) : undefined); @@ -2062,11 +2074,21 @@ export const QuotaBucket = { }, fromPartial(object: DeepPartial): QuotaBucket { const message = createBaseQuotaBucket(); - message.effectiveLimit = object.effectiveLimit !== undefined && object.effectiveLimit !== null ? Long.fromValue(object.effectiveLimit) : Long.ZERO; - message.defaultLimit = object.defaultLimit !== undefined && object.defaultLimit !== null ? Long.fromValue(object.defaultLimit) : Long.ZERO; - message.producerOverride = object.producerOverride !== undefined && object.producerOverride !== null ? QuotaOverride.fromPartial(object.producerOverride) : undefined; - message.consumerOverride = object.consumerOverride !== undefined && object.consumerOverride !== null ? QuotaOverride.fromPartial(object.consumerOverride) : undefined; - message.adminOverride = object.adminOverride !== undefined && object.adminOverride !== null ? QuotaOverride.fromPartial(object.adminOverride) : undefined; + if (object.effectiveLimit !== undefined && object.effectiveLimit !== null) { + message.effectiveLimit = BigInt(object.effectiveLimit.toString()); + } + if (object.defaultLimit !== undefined && object.defaultLimit !== null) { + message.defaultLimit = BigInt(object.defaultLimit.toString()); + } + if (object.producerOverride !== undefined && object.producerOverride !== null) { + message.producerOverride = QuotaOverride.fromPartial(object.producerOverride); + } + if (object.consumerOverride !== undefined && object.consumerOverride !== null) { + message.consumerOverride = QuotaOverride.fromPartial(object.consumerOverride); + } + if (object.adminOverride !== undefined && object.adminOverride !== null) { + message.adminOverride = QuotaOverride.fromPartial(object.adminOverride); + } message.dimensions = Object.entries(object.dimensions ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -2109,8 +2131,8 @@ export const QuotaBucket = { }, fromAmino(object: QuotaBucketAmino): QuotaBucket { return { - effectiveLimit: Long.fromString(object.effective_limit), - defaultLimit: Long.fromString(object.default_limit), + effectiveLimit: BigInt(object.effective_limit), + defaultLimit: BigInt(object.default_limit), producerOverride: object?.producer_override ? QuotaOverride.fromAmino(object.producer_override) : undefined, consumerOverride: object?.consumer_override ? QuotaOverride.fromAmino(object.consumer_override) : undefined, adminOverride: object?.admin_override ? QuotaOverride.fromAmino(object.admin_override) : undefined, @@ -2160,7 +2182,7 @@ function createBaseQuotaOverride_DimensionsEntry(): QuotaOverride_DimensionsEntr }; } export const QuotaOverride_DimensionsEntry = { - encode(message: QuotaOverride_DimensionsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaOverride_DimensionsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -2169,8 +2191,8 @@ export const QuotaOverride_DimensionsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaOverride_DimensionsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaOverride_DimensionsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaOverride_DimensionsEntry(); while (reader.pos < end) { @@ -2190,10 +2212,10 @@ export const QuotaOverride_DimensionsEntry = { return message; }, fromJSON(object: any): QuotaOverride_DimensionsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseQuotaOverride_DimensionsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: QuotaOverride_DimensionsEntry): unknown { const obj: any = {}; @@ -2244,7 +2266,7 @@ export const QuotaOverride_DimensionsEntry = { function createBaseQuotaOverride(): QuotaOverride { return { name: "", - overrideValue: Long.ZERO, + overrideValue: BigInt(0), dimensions: {}, metric: "", unit: "", @@ -2253,11 +2275,11 @@ function createBaseQuotaOverride(): QuotaOverride { } export const QuotaOverride = { typeUrl: "/google.api.serviceusage.v1beta1.QuotaOverride", - encode(message: QuotaOverride, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: QuotaOverride, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } - if (!message.overrideValue.isZero()) { + if (message.overrideValue !== BigInt(0)) { writer.uint32(16).int64(message.overrideValue); } Object.entries(message.dimensions).forEach(([key, value]) => { @@ -2277,8 +2299,8 @@ export const QuotaOverride = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): QuotaOverride { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): QuotaOverride { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseQuotaOverride(); while (reader.pos < end) { @@ -2288,7 +2310,7 @@ export const QuotaOverride = { message.name = reader.string(); break; case 2: - message.overrideValue = (reader.int64() as Long); + message.overrideValue = reader.int64(); break; case 3: const entry3 = QuotaOverride_DimensionsEntry.decode(reader, reader.uint32()); @@ -2313,24 +2335,24 @@ export const QuotaOverride = { return message; }, fromJSON(object: any): QuotaOverride { - return { - name: isSet(object.name) ? String(object.name) : "", - overrideValue: isSet(object.overrideValue) ? Long.fromValue(object.overrideValue) : Long.ZERO, - dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - metric: isSet(object.metric) ? String(object.metric) : "", - unit: isSet(object.unit) ? String(object.unit) : "", - adminOverrideAncestor: isSet(object.adminOverrideAncestor) ? String(object.adminOverrideAncestor) : "" - }; + const obj = createBaseQuotaOverride(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.overrideValue)) obj.overrideValue = BigInt(object.overrideValue.toString()); + if (isObject(object.dimensions)) obj.dimensions = Object.entries(object.dimensions).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (isSet(object.metric)) obj.metric = String(object.metric); + if (isSet(object.unit)) obj.unit = String(object.unit); + if (isSet(object.adminOverrideAncestor)) obj.adminOverrideAncestor = String(object.adminOverrideAncestor); + return obj; }, toJSON(message: QuotaOverride): unknown { const obj: any = {}; message.name !== undefined && (obj.name = message.name); - message.overrideValue !== undefined && (obj.overrideValue = (message.overrideValue || Long.ZERO).toString()); + message.overrideValue !== undefined && (obj.overrideValue = (message.overrideValue || BigInt(0)).toString()); obj.dimensions = {}; if (message.dimensions) { Object.entries(message.dimensions).forEach(([k, v]) => { @@ -2345,7 +2367,9 @@ export const QuotaOverride = { fromPartial(object: DeepPartial): QuotaOverride { const message = createBaseQuotaOverride(); message.name = object.name ?? ""; - message.overrideValue = object.overrideValue !== undefined && object.overrideValue !== null ? Long.fromValue(object.overrideValue) : Long.ZERO; + if (object.overrideValue !== undefined && object.overrideValue !== null) { + message.overrideValue = BigInt(object.overrideValue.toString()); + } message.dimensions = Object.entries(object.dimensions ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -2392,7 +2416,7 @@ export const QuotaOverride = { fromAmino(object: QuotaOverrideAmino): QuotaOverride { return { name: object.name, - overrideValue: Long.fromString(object.override_value), + overrideValue: BigInt(object.override_value), dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -2442,14 +2466,14 @@ function createBaseOverrideInlineSource(): OverrideInlineSource { } export const OverrideInlineSource = { typeUrl: "/google.api.serviceusage.v1beta1.OverrideInlineSource", - encode(message: OverrideInlineSource, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OverrideInlineSource, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OverrideInlineSource { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OverrideInlineSource { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOverrideInlineSource(); while (reader.pos < end) { @@ -2466,9 +2490,9 @@ export const OverrideInlineSource = { return message; }, fromJSON(object: any): OverrideInlineSource { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [] - }; + const obj = createBaseOverrideInlineSource(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + return obj; }, toJSON(message: OverrideInlineSource): unknown { const obj: any = {}; @@ -2535,7 +2559,7 @@ function createBaseAdminQuotaPolicy_DimensionsEntry(): AdminQuotaPolicy_Dimensio }; } export const AdminQuotaPolicy_DimensionsEntry = { - encode(message: AdminQuotaPolicy_DimensionsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AdminQuotaPolicy_DimensionsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -2544,8 +2568,8 @@ export const AdminQuotaPolicy_DimensionsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AdminQuotaPolicy_DimensionsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AdminQuotaPolicy_DimensionsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAdminQuotaPolicy_DimensionsEntry(); while (reader.pos < end) { @@ -2565,10 +2589,10 @@ export const AdminQuotaPolicy_DimensionsEntry = { return message; }, fromJSON(object: any): AdminQuotaPolicy_DimensionsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseAdminQuotaPolicy_DimensionsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: AdminQuotaPolicy_DimensionsEntry): unknown { const obj: any = {}; @@ -2619,7 +2643,7 @@ export const AdminQuotaPolicy_DimensionsEntry = { function createBaseAdminQuotaPolicy(): AdminQuotaPolicy { return { name: "", - policyValue: Long.ZERO, + policyValue: BigInt(0), dimensions: {}, metric: "", unit: "", @@ -2628,11 +2652,11 @@ function createBaseAdminQuotaPolicy(): AdminQuotaPolicy { } export const AdminQuotaPolicy = { typeUrl: "/google.api.serviceusage.v1beta1.AdminQuotaPolicy", - encode(message: AdminQuotaPolicy, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: AdminQuotaPolicy, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } - if (!message.policyValue.isZero()) { + if (message.policyValue !== BigInt(0)) { writer.uint32(16).int64(message.policyValue); } Object.entries(message.dimensions).forEach(([key, value]) => { @@ -2652,8 +2676,8 @@ export const AdminQuotaPolicy = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): AdminQuotaPolicy { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): AdminQuotaPolicy { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAdminQuotaPolicy(); while (reader.pos < end) { @@ -2663,7 +2687,7 @@ export const AdminQuotaPolicy = { message.name = reader.string(); break; case 2: - message.policyValue = (reader.int64() as Long); + message.policyValue = reader.int64(); break; case 3: const entry3 = AdminQuotaPolicy_DimensionsEntry.decode(reader, reader.uint32()); @@ -2688,24 +2712,24 @@ export const AdminQuotaPolicy = { return message; }, fromJSON(object: any): AdminQuotaPolicy { - return { - name: isSet(object.name) ? String(object.name) : "", - policyValue: isSet(object.policyValue) ? Long.fromValue(object.policyValue) : Long.ZERO, - dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - metric: isSet(object.metric) ? String(object.metric) : "", - unit: isSet(object.unit) ? String(object.unit) : "", - container: isSet(object.container) ? String(object.container) : "" - }; + const obj = createBaseAdminQuotaPolicy(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.policyValue)) obj.policyValue = BigInt(object.policyValue.toString()); + if (isObject(object.dimensions)) obj.dimensions = Object.entries(object.dimensions).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (isSet(object.metric)) obj.metric = String(object.metric); + if (isSet(object.unit)) obj.unit = String(object.unit); + if (isSet(object.container)) obj.container = String(object.container); + return obj; }, toJSON(message: AdminQuotaPolicy): unknown { const obj: any = {}; message.name !== undefined && (obj.name = message.name); - message.policyValue !== undefined && (obj.policyValue = (message.policyValue || Long.ZERO).toString()); + message.policyValue !== undefined && (obj.policyValue = (message.policyValue || BigInt(0)).toString()); obj.dimensions = {}; if (message.dimensions) { Object.entries(message.dimensions).forEach(([k, v]) => { @@ -2720,7 +2744,9 @@ export const AdminQuotaPolicy = { fromPartial(object: DeepPartial): AdminQuotaPolicy { const message = createBaseAdminQuotaPolicy(); message.name = object.name ?? ""; - message.policyValue = object.policyValue !== undefined && object.policyValue !== null ? Long.fromValue(object.policyValue) : Long.ZERO; + if (object.policyValue !== undefined && object.policyValue !== null) { + message.policyValue = BigInt(object.policyValue.toString()); + } message.dimensions = Object.entries(object.dimensions ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -2767,7 +2793,7 @@ export const AdminQuotaPolicy = { fromAmino(object: AdminQuotaPolicyAmino): AdminQuotaPolicy { return { name: object.name, - policyValue: Long.fromString(object.policy_value), + policyValue: BigInt(object.policy_value), dimensions: isObject(object.dimensions) ? Object.entries(object.dimensions).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -2818,7 +2844,7 @@ function createBaseServiceIdentity(): ServiceIdentity { } export const ServiceIdentity = { typeUrl: "/google.api.serviceusage.v1beta1.ServiceIdentity", - encode(message: ServiceIdentity, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ServiceIdentity, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.email !== "") { writer.uint32(10).string(message.email); } @@ -2827,8 +2853,8 @@ export const ServiceIdentity = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ServiceIdentity { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ServiceIdentity { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseServiceIdentity(); while (reader.pos < end) { @@ -2848,10 +2874,10 @@ export const ServiceIdentity = { return message; }, fromJSON(object: any): ServiceIdentity { - return { - email: isSet(object.email) ? String(object.email) : "", - uniqueId: isSet(object.uniqueId) ? String(object.uniqueId) : "" - }; + const obj = createBaseServiceIdentity(); + if (isSet(object.email)) obj.email = String(object.email); + if (isSet(object.uniqueId)) obj.uniqueId = String(object.uniqueId); + return obj; }, toJSON(message: ServiceIdentity): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts index 72e2ccab4f..1a20b17587 100644 --- a/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts +++ b/__fixtures__/v-next/outputv2/google/api/serviceusage/v1beta1/serviceusage.ts @@ -1,6 +1,6 @@ import { QuotaView, QuotaOverride, QuotaOverrideAmino, QuotaOverrideSDKType, QuotaSafetyCheck, OverrideInlineSource, OverrideInlineSourceAmino, OverrideInlineSourceSDKType, Service, ServiceAmino, ServiceSDKType, ConsumerQuotaMetric, ConsumerQuotaMetricAmino, ConsumerQuotaMetricSDKType, AdminQuotaPolicy, AdminQuotaPolicyAmino, AdminQuotaPolicySDKType, ServiceIdentity, ServiceIdentityAmino, ServiceIdentitySDKType, quotaViewFromJSON, quotaViewToJSON, quotaSafetyCheckFromJSON, quotaSafetyCheckToJSON } from "./resources"; import { FieldMask, FieldMaskAmino, FieldMaskSDKType } from "../../../protobuf/field_mask"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../../binary"; import { isSet, DeepPartial } from "../../../../helpers"; export const protobufPackage = "google.api.serviceusage.v1beta1"; /** Enum for service identity state. */ @@ -1572,14 +1572,14 @@ function createBaseEnableServiceRequest(): EnableServiceRequest { } export const EnableServiceRequest = { typeUrl: "/google.api.serviceusage.v1beta1.EnableServiceRequest", - encode(message: EnableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnableServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnableServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnableServiceRequest(); while (reader.pos < end) { @@ -1596,9 +1596,9 @@ export const EnableServiceRequest = { return message; }, fromJSON(object: any): EnableServiceRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseEnableServiceRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: EnableServiceRequest): unknown { const obj: any = {}; @@ -1653,14 +1653,14 @@ function createBaseDisableServiceRequest(): DisableServiceRequest { } export const DisableServiceRequest = { typeUrl: "/google.api.serviceusage.v1beta1.DisableServiceRequest", - encode(message: DisableServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DisableServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DisableServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DisableServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDisableServiceRequest(); while (reader.pos < end) { @@ -1677,9 +1677,9 @@ export const DisableServiceRequest = { return message; }, fromJSON(object: any): DisableServiceRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseDisableServiceRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: DisableServiceRequest): unknown { const obj: any = {}; @@ -1734,14 +1734,14 @@ function createBaseGetServiceRequest(): GetServiceRequest { } export const GetServiceRequest = { typeUrl: "/google.api.serviceusage.v1beta1.GetServiceRequest", - encode(message: GetServiceRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetServiceRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceRequest(); while (reader.pos < end) { @@ -1758,9 +1758,9 @@ export const GetServiceRequest = { return message; }, fromJSON(object: any): GetServiceRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetServiceRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetServiceRequest): unknown { const obj: any = {}; @@ -1818,7 +1818,7 @@ function createBaseListServicesRequest(): ListServicesRequest { } export const ListServicesRequest = { typeUrl: "/google.api.serviceusage.v1beta1.ListServicesRequest", - encode(message: ListServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -1833,8 +1833,8 @@ export const ListServicesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServicesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServicesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServicesRequest(); while (reader.pos < end) { @@ -1860,12 +1860,12 @@ export const ListServicesRequest = { return message; }, fromJSON(object: any): ListServicesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - filter: isSet(object.filter) ? String(object.filter) : "" - }; + const obj = createBaseListServicesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.filter)) obj.filter = String(object.filter); + return obj; }, toJSON(message: ListServicesRequest): unknown { const obj: any = {}; @@ -1939,7 +1939,7 @@ function createBaseListServicesResponse(): ListServicesResponse { } export const ListServicesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ListServicesResponse", - encode(message: ListServicesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListServicesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.services) { Service.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1948,8 +1948,8 @@ export const ListServicesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListServicesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListServicesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListServicesResponse(); while (reader.pos < end) { @@ -1969,10 +1969,10 @@ export const ListServicesResponse = { return message; }, fromJSON(object: any): ListServicesResponse { - return { - services: Array.isArray(object?.services) ? object.services.map((e: any) => Service.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListServicesResponse(); + if (Array.isArray(object?.services)) object.services.map((e: any) => Service.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListServicesResponse): unknown { const obj: any = {}; @@ -2046,7 +2046,7 @@ function createBaseBatchEnableServicesRequest(): BatchEnableServicesRequest { } export const BatchEnableServicesRequest = { typeUrl: "/google.api.serviceusage.v1beta1.BatchEnableServicesRequest", - encode(message: BatchEnableServicesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchEnableServicesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -2055,8 +2055,8 @@ export const BatchEnableServicesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchEnableServicesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchEnableServicesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchEnableServicesRequest(); while (reader.pos < end) { @@ -2076,10 +2076,10 @@ export const BatchEnableServicesRequest = { return message; }, fromJSON(object: any): BatchEnableServicesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - serviceIds: Array.isArray(object?.serviceIds) ? object.serviceIds.map((e: any) => String(e)) : [] - }; + const obj = createBaseBatchEnableServicesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (Array.isArray(object?.serviceIds)) object.serviceIds.map((e: any) => String(e)); + return obj; }, toJSON(message: BatchEnableServicesRequest): unknown { const obj: any = {}; @@ -2155,7 +2155,7 @@ function createBaseListConsumerQuotaMetricsRequest(): ListConsumerQuotaMetricsRe } export const ListConsumerQuotaMetricsRequest = { typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsRequest", - encode(message: ListConsumerQuotaMetricsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListConsumerQuotaMetricsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -2170,8 +2170,8 @@ export const ListConsumerQuotaMetricsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListConsumerQuotaMetricsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListConsumerQuotaMetricsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListConsumerQuotaMetricsRequest(); while (reader.pos < end) { @@ -2197,12 +2197,12 @@ export const ListConsumerQuotaMetricsRequest = { return message; }, fromJSON(object: any): ListConsumerQuotaMetricsRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - view: isSet(object.view) ? quotaViewFromJSON(object.view) : -1 - }; + const obj = createBaseListConsumerQuotaMetricsRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.view)) obj.view = quotaViewFromJSON(object.view); + return obj; }, toJSON(message: ListConsumerQuotaMetricsRequest): unknown { const obj: any = {}; @@ -2276,7 +2276,7 @@ function createBaseListConsumerQuotaMetricsResponse(): ListConsumerQuotaMetricsR } export const ListConsumerQuotaMetricsResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerQuotaMetricsResponse", - encode(message: ListConsumerQuotaMetricsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListConsumerQuotaMetricsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.metrics) { ConsumerQuotaMetric.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2285,8 +2285,8 @@ export const ListConsumerQuotaMetricsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListConsumerQuotaMetricsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListConsumerQuotaMetricsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListConsumerQuotaMetricsResponse(); while (reader.pos < end) { @@ -2306,10 +2306,10 @@ export const ListConsumerQuotaMetricsResponse = { return message; }, fromJSON(object: any): ListConsumerQuotaMetricsResponse { - return { - metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => ConsumerQuotaMetric.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListConsumerQuotaMetricsResponse(); + if (Array.isArray(object?.metrics)) object.metrics.map((e: any) => ConsumerQuotaMetric.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListConsumerQuotaMetricsResponse): unknown { const obj: any = {}; @@ -2383,7 +2383,7 @@ function createBaseGetConsumerQuotaMetricRequest(): GetConsumerQuotaMetricReques } export const GetConsumerQuotaMetricRequest = { typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaMetricRequest", - encode(message: GetConsumerQuotaMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetConsumerQuotaMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2392,8 +2392,8 @@ export const GetConsumerQuotaMetricRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetConsumerQuotaMetricRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetConsumerQuotaMetricRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetConsumerQuotaMetricRequest(); while (reader.pos < end) { @@ -2413,10 +2413,10 @@ export const GetConsumerQuotaMetricRequest = { return message; }, fromJSON(object: any): GetConsumerQuotaMetricRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - view: isSet(object.view) ? quotaViewFromJSON(object.view) : -1 - }; + const obj = createBaseGetConsumerQuotaMetricRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.view)) obj.view = quotaViewFromJSON(object.view); + return obj; }, toJSON(message: GetConsumerQuotaMetricRequest): unknown { const obj: any = {}; @@ -2478,7 +2478,7 @@ function createBaseGetConsumerQuotaLimitRequest(): GetConsumerQuotaLimitRequest } export const GetConsumerQuotaLimitRequest = { typeUrl: "/google.api.serviceusage.v1beta1.GetConsumerQuotaLimitRequest", - encode(message: GetConsumerQuotaLimitRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetConsumerQuotaLimitRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2487,8 +2487,8 @@ export const GetConsumerQuotaLimitRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetConsumerQuotaLimitRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetConsumerQuotaLimitRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetConsumerQuotaLimitRequest(); while (reader.pos < end) { @@ -2508,10 +2508,10 @@ export const GetConsumerQuotaLimitRequest = { return message; }, fromJSON(object: any): GetConsumerQuotaLimitRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - view: isSet(object.view) ? quotaViewFromJSON(object.view) : -1 - }; + const obj = createBaseGetConsumerQuotaLimitRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.view)) obj.view = quotaViewFromJSON(object.view); + return obj; }, toJSON(message: GetConsumerQuotaLimitRequest): unknown { const obj: any = {}; @@ -2575,7 +2575,7 @@ function createBaseCreateAdminOverrideRequest(): CreateAdminOverrideRequest { } export const CreateAdminOverrideRequest = { typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminOverrideRequest", - encode(message: CreateAdminOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateAdminOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -2592,8 +2592,8 @@ export const CreateAdminOverrideRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateAdminOverrideRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateAdminOverrideRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateAdminOverrideRequest(); while (reader.pos < end) { @@ -2626,12 +2626,12 @@ export const CreateAdminOverrideRequest = { return message; }, fromJSON(object: any): CreateAdminOverrideRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - override: isSet(object.override) ? QuotaOverride.fromJSON(object.override) : undefined, - force: isSet(object.force) ? Boolean(object.force) : false, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseCreateAdminOverrideRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.override)) obj.override = QuotaOverride.fromJSON(object.override); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: CreateAdminOverrideRequest): unknown { const obj: any = {}; @@ -2648,7 +2648,9 @@ export const CreateAdminOverrideRequest = { fromPartial(object: DeepPartial): CreateAdminOverrideRequest { const message = createBaseCreateAdminOverrideRequest(); message.parent = object.parent ?? ""; - message.override = object.override !== undefined && object.override !== null ? QuotaOverride.fromPartial(object.override) : undefined; + if (object.override !== undefined && object.override !== null) { + message.override = QuotaOverride.fromPartial(object.override); + } message.force = object.force ?? false; message.forceOnly = object.forceOnly?.map(e => e) || []; return message; @@ -2720,7 +2722,7 @@ function createBaseUpdateAdminOverrideRequest(): UpdateAdminOverrideRequest { } export const UpdateAdminOverrideRequest = { typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminOverrideRequest", - encode(message: UpdateAdminOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateAdminOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2740,8 +2742,8 @@ export const UpdateAdminOverrideRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateAdminOverrideRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateAdminOverrideRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateAdminOverrideRequest(); while (reader.pos < end) { @@ -2777,13 +2779,13 @@ export const UpdateAdminOverrideRequest = { return message; }, fromJSON(object: any): UpdateAdminOverrideRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - override: isSet(object.override) ? QuotaOverride.fromJSON(object.override) : undefined, - force: isSet(object.force) ? Boolean(object.force) : false, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseUpdateAdminOverrideRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.override)) obj.override = QuotaOverride.fromJSON(object.override); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: UpdateAdminOverrideRequest): unknown { const obj: any = {}; @@ -2801,9 +2803,13 @@ export const UpdateAdminOverrideRequest = { fromPartial(object: DeepPartial): UpdateAdminOverrideRequest { const message = createBaseUpdateAdminOverrideRequest(); message.name = object.name ?? ""; - message.override = object.override !== undefined && object.override !== null ? QuotaOverride.fromPartial(object.override) : undefined; + if (object.override !== undefined && object.override !== null) { + message.override = QuotaOverride.fromPartial(object.override); + } message.force = object.force ?? false; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } message.forceOnly = object.forceOnly?.map(e => e) || []; return message; }, @@ -2876,7 +2882,7 @@ function createBaseDeleteAdminOverrideRequest(): DeleteAdminOverrideRequest { } export const DeleteAdminOverrideRequest = { typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminOverrideRequest", - encode(message: DeleteAdminOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteAdminOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2890,8 +2896,8 @@ export const DeleteAdminOverrideRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteAdminOverrideRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteAdminOverrideRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteAdminOverrideRequest(); while (reader.pos < end) { @@ -2921,11 +2927,11 @@ export const DeleteAdminOverrideRequest = { return message; }, fromJSON(object: any): DeleteAdminOverrideRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - force: isSet(object.force) ? Boolean(object.force) : false, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseDeleteAdminOverrideRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: DeleteAdminOverrideRequest): unknown { const obj: any = {}; @@ -3006,7 +3012,7 @@ function createBaseListAdminOverridesRequest(): ListAdminOverridesRequest { } export const ListAdminOverridesRequest = { typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesRequest", - encode(message: ListAdminOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListAdminOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -3018,8 +3024,8 @@ export const ListAdminOverridesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListAdminOverridesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListAdminOverridesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListAdminOverridesRequest(); while (reader.pos < end) { @@ -3042,11 +3048,11 @@ export const ListAdminOverridesRequest = { return message; }, fromJSON(object: any): ListAdminOverridesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "" - }; + const obj = createBaseListAdminOverridesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + return obj; }, toJSON(message: ListAdminOverridesRequest): unknown { const obj: any = {}; @@ -3114,7 +3120,7 @@ function createBaseListAdminOverridesResponse(): ListAdminOverridesResponse { } export const ListAdminOverridesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ListAdminOverridesResponse", - encode(message: ListAdminOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListAdminOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -3123,8 +3129,8 @@ export const ListAdminOverridesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListAdminOverridesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListAdminOverridesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListAdminOverridesResponse(); while (reader.pos < end) { @@ -3144,10 +3150,10 @@ export const ListAdminOverridesResponse = { return message; }, fromJSON(object: any): ListAdminOverridesResponse { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListAdminOverridesResponse(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListAdminOverridesResponse): unknown { const obj: any = {}; @@ -3220,14 +3226,14 @@ function createBaseBatchCreateAdminOverridesResponse(): BatchCreateAdminOverride } export const BatchCreateAdminOverridesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateAdminOverridesResponse", - encode(message: BatchCreateAdminOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchCreateAdminOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchCreateAdminOverridesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchCreateAdminOverridesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchCreateAdminOverridesResponse(); while (reader.pos < end) { @@ -3244,9 +3250,9 @@ export const BatchCreateAdminOverridesResponse = { return message; }, fromJSON(object: any): BatchCreateAdminOverridesResponse { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [] - }; + const obj = createBaseBatchCreateAdminOverridesResponse(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + return obj; }, toJSON(message: BatchCreateAdminOverridesResponse): unknown { const obj: any = {}; @@ -3316,7 +3322,7 @@ function createBaseImportAdminOverridesRequest(): ImportAdminOverridesRequest { } export const ImportAdminOverridesRequest = { typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesRequest", - encode(message: ImportAdminOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ImportAdminOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -3333,8 +3339,8 @@ export const ImportAdminOverridesRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportAdminOverridesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportAdminOverridesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportAdminOverridesRequest(); while (reader.pos < end) { @@ -3367,12 +3373,12 @@ export const ImportAdminOverridesRequest = { return message; }, fromJSON(object: any): ImportAdminOverridesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - inlineSource: isSet(object.inlineSource) ? OverrideInlineSource.fromJSON(object.inlineSource) : undefined, - force: isSet(object.force) ? Boolean(object.force) : false, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseImportAdminOverridesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.inlineSource)) obj.inlineSource = OverrideInlineSource.fromJSON(object.inlineSource); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: ImportAdminOverridesRequest): unknown { const obj: any = {}; @@ -3389,7 +3395,9 @@ export const ImportAdminOverridesRequest = { fromPartial(object: DeepPartial): ImportAdminOverridesRequest { const message = createBaseImportAdminOverridesRequest(); message.parent = object.parent ?? ""; - message.inlineSource = object.inlineSource !== undefined && object.inlineSource !== null ? OverrideInlineSource.fromPartial(object.inlineSource) : undefined; + if (object.inlineSource !== undefined && object.inlineSource !== null) { + message.inlineSource = OverrideInlineSource.fromPartial(object.inlineSource); + } message.force = object.force ?? false; message.forceOnly = object.forceOnly?.map(e => e) || []; return message; @@ -3457,14 +3465,14 @@ function createBaseImportAdminOverridesResponse(): ImportAdminOverridesResponse } export const ImportAdminOverridesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesResponse", - encode(message: ImportAdminOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ImportAdminOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportAdminOverridesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportAdminOverridesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportAdminOverridesResponse(); while (reader.pos < end) { @@ -3481,9 +3489,9 @@ export const ImportAdminOverridesResponse = { return message; }, fromJSON(object: any): ImportAdminOverridesResponse { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [] - }; + const obj = createBaseImportAdminOverridesResponse(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + return obj; }, toJSON(message: ImportAdminOverridesResponse): unknown { const obj: any = {}; @@ -3548,11 +3556,11 @@ function createBaseImportAdminOverridesMetadata(): ImportAdminOverridesMetadata } export const ImportAdminOverridesMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminOverridesMetadata", - encode(_: ImportAdminOverridesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: ImportAdminOverridesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportAdminOverridesMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportAdminOverridesMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportAdminOverridesMetadata(); while (reader.pos < end) { @@ -3566,7 +3574,8 @@ export const ImportAdminOverridesMetadata = { return message; }, fromJSON(_: any): ImportAdminOverridesMetadata { - return {}; + const obj = createBaseImportAdminOverridesMetadata(); + return obj; }, toJSON(_: ImportAdminOverridesMetadata): unknown { const obj: any = {}; @@ -3616,7 +3625,7 @@ function createBaseCreateConsumerOverrideRequest(): CreateConsumerOverrideReques } export const CreateConsumerOverrideRequest = { typeUrl: "/google.api.serviceusage.v1beta1.CreateConsumerOverrideRequest", - encode(message: CreateConsumerOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateConsumerOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -3633,8 +3642,8 @@ export const CreateConsumerOverrideRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateConsumerOverrideRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateConsumerOverrideRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateConsumerOverrideRequest(); while (reader.pos < end) { @@ -3667,12 +3676,12 @@ export const CreateConsumerOverrideRequest = { return message; }, fromJSON(object: any): CreateConsumerOverrideRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - override: isSet(object.override) ? QuotaOverride.fromJSON(object.override) : undefined, - force: isSet(object.force) ? Boolean(object.force) : false, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseCreateConsumerOverrideRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.override)) obj.override = QuotaOverride.fromJSON(object.override); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: CreateConsumerOverrideRequest): unknown { const obj: any = {}; @@ -3689,7 +3698,9 @@ export const CreateConsumerOverrideRequest = { fromPartial(object: DeepPartial): CreateConsumerOverrideRequest { const message = createBaseCreateConsumerOverrideRequest(); message.parent = object.parent ?? ""; - message.override = object.override !== undefined && object.override !== null ? QuotaOverride.fromPartial(object.override) : undefined; + if (object.override !== undefined && object.override !== null) { + message.override = QuotaOverride.fromPartial(object.override); + } message.force = object.force ?? false; message.forceOnly = object.forceOnly?.map(e => e) || []; return message; @@ -3761,7 +3772,7 @@ function createBaseUpdateConsumerOverrideRequest(): UpdateConsumerOverrideReques } export const UpdateConsumerOverrideRequest = { typeUrl: "/google.api.serviceusage.v1beta1.UpdateConsumerOverrideRequest", - encode(message: UpdateConsumerOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateConsumerOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3781,8 +3792,8 @@ export const UpdateConsumerOverrideRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateConsumerOverrideRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateConsumerOverrideRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateConsumerOverrideRequest(); while (reader.pos < end) { @@ -3818,13 +3829,13 @@ export const UpdateConsumerOverrideRequest = { return message; }, fromJSON(object: any): UpdateConsumerOverrideRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - override: isSet(object.override) ? QuotaOverride.fromJSON(object.override) : undefined, - force: isSet(object.force) ? Boolean(object.force) : false, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseUpdateConsumerOverrideRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.override)) obj.override = QuotaOverride.fromJSON(object.override); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: UpdateConsumerOverrideRequest): unknown { const obj: any = {}; @@ -3842,9 +3853,13 @@ export const UpdateConsumerOverrideRequest = { fromPartial(object: DeepPartial): UpdateConsumerOverrideRequest { const message = createBaseUpdateConsumerOverrideRequest(); message.name = object.name ?? ""; - message.override = object.override !== undefined && object.override !== null ? QuotaOverride.fromPartial(object.override) : undefined; + if (object.override !== undefined && object.override !== null) { + message.override = QuotaOverride.fromPartial(object.override); + } message.force = object.force ?? false; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } message.forceOnly = object.forceOnly?.map(e => e) || []; return message; }, @@ -3917,7 +3932,7 @@ function createBaseDeleteConsumerOverrideRequest(): DeleteConsumerOverrideReques } export const DeleteConsumerOverrideRequest = { typeUrl: "/google.api.serviceusage.v1beta1.DeleteConsumerOverrideRequest", - encode(message: DeleteConsumerOverrideRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteConsumerOverrideRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3931,8 +3946,8 @@ export const DeleteConsumerOverrideRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteConsumerOverrideRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteConsumerOverrideRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteConsumerOverrideRequest(); while (reader.pos < end) { @@ -3962,11 +3977,11 @@ export const DeleteConsumerOverrideRequest = { return message; }, fromJSON(object: any): DeleteConsumerOverrideRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - force: isSet(object.force) ? Boolean(object.force) : false, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseDeleteConsumerOverrideRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: DeleteConsumerOverrideRequest): unknown { const obj: any = {}; @@ -4047,7 +4062,7 @@ function createBaseListConsumerOverridesRequest(): ListConsumerOverridesRequest } export const ListConsumerOverridesRequest = { typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesRequest", - encode(message: ListConsumerOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListConsumerOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -4059,8 +4074,8 @@ export const ListConsumerOverridesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListConsumerOverridesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListConsumerOverridesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListConsumerOverridesRequest(); while (reader.pos < end) { @@ -4083,11 +4098,11 @@ export const ListConsumerOverridesRequest = { return message; }, fromJSON(object: any): ListConsumerOverridesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "" - }; + const obj = createBaseListConsumerOverridesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + return obj; }, toJSON(message: ListConsumerOverridesRequest): unknown { const obj: any = {}; @@ -4155,7 +4170,7 @@ function createBaseListConsumerOverridesResponse(): ListConsumerOverridesRespons } export const ListConsumerOverridesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ListConsumerOverridesResponse", - encode(message: ListConsumerOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListConsumerOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -4164,8 +4179,8 @@ export const ListConsumerOverridesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListConsumerOverridesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListConsumerOverridesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListConsumerOverridesResponse(); while (reader.pos < end) { @@ -4185,10 +4200,10 @@ export const ListConsumerOverridesResponse = { return message; }, fromJSON(object: any): ListConsumerOverridesResponse { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListConsumerOverridesResponse(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListConsumerOverridesResponse): unknown { const obj: any = {}; @@ -4261,14 +4276,14 @@ function createBaseBatchCreateConsumerOverridesResponse(): BatchCreateConsumerOv } export const BatchCreateConsumerOverridesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.BatchCreateConsumerOverridesResponse", - encode(message: BatchCreateConsumerOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BatchCreateConsumerOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BatchCreateConsumerOverridesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BatchCreateConsumerOverridesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBatchCreateConsumerOverridesResponse(); while (reader.pos < end) { @@ -4285,9 +4300,9 @@ export const BatchCreateConsumerOverridesResponse = { return message; }, fromJSON(object: any): BatchCreateConsumerOverridesResponse { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [] - }; + const obj = createBaseBatchCreateConsumerOverridesResponse(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + return obj; }, toJSON(message: BatchCreateConsumerOverridesResponse): unknown { const obj: any = {}; @@ -4357,7 +4372,7 @@ function createBaseImportConsumerOverridesRequest(): ImportConsumerOverridesRequ } export const ImportConsumerOverridesRequest = { typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesRequest", - encode(message: ImportConsumerOverridesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ImportConsumerOverridesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -4374,8 +4389,8 @@ export const ImportConsumerOverridesRequest = { writer.ldelim(); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportConsumerOverridesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportConsumerOverridesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportConsumerOverridesRequest(); while (reader.pos < end) { @@ -4408,12 +4423,12 @@ export const ImportConsumerOverridesRequest = { return message; }, fromJSON(object: any): ImportConsumerOverridesRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - inlineSource: isSet(object.inlineSource) ? OverrideInlineSource.fromJSON(object.inlineSource) : undefined, - force: isSet(object.force) ? Boolean(object.force) : false, - forceOnly: Array.isArray(object?.forceOnly) ? object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)) : [] - }; + const obj = createBaseImportConsumerOverridesRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.inlineSource)) obj.inlineSource = OverrideInlineSource.fromJSON(object.inlineSource); + if (isSet(object.force)) obj.force = Boolean(object.force); + if (Array.isArray(object?.forceOnly)) object.forceOnly.map((e: any) => quotaSafetyCheckFromJSON(e)); + return obj; }, toJSON(message: ImportConsumerOverridesRequest): unknown { const obj: any = {}; @@ -4430,7 +4445,9 @@ export const ImportConsumerOverridesRequest = { fromPartial(object: DeepPartial): ImportConsumerOverridesRequest { const message = createBaseImportConsumerOverridesRequest(); message.parent = object.parent ?? ""; - message.inlineSource = object.inlineSource !== undefined && object.inlineSource !== null ? OverrideInlineSource.fromPartial(object.inlineSource) : undefined; + if (object.inlineSource !== undefined && object.inlineSource !== null) { + message.inlineSource = OverrideInlineSource.fromPartial(object.inlineSource); + } message.force = object.force ?? false; message.forceOnly = object.forceOnly?.map(e => e) || []; return message; @@ -4498,14 +4515,14 @@ function createBaseImportConsumerOverridesResponse(): ImportConsumerOverridesRes } export const ImportConsumerOverridesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesResponse", - encode(message: ImportConsumerOverridesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ImportConsumerOverridesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.overrides) { QuotaOverride.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportConsumerOverridesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportConsumerOverridesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportConsumerOverridesResponse(); while (reader.pos < end) { @@ -4522,9 +4539,9 @@ export const ImportConsumerOverridesResponse = { return message; }, fromJSON(object: any): ImportConsumerOverridesResponse { - return { - overrides: Array.isArray(object?.overrides) ? object.overrides.map((e: any) => QuotaOverride.fromJSON(e)) : [] - }; + const obj = createBaseImportConsumerOverridesResponse(); + if (Array.isArray(object?.overrides)) object.overrides.map((e: any) => QuotaOverride.fromJSON(e)); + return obj; }, toJSON(message: ImportConsumerOverridesResponse): unknown { const obj: any = {}; @@ -4589,11 +4606,11 @@ function createBaseImportConsumerOverridesMetadata(): ImportConsumerOverridesMet } export const ImportConsumerOverridesMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.ImportConsumerOverridesMetadata", - encode(_: ImportConsumerOverridesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: ImportConsumerOverridesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportConsumerOverridesMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportConsumerOverridesMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportConsumerOverridesMetadata(); while (reader.pos < end) { @@ -4607,7 +4624,8 @@ export const ImportConsumerOverridesMetadata = { return message; }, fromJSON(_: any): ImportConsumerOverridesMetadata { - return {}; + const obj = createBaseImportConsumerOverridesMetadata(); + return obj; }, toJSON(_: ImportConsumerOverridesMetadata): unknown { const obj: any = {}; @@ -4654,14 +4672,14 @@ function createBaseImportAdminQuotaPoliciesResponse(): ImportAdminQuotaPoliciesR } export const ImportAdminQuotaPoliciesResponse = { typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesResponse", - encode(message: ImportAdminQuotaPoliciesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ImportAdminQuotaPoliciesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.policies) { AdminQuotaPolicy.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportAdminQuotaPoliciesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportAdminQuotaPoliciesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportAdminQuotaPoliciesResponse(); while (reader.pos < end) { @@ -4678,9 +4696,9 @@ export const ImportAdminQuotaPoliciesResponse = { return message; }, fromJSON(object: any): ImportAdminQuotaPoliciesResponse { - return { - policies: Array.isArray(object?.policies) ? object.policies.map((e: any) => AdminQuotaPolicy.fromJSON(e)) : [] - }; + const obj = createBaseImportAdminQuotaPoliciesResponse(); + if (Array.isArray(object?.policies)) object.policies.map((e: any) => AdminQuotaPolicy.fromJSON(e)); + return obj; }, toJSON(message: ImportAdminQuotaPoliciesResponse): unknown { const obj: any = {}; @@ -4745,11 +4763,11 @@ function createBaseImportAdminQuotaPoliciesMetadata(): ImportAdminQuotaPoliciesM } export const ImportAdminQuotaPoliciesMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.ImportAdminQuotaPoliciesMetadata", - encode(_: ImportAdminQuotaPoliciesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: ImportAdminQuotaPoliciesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ImportAdminQuotaPoliciesMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ImportAdminQuotaPoliciesMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseImportAdminQuotaPoliciesMetadata(); while (reader.pos < end) { @@ -4763,7 +4781,8 @@ export const ImportAdminQuotaPoliciesMetadata = { return message; }, fromJSON(_: any): ImportAdminQuotaPoliciesMetadata { - return {}; + const obj = createBaseImportAdminQuotaPoliciesMetadata(); + return obj; }, toJSON(_: ImportAdminQuotaPoliciesMetadata): unknown { const obj: any = {}; @@ -4808,11 +4827,11 @@ function createBaseCreateAdminQuotaPolicyMetadata(): CreateAdminQuotaPolicyMetad } export const CreateAdminQuotaPolicyMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.CreateAdminQuotaPolicyMetadata", - encode(_: CreateAdminQuotaPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: CreateAdminQuotaPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateAdminQuotaPolicyMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateAdminQuotaPolicyMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateAdminQuotaPolicyMetadata(); while (reader.pos < end) { @@ -4826,7 +4845,8 @@ export const CreateAdminQuotaPolicyMetadata = { return message; }, fromJSON(_: any): CreateAdminQuotaPolicyMetadata { - return {}; + const obj = createBaseCreateAdminQuotaPolicyMetadata(); + return obj; }, toJSON(_: CreateAdminQuotaPolicyMetadata): unknown { const obj: any = {}; @@ -4871,11 +4891,11 @@ function createBaseUpdateAdminQuotaPolicyMetadata(): UpdateAdminQuotaPolicyMetad } export const UpdateAdminQuotaPolicyMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.UpdateAdminQuotaPolicyMetadata", - encode(_: UpdateAdminQuotaPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: UpdateAdminQuotaPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateAdminQuotaPolicyMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateAdminQuotaPolicyMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateAdminQuotaPolicyMetadata(); while (reader.pos < end) { @@ -4889,7 +4909,8 @@ export const UpdateAdminQuotaPolicyMetadata = { return message; }, fromJSON(_: any): UpdateAdminQuotaPolicyMetadata { - return {}; + const obj = createBaseUpdateAdminQuotaPolicyMetadata(); + return obj; }, toJSON(_: UpdateAdminQuotaPolicyMetadata): unknown { const obj: any = {}; @@ -4934,11 +4955,11 @@ function createBaseDeleteAdminQuotaPolicyMetadata(): DeleteAdminQuotaPolicyMetad } export const DeleteAdminQuotaPolicyMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.DeleteAdminQuotaPolicyMetadata", - encode(_: DeleteAdminQuotaPolicyMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: DeleteAdminQuotaPolicyMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteAdminQuotaPolicyMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteAdminQuotaPolicyMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteAdminQuotaPolicyMetadata(); while (reader.pos < end) { @@ -4952,7 +4973,8 @@ export const DeleteAdminQuotaPolicyMetadata = { return message; }, fromJSON(_: any): DeleteAdminQuotaPolicyMetadata { - return {}; + const obj = createBaseDeleteAdminQuotaPolicyMetadata(); + return obj; }, toJSON(_: DeleteAdminQuotaPolicyMetadata): unknown { const obj: any = {}; @@ -4999,14 +5021,14 @@ function createBaseGenerateServiceIdentityRequest(): GenerateServiceIdentityRequ } export const GenerateServiceIdentityRequest = { typeUrl: "/google.api.serviceusage.v1beta1.GenerateServiceIdentityRequest", - encode(message: GenerateServiceIdentityRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GenerateServiceIdentityRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GenerateServiceIdentityRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GenerateServiceIdentityRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGenerateServiceIdentityRequest(); while (reader.pos < end) { @@ -5023,9 +5045,9 @@ export const GenerateServiceIdentityRequest = { return message; }, fromJSON(object: any): GenerateServiceIdentityRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "" - }; + const obj = createBaseGenerateServiceIdentityRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + return obj; }, toJSON(message: GenerateServiceIdentityRequest): unknown { const obj: any = {}; @@ -5081,7 +5103,7 @@ function createBaseGetServiceIdentityResponse(): GetServiceIdentityResponse { } export const GetServiceIdentityResponse = { typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityResponse", - encode(message: GetServiceIdentityResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetServiceIdentityResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.identity !== undefined) { ServiceIdentity.encode(message.identity, writer.uint32(10).fork()).ldelim(); } @@ -5090,8 +5112,8 @@ export const GetServiceIdentityResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceIdentityResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceIdentityResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceIdentityResponse(); while (reader.pos < end) { @@ -5111,10 +5133,10 @@ export const GetServiceIdentityResponse = { return message; }, fromJSON(object: any): GetServiceIdentityResponse { - return { - identity: isSet(object.identity) ? ServiceIdentity.fromJSON(object.identity) : undefined, - state: isSet(object.state) ? getServiceIdentityResponse_IdentityStateFromJSON(object.state) : -1 - }; + const obj = createBaseGetServiceIdentityResponse(); + if (isSet(object.identity)) obj.identity = ServiceIdentity.fromJSON(object.identity); + if (isSet(object.state)) obj.state = getServiceIdentityResponse_IdentityStateFromJSON(object.state); + return obj; }, toJSON(message: GetServiceIdentityResponse): unknown { const obj: any = {}; @@ -5124,7 +5146,9 @@ export const GetServiceIdentityResponse = { }, fromPartial(object: DeepPartial): GetServiceIdentityResponse { const message = createBaseGetServiceIdentityResponse(); - message.identity = object.identity !== undefined && object.identity !== null ? ServiceIdentity.fromPartial(object.identity) : undefined; + if (object.identity !== undefined && object.identity !== null) { + message.identity = ServiceIdentity.fromPartial(object.identity); + } message.state = object.state ?? 0; return message; }, @@ -5173,11 +5197,11 @@ function createBaseGetServiceIdentityMetadata(): GetServiceIdentityMetadata { } export const GetServiceIdentityMetadata = { typeUrl: "/google.api.serviceusage.v1beta1.GetServiceIdentityMetadata", - encode(_: GetServiceIdentityMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: GetServiceIdentityMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetServiceIdentityMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetServiceIdentityMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetServiceIdentityMetadata(); while (reader.pos < end) { @@ -5191,7 +5215,8 @@ export const GetServiceIdentityMetadata = { return message; }, fromJSON(_: any): GetServiceIdentityMetadata { - return {}; + const obj = createBaseGetServiceIdentityMetadata(); + return obj; }, toJSON(_: GetServiceIdentityMetadata): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/source_info.ts b/__fixtures__/v-next/outputv2/google/api/source_info.ts index 6f5e1784e3..b3f6f6624b 100644 --- a/__fixtures__/v-next/outputv2/google/api/source_info.ts +++ b/__fixtures__/v-next/outputv2/google/api/source_info.ts @@ -1,5 +1,5 @@ import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** Source information used to create a Service Config */ @@ -31,14 +31,14 @@ function createBaseSourceInfo(): SourceInfo { } export const SourceInfo = { typeUrl: "/google.api.SourceInfo", - encode(message: SourceInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.sourceFiles) { Any.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceInfo(); while (reader.pos < end) { @@ -55,9 +55,9 @@ export const SourceInfo = { return message; }, fromJSON(object: any): SourceInfo { - return { - sourceFiles: Array.isArray(object?.sourceFiles) ? object.sourceFiles.map((e: any) => Any.fromJSON(e)) : [] - }; + const obj = createBaseSourceInfo(); + if (Array.isArray(object?.sourceFiles)) object.sourceFiles.map((e: any) => Any.fromJSON(e)); + return obj; }, toJSON(message: SourceInfo): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/system_parameter.ts b/__fixtures__/v-next/outputv2/google/api/system_parameter.ts index 2971c08450..1a375b9b66 100644 --- a/__fixtures__/v-next/outputv2/google/api/system_parameter.ts +++ b/__fixtures__/v-next/outputv2/google/api/system_parameter.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -225,14 +225,14 @@ function createBaseSystemParameters(): SystemParameters { } export const SystemParameters = { typeUrl: "/google.api.SystemParameters", - encode(message: SystemParameters, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SystemParameters, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { SystemParameterRule.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SystemParameters { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SystemParameters { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSystemParameters(); while (reader.pos < end) { @@ -249,9 +249,9 @@ export const SystemParameters = { return message; }, fromJSON(object: any): SystemParameters { - return { - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => SystemParameterRule.fromJSON(e)) : [] - }; + const obj = createBaseSystemParameters(); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => SystemParameterRule.fromJSON(e)); + return obj; }, toJSON(message: SystemParameters): unknown { const obj: any = {}; @@ -319,7 +319,7 @@ function createBaseSystemParameterRule(): SystemParameterRule { } export const SystemParameterRule = { typeUrl: "/google.api.SystemParameterRule", - encode(message: SystemParameterRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SystemParameterRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -328,8 +328,8 @@ export const SystemParameterRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SystemParameterRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SystemParameterRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSystemParameterRule(); while (reader.pos < end) { @@ -349,10 +349,10 @@ export const SystemParameterRule = { return message; }, fromJSON(object: any): SystemParameterRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - parameters: Array.isArray(object?.parameters) ? object.parameters.map((e: any) => SystemParameter.fromJSON(e)) : [] - }; + const obj = createBaseSystemParameterRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (Array.isArray(object?.parameters)) object.parameters.map((e: any) => SystemParameter.fromJSON(e)); + return obj; }, toJSON(message: SystemParameterRule): unknown { const obj: any = {}; @@ -427,7 +427,7 @@ function createBaseSystemParameter(): SystemParameter { } export const SystemParameter = { typeUrl: "/google.api.SystemParameter", - encode(message: SystemParameter, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SystemParameter, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -439,8 +439,8 @@ export const SystemParameter = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SystemParameter { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SystemParameter { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSystemParameter(); while (reader.pos < end) { @@ -463,11 +463,11 @@ export const SystemParameter = { return message; }, fromJSON(object: any): SystemParameter { - return { - name: isSet(object.name) ? String(object.name) : "", - httpHeader: isSet(object.httpHeader) ? String(object.httpHeader) : "", - urlQueryParameter: isSet(object.urlQueryParameter) ? String(object.urlQueryParameter) : "" - }; + const obj = createBaseSystemParameter(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.httpHeader)) obj.httpHeader = String(object.httpHeader); + if (isSet(object.urlQueryParameter)) obj.urlQueryParameter = String(object.urlQueryParameter); + return obj; }, toJSON(message: SystemParameter): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/usage.ts b/__fixtures__/v-next/outputv2/google/api/usage.ts index 0d35e52c1f..cc69c2f24e 100644 --- a/__fixtures__/v-next/outputv2/google/api/usage.ts +++ b/__fixtures__/v-next/outputv2/google/api/usage.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.api"; /** Configuration controlling usage of a service. */ @@ -224,7 +224,7 @@ function createBaseUsage(): Usage { } export const Usage = { typeUrl: "/google.api.Usage", - encode(message: Usage, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Usage, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.requirements) { writer.uint32(10).string(v!); } @@ -236,8 +236,8 @@ export const Usage = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Usage { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Usage { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUsage(); while (reader.pos < end) { @@ -260,11 +260,11 @@ export const Usage = { return message; }, fromJSON(object: any): Usage { - return { - requirements: Array.isArray(object?.requirements) ? object.requirements.map((e: any) => String(e)) : [], - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => UsageRule.fromJSON(e)) : [], - producerNotificationChannel: isSet(object.producerNotificationChannel) ? String(object.producerNotificationChannel) : "" - }; + const obj = createBaseUsage(); + if (Array.isArray(object?.requirements)) object.requirements.map((e: any) => String(e)); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => UsageRule.fromJSON(e)); + if (isSet(object.producerNotificationChannel)) obj.producerNotificationChannel = String(object.producerNotificationChannel); + return obj; }, toJSON(message: Usage): unknown { const obj: any = {}; @@ -357,7 +357,7 @@ function createBaseUsageRule(): UsageRule { } export const UsageRule = { typeUrl: "/google.api.UsageRule", - encode(message: UsageRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UsageRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -369,8 +369,8 @@ export const UsageRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UsageRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UsageRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUsageRule(); while (reader.pos < end) { @@ -393,11 +393,11 @@ export const UsageRule = { return message; }, fromJSON(object: any): UsageRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - allowUnregisteredCalls: isSet(object.allowUnregisteredCalls) ? Boolean(object.allowUnregisteredCalls) : false, - skipServiceControl: isSet(object.skipServiceControl) ? Boolean(object.skipServiceControl) : false - }; + const obj = createBaseUsageRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isSet(object.allowUnregisteredCalls)) obj.allowUnregisteredCalls = Boolean(object.allowUnregisteredCalls); + if (isSet(object.skipServiceControl)) obj.skipServiceControl = Boolean(object.skipServiceControl); + return obj; }, toJSON(message: UsageRule): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/api/visibility.ts b/__fixtures__/v-next/outputv2/google/api/visibility.ts index c2ab7671b6..8d0b4ce888 100644 --- a/__fixtures__/v-next/outputv2/google/api/visibility.ts +++ b/__fixtures__/v-next/outputv2/google/api/visibility.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial, isSet } from "../../helpers"; export const protobufPackage = "google.api"; /** @@ -183,14 +183,14 @@ function createBaseVisibility(): Visibility { } export const Visibility = { typeUrl: "/google.api.Visibility", - encode(message: Visibility, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Visibility, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.rules) { VisibilityRule.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Visibility { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Visibility { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVisibility(); while (reader.pos < end) { @@ -207,9 +207,9 @@ export const Visibility = { return message; }, fromJSON(object: any): Visibility { - return { - rules: Array.isArray(object?.rules) ? object.rules.map((e: any) => VisibilityRule.fromJSON(e)) : [] - }; + const obj = createBaseVisibility(); + if (Array.isArray(object?.rules)) object.rules.map((e: any) => VisibilityRule.fromJSON(e)); + return obj; }, toJSON(message: Visibility): unknown { const obj: any = {}; @@ -277,7 +277,7 @@ function createBaseVisibilityRule(): VisibilityRule { } export const VisibilityRule = { typeUrl: "/google.api.VisibilityRule", - encode(message: VisibilityRule, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: VisibilityRule, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.selector !== "") { writer.uint32(10).string(message.selector); } @@ -286,8 +286,8 @@ export const VisibilityRule = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): VisibilityRule { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): VisibilityRule { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVisibilityRule(); while (reader.pos < end) { @@ -307,10 +307,10 @@ export const VisibilityRule = { return message; }, fromJSON(object: any): VisibilityRule { - return { - selector: isSet(object.selector) ? String(object.selector) : "", - restriction: isSet(object.restriction) ? String(object.restriction) : "" - }; + const obj = createBaseVisibilityRule(); + if (isSet(object.selector)) obj.selector = String(object.selector); + if (isSet(object.restriction)) obj.restriction = String(object.restriction); + return obj; }, toJSON(message: VisibilityRule): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/logging/type/http_request.ts b/__fixtures__/v-next/outputv2/google/logging/type/http_request.ts index 2c2d99676c..af1be6b307 100644 --- a/__fixtures__/v-next/outputv2/google/logging/type/http_request.ts +++ b/__fixtures__/v-next/outputv2/google/logging/type/http_request.ts @@ -1,6 +1,6 @@ import { Duration, DurationAmino, DurationSDKType } from "../../protobuf/duration"; -import { Long, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "google.logging.type"; /** * A common proto for logging HTTP requests. Only contains semantics @@ -20,7 +20,7 @@ export interface HttpRequest { * The size of the HTTP request message in bytes, including the request * headers and the request body. */ - requestSize: Long; + requestSize: bigint; /** * The response code indicating the status of response. * Examples: 200, 404. @@ -30,7 +30,7 @@ export interface HttpRequest { * The size of the HTTP response message sent back to the client, in bytes, * including the response headers and the response body. */ - responseSize: Long; + responseSize: bigint; /** * The user agent sent by the client. Example: * `"Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Q312461; .NET @@ -77,7 +77,7 @@ export interface HttpRequest { * The number of HTTP response bytes inserted into cache. Set only when a * cache fill was attempted. */ - cacheFillBytes: Long; + cacheFillBytes: bigint; /** Protocol used for the request. Examples: "HTTP/1.1", "HTTP/2", "websocket" */ protocol: string; } @@ -176,9 +176,9 @@ export interface HttpRequestAminoMsg { export interface HttpRequestSDKType { request_method: string; request_url: string; - request_size: Long; + request_size: bigint; status: number; - response_size: Long; + response_size: bigint; user_agent: string; remote_ip: string; server_ip: string; @@ -187,16 +187,16 @@ export interface HttpRequestSDKType { cache_lookup: boolean; cache_hit: boolean; cache_validated_with_origin_server: boolean; - cache_fill_bytes: Long; + cache_fill_bytes: bigint; protocol: string; } function createBaseHttpRequest(): HttpRequest { return { requestMethod: "", requestUrl: "", - requestSize: Long.ZERO, + requestSize: BigInt(0), status: 0, - responseSize: Long.ZERO, + responseSize: BigInt(0), userAgent: "", remoteIp: "", serverIp: "", @@ -205,26 +205,26 @@ function createBaseHttpRequest(): HttpRequest { cacheLookup: false, cacheHit: false, cacheValidatedWithOriginServer: false, - cacheFillBytes: Long.ZERO, + cacheFillBytes: BigInt(0), protocol: "" }; } export const HttpRequest = { typeUrl: "/google.logging.type.HttpRequest", - encode(message: HttpRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: HttpRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.requestMethod !== "") { writer.uint32(10).string(message.requestMethod); } if (message.requestUrl !== "") { writer.uint32(18).string(message.requestUrl); } - if (!message.requestSize.isZero()) { + if (message.requestSize !== BigInt(0)) { writer.uint32(24).int64(message.requestSize); } if (message.status !== 0) { writer.uint32(32).int32(message.status); } - if (!message.responseSize.isZero()) { + if (message.responseSize !== BigInt(0)) { writer.uint32(40).int64(message.responseSize); } if (message.userAgent !== "") { @@ -251,7 +251,7 @@ export const HttpRequest = { if (message.cacheValidatedWithOriginServer === true) { writer.uint32(80).bool(message.cacheValidatedWithOriginServer); } - if (!message.cacheFillBytes.isZero()) { + if (message.cacheFillBytes !== BigInt(0)) { writer.uint32(96).int64(message.cacheFillBytes); } if (message.protocol !== "") { @@ -259,8 +259,8 @@ export const HttpRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): HttpRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): HttpRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseHttpRequest(); while (reader.pos < end) { @@ -273,13 +273,13 @@ export const HttpRequest = { message.requestUrl = reader.string(); break; case 3: - message.requestSize = (reader.int64() as Long); + message.requestSize = reader.int64(); break; case 4: message.status = reader.int32(); break; case 5: - message.responseSize = (reader.int64() as Long); + message.responseSize = reader.int64(); break; case 6: message.userAgent = reader.string(); @@ -306,7 +306,7 @@ export const HttpRequest = { message.cacheValidatedWithOriginServer = reader.bool(); break; case 12: - message.cacheFillBytes = (reader.int64() as Long); + message.cacheFillBytes = reader.int64(); break; case 15: message.protocol = reader.string(); @@ -319,31 +319,31 @@ export const HttpRequest = { return message; }, fromJSON(object: any): HttpRequest { - return { - requestMethod: isSet(object.requestMethod) ? String(object.requestMethod) : "", - requestUrl: isSet(object.requestUrl) ? String(object.requestUrl) : "", - requestSize: isSet(object.requestSize) ? Long.fromValue(object.requestSize) : Long.ZERO, - status: isSet(object.status) ? Number(object.status) : 0, - responseSize: isSet(object.responseSize) ? Long.fromValue(object.responseSize) : Long.ZERO, - userAgent: isSet(object.userAgent) ? String(object.userAgent) : "", - remoteIp: isSet(object.remoteIp) ? String(object.remoteIp) : "", - serverIp: isSet(object.serverIp) ? String(object.serverIp) : "", - referer: isSet(object.referer) ? String(object.referer) : "", - latency: isSet(object.latency) ? Duration.fromJSON(object.latency) : undefined, - cacheLookup: isSet(object.cacheLookup) ? Boolean(object.cacheLookup) : false, - cacheHit: isSet(object.cacheHit) ? Boolean(object.cacheHit) : false, - cacheValidatedWithOriginServer: isSet(object.cacheValidatedWithOriginServer) ? Boolean(object.cacheValidatedWithOriginServer) : false, - cacheFillBytes: isSet(object.cacheFillBytes) ? Long.fromValue(object.cacheFillBytes) : Long.ZERO, - protocol: isSet(object.protocol) ? String(object.protocol) : "" - }; + const obj = createBaseHttpRequest(); + if (isSet(object.requestMethod)) obj.requestMethod = String(object.requestMethod); + if (isSet(object.requestUrl)) obj.requestUrl = String(object.requestUrl); + if (isSet(object.requestSize)) obj.requestSize = BigInt(object.requestSize.toString()); + if (isSet(object.status)) obj.status = Number(object.status); + if (isSet(object.responseSize)) obj.responseSize = BigInt(object.responseSize.toString()); + if (isSet(object.userAgent)) obj.userAgent = String(object.userAgent); + if (isSet(object.remoteIp)) obj.remoteIp = String(object.remoteIp); + if (isSet(object.serverIp)) obj.serverIp = String(object.serverIp); + if (isSet(object.referer)) obj.referer = String(object.referer); + if (isSet(object.latency)) obj.latency = Duration.fromJSON(object.latency); + if (isSet(object.cacheLookup)) obj.cacheLookup = Boolean(object.cacheLookup); + if (isSet(object.cacheHit)) obj.cacheHit = Boolean(object.cacheHit); + if (isSet(object.cacheValidatedWithOriginServer)) obj.cacheValidatedWithOriginServer = Boolean(object.cacheValidatedWithOriginServer); + if (isSet(object.cacheFillBytes)) obj.cacheFillBytes = BigInt(object.cacheFillBytes.toString()); + if (isSet(object.protocol)) obj.protocol = String(object.protocol); + return obj; }, toJSON(message: HttpRequest): unknown { const obj: any = {}; message.requestMethod !== undefined && (obj.requestMethod = message.requestMethod); message.requestUrl !== undefined && (obj.requestUrl = message.requestUrl); - message.requestSize !== undefined && (obj.requestSize = (message.requestSize || Long.ZERO).toString()); + message.requestSize !== undefined && (obj.requestSize = (message.requestSize || BigInt(0)).toString()); message.status !== undefined && (obj.status = Math.round(message.status)); - message.responseSize !== undefined && (obj.responseSize = (message.responseSize || Long.ZERO).toString()); + message.responseSize !== undefined && (obj.responseSize = (message.responseSize || BigInt(0)).toString()); message.userAgent !== undefined && (obj.userAgent = message.userAgent); message.remoteIp !== undefined && (obj.remoteIp = message.remoteIp); message.serverIp !== undefined && (obj.serverIp = message.serverIp); @@ -352,7 +352,7 @@ export const HttpRequest = { message.cacheLookup !== undefined && (obj.cacheLookup = message.cacheLookup); message.cacheHit !== undefined && (obj.cacheHit = message.cacheHit); message.cacheValidatedWithOriginServer !== undefined && (obj.cacheValidatedWithOriginServer = message.cacheValidatedWithOriginServer); - message.cacheFillBytes !== undefined && (obj.cacheFillBytes = (message.cacheFillBytes || Long.ZERO).toString()); + message.cacheFillBytes !== undefined && (obj.cacheFillBytes = (message.cacheFillBytes || BigInt(0)).toString()); message.protocol !== undefined && (obj.protocol = message.protocol); return obj; }, @@ -360,18 +360,26 @@ export const HttpRequest = { const message = createBaseHttpRequest(); message.requestMethod = object.requestMethod ?? ""; message.requestUrl = object.requestUrl ?? ""; - message.requestSize = object.requestSize !== undefined && object.requestSize !== null ? Long.fromValue(object.requestSize) : Long.ZERO; + if (object.requestSize !== undefined && object.requestSize !== null) { + message.requestSize = BigInt(object.requestSize.toString()); + } message.status = object.status ?? 0; - message.responseSize = object.responseSize !== undefined && object.responseSize !== null ? Long.fromValue(object.responseSize) : Long.ZERO; + if (object.responseSize !== undefined && object.responseSize !== null) { + message.responseSize = BigInt(object.responseSize.toString()); + } message.userAgent = object.userAgent ?? ""; message.remoteIp = object.remoteIp ?? ""; message.serverIp = object.serverIp ?? ""; message.referer = object.referer ?? ""; - message.latency = object.latency !== undefined && object.latency !== null ? Duration.fromPartial(object.latency) : undefined; + if (object.latency !== undefined && object.latency !== null) { + message.latency = Duration.fromPartial(object.latency); + } message.cacheLookup = object.cacheLookup ?? false; message.cacheHit = object.cacheHit ?? false; message.cacheValidatedWithOriginServer = object.cacheValidatedWithOriginServer ?? false; - message.cacheFillBytes = object.cacheFillBytes !== undefined && object.cacheFillBytes !== null ? Long.fromValue(object.cacheFillBytes) : Long.ZERO; + if (object.cacheFillBytes !== undefined && object.cacheFillBytes !== null) { + message.cacheFillBytes = BigInt(object.cacheFillBytes.toString()); + } message.protocol = object.protocol ?? ""; return message; }, @@ -417,9 +425,9 @@ export const HttpRequest = { return { requestMethod: object.request_method, requestUrl: object.request_url, - requestSize: Long.fromString(object.request_size), + requestSize: BigInt(object.request_size), status: object.status, - responseSize: Long.fromString(object.response_size), + responseSize: BigInt(object.response_size), userAgent: object.user_agent, remoteIp: object.remote_ip, serverIp: object.server_ip, @@ -428,7 +436,7 @@ export const HttpRequest = { cacheLookup: object.cache_lookup, cacheHit: object.cache_hit, cacheValidatedWithOriginServer: object.cache_validated_with_origin_server, - cacheFillBytes: Long.fromString(object.cache_fill_bytes), + cacheFillBytes: BigInt(object.cache_fill_bytes), protocol: object.protocol }; }, diff --git a/__fixtures__/v-next/outputv2/google/logging/v2/log_entry.ts b/__fixtures__/v-next/outputv2/google/logging/v2/log_entry.ts index 0cba674d6c..dd5e5171ba 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/log_entry.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/log_entry.ts @@ -4,8 +4,8 @@ import { Struct, StructAmino, StructSDKType } from "../../protobuf/struct"; import { Timestamp } from "../../protobuf/timestamp"; import { LogSeverity, logSeverityFromJSON, logSeverityToJSON } from "../type/log_severity"; import { HttpRequest, HttpRequestAmino, HttpRequestSDKType } from "../type/http_request"; -import { Long, isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../helpers"; export const protobufPackage = "google.logging.v2"; export interface LogEntry_LabelsEntry { key: string; @@ -427,7 +427,7 @@ export interface LogEntrySourceLocation { * Optional. Line within the source file. 1-based; 0 indicates no line number * available. */ - line: Long; + line: bigint; /** * Optional. Human-readable name of the function or method being invoked, with * optional context such as the class or package name. This information may be @@ -477,7 +477,7 @@ export interface LogEntrySourceLocationAminoMsg { */ export interface LogEntrySourceLocationSDKType { file: string; - line: Long; + line: bigint; function: string; } /** @@ -547,7 +547,7 @@ function createBaseLogEntry_LabelsEntry(): LogEntry_LabelsEntry { }; } export const LogEntry_LabelsEntry = { - encode(message: LogEntry_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntry_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -556,8 +556,8 @@ export const LogEntry_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntry_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntry_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntry_LabelsEntry(); while (reader.pos < end) { @@ -577,10 +577,10 @@ export const LogEntry_LabelsEntry = { return message; }, fromJSON(object: any): LogEntry_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseLogEntry_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: LogEntry_LabelsEntry): unknown { const obj: any = {}; @@ -651,7 +651,7 @@ function createBaseLogEntry(): LogEntry { } export const LogEntry = { typeUrl: "/google.logging.v2.LogEntry", - encode(message: LogEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logName !== "") { writer.uint32(98).string(message.logName); } @@ -708,8 +708,8 @@ export const LogEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntry(); while (reader.pos < end) { @@ -777,30 +777,30 @@ export const LogEntry = { return message; }, fromJSON(object: any): LogEntry { - return { - logName: isSet(object.logName) ? String(object.logName) : "", - resource: isSet(object.resource) ? MonitoredResource.fromJSON(object.resource) : undefined, - protoPayload: isSet(object.protoPayload) ? Any.fromJSON(object.protoPayload) : undefined, - textPayload: isSet(object.textPayload) ? String(object.textPayload) : undefined, - jsonPayload: isSet(object.jsonPayload) ? Struct.fromJSON(object.jsonPayload) : undefined, - timestamp: isSet(object.timestamp) ? new Date(object.timestamp) : undefined, - receiveTimestamp: isSet(object.receiveTimestamp) ? new Date(object.receiveTimestamp) : undefined, - severity: isSet(object.severity) ? logSeverityFromJSON(object.severity) : -1, - insertId: isSet(object.insertId) ? String(object.insertId) : "", - httpRequest: isSet(object.httpRequest) ? HttpRequest.fromJSON(object.httpRequest) : undefined, - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - operation: isSet(object.operation) ? LogEntryOperation.fromJSON(object.operation) : undefined, - trace: isSet(object.trace) ? String(object.trace) : "", - spanId: isSet(object.spanId) ? String(object.spanId) : "", - traceSampled: isSet(object.traceSampled) ? Boolean(object.traceSampled) : false, - sourceLocation: isSet(object.sourceLocation) ? LogEntrySourceLocation.fromJSON(object.sourceLocation) : undefined, - split: isSet(object.split) ? LogSplit.fromJSON(object.split) : undefined - }; + const obj = createBaseLogEntry(); + if (isSet(object.logName)) obj.logName = String(object.logName); + if (isSet(object.resource)) obj.resource = MonitoredResource.fromJSON(object.resource); + if (isSet(object.protoPayload)) obj.protoPayload = Any.fromJSON(object.protoPayload); + if (isSet(object.textPayload)) obj.textPayload = String(object.textPayload); + if (isSet(object.jsonPayload)) obj.jsonPayload = Struct.fromJSON(object.jsonPayload); + if (isSet(object.timestamp)) obj.timestamp = new Date(object.timestamp); + if (isSet(object.receiveTimestamp)) obj.receiveTimestamp = new Date(object.receiveTimestamp); + if (isSet(object.severity)) obj.severity = logSeverityFromJSON(object.severity); + if (isSet(object.insertId)) obj.insertId = String(object.insertId); + if (isSet(object.httpRequest)) obj.httpRequest = HttpRequest.fromJSON(object.httpRequest); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (isSet(object.operation)) obj.operation = LogEntryOperation.fromJSON(object.operation); + if (isSet(object.trace)) obj.trace = String(object.trace); + if (isSet(object.spanId)) obj.spanId = String(object.spanId); + if (isSet(object.traceSampled)) obj.traceSampled = Boolean(object.traceSampled); + if (isSet(object.sourceLocation)) obj.sourceLocation = LogEntrySourceLocation.fromJSON(object.sourceLocation); + if (isSet(object.split)) obj.split = LogSplit.fromJSON(object.split); + return obj; }, toJSON(message: LogEntry): unknown { const obj: any = {}; @@ -831,15 +831,23 @@ export const LogEntry = { fromPartial(object: DeepPartial): LogEntry { const message = createBaseLogEntry(); message.logName = object.logName ?? ""; - message.resource = object.resource !== undefined && object.resource !== null ? MonitoredResource.fromPartial(object.resource) : undefined; - message.protoPayload = object.protoPayload !== undefined && object.protoPayload !== null ? Any.fromPartial(object.protoPayload) : undefined; + if (object.resource !== undefined && object.resource !== null) { + message.resource = MonitoredResource.fromPartial(object.resource); + } + if (object.protoPayload !== undefined && object.protoPayload !== null) { + message.protoPayload = Any.fromPartial(object.protoPayload); + } message.textPayload = object.textPayload ?? undefined; - message.jsonPayload = object.jsonPayload !== undefined && object.jsonPayload !== null ? Struct.fromPartial(object.jsonPayload) : undefined; + if (object.jsonPayload !== undefined && object.jsonPayload !== null) { + message.jsonPayload = Struct.fromPartial(object.jsonPayload); + } message.timestamp = object.timestamp ?? undefined; message.receiveTimestamp = object.receiveTimestamp ?? undefined; message.severity = object.severity ?? 0; message.insertId = object.insertId ?? ""; - message.httpRequest = object.httpRequest !== undefined && object.httpRequest !== null ? HttpRequest.fromPartial(object.httpRequest) : undefined; + if (object.httpRequest !== undefined && object.httpRequest !== null) { + message.httpRequest = HttpRequest.fromPartial(object.httpRequest); + } message.labels = Object.entries(object.labels ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -848,12 +856,18 @@ export const LogEntry = { } return acc; }, {}); - message.operation = object.operation !== undefined && object.operation !== null ? LogEntryOperation.fromPartial(object.operation) : undefined; + if (object.operation !== undefined && object.operation !== null) { + message.operation = LogEntryOperation.fromPartial(object.operation); + } message.trace = object.trace ?? ""; message.spanId = object.spanId ?? ""; message.traceSampled = object.traceSampled ?? false; - message.sourceLocation = object.sourceLocation !== undefined && object.sourceLocation !== null ? LogEntrySourceLocation.fromPartial(object.sourceLocation) : undefined; - message.split = object.split !== undefined && object.split !== null ? LogSplit.fromPartial(object.split) : undefined; + if (object.sourceLocation !== undefined && object.sourceLocation !== null) { + message.sourceLocation = LogEntrySourceLocation.fromPartial(object.sourceLocation); + } + if (object.split !== undefined && object.split !== null) { + message.split = LogSplit.fromPartial(object.split); + } return message; }, fromSDK(object: LogEntrySDKType): LogEntry { @@ -986,7 +1000,7 @@ function createBaseLogEntryOperation(): LogEntryOperation { } export const LogEntryOperation = { typeUrl: "/google.logging.v2.LogEntryOperation", - encode(message: LogEntryOperation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntryOperation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.id !== "") { writer.uint32(10).string(message.id); } @@ -1001,8 +1015,8 @@ export const LogEntryOperation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntryOperation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntryOperation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntryOperation(); while (reader.pos < end) { @@ -1028,12 +1042,12 @@ export const LogEntryOperation = { return message; }, fromJSON(object: any): LogEntryOperation { - return { - id: isSet(object.id) ? String(object.id) : "", - producer: isSet(object.producer) ? String(object.producer) : "", - first: isSet(object.first) ? Boolean(object.first) : false, - last: isSet(object.last) ? Boolean(object.last) : false - }; + const obj = createBaseLogEntryOperation(); + if (isSet(object.id)) obj.id = String(object.id); + if (isSet(object.producer)) obj.producer = String(object.producer); + if (isSet(object.first)) obj.first = Boolean(object.first); + if (isSet(object.last)) obj.last = Boolean(object.last); + return obj; }, toJSON(message: LogEntryOperation): unknown { const obj: any = {}; @@ -1102,17 +1116,17 @@ export const LogEntryOperation = { function createBaseLogEntrySourceLocation(): LogEntrySourceLocation { return { file: "", - line: Long.ZERO, + line: BigInt(0), function: "" }; } export const LogEntrySourceLocation = { typeUrl: "/google.logging.v2.LogEntrySourceLocation", - encode(message: LogEntrySourceLocation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogEntrySourceLocation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.file !== "") { writer.uint32(10).string(message.file); } - if (!message.line.isZero()) { + if (message.line !== BigInt(0)) { writer.uint32(16).int64(message.line); } if (message.function !== "") { @@ -1120,8 +1134,8 @@ export const LogEntrySourceLocation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogEntrySourceLocation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogEntrySourceLocation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogEntrySourceLocation(); while (reader.pos < end) { @@ -1131,7 +1145,7 @@ export const LogEntrySourceLocation = { message.file = reader.string(); break; case 2: - message.line = (reader.int64() as Long); + message.line = reader.int64(); break; case 3: message.function = reader.string(); @@ -1144,23 +1158,25 @@ export const LogEntrySourceLocation = { return message; }, fromJSON(object: any): LogEntrySourceLocation { - return { - file: isSet(object.file) ? String(object.file) : "", - line: isSet(object.line) ? Long.fromValue(object.line) : Long.ZERO, - function: isSet(object.function) ? String(object.function) : "" - }; + const obj = createBaseLogEntrySourceLocation(); + if (isSet(object.file)) obj.file = String(object.file); + if (isSet(object.line)) obj.line = BigInt(object.line.toString()); + if (isSet(object.function)) obj.function = String(object.function); + return obj; }, toJSON(message: LogEntrySourceLocation): unknown { const obj: any = {}; message.file !== undefined && (obj.file = message.file); - message.line !== undefined && (obj.line = (message.line || Long.ZERO).toString()); + message.line !== undefined && (obj.line = (message.line || BigInt(0)).toString()); message.function !== undefined && (obj.function = message.function); return obj; }, fromPartial(object: DeepPartial): LogEntrySourceLocation { const message = createBaseLogEntrySourceLocation(); message.file = object.file ?? ""; - message.line = object.line !== undefined && object.line !== null ? Long.fromValue(object.line) : Long.ZERO; + if (object.line !== undefined && object.line !== null) { + message.line = BigInt(object.line.toString()); + } message.function = object.function ?? ""; return message; }, @@ -1181,7 +1197,7 @@ export const LogEntrySourceLocation = { fromAmino(object: LogEntrySourceLocationAmino): LogEntrySourceLocation { return { file: object.file, - line: Long.fromString(object.line), + line: BigInt(object.line), function: object.function }; }, @@ -1217,7 +1233,7 @@ function createBaseLogSplit(): LogSplit { } export const LogSplit = { typeUrl: "/google.logging.v2.LogSplit", - encode(message: LogSplit, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogSplit, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.uid !== "") { writer.uint32(10).string(message.uid); } @@ -1229,8 +1245,8 @@ export const LogSplit = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogSplit { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogSplit { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogSplit(); while (reader.pos < end) { @@ -1253,11 +1269,11 @@ export const LogSplit = { return message; }, fromJSON(object: any): LogSplit { - return { - uid: isSet(object.uid) ? String(object.uid) : "", - index: isSet(object.index) ? Number(object.index) : 0, - totalSplits: isSet(object.totalSplits) ? Number(object.totalSplits) : 0 - }; + const obj = createBaseLogSplit(); + if (isSet(object.uid)) obj.uid = String(object.uid); + if (isSet(object.index)) obj.index = Number(object.index); + if (isSet(object.totalSplits)) obj.totalSplits = Number(object.totalSplits); + return obj; }, toJSON(message: LogSplit): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts b/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts index d2b80afcb1..ffc015aa20 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/logging.ts @@ -2,7 +2,7 @@ import { MonitoredResource, MonitoredResourceAmino, MonitoredResourceSDKType, Mo import { LogEntry, LogEntryAmino, LogEntrySDKType } from "./log_entry"; import { Duration, DurationAmino, DurationSDKType } from "../../protobuf/duration"; import { Status, StatusAmino, StatusSDKType } from "../../rpc/status"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, isObject } from "../../../helpers"; export const protobufPackage = "google.logging.v2"; /** An indicator of why entries were omitted. */ @@ -958,14 +958,14 @@ function createBaseDeleteLogRequest(): DeleteLogRequest { } export const DeleteLogRequest = { typeUrl: "/google.logging.v2.DeleteLogRequest", - encode(message: DeleteLogRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteLogRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logName !== "") { writer.uint32(10).string(message.logName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteLogRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteLogRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteLogRequest(); while (reader.pos < end) { @@ -982,9 +982,9 @@ export const DeleteLogRequest = { return message; }, fromJSON(object: any): DeleteLogRequest { - return { - logName: isSet(object.logName) ? String(object.logName) : "" - }; + const obj = createBaseDeleteLogRequest(); + if (isSet(object.logName)) obj.logName = String(object.logName); + return obj; }, toJSON(message: DeleteLogRequest): unknown { const obj: any = {}; @@ -1039,7 +1039,7 @@ function createBaseWriteLogEntriesRequest_LabelsEntry(): WriteLogEntriesRequest_ }; } export const WriteLogEntriesRequest_LabelsEntry = { - encode(message: WriteLogEntriesRequest_LabelsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WriteLogEntriesRequest_LabelsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -1048,8 +1048,8 @@ export const WriteLogEntriesRequest_LabelsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WriteLogEntriesRequest_LabelsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WriteLogEntriesRequest_LabelsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWriteLogEntriesRequest_LabelsEntry(); while (reader.pos < end) { @@ -1069,10 +1069,10 @@ export const WriteLogEntriesRequest_LabelsEntry = { return message; }, fromJSON(object: any): WriteLogEntriesRequest_LabelsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseWriteLogEntriesRequest_LabelsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: WriteLogEntriesRequest_LabelsEntry): unknown { const obj: any = {}; @@ -1132,7 +1132,7 @@ function createBaseWriteLogEntriesRequest(): WriteLogEntriesRequest { } export const WriteLogEntriesRequest = { typeUrl: "/google.logging.v2.WriteLogEntriesRequest", - encode(message: WriteLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WriteLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.logName !== "") { writer.uint32(10).string(message.logName); } @@ -1156,8 +1156,8 @@ export const WriteLogEntriesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WriteLogEntriesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WriteLogEntriesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWriteLogEntriesRequest(); while (reader.pos < end) { @@ -1192,19 +1192,19 @@ export const WriteLogEntriesRequest = { return message; }, fromJSON(object: any): WriteLogEntriesRequest { - return { - logName: isSet(object.logName) ? String(object.logName) : "", - resource: isSet(object.resource) ? MonitoredResource.fromJSON(object.resource) : undefined, - labels: isObject(object.labels) ? Object.entries(object.labels).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => LogEntry.fromJSON(e)) : [], - partialSuccess: isSet(object.partialSuccess) ? Boolean(object.partialSuccess) : false, - dryRun: isSet(object.dryRun) ? Boolean(object.dryRun) : false - }; + const obj = createBaseWriteLogEntriesRequest(); + if (isSet(object.logName)) obj.logName = String(object.logName); + if (isSet(object.resource)) obj.resource = MonitoredResource.fromJSON(object.resource); + if (isObject(object.labels)) obj.labels = Object.entries(object.labels).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => LogEntry.fromJSON(e)); + if (isSet(object.partialSuccess)) obj.partialSuccess = Boolean(object.partialSuccess); + if (isSet(object.dryRun)) obj.dryRun = Boolean(object.dryRun); + return obj; }, toJSON(message: WriteLogEntriesRequest): unknown { const obj: any = {}; @@ -1228,7 +1228,9 @@ export const WriteLogEntriesRequest = { fromPartial(object: DeepPartial): WriteLogEntriesRequest { const message = createBaseWriteLogEntriesRequest(); message.logName = object.logName ?? ""; - message.resource = object.resource !== undefined && object.resource !== null ? MonitoredResource.fromPartial(object.resource) : undefined; + if (object.resource !== undefined && object.resource !== null) { + message.resource = MonitoredResource.fromPartial(object.resource); + } message.labels = Object.entries(object.labels ?? {}).reduce<{ [key: string]: string; }>((acc, [key, value]) => { @@ -1331,11 +1333,11 @@ function createBaseWriteLogEntriesResponse(): WriteLogEntriesResponse { } export const WriteLogEntriesResponse = { typeUrl: "/google.logging.v2.WriteLogEntriesResponse", - encode(_: WriteLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: WriteLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WriteLogEntriesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WriteLogEntriesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWriteLogEntriesResponse(); while (reader.pos < end) { @@ -1349,7 +1351,8 @@ export const WriteLogEntriesResponse = { return message; }, fromJSON(_: any): WriteLogEntriesResponse { - return {}; + const obj = createBaseWriteLogEntriesResponse(); + return obj; }, toJSON(_: WriteLogEntriesResponse): unknown { const obj: any = {}; @@ -1396,7 +1399,7 @@ function createBaseWriteLogEntriesPartialErrors_LogEntryErrorsEntry(): WriteLogE }; } export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { - encode(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== 0) { writer.uint32(8).int32(message.key); } @@ -1405,8 +1408,8 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWriteLogEntriesPartialErrors_LogEntryErrorsEntry(); while (reader.pos < end) { @@ -1426,10 +1429,10 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { return message; }, fromJSON(object: any): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { - return { - key: isSet(object.key) ? Number(object.key) : 0, - value: isSet(object.value) ? Status.fromJSON(object.value) : undefined - }; + const obj = createBaseWriteLogEntriesPartialErrors_LogEntryErrorsEntry(); + if (isSet(object.key)) obj.key = Number(object.key); + if (isSet(object.value)) obj.value = Status.fromJSON(object.value); + return obj; }, toJSON(message: WriteLogEntriesPartialErrors_LogEntryErrorsEntry): unknown { const obj: any = {}; @@ -1440,7 +1443,9 @@ export const WriteLogEntriesPartialErrors_LogEntryErrorsEntry = { fromPartial(object: DeepPartial): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { const message = createBaseWriteLogEntriesPartialErrors_LogEntryErrorsEntry(); message.key = object.key ?? 0; - message.value = object.value !== undefined && object.value !== null ? Status.fromPartial(object.value) : undefined; + if (object.value !== undefined && object.value !== null) { + message.value = Status.fromPartial(object.value); + } return message; }, fromSDK(object: WriteLogEntriesPartialErrors_LogEntryErrorsEntrySDKType): WriteLogEntriesPartialErrors_LogEntryErrorsEntry { @@ -1484,7 +1489,7 @@ function createBaseWriteLogEntriesPartialErrors(): WriteLogEntriesPartialErrors } export const WriteLogEntriesPartialErrors = { typeUrl: "/google.logging.v2.WriteLogEntriesPartialErrors", - encode(message: WriteLogEntriesPartialErrors, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WriteLogEntriesPartialErrors, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.logEntryErrors).forEach(([key, value]) => { WriteLogEntriesPartialErrors_LogEntryErrorsEntry.encode({ key: (key as any), @@ -1493,8 +1498,8 @@ export const WriteLogEntriesPartialErrors = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WriteLogEntriesPartialErrors { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WriteLogEntriesPartialErrors { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWriteLogEntriesPartialErrors(); while (reader.pos < end) { @@ -1514,14 +1519,14 @@ export const WriteLogEntriesPartialErrors = { return message; }, fromJSON(object: any): WriteLogEntriesPartialErrors { - return { - logEntryErrors: isObject(object.logEntryErrors) ? Object.entries(object.logEntryErrors).reduce<{ - [key: number]: Status; - }>((acc, [key, value]) => { - acc[Number(key)] = Status.fromJSON(value); - return acc; - }, {}) : {} - }; + const obj = createBaseWriteLogEntriesPartialErrors(); + if (isObject(object.logEntryErrors)) obj.logEntryErrors = Object.entries(object.logEntryErrors).reduce<{ + [key: number]: Status; + }>((acc, [key, value]) => { + acc[Number(key)] = Status.fromJSON(value); + return acc; + }, {}); + return obj; }, toJSON(message: WriteLogEntriesPartialErrors): unknown { const obj: any = {}; @@ -1612,7 +1617,7 @@ function createBaseListLogEntriesRequest(): ListLogEntriesRequest { } export const ListLogEntriesRequest = { typeUrl: "/google.logging.v2.ListLogEntriesRequest", - encode(message: ListLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(66).string(v!); } @@ -1630,8 +1635,8 @@ export const ListLogEntriesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListLogEntriesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListLogEntriesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListLogEntriesRequest(); while (reader.pos < end) { @@ -1660,13 +1665,13 @@ export const ListLogEntriesRequest = { return message; }, fromJSON(object: any): ListLogEntriesRequest { - return { - resourceNames: Array.isArray(object?.resourceNames) ? object.resourceNames.map((e: any) => String(e)) : [], - filter: isSet(object.filter) ? String(object.filter) : "", - orderBy: isSet(object.orderBy) ? String(object.orderBy) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "" - }; + const obj = createBaseListLogEntriesRequest(); + if (Array.isArray(object?.resourceNames)) object.resourceNames.map((e: any) => String(e)); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.orderBy)) obj.orderBy = String(object.orderBy); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + return obj; }, toJSON(message: ListLogEntriesRequest): unknown { const obj: any = {}; @@ -1758,7 +1763,7 @@ function createBaseListLogEntriesResponse(): ListLogEntriesResponse { } export const ListLogEntriesResponse = { typeUrl: "/google.logging.v2.ListLogEntriesResponse", - encode(message: ListLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { LogEntry.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1767,8 +1772,8 @@ export const ListLogEntriesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListLogEntriesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListLogEntriesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListLogEntriesResponse(); while (reader.pos < end) { @@ -1788,10 +1793,10 @@ export const ListLogEntriesResponse = { return message; }, fromJSON(object: any): ListLogEntriesResponse { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => LogEntry.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListLogEntriesResponse(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => LogEntry.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListLogEntriesResponse): unknown { const obj: any = {}; @@ -1865,7 +1870,7 @@ function createBaseListMonitoredResourceDescriptorsRequest(): ListMonitoredResou } export const ListMonitoredResourceDescriptorsRequest = { typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsRequest", - encode(message: ListMonitoredResourceDescriptorsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListMonitoredResourceDescriptorsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.pageSize !== 0) { writer.uint32(8).int32(message.pageSize); } @@ -1874,8 +1879,8 @@ export const ListMonitoredResourceDescriptorsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListMonitoredResourceDescriptorsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListMonitoredResourceDescriptorsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListMonitoredResourceDescriptorsRequest(); while (reader.pos < end) { @@ -1895,10 +1900,10 @@ export const ListMonitoredResourceDescriptorsRequest = { return message; }, fromJSON(object: any): ListMonitoredResourceDescriptorsRequest { - return { - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "" - }; + const obj = createBaseListMonitoredResourceDescriptorsRequest(); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + return obj; }, toJSON(message: ListMonitoredResourceDescriptorsRequest): unknown { const obj: any = {}; @@ -1960,7 +1965,7 @@ function createBaseListMonitoredResourceDescriptorsResponse(): ListMonitoredReso } export const ListMonitoredResourceDescriptorsResponse = { typeUrl: "/google.logging.v2.ListMonitoredResourceDescriptorsResponse", - encode(message: ListMonitoredResourceDescriptorsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListMonitoredResourceDescriptorsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceDescriptors) { MonitoredResourceDescriptor.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1969,8 +1974,8 @@ export const ListMonitoredResourceDescriptorsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListMonitoredResourceDescriptorsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListMonitoredResourceDescriptorsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListMonitoredResourceDescriptorsResponse(); while (reader.pos < end) { @@ -1990,10 +1995,10 @@ export const ListMonitoredResourceDescriptorsResponse = { return message; }, fromJSON(object: any): ListMonitoredResourceDescriptorsResponse { - return { - resourceDescriptors: Array.isArray(object?.resourceDescriptors) ? object.resourceDescriptors.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListMonitoredResourceDescriptorsResponse(); + if (Array.isArray(object?.resourceDescriptors)) object.resourceDescriptors.map((e: any) => MonitoredResourceDescriptor.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListMonitoredResourceDescriptorsResponse): unknown { const obj: any = {}; @@ -2069,7 +2074,7 @@ function createBaseListLogsRequest(): ListLogsRequest { } export const ListLogsRequest = { typeUrl: "/google.logging.v2.ListLogsRequest", - encode(message: ListLogsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListLogsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -2084,8 +2089,8 @@ export const ListLogsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListLogsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListLogsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListLogsRequest(); while (reader.pos < end) { @@ -2111,12 +2116,12 @@ export const ListLogsRequest = { return message; }, fromJSON(object: any): ListLogsRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - resourceNames: Array.isArray(object?.resourceNames) ? object.resourceNames.map((e: any) => String(e)) : [] - }; + const obj = createBaseListLogsRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (Array.isArray(object?.resourceNames)) object.resourceNames.map((e: any) => String(e)); + return obj; }, toJSON(message: ListLogsRequest): unknown { const obj: any = {}; @@ -2202,7 +2207,7 @@ function createBaseListLogsResponse(): ListLogsResponse { } export const ListLogsResponse = { typeUrl: "/google.logging.v2.ListLogsResponse", - encode(message: ListLogsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListLogsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.logNames) { writer.uint32(26).string(v!); } @@ -2211,8 +2216,8 @@ export const ListLogsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListLogsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListLogsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListLogsResponse(); while (reader.pos < end) { @@ -2232,10 +2237,10 @@ export const ListLogsResponse = { return message; }, fromJSON(object: any): ListLogsResponse { - return { - logNames: Array.isArray(object?.logNames) ? object.logNames.map((e: any) => String(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListLogsResponse(); + if (Array.isArray(object?.logNames)) object.logNames.map((e: any) => String(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListLogsResponse): unknown { const obj: any = {}; @@ -2310,7 +2315,7 @@ function createBaseTailLogEntriesRequest(): TailLogEntriesRequest { } export const TailLogEntriesRequest = { typeUrl: "/google.logging.v2.TailLogEntriesRequest", - encode(message: TailLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TailLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.resourceNames) { writer.uint32(10).string(v!); } @@ -2322,8 +2327,8 @@ export const TailLogEntriesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TailLogEntriesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TailLogEntriesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTailLogEntriesRequest(); while (reader.pos < end) { @@ -2346,11 +2351,11 @@ export const TailLogEntriesRequest = { return message; }, fromJSON(object: any): TailLogEntriesRequest { - return { - resourceNames: Array.isArray(object?.resourceNames) ? object.resourceNames.map((e: any) => String(e)) : [], - filter: isSet(object.filter) ? String(object.filter) : "", - bufferWindow: isSet(object.bufferWindow) ? Duration.fromJSON(object.bufferWindow) : undefined - }; + const obj = createBaseTailLogEntriesRequest(); + if (Array.isArray(object?.resourceNames)) object.resourceNames.map((e: any) => String(e)); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.bufferWindow)) obj.bufferWindow = Duration.fromJSON(object.bufferWindow); + return obj; }, toJSON(message: TailLogEntriesRequest): unknown { const obj: any = {}; @@ -2367,7 +2372,9 @@ export const TailLogEntriesRequest = { const message = createBaseTailLogEntriesRequest(); message.resourceNames = object.resourceNames?.map(e => e) || []; message.filter = object.filter ?? ""; - message.bufferWindow = object.bufferWindow !== undefined && object.bufferWindow !== null ? Duration.fromPartial(object.bufferWindow) : undefined; + if (object.bufferWindow !== undefined && object.bufferWindow !== null) { + message.bufferWindow = Duration.fromPartial(object.bufferWindow); + } return message; }, fromSDK(object: TailLogEntriesRequestSDKType): TailLogEntriesRequest { @@ -2430,7 +2437,7 @@ function createBaseTailLogEntriesResponse(): TailLogEntriesResponse { } export const TailLogEntriesResponse = { typeUrl: "/google.logging.v2.TailLogEntriesResponse", - encode(message: TailLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TailLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.entries) { LogEntry.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -2439,8 +2446,8 @@ export const TailLogEntriesResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TailLogEntriesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TailLogEntriesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTailLogEntriesResponse(); while (reader.pos < end) { @@ -2460,10 +2467,10 @@ export const TailLogEntriesResponse = { return message; }, fromJSON(object: any): TailLogEntriesResponse { - return { - entries: Array.isArray(object?.entries) ? object.entries.map((e: any) => LogEntry.fromJSON(e)) : [], - suppressionInfo: Array.isArray(object?.suppressionInfo) ? object.suppressionInfo.map((e: any) => TailLogEntriesResponse_SuppressionInfo.fromJSON(e)) : [] - }; + const obj = createBaseTailLogEntriesResponse(); + if (Array.isArray(object?.entries)) object.entries.map((e: any) => LogEntry.fromJSON(e)); + if (Array.isArray(object?.suppressionInfo)) object.suppressionInfo.map((e: any) => TailLogEntriesResponse_SuppressionInfo.fromJSON(e)); + return obj; }, toJSON(message: TailLogEntriesResponse): unknown { const obj: any = {}; @@ -2549,7 +2556,7 @@ function createBaseTailLogEntriesResponse_SuppressionInfo(): TailLogEntriesRespo } export const TailLogEntriesResponse_SuppressionInfo = { typeUrl: "/google.logging.v2.SuppressionInfo", - encode(message: TailLogEntriesResponse_SuppressionInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: TailLogEntriesResponse_SuppressionInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.reason !== 0) { writer.uint32(8).int32(message.reason); } @@ -2558,8 +2565,8 @@ export const TailLogEntriesResponse_SuppressionInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): TailLogEntriesResponse_SuppressionInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): TailLogEntriesResponse_SuppressionInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTailLogEntriesResponse_SuppressionInfo(); while (reader.pos < end) { @@ -2579,10 +2586,10 @@ export const TailLogEntriesResponse_SuppressionInfo = { return message; }, fromJSON(object: any): TailLogEntriesResponse_SuppressionInfo { - return { - reason: isSet(object.reason) ? tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason) : -1, - suppressedCount: isSet(object.suppressedCount) ? Number(object.suppressedCount) : 0 - }; + const obj = createBaseTailLogEntriesResponse_SuppressionInfo(); + if (isSet(object.reason)) obj.reason = tailLogEntriesResponse_SuppressionInfo_ReasonFromJSON(object.reason); + if (isSet(object.suppressedCount)) obj.suppressedCount = Number(object.suppressedCount); + return obj; }, toJSON(message: TailLogEntriesResponse_SuppressionInfo): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/logging/v2/logging_config.ts b/__fixtures__/v-next/outputv2/google/logging/v2/logging_config.ts index 3c8c76570a..99e8461bd8 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/logging_config.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/logging_config.ts @@ -1,7 +1,7 @@ import { FieldMask, FieldMaskAmino, FieldMaskSDKType } from "../../protobuf/field_mask"; import { Timestamp } from "../../protobuf/timestamp"; -import { Long, toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; +import { toTimestamp, fromTimestamp, isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "google.logging.v2"; /** Deprecated. This is unused. */ export enum LogSink_VersionFormat { @@ -3014,7 +3014,7 @@ export interface CopyLogEntriesMetadataSDKType { /** Response type for CopyLogEntries long running operations. */ export interface CopyLogEntriesResponse { /** Number of log entries copied. */ - logEntriesCopiedCount: Long; + logEntriesCopiedCount: bigint; } export interface CopyLogEntriesResponseProtoMsg { typeUrl: "/google.logging.v2.CopyLogEntriesResponse"; @@ -3031,7 +3031,7 @@ export interface CopyLogEntriesResponseAminoMsg { } /** Response type for CopyLogEntries long running operations. */ export interface CopyLogEntriesResponseSDKType { - log_entries_copied_count: Long; + log_entries_copied_count: bigint; } function createBaseLogBucket(): LogBucket { return { @@ -3048,7 +3048,7 @@ function createBaseLogBucket(): LogBucket { } export const LogBucket = { typeUrl: "/google.logging.v2.LogBucket", - encode(message: LogBucket, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogBucket, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3078,8 +3078,8 @@ export const LogBucket = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogBucket { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogBucket { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogBucket(); while (reader.pos < end) { @@ -3120,17 +3120,17 @@ export const LogBucket = { return message; }, fromJSON(object: any): LogBucket { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "", - createTime: isSet(object.createTime) ? new Date(object.createTime) : undefined, - updateTime: isSet(object.updateTime) ? new Date(object.updateTime) : undefined, - retentionDays: isSet(object.retentionDays) ? Number(object.retentionDays) : 0, - locked: isSet(object.locked) ? Boolean(object.locked) : false, - lifecycleState: isSet(object.lifecycleState) ? lifecycleStateFromJSON(object.lifecycleState) : -1, - restrictedFields: Array.isArray(object?.restrictedFields) ? object.restrictedFields.map((e: any) => String(e)) : [], - cmekSettings: isSet(object.cmekSettings) ? CmekSettings.fromJSON(object.cmekSettings) : undefined - }; + const obj = createBaseLogBucket(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.createTime)) obj.createTime = new Date(object.createTime); + if (isSet(object.updateTime)) obj.updateTime = new Date(object.updateTime); + if (isSet(object.retentionDays)) obj.retentionDays = Number(object.retentionDays); + if (isSet(object.locked)) obj.locked = Boolean(object.locked); + if (isSet(object.lifecycleState)) obj.lifecycleState = lifecycleStateFromJSON(object.lifecycleState); + if (Array.isArray(object?.restrictedFields)) object.restrictedFields.map((e: any) => String(e)); + if (isSet(object.cmekSettings)) obj.cmekSettings = CmekSettings.fromJSON(object.cmekSettings); + return obj; }, toJSON(message: LogBucket): unknown { const obj: any = {}; @@ -3159,7 +3159,9 @@ export const LogBucket = { message.locked = object.locked ?? false; message.lifecycleState = object.lifecycleState ?? 0; message.restrictedFields = object.restrictedFields?.map(e => e) || []; - message.cmekSettings = object.cmekSettings !== undefined && object.cmekSettings !== null ? CmekSettings.fromPartial(object.cmekSettings) : undefined; + if (object.cmekSettings !== undefined && object.cmekSettings !== null) { + message.cmekSettings = CmekSettings.fromPartial(object.cmekSettings); + } return message; }, fromSDK(object: LogBucketSDKType): LogBucket { @@ -3249,7 +3251,7 @@ function createBaseLogView(): LogView { } export const LogView = { typeUrl: "/google.logging.v2.LogView", - encode(message: LogView, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogView, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3267,8 +3269,8 @@ export const LogView = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogView { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogView { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogView(); while (reader.pos < end) { @@ -3297,13 +3299,13 @@ export const LogView = { return message; }, fromJSON(object: any): LogView { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "", - createTime: isSet(object.createTime) ? new Date(object.createTime) : undefined, - updateTime: isSet(object.updateTime) ? new Date(object.updateTime) : undefined, - filter: isSet(object.filter) ? String(object.filter) : "" - }; + const obj = createBaseLogView(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.createTime)) obj.createTime = new Date(object.createTime); + if (isSet(object.updateTime)) obj.updateTime = new Date(object.updateTime); + if (isSet(object.filter)) obj.filter = String(object.filter); + return obj; }, toJSON(message: LogView): unknown { const obj: any = {}; @@ -3393,7 +3395,7 @@ function createBaseLogSink(): LogSink { } export const LogSink = { typeUrl: "/google.logging.v2.LogSink", - encode(message: LogSink, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogSink, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3432,8 +3434,8 @@ export const LogSink = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogSink { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogSink { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogSink(); while (reader.pos < end) { @@ -3483,20 +3485,20 @@ export const LogSink = { return message; }, fromJSON(object: any): LogSink { - return { - name: isSet(object.name) ? String(object.name) : "", - destination: isSet(object.destination) ? String(object.destination) : "", - filter: isSet(object.filter) ? String(object.filter) : "", - description: isSet(object.description) ? String(object.description) : "", - disabled: isSet(object.disabled) ? Boolean(object.disabled) : false, - exclusions: Array.isArray(object?.exclusions) ? object.exclusions.map((e: any) => LogExclusion.fromJSON(e)) : [], - outputVersionFormat: isSet(object.outputVersionFormat) ? logSink_VersionFormatFromJSON(object.outputVersionFormat) : -1, - writerIdentity: isSet(object.writerIdentity) ? String(object.writerIdentity) : "", - includeChildren: isSet(object.includeChildren) ? Boolean(object.includeChildren) : false, - bigqueryOptions: isSet(object.bigqueryOptions) ? BigQueryOptions.fromJSON(object.bigqueryOptions) : undefined, - createTime: isSet(object.createTime) ? new Date(object.createTime) : undefined, - updateTime: isSet(object.updateTime) ? new Date(object.updateTime) : undefined - }; + const obj = createBaseLogSink(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.destination)) obj.destination = String(object.destination); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.disabled)) obj.disabled = Boolean(object.disabled); + if (Array.isArray(object?.exclusions)) object.exclusions.map((e: any) => LogExclusion.fromJSON(e)); + if (isSet(object.outputVersionFormat)) obj.outputVersionFormat = logSink_VersionFormatFromJSON(object.outputVersionFormat); + if (isSet(object.writerIdentity)) obj.writerIdentity = String(object.writerIdentity); + if (isSet(object.includeChildren)) obj.includeChildren = Boolean(object.includeChildren); + if (isSet(object.bigqueryOptions)) obj.bigqueryOptions = BigQueryOptions.fromJSON(object.bigqueryOptions); + if (isSet(object.createTime)) obj.createTime = new Date(object.createTime); + if (isSet(object.updateTime)) obj.updateTime = new Date(object.updateTime); + return obj; }, toJSON(message: LogSink): unknown { const obj: any = {}; @@ -3529,7 +3531,9 @@ export const LogSink = { message.outputVersionFormat = object.outputVersionFormat ?? 0; message.writerIdentity = object.writerIdentity ?? ""; message.includeChildren = object.includeChildren ?? false; - message.bigqueryOptions = object.bigqueryOptions !== undefined && object.bigqueryOptions !== null ? BigQueryOptions.fromPartial(object.bigqueryOptions) : undefined; + if (object.bigqueryOptions !== undefined && object.bigqueryOptions !== null) { + message.bigqueryOptions = BigQueryOptions.fromPartial(object.bigqueryOptions); + } message.createTime = object.createTime ?? undefined; message.updateTime = object.updateTime ?? undefined; return message; @@ -3630,7 +3634,7 @@ function createBaseBigQueryOptions(): BigQueryOptions { } export const BigQueryOptions = { typeUrl: "/google.logging.v2.BigQueryOptions", - encode(message: BigQueryOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: BigQueryOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.usePartitionedTables === true) { writer.uint32(8).bool(message.usePartitionedTables); } @@ -3639,8 +3643,8 @@ export const BigQueryOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): BigQueryOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): BigQueryOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseBigQueryOptions(); while (reader.pos < end) { @@ -3660,10 +3664,10 @@ export const BigQueryOptions = { return message; }, fromJSON(object: any): BigQueryOptions { - return { - usePartitionedTables: isSet(object.usePartitionedTables) ? Boolean(object.usePartitionedTables) : false, - usesTimestampColumnPartitioning: isSet(object.usesTimestampColumnPartitioning) ? Boolean(object.usesTimestampColumnPartitioning) : false - }; + const obj = createBaseBigQueryOptions(); + if (isSet(object.usePartitionedTables)) obj.usePartitionedTables = Boolean(object.usePartitionedTables); + if (isSet(object.usesTimestampColumnPartitioning)) obj.usesTimestampColumnPartitioning = Boolean(object.usesTimestampColumnPartitioning); + return obj; }, toJSON(message: BigQueryOptions): unknown { const obj: any = {}; @@ -3726,7 +3730,7 @@ function createBaseListBucketsRequest(): ListBucketsRequest { } export const ListBucketsRequest = { typeUrl: "/google.logging.v2.ListBucketsRequest", - encode(message: ListBucketsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListBucketsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -3738,8 +3742,8 @@ export const ListBucketsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListBucketsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListBucketsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListBucketsRequest(); while (reader.pos < end) { @@ -3762,11 +3766,11 @@ export const ListBucketsRequest = { return message; }, fromJSON(object: any): ListBucketsRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0 - }; + const obj = createBaseListBucketsRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + return obj; }, toJSON(message: ListBucketsRequest): unknown { const obj: any = {}; @@ -3834,7 +3838,7 @@ function createBaseListBucketsResponse(): ListBucketsResponse { } export const ListBucketsResponse = { typeUrl: "/google.logging.v2.ListBucketsResponse", - encode(message: ListBucketsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListBucketsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.buckets) { LogBucket.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -3843,8 +3847,8 @@ export const ListBucketsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListBucketsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListBucketsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListBucketsResponse(); while (reader.pos < end) { @@ -3864,10 +3868,10 @@ export const ListBucketsResponse = { return message; }, fromJSON(object: any): ListBucketsResponse { - return { - buckets: Array.isArray(object?.buckets) ? object.buckets.map((e: any) => LogBucket.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListBucketsResponse(); + if (Array.isArray(object?.buckets)) object.buckets.map((e: any) => LogBucket.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListBucketsResponse): unknown { const obj: any = {}; @@ -3942,7 +3946,7 @@ function createBaseCreateBucketRequest(): CreateBucketRequest { } export const CreateBucketRequest = { typeUrl: "/google.logging.v2.CreateBucketRequest", - encode(message: CreateBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -3954,8 +3958,8 @@ export const CreateBucketRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateBucketRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateBucketRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateBucketRequest(); while (reader.pos < end) { @@ -3978,11 +3982,11 @@ export const CreateBucketRequest = { return message; }, fromJSON(object: any): CreateBucketRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - bucketId: isSet(object.bucketId) ? String(object.bucketId) : "", - bucket: isSet(object.bucket) ? LogBucket.fromJSON(object.bucket) : undefined - }; + const obj = createBaseCreateBucketRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.bucketId)) obj.bucketId = String(object.bucketId); + if (isSet(object.bucket)) obj.bucket = LogBucket.fromJSON(object.bucket); + return obj; }, toJSON(message: CreateBucketRequest): unknown { const obj: any = {}; @@ -3995,7 +3999,9 @@ export const CreateBucketRequest = { const message = createBaseCreateBucketRequest(); message.parent = object.parent ?? ""; message.bucketId = object.bucketId ?? ""; - message.bucket = object.bucket !== undefined && object.bucket !== null ? LogBucket.fromPartial(object.bucket) : undefined; + if (object.bucket !== undefined && object.bucket !== null) { + message.bucket = LogBucket.fromPartial(object.bucket); + } return message; }, fromSDK(object: CreateBucketRequestSDKType): CreateBucketRequest { @@ -4051,7 +4057,7 @@ function createBaseUpdateBucketRequest(): UpdateBucketRequest { } export const UpdateBucketRequest = { typeUrl: "/google.logging.v2.UpdateBucketRequest", - encode(message: UpdateBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -4063,8 +4069,8 @@ export const UpdateBucketRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateBucketRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateBucketRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateBucketRequest(); while (reader.pos < end) { @@ -4087,11 +4093,11 @@ export const UpdateBucketRequest = { return message; }, fromJSON(object: any): UpdateBucketRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - bucket: isSet(object.bucket) ? LogBucket.fromJSON(object.bucket) : undefined, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined - }; + const obj = createBaseUpdateBucketRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.bucket)) obj.bucket = LogBucket.fromJSON(object.bucket); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + return obj; }, toJSON(message: UpdateBucketRequest): unknown { const obj: any = {}; @@ -4103,8 +4109,12 @@ export const UpdateBucketRequest = { fromPartial(object: DeepPartial): UpdateBucketRequest { const message = createBaseUpdateBucketRequest(); message.name = object.name ?? ""; - message.bucket = object.bucket !== undefined && object.bucket !== null ? LogBucket.fromPartial(object.bucket) : undefined; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.bucket !== undefined && object.bucket !== null) { + message.bucket = LogBucket.fromPartial(object.bucket); + } + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } return message; }, fromSDK(object: UpdateBucketRequestSDKType): UpdateBucketRequest { @@ -4158,14 +4168,14 @@ function createBaseGetBucketRequest(): GetBucketRequest { } export const GetBucketRequest = { typeUrl: "/google.logging.v2.GetBucketRequest", - encode(message: GetBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetBucketRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetBucketRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetBucketRequest(); while (reader.pos < end) { @@ -4182,9 +4192,9 @@ export const GetBucketRequest = { return message; }, fromJSON(object: any): GetBucketRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetBucketRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetBucketRequest): unknown { const obj: any = {}; @@ -4239,14 +4249,14 @@ function createBaseDeleteBucketRequest(): DeleteBucketRequest { } export const DeleteBucketRequest = { typeUrl: "/google.logging.v2.DeleteBucketRequest", - encode(message: DeleteBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteBucketRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteBucketRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteBucketRequest(); while (reader.pos < end) { @@ -4263,9 +4273,9 @@ export const DeleteBucketRequest = { return message; }, fromJSON(object: any): DeleteBucketRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseDeleteBucketRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: DeleteBucketRequest): unknown { const obj: any = {}; @@ -4320,14 +4330,14 @@ function createBaseUndeleteBucketRequest(): UndeleteBucketRequest { } export const UndeleteBucketRequest = { typeUrl: "/google.logging.v2.UndeleteBucketRequest", - encode(message: UndeleteBucketRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UndeleteBucketRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UndeleteBucketRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UndeleteBucketRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUndeleteBucketRequest(); while (reader.pos < end) { @@ -4344,9 +4354,9 @@ export const UndeleteBucketRequest = { return message; }, fromJSON(object: any): UndeleteBucketRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseUndeleteBucketRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: UndeleteBucketRequest): unknown { const obj: any = {}; @@ -4403,7 +4413,7 @@ function createBaseListViewsRequest(): ListViewsRequest { } export const ListViewsRequest = { typeUrl: "/google.logging.v2.ListViewsRequest", - encode(message: ListViewsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListViewsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -4415,8 +4425,8 @@ export const ListViewsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListViewsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListViewsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListViewsRequest(); while (reader.pos < end) { @@ -4439,11 +4449,11 @@ export const ListViewsRequest = { return message; }, fromJSON(object: any): ListViewsRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0 - }; + const obj = createBaseListViewsRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + return obj; }, toJSON(message: ListViewsRequest): unknown { const obj: any = {}; @@ -4511,7 +4521,7 @@ function createBaseListViewsResponse(): ListViewsResponse { } export const ListViewsResponse = { typeUrl: "/google.logging.v2.ListViewsResponse", - encode(message: ListViewsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListViewsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.views) { LogView.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -4520,8 +4530,8 @@ export const ListViewsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListViewsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListViewsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListViewsResponse(); while (reader.pos < end) { @@ -4541,10 +4551,10 @@ export const ListViewsResponse = { return message; }, fromJSON(object: any): ListViewsResponse { - return { - views: Array.isArray(object?.views) ? object.views.map((e: any) => LogView.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListViewsResponse(); + if (Array.isArray(object?.views)) object.views.map((e: any) => LogView.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListViewsResponse): unknown { const obj: any = {}; @@ -4619,7 +4629,7 @@ function createBaseCreateViewRequest(): CreateViewRequest { } export const CreateViewRequest = { typeUrl: "/google.logging.v2.CreateViewRequest", - encode(message: CreateViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -4631,8 +4641,8 @@ export const CreateViewRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateViewRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateViewRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateViewRequest(); while (reader.pos < end) { @@ -4655,11 +4665,11 @@ export const CreateViewRequest = { return message; }, fromJSON(object: any): CreateViewRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - viewId: isSet(object.viewId) ? String(object.viewId) : "", - view: isSet(object.view) ? LogView.fromJSON(object.view) : undefined - }; + const obj = createBaseCreateViewRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.viewId)) obj.viewId = String(object.viewId); + if (isSet(object.view)) obj.view = LogView.fromJSON(object.view); + return obj; }, toJSON(message: CreateViewRequest): unknown { const obj: any = {}; @@ -4672,7 +4682,9 @@ export const CreateViewRequest = { const message = createBaseCreateViewRequest(); message.parent = object.parent ?? ""; message.viewId = object.viewId ?? ""; - message.view = object.view !== undefined && object.view !== null ? LogView.fromPartial(object.view) : undefined; + if (object.view !== undefined && object.view !== null) { + message.view = LogView.fromPartial(object.view); + } return message; }, fromSDK(object: CreateViewRequestSDKType): CreateViewRequest { @@ -4728,7 +4740,7 @@ function createBaseUpdateViewRequest(): UpdateViewRequest { } export const UpdateViewRequest = { typeUrl: "/google.logging.v2.UpdateViewRequest", - encode(message: UpdateViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -4740,8 +4752,8 @@ export const UpdateViewRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateViewRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateViewRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateViewRequest(); while (reader.pos < end) { @@ -4764,11 +4776,11 @@ export const UpdateViewRequest = { return message; }, fromJSON(object: any): UpdateViewRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - view: isSet(object.view) ? LogView.fromJSON(object.view) : undefined, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined - }; + const obj = createBaseUpdateViewRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.view)) obj.view = LogView.fromJSON(object.view); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + return obj; }, toJSON(message: UpdateViewRequest): unknown { const obj: any = {}; @@ -4780,8 +4792,12 @@ export const UpdateViewRequest = { fromPartial(object: DeepPartial): UpdateViewRequest { const message = createBaseUpdateViewRequest(); message.name = object.name ?? ""; - message.view = object.view !== undefined && object.view !== null ? LogView.fromPartial(object.view) : undefined; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.view !== undefined && object.view !== null) { + message.view = LogView.fromPartial(object.view); + } + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } return message; }, fromSDK(object: UpdateViewRequestSDKType): UpdateViewRequest { @@ -4835,14 +4851,14 @@ function createBaseGetViewRequest(): GetViewRequest { } export const GetViewRequest = { typeUrl: "/google.logging.v2.GetViewRequest", - encode(message: GetViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetViewRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetViewRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetViewRequest(); while (reader.pos < end) { @@ -4859,9 +4875,9 @@ export const GetViewRequest = { return message; }, fromJSON(object: any): GetViewRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetViewRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetViewRequest): unknown { const obj: any = {}; @@ -4916,14 +4932,14 @@ function createBaseDeleteViewRequest(): DeleteViewRequest { } export const DeleteViewRequest = { typeUrl: "/google.logging.v2.DeleteViewRequest", - encode(message: DeleteViewRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteViewRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteViewRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteViewRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteViewRequest(); while (reader.pos < end) { @@ -4940,9 +4956,9 @@ export const DeleteViewRequest = { return message; }, fromJSON(object: any): DeleteViewRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseDeleteViewRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: DeleteViewRequest): unknown { const obj: any = {}; @@ -4999,7 +5015,7 @@ function createBaseListSinksRequest(): ListSinksRequest { } export const ListSinksRequest = { typeUrl: "/google.logging.v2.ListSinksRequest", - encode(message: ListSinksRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListSinksRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -5011,8 +5027,8 @@ export const ListSinksRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListSinksRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListSinksRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListSinksRequest(); while (reader.pos < end) { @@ -5035,11 +5051,11 @@ export const ListSinksRequest = { return message; }, fromJSON(object: any): ListSinksRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0 - }; + const obj = createBaseListSinksRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + return obj; }, toJSON(message: ListSinksRequest): unknown { const obj: any = {}; @@ -5107,7 +5123,7 @@ function createBaseListSinksResponse(): ListSinksResponse { } export const ListSinksResponse = { typeUrl: "/google.logging.v2.ListSinksResponse", - encode(message: ListSinksResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListSinksResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.sinks) { LogSink.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -5116,8 +5132,8 @@ export const ListSinksResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListSinksResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListSinksResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListSinksResponse(); while (reader.pos < end) { @@ -5137,10 +5153,10 @@ export const ListSinksResponse = { return message; }, fromJSON(object: any): ListSinksResponse { - return { - sinks: Array.isArray(object?.sinks) ? object.sinks.map((e: any) => LogSink.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListSinksResponse(); + if (Array.isArray(object?.sinks)) object.sinks.map((e: any) => LogSink.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListSinksResponse): unknown { const obj: any = {}; @@ -5213,14 +5229,14 @@ function createBaseGetSinkRequest(): GetSinkRequest { } export const GetSinkRequest = { typeUrl: "/google.logging.v2.GetSinkRequest", - encode(message: GetSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sinkName !== "") { writer.uint32(10).string(message.sinkName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetSinkRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetSinkRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetSinkRequest(); while (reader.pos < end) { @@ -5237,9 +5253,9 @@ export const GetSinkRequest = { return message; }, fromJSON(object: any): GetSinkRequest { - return { - sinkName: isSet(object.sinkName) ? String(object.sinkName) : "" - }; + const obj = createBaseGetSinkRequest(); + if (isSet(object.sinkName)) obj.sinkName = String(object.sinkName); + return obj; }, toJSON(message: GetSinkRequest): unknown { const obj: any = {}; @@ -5296,7 +5312,7 @@ function createBaseCreateSinkRequest(): CreateSinkRequest { } export const CreateSinkRequest = { typeUrl: "/google.logging.v2.CreateSinkRequest", - encode(message: CreateSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -5308,8 +5324,8 @@ export const CreateSinkRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateSinkRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateSinkRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateSinkRequest(); while (reader.pos < end) { @@ -5332,11 +5348,11 @@ export const CreateSinkRequest = { return message; }, fromJSON(object: any): CreateSinkRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - sink: isSet(object.sink) ? LogSink.fromJSON(object.sink) : undefined, - uniqueWriterIdentity: isSet(object.uniqueWriterIdentity) ? Boolean(object.uniqueWriterIdentity) : false - }; + const obj = createBaseCreateSinkRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.sink)) obj.sink = LogSink.fromJSON(object.sink); + if (isSet(object.uniqueWriterIdentity)) obj.uniqueWriterIdentity = Boolean(object.uniqueWriterIdentity); + return obj; }, toJSON(message: CreateSinkRequest): unknown { const obj: any = {}; @@ -5348,7 +5364,9 @@ export const CreateSinkRequest = { fromPartial(object: DeepPartial): CreateSinkRequest { const message = createBaseCreateSinkRequest(); message.parent = object.parent ?? ""; - message.sink = object.sink !== undefined && object.sink !== null ? LogSink.fromPartial(object.sink) : undefined; + if (object.sink !== undefined && object.sink !== null) { + message.sink = LogSink.fromPartial(object.sink); + } message.uniqueWriterIdentity = object.uniqueWriterIdentity ?? false; return message; }, @@ -5406,7 +5424,7 @@ function createBaseUpdateSinkRequest(): UpdateSinkRequest { } export const UpdateSinkRequest = { typeUrl: "/google.logging.v2.UpdateSinkRequest", - encode(message: UpdateSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sinkName !== "") { writer.uint32(10).string(message.sinkName); } @@ -5421,8 +5439,8 @@ export const UpdateSinkRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateSinkRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateSinkRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateSinkRequest(); while (reader.pos < end) { @@ -5448,12 +5466,12 @@ export const UpdateSinkRequest = { return message; }, fromJSON(object: any): UpdateSinkRequest { - return { - sinkName: isSet(object.sinkName) ? String(object.sinkName) : "", - sink: isSet(object.sink) ? LogSink.fromJSON(object.sink) : undefined, - uniqueWriterIdentity: isSet(object.uniqueWriterIdentity) ? Boolean(object.uniqueWriterIdentity) : false, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined - }; + const obj = createBaseUpdateSinkRequest(); + if (isSet(object.sinkName)) obj.sinkName = String(object.sinkName); + if (isSet(object.sink)) obj.sink = LogSink.fromJSON(object.sink); + if (isSet(object.uniqueWriterIdentity)) obj.uniqueWriterIdentity = Boolean(object.uniqueWriterIdentity); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + return obj; }, toJSON(message: UpdateSinkRequest): unknown { const obj: any = {}; @@ -5466,9 +5484,13 @@ export const UpdateSinkRequest = { fromPartial(object: DeepPartial): UpdateSinkRequest { const message = createBaseUpdateSinkRequest(); message.sinkName = object.sinkName ?? ""; - message.sink = object.sink !== undefined && object.sink !== null ? LogSink.fromPartial(object.sink) : undefined; + if (object.sink !== undefined && object.sink !== null) { + message.sink = LogSink.fromPartial(object.sink); + } message.uniqueWriterIdentity = object.uniqueWriterIdentity ?? false; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } return message; }, fromSDK(object: UpdateSinkRequestSDKType): UpdateSinkRequest { @@ -5526,14 +5548,14 @@ function createBaseDeleteSinkRequest(): DeleteSinkRequest { } export const DeleteSinkRequest = { typeUrl: "/google.logging.v2.DeleteSinkRequest", - encode(message: DeleteSinkRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteSinkRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.sinkName !== "") { writer.uint32(10).string(message.sinkName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteSinkRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteSinkRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteSinkRequest(); while (reader.pos < end) { @@ -5550,9 +5572,9 @@ export const DeleteSinkRequest = { return message; }, fromJSON(object: any): DeleteSinkRequest { - return { - sinkName: isSet(object.sinkName) ? String(object.sinkName) : "" - }; + const obj = createBaseDeleteSinkRequest(); + if (isSet(object.sinkName)) obj.sinkName = String(object.sinkName); + return obj; }, toJSON(message: DeleteSinkRequest): unknown { const obj: any = {}; @@ -5612,7 +5634,7 @@ function createBaseLogExclusion(): LogExclusion { } export const LogExclusion = { typeUrl: "/google.logging.v2.LogExclusion", - encode(message: LogExclusion, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogExclusion, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -5633,8 +5655,8 @@ export const LogExclusion = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogExclusion { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogExclusion { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogExclusion(); while (reader.pos < end) { @@ -5666,14 +5688,14 @@ export const LogExclusion = { return message; }, fromJSON(object: any): LogExclusion { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "", - filter: isSet(object.filter) ? String(object.filter) : "", - disabled: isSet(object.disabled) ? Boolean(object.disabled) : false, - createTime: isSet(object.createTime) ? new Date(object.createTime) : undefined, - updateTime: isSet(object.updateTime) ? new Date(object.updateTime) : undefined - }; + const obj = createBaseLogExclusion(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.disabled)) obj.disabled = Boolean(object.disabled); + if (isSet(object.createTime)) obj.createTime = new Date(object.createTime); + if (isSet(object.updateTime)) obj.updateTime = new Date(object.updateTime); + return obj; }, toJSON(message: LogExclusion): unknown { const obj: any = {}; @@ -5760,7 +5782,7 @@ function createBaseListExclusionsRequest(): ListExclusionsRequest { } export const ListExclusionsRequest = { typeUrl: "/google.logging.v2.ListExclusionsRequest", - encode(message: ListExclusionsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListExclusionsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -5772,8 +5794,8 @@ export const ListExclusionsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListExclusionsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListExclusionsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListExclusionsRequest(); while (reader.pos < end) { @@ -5796,11 +5818,11 @@ export const ListExclusionsRequest = { return message; }, fromJSON(object: any): ListExclusionsRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0 - }; + const obj = createBaseListExclusionsRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + return obj; }, toJSON(message: ListExclusionsRequest): unknown { const obj: any = {}; @@ -5868,7 +5890,7 @@ function createBaseListExclusionsResponse(): ListExclusionsResponse { } export const ListExclusionsResponse = { typeUrl: "/google.logging.v2.ListExclusionsResponse", - encode(message: ListExclusionsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListExclusionsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.exclusions) { LogExclusion.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -5877,8 +5899,8 @@ export const ListExclusionsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListExclusionsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListExclusionsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListExclusionsResponse(); while (reader.pos < end) { @@ -5898,10 +5920,10 @@ export const ListExclusionsResponse = { return message; }, fromJSON(object: any): ListExclusionsResponse { - return { - exclusions: Array.isArray(object?.exclusions) ? object.exclusions.map((e: any) => LogExclusion.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListExclusionsResponse(); + if (Array.isArray(object?.exclusions)) object.exclusions.map((e: any) => LogExclusion.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListExclusionsResponse): unknown { const obj: any = {}; @@ -5974,14 +5996,14 @@ function createBaseGetExclusionRequest(): GetExclusionRequest { } export const GetExclusionRequest = { typeUrl: "/google.logging.v2.GetExclusionRequest", - encode(message: GetExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetExclusionRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetExclusionRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetExclusionRequest(); while (reader.pos < end) { @@ -5998,9 +6020,9 @@ export const GetExclusionRequest = { return message; }, fromJSON(object: any): GetExclusionRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetExclusionRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetExclusionRequest): unknown { const obj: any = {}; @@ -6056,7 +6078,7 @@ function createBaseCreateExclusionRequest(): CreateExclusionRequest { } export const CreateExclusionRequest = { typeUrl: "/google.logging.v2.CreateExclusionRequest", - encode(message: CreateExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -6065,8 +6087,8 @@ export const CreateExclusionRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateExclusionRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateExclusionRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateExclusionRequest(); while (reader.pos < end) { @@ -6086,10 +6108,10 @@ export const CreateExclusionRequest = { return message; }, fromJSON(object: any): CreateExclusionRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - exclusion: isSet(object.exclusion) ? LogExclusion.fromJSON(object.exclusion) : undefined - }; + const obj = createBaseCreateExclusionRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.exclusion)) obj.exclusion = LogExclusion.fromJSON(object.exclusion); + return obj; }, toJSON(message: CreateExclusionRequest): unknown { const obj: any = {}; @@ -6100,7 +6122,9 @@ export const CreateExclusionRequest = { fromPartial(object: DeepPartial): CreateExclusionRequest { const message = createBaseCreateExclusionRequest(); message.parent = object.parent ?? ""; - message.exclusion = object.exclusion !== undefined && object.exclusion !== null ? LogExclusion.fromPartial(object.exclusion) : undefined; + if (object.exclusion !== undefined && object.exclusion !== null) { + message.exclusion = LogExclusion.fromPartial(object.exclusion); + } return message; }, fromSDK(object: CreateExclusionRequestSDKType): CreateExclusionRequest { @@ -6152,7 +6176,7 @@ function createBaseUpdateExclusionRequest(): UpdateExclusionRequest { } export const UpdateExclusionRequest = { typeUrl: "/google.logging.v2.UpdateExclusionRequest", - encode(message: UpdateExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -6164,8 +6188,8 @@ export const UpdateExclusionRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateExclusionRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateExclusionRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateExclusionRequest(); while (reader.pos < end) { @@ -6188,11 +6212,11 @@ export const UpdateExclusionRequest = { return message; }, fromJSON(object: any): UpdateExclusionRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - exclusion: isSet(object.exclusion) ? LogExclusion.fromJSON(object.exclusion) : undefined, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined - }; + const obj = createBaseUpdateExclusionRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.exclusion)) obj.exclusion = LogExclusion.fromJSON(object.exclusion); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + return obj; }, toJSON(message: UpdateExclusionRequest): unknown { const obj: any = {}; @@ -6204,8 +6228,12 @@ export const UpdateExclusionRequest = { fromPartial(object: DeepPartial): UpdateExclusionRequest { const message = createBaseUpdateExclusionRequest(); message.name = object.name ?? ""; - message.exclusion = object.exclusion !== undefined && object.exclusion !== null ? LogExclusion.fromPartial(object.exclusion) : undefined; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.exclusion !== undefined && object.exclusion !== null) { + message.exclusion = LogExclusion.fromPartial(object.exclusion); + } + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } return message; }, fromSDK(object: UpdateExclusionRequestSDKType): UpdateExclusionRequest { @@ -6259,14 +6287,14 @@ function createBaseDeleteExclusionRequest(): DeleteExclusionRequest { } export const DeleteExclusionRequest = { typeUrl: "/google.logging.v2.DeleteExclusionRequest", - encode(message: DeleteExclusionRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteExclusionRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteExclusionRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteExclusionRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteExclusionRequest(); while (reader.pos < end) { @@ -6283,9 +6311,9 @@ export const DeleteExclusionRequest = { return message; }, fromJSON(object: any): DeleteExclusionRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseDeleteExclusionRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: DeleteExclusionRequest): unknown { const obj: any = {}; @@ -6340,14 +6368,14 @@ function createBaseGetCmekSettingsRequest(): GetCmekSettingsRequest { } export const GetCmekSettingsRequest = { typeUrl: "/google.logging.v2.GetCmekSettingsRequest", - encode(message: GetCmekSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetCmekSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetCmekSettingsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetCmekSettingsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetCmekSettingsRequest(); while (reader.pos < end) { @@ -6364,9 +6392,9 @@ export const GetCmekSettingsRequest = { return message; }, fromJSON(object: any): GetCmekSettingsRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetCmekSettingsRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetCmekSettingsRequest): unknown { const obj: any = {}; @@ -6423,7 +6451,7 @@ function createBaseUpdateCmekSettingsRequest(): UpdateCmekSettingsRequest { } export const UpdateCmekSettingsRequest = { typeUrl: "/google.logging.v2.UpdateCmekSettingsRequest", - encode(message: UpdateCmekSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateCmekSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -6435,8 +6463,8 @@ export const UpdateCmekSettingsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateCmekSettingsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateCmekSettingsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateCmekSettingsRequest(); while (reader.pos < end) { @@ -6459,11 +6487,11 @@ export const UpdateCmekSettingsRequest = { return message; }, fromJSON(object: any): UpdateCmekSettingsRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - cmekSettings: isSet(object.cmekSettings) ? CmekSettings.fromJSON(object.cmekSettings) : undefined, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined - }; + const obj = createBaseUpdateCmekSettingsRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.cmekSettings)) obj.cmekSettings = CmekSettings.fromJSON(object.cmekSettings); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + return obj; }, toJSON(message: UpdateCmekSettingsRequest): unknown { const obj: any = {}; @@ -6475,8 +6503,12 @@ export const UpdateCmekSettingsRequest = { fromPartial(object: DeepPartial): UpdateCmekSettingsRequest { const message = createBaseUpdateCmekSettingsRequest(); message.name = object.name ?? ""; - message.cmekSettings = object.cmekSettings !== undefined && object.cmekSettings !== null ? CmekSettings.fromPartial(object.cmekSettings) : undefined; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.cmekSettings !== undefined && object.cmekSettings !== null) { + message.cmekSettings = CmekSettings.fromPartial(object.cmekSettings); + } + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } return message; }, fromSDK(object: UpdateCmekSettingsRequestSDKType): UpdateCmekSettingsRequest { @@ -6532,7 +6564,7 @@ function createBaseCmekSettings(): CmekSettings { } export const CmekSettings = { typeUrl: "/google.logging.v2.CmekSettings", - encode(message: CmekSettings, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CmekSettings, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -6544,8 +6576,8 @@ export const CmekSettings = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CmekSettings { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CmekSettings { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCmekSettings(); while (reader.pos < end) { @@ -6568,11 +6600,11 @@ export const CmekSettings = { return message; }, fromJSON(object: any): CmekSettings { - return { - name: isSet(object.name) ? String(object.name) : "", - kmsKeyName: isSet(object.kmsKeyName) ? String(object.kmsKeyName) : "", - serviceAccountId: isSet(object.serviceAccountId) ? String(object.serviceAccountId) : "" - }; + const obj = createBaseCmekSettings(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.kmsKeyName)) obj.kmsKeyName = String(object.kmsKeyName); + if (isSet(object.serviceAccountId)) obj.serviceAccountId = String(object.serviceAccountId); + return obj; }, toJSON(message: CmekSettings): unknown { const obj: any = {}; @@ -6639,14 +6671,14 @@ function createBaseGetSettingsRequest(): GetSettingsRequest { } export const GetSettingsRequest = { typeUrl: "/google.logging.v2.GetSettingsRequest", - encode(message: GetSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetSettingsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetSettingsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetSettingsRequest(); while (reader.pos < end) { @@ -6663,9 +6695,9 @@ export const GetSettingsRequest = { return message; }, fromJSON(object: any): GetSettingsRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetSettingsRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetSettingsRequest): unknown { const obj: any = {}; @@ -6722,7 +6754,7 @@ function createBaseUpdateSettingsRequest(): UpdateSettingsRequest { } export const UpdateSettingsRequest = { typeUrl: "/google.logging.v2.UpdateSettingsRequest", - encode(message: UpdateSettingsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateSettingsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -6734,8 +6766,8 @@ export const UpdateSettingsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateSettingsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateSettingsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateSettingsRequest(); while (reader.pos < end) { @@ -6758,11 +6790,11 @@ export const UpdateSettingsRequest = { return message; }, fromJSON(object: any): UpdateSettingsRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - settings: isSet(object.settings) ? Settings.fromJSON(object.settings) : undefined, - updateMask: isSet(object.updateMask) ? FieldMask.fromJSON(object.updateMask) : undefined - }; + const obj = createBaseUpdateSettingsRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.settings)) obj.settings = Settings.fromJSON(object.settings); + if (isSet(object.updateMask)) obj.updateMask = FieldMask.fromJSON(object.updateMask); + return obj; }, toJSON(message: UpdateSettingsRequest): unknown { const obj: any = {}; @@ -6774,8 +6806,12 @@ export const UpdateSettingsRequest = { fromPartial(object: DeepPartial): UpdateSettingsRequest { const message = createBaseUpdateSettingsRequest(); message.name = object.name ?? ""; - message.settings = object.settings !== undefined && object.settings !== null ? Settings.fromPartial(object.settings) : undefined; - message.updateMask = object.updateMask !== undefined && object.updateMask !== null ? FieldMask.fromPartial(object.updateMask) : undefined; + if (object.settings !== undefined && object.settings !== null) { + message.settings = Settings.fromPartial(object.settings); + } + if (object.updateMask !== undefined && object.updateMask !== null) { + message.updateMask = FieldMask.fromPartial(object.updateMask); + } return message; }, fromSDK(object: UpdateSettingsRequestSDKType): UpdateSettingsRequest { @@ -6833,7 +6869,7 @@ function createBaseSettings(): Settings { } export const Settings = { typeUrl: "/google.logging.v2.Settings", - encode(message: Settings, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Settings, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -6851,8 +6887,8 @@ export const Settings = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Settings { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Settings { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSettings(); while (reader.pos < end) { @@ -6881,13 +6917,13 @@ export const Settings = { return message; }, fromJSON(object: any): Settings { - return { - name: isSet(object.name) ? String(object.name) : "", - kmsKeyName: isSet(object.kmsKeyName) ? String(object.kmsKeyName) : "", - kmsServiceAccountId: isSet(object.kmsServiceAccountId) ? String(object.kmsServiceAccountId) : "", - storageLocation: isSet(object.storageLocation) ? String(object.storageLocation) : "", - disableDefaultSink: isSet(object.disableDefaultSink) ? Boolean(object.disableDefaultSink) : false - }; + const obj = createBaseSettings(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.kmsKeyName)) obj.kmsKeyName = String(object.kmsKeyName); + if (isSet(object.kmsServiceAccountId)) obj.kmsServiceAccountId = String(object.kmsServiceAccountId); + if (isSet(object.storageLocation)) obj.storageLocation = String(object.storageLocation); + if (isSet(object.disableDefaultSink)) obj.disableDefaultSink = Boolean(object.disableDefaultSink); + return obj; }, toJSON(message: Settings): unknown { const obj: any = {}; @@ -6968,7 +7004,7 @@ function createBaseCopyLogEntriesRequest(): CopyLogEntriesRequest { } export const CopyLogEntriesRequest = { typeUrl: "/google.logging.v2.CopyLogEntriesRequest", - encode(message: CopyLogEntriesRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CopyLogEntriesRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -6980,8 +7016,8 @@ export const CopyLogEntriesRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CopyLogEntriesRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CopyLogEntriesRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCopyLogEntriesRequest(); while (reader.pos < end) { @@ -7004,11 +7040,11 @@ export const CopyLogEntriesRequest = { return message; }, fromJSON(object: any): CopyLogEntriesRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - filter: isSet(object.filter) ? String(object.filter) : "", - destination: isSet(object.destination) ? String(object.destination) : "" - }; + const obj = createBaseCopyLogEntriesRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.destination)) obj.destination = String(object.destination); + return obj; }, toJSON(message: CopyLogEntriesRequest): unknown { const obj: any = {}; @@ -7081,7 +7117,7 @@ function createBaseCopyLogEntriesMetadata(): CopyLogEntriesMetadata { } export const CopyLogEntriesMetadata = { typeUrl: "/google.logging.v2.CopyLogEntriesMetadata", - encode(message: CopyLogEntriesMetadata, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CopyLogEntriesMetadata, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.startTime !== undefined) { Timestamp.encode(toTimestamp(message.startTime), writer.uint32(10).fork()).ldelim(); } @@ -7105,8 +7141,8 @@ export const CopyLogEntriesMetadata = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CopyLogEntriesMetadata { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CopyLogEntriesMetadata { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCopyLogEntriesMetadata(); while (reader.pos < end) { @@ -7141,15 +7177,15 @@ export const CopyLogEntriesMetadata = { return message; }, fromJSON(object: any): CopyLogEntriesMetadata { - return { - startTime: isSet(object.startTime) ? new Date(object.startTime) : undefined, - endTime: isSet(object.endTime) ? new Date(object.endTime) : undefined, - state: isSet(object.state) ? operationStateFromJSON(object.state) : -1, - cancellationRequested: isSet(object.cancellationRequested) ? Boolean(object.cancellationRequested) : false, - request: isSet(object.request) ? CopyLogEntriesRequest.fromJSON(object.request) : undefined, - progress: isSet(object.progress) ? Number(object.progress) : 0, - writerIdentity: isSet(object.writerIdentity) ? String(object.writerIdentity) : "" - }; + const obj = createBaseCopyLogEntriesMetadata(); + if (isSet(object.startTime)) obj.startTime = new Date(object.startTime); + if (isSet(object.endTime)) obj.endTime = new Date(object.endTime); + if (isSet(object.state)) obj.state = operationStateFromJSON(object.state); + if (isSet(object.cancellationRequested)) obj.cancellationRequested = Boolean(object.cancellationRequested); + if (isSet(object.request)) obj.request = CopyLogEntriesRequest.fromJSON(object.request); + if (isSet(object.progress)) obj.progress = Number(object.progress); + if (isSet(object.writerIdentity)) obj.writerIdentity = String(object.writerIdentity); + return obj; }, toJSON(message: CopyLogEntriesMetadata): unknown { const obj: any = {}; @@ -7168,7 +7204,9 @@ export const CopyLogEntriesMetadata = { message.endTime = object.endTime ?? undefined; message.state = object.state ?? 0; message.cancellationRequested = object.cancellationRequested ?? false; - message.request = object.request !== undefined && object.request !== null ? CopyLogEntriesRequest.fromPartial(object.request) : undefined; + if (object.request !== undefined && object.request !== null) { + message.request = CopyLogEntriesRequest.fromPartial(object.request); + } message.progress = object.progress ?? 0; message.writerIdentity = object.writerIdentity ?? ""; return message; @@ -7235,26 +7273,26 @@ export const CopyLogEntriesMetadata = { }; function createBaseCopyLogEntriesResponse(): CopyLogEntriesResponse { return { - logEntriesCopiedCount: Long.ZERO + logEntriesCopiedCount: BigInt(0) }; } export const CopyLogEntriesResponse = { typeUrl: "/google.logging.v2.CopyLogEntriesResponse", - encode(message: CopyLogEntriesResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.logEntriesCopiedCount.isZero()) { + encode(message: CopyLogEntriesResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.logEntriesCopiedCount !== BigInt(0)) { writer.uint32(8).int64(message.logEntriesCopiedCount); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CopyLogEntriesResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CopyLogEntriesResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCopyLogEntriesResponse(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.logEntriesCopiedCount = (reader.int64() as Long); + message.logEntriesCopiedCount = reader.int64(); break; default: reader.skipType(tag & 7); @@ -7264,18 +7302,20 @@ export const CopyLogEntriesResponse = { return message; }, fromJSON(object: any): CopyLogEntriesResponse { - return { - logEntriesCopiedCount: isSet(object.logEntriesCopiedCount) ? Long.fromValue(object.logEntriesCopiedCount) : Long.ZERO - }; + const obj = createBaseCopyLogEntriesResponse(); + if (isSet(object.logEntriesCopiedCount)) obj.logEntriesCopiedCount = BigInt(object.logEntriesCopiedCount.toString()); + return obj; }, toJSON(message: CopyLogEntriesResponse): unknown { const obj: any = {}; - message.logEntriesCopiedCount !== undefined && (obj.logEntriesCopiedCount = (message.logEntriesCopiedCount || Long.ZERO).toString()); + message.logEntriesCopiedCount !== undefined && (obj.logEntriesCopiedCount = (message.logEntriesCopiedCount || BigInt(0)).toString()); return obj; }, fromPartial(object: DeepPartial): CopyLogEntriesResponse { const message = createBaseCopyLogEntriesResponse(); - message.logEntriesCopiedCount = object.logEntriesCopiedCount !== undefined && object.logEntriesCopiedCount !== null ? Long.fromValue(object.logEntriesCopiedCount) : Long.ZERO; + if (object.logEntriesCopiedCount !== undefined && object.logEntriesCopiedCount !== null) { + message.logEntriesCopiedCount = BigInt(object.logEntriesCopiedCount.toString()); + } return message; }, fromSDK(object: CopyLogEntriesResponseSDKType): CopyLogEntriesResponse { @@ -7290,7 +7330,7 @@ export const CopyLogEntriesResponse = { }, fromAmino(object: CopyLogEntriesResponseAmino): CopyLogEntriesResponse { return { - logEntriesCopiedCount: Long.fromString(object.log_entries_copied_count) + logEntriesCopiedCount: BigInt(object.log_entries_copied_count) }; }, toAmino(message: CopyLogEntriesResponse): CopyLogEntriesResponseAmino { diff --git a/__fixtures__/v-next/outputv2/google/logging/v2/logging_metrics.ts b/__fixtures__/v-next/outputv2/google/logging/v2/logging_metrics.ts index 7aaba5f5c1..5746150b32 100644 --- a/__fixtures__/v-next/outputv2/google/logging/v2/logging_metrics.ts +++ b/__fixtures__/v-next/outputv2/google/logging/v2/logging_metrics.ts @@ -1,7 +1,7 @@ import { MetricDescriptor, MetricDescriptorAmino, MetricDescriptorSDKType } from "../../api/metric"; import { Distribution_BucketOptions } from "../../api/distribution"; import { Timestamp } from "../../protobuf/timestamp"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial, toTimestamp, fromTimestamp, isObject } from "../../../helpers"; export const protobufPackage = "google.logging.v2"; /** Logging API version. */ @@ -612,7 +612,7 @@ function createBaseLogMetric_LabelExtractorsEntry(): LogMetric_LabelExtractorsEn }; } export const LogMetric_LabelExtractorsEntry = { - encode(message: LogMetric_LabelExtractorsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogMetric_LabelExtractorsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -621,8 +621,8 @@ export const LogMetric_LabelExtractorsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogMetric_LabelExtractorsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogMetric_LabelExtractorsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogMetric_LabelExtractorsEntry(); while (reader.pos < end) { @@ -642,10 +642,10 @@ export const LogMetric_LabelExtractorsEntry = { return message; }, fromJSON(object: any): LogMetric_LabelExtractorsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? String(object.value) : "" - }; + const obj = createBaseLogMetric_LabelExtractorsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = String(object.value); + return obj; }, toJSON(message: LogMetric_LabelExtractorsEntry): unknown { const obj: any = {}; @@ -710,7 +710,7 @@ function createBaseLogMetric(): LogMetric { } export const LogMetric = { typeUrl: "/google.logging.v2.LogMetric", - encode(message: LogMetric, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: LogMetric, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -749,8 +749,8 @@ export const LogMetric = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): LogMetric { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): LogMetric { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseLogMetric(); while (reader.pos < end) { @@ -800,24 +800,24 @@ export const LogMetric = { return message; }, fromJSON(object: any): LogMetric { - return { - name: isSet(object.name) ? String(object.name) : "", - description: isSet(object.description) ? String(object.description) : "", - filter: isSet(object.filter) ? String(object.filter) : "", - disabled: isSet(object.disabled) ? Boolean(object.disabled) : false, - metricDescriptor: isSet(object.metricDescriptor) ? MetricDescriptor.fromJSON(object.metricDescriptor) : undefined, - valueExtractor: isSet(object.valueExtractor) ? String(object.valueExtractor) : "", - labelExtractors: isObject(object.labelExtractors) ? Object.entries(object.labelExtractors).reduce<{ - [key: string]: string; - }>((acc, [key, value]) => { - acc[key] = String(value); - return acc; - }, {}) : {}, - bucketOptions: isSet(object.bucketOptions) ? Distribution_BucketOptions.fromJSON(object.bucketOptions) : undefined, - createTime: isSet(object.createTime) ? new Date(object.createTime) : undefined, - updateTime: isSet(object.updateTime) ? new Date(object.updateTime) : undefined, - version: isSet(object.version) ? logMetric_ApiVersionFromJSON(object.version) : -1 - }; + const obj = createBaseLogMetric(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.description)) obj.description = String(object.description); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.disabled)) obj.disabled = Boolean(object.disabled); + if (isSet(object.metricDescriptor)) obj.metricDescriptor = MetricDescriptor.fromJSON(object.metricDescriptor); + if (isSet(object.valueExtractor)) obj.valueExtractor = String(object.valueExtractor); + if (isObject(object.labelExtractors)) obj.labelExtractors = Object.entries(object.labelExtractors).reduce<{ + [key: string]: string; + }>((acc, [key, value]) => { + acc[key] = String(value); + return acc; + }, {}); + if (isSet(object.bucketOptions)) obj.bucketOptions = Distribution_BucketOptions.fromJSON(object.bucketOptions); + if (isSet(object.createTime)) obj.createTime = new Date(object.createTime); + if (isSet(object.updateTime)) obj.updateTime = new Date(object.updateTime); + if (isSet(object.version)) obj.version = logMetric_ApiVersionFromJSON(object.version); + return obj; }, toJSON(message: LogMetric): unknown { const obj: any = {}; @@ -845,7 +845,9 @@ export const LogMetric = { message.description = object.description ?? ""; message.filter = object.filter ?? ""; message.disabled = object.disabled ?? false; - message.metricDescriptor = object.metricDescriptor !== undefined && object.metricDescriptor !== null ? MetricDescriptor.fromPartial(object.metricDescriptor) : undefined; + if (object.metricDescriptor !== undefined && object.metricDescriptor !== null) { + message.metricDescriptor = MetricDescriptor.fromPartial(object.metricDescriptor); + } message.valueExtractor = object.valueExtractor ?? ""; message.labelExtractors = Object.entries(object.labelExtractors ?? {}).reduce<{ [key: string]: string; @@ -855,7 +857,9 @@ export const LogMetric = { } return acc; }, {}); - message.bucketOptions = object.bucketOptions !== undefined && object.bucketOptions !== null ? Distribution_BucketOptions.fromPartial(object.bucketOptions) : undefined; + if (object.bucketOptions !== undefined && object.bucketOptions !== null) { + message.bucketOptions = Distribution_BucketOptions.fromPartial(object.bucketOptions); + } message.createTime = object.createTime ?? undefined; message.updateTime = object.updateTime ?? undefined; message.version = object.version ?? 0; @@ -966,7 +970,7 @@ function createBaseListLogMetricsRequest(): ListLogMetricsRequest { } export const ListLogMetricsRequest = { typeUrl: "/google.logging.v2.ListLogMetricsRequest", - encode(message: ListLogMetricsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListLogMetricsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -978,8 +982,8 @@ export const ListLogMetricsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListLogMetricsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListLogMetricsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListLogMetricsRequest(); while (reader.pos < end) { @@ -1002,11 +1006,11 @@ export const ListLogMetricsRequest = { return message; }, fromJSON(object: any): ListLogMetricsRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0 - }; + const obj = createBaseListLogMetricsRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + return obj; }, toJSON(message: ListLogMetricsRequest): unknown { const obj: any = {}; @@ -1074,7 +1078,7 @@ function createBaseListLogMetricsResponse(): ListLogMetricsResponse { } export const ListLogMetricsResponse = { typeUrl: "/google.logging.v2.ListLogMetricsResponse", - encode(message: ListLogMetricsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListLogMetricsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.metrics) { LogMetric.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -1083,8 +1087,8 @@ export const ListLogMetricsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListLogMetricsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListLogMetricsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListLogMetricsResponse(); while (reader.pos < end) { @@ -1104,10 +1108,10 @@ export const ListLogMetricsResponse = { return message; }, fromJSON(object: any): ListLogMetricsResponse { - return { - metrics: Array.isArray(object?.metrics) ? object.metrics.map((e: any) => LogMetric.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListLogMetricsResponse(); + if (Array.isArray(object?.metrics)) object.metrics.map((e: any) => LogMetric.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListLogMetricsResponse): unknown { const obj: any = {}; @@ -1180,14 +1184,14 @@ function createBaseGetLogMetricRequest(): GetLogMetricRequest { } export const GetLogMetricRequest = { typeUrl: "/google.logging.v2.GetLogMetricRequest", - encode(message: GetLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetLogMetricRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetLogMetricRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetLogMetricRequest(); while (reader.pos < end) { @@ -1204,9 +1208,9 @@ export const GetLogMetricRequest = { return message; }, fromJSON(object: any): GetLogMetricRequest { - return { - metricName: isSet(object.metricName) ? String(object.metricName) : "" - }; + const obj = createBaseGetLogMetricRequest(); + if (isSet(object.metricName)) obj.metricName = String(object.metricName); + return obj; }, toJSON(message: GetLogMetricRequest): unknown { const obj: any = {}; @@ -1262,7 +1266,7 @@ function createBaseCreateLogMetricRequest(): CreateLogMetricRequest { } export const CreateLogMetricRequest = { typeUrl: "/google.logging.v2.CreateLogMetricRequest", - encode(message: CreateLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CreateLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.parent !== "") { writer.uint32(10).string(message.parent); } @@ -1271,8 +1275,8 @@ export const CreateLogMetricRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CreateLogMetricRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CreateLogMetricRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCreateLogMetricRequest(); while (reader.pos < end) { @@ -1292,10 +1296,10 @@ export const CreateLogMetricRequest = { return message; }, fromJSON(object: any): CreateLogMetricRequest { - return { - parent: isSet(object.parent) ? String(object.parent) : "", - metric: isSet(object.metric) ? LogMetric.fromJSON(object.metric) : undefined - }; + const obj = createBaseCreateLogMetricRequest(); + if (isSet(object.parent)) obj.parent = String(object.parent); + if (isSet(object.metric)) obj.metric = LogMetric.fromJSON(object.metric); + return obj; }, toJSON(message: CreateLogMetricRequest): unknown { const obj: any = {}; @@ -1306,7 +1310,9 @@ export const CreateLogMetricRequest = { fromPartial(object: DeepPartial): CreateLogMetricRequest { const message = createBaseCreateLogMetricRequest(); message.parent = object.parent ?? ""; - message.metric = object.metric !== undefined && object.metric !== null ? LogMetric.fromPartial(object.metric) : undefined; + if (object.metric !== undefined && object.metric !== null) { + message.metric = LogMetric.fromPartial(object.metric); + } return message; }, fromSDK(object: CreateLogMetricRequestSDKType): CreateLogMetricRequest { @@ -1357,7 +1363,7 @@ function createBaseUpdateLogMetricRequest(): UpdateLogMetricRequest { } export const UpdateLogMetricRequest = { typeUrl: "/google.logging.v2.UpdateLogMetricRequest", - encode(message: UpdateLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UpdateLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); } @@ -1366,8 +1372,8 @@ export const UpdateLogMetricRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UpdateLogMetricRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UpdateLogMetricRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUpdateLogMetricRequest(); while (reader.pos < end) { @@ -1387,10 +1393,10 @@ export const UpdateLogMetricRequest = { return message; }, fromJSON(object: any): UpdateLogMetricRequest { - return { - metricName: isSet(object.metricName) ? String(object.metricName) : "", - metric: isSet(object.metric) ? LogMetric.fromJSON(object.metric) : undefined - }; + const obj = createBaseUpdateLogMetricRequest(); + if (isSet(object.metricName)) obj.metricName = String(object.metricName); + if (isSet(object.metric)) obj.metric = LogMetric.fromJSON(object.metric); + return obj; }, toJSON(message: UpdateLogMetricRequest): unknown { const obj: any = {}; @@ -1401,7 +1407,9 @@ export const UpdateLogMetricRequest = { fromPartial(object: DeepPartial): UpdateLogMetricRequest { const message = createBaseUpdateLogMetricRequest(); message.metricName = object.metricName ?? ""; - message.metric = object.metric !== undefined && object.metric !== null ? LogMetric.fromPartial(object.metric) : undefined; + if (object.metric !== undefined && object.metric !== null) { + message.metric = LogMetric.fromPartial(object.metric); + } return message; }, fromSDK(object: UpdateLogMetricRequestSDKType): UpdateLogMetricRequest { @@ -1451,14 +1459,14 @@ function createBaseDeleteLogMetricRequest(): DeleteLogMetricRequest { } export const DeleteLogMetricRequest = { typeUrl: "/google.logging.v2.DeleteLogMetricRequest", - encode(message: DeleteLogMetricRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteLogMetricRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.metricName !== "") { writer.uint32(10).string(message.metricName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteLogMetricRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteLogMetricRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteLogMetricRequest(); while (reader.pos < end) { @@ -1475,9 +1483,9 @@ export const DeleteLogMetricRequest = { return message; }, fromJSON(object: any): DeleteLogMetricRequest { - return { - metricName: isSet(object.metricName) ? String(object.metricName) : "" - }; + const obj = createBaseDeleteLogMetricRequest(); + if (isSet(object.metricName)) obj.metricName = String(object.metricName); + return obj; }, toJSON(message: DeleteLogMetricRequest): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/longrunning/operations.ts b/__fixtures__/v-next/outputv2/google/longrunning/operations.ts index fa43809592..c563396e08 100644 --- a/__fixtures__/v-next/outputv2/google/longrunning/operations.ts +++ b/__fixtures__/v-next/outputv2/google/longrunning/operations.ts @@ -1,7 +1,7 @@ import { Duration, DurationAmino, DurationSDKType } from "../protobuf/duration"; import { Any, AnyAmino, AnySDKType } from "../protobuf/any"; import { Status, StatusAmino, StatusSDKType } from "../rpc/status"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.longrunning"; /** @@ -372,7 +372,7 @@ function createBaseOperation(): Operation { } export const Operation = { typeUrl: "/google.longrunning.Operation", - encode(message: Operation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Operation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -390,8 +390,8 @@ export const Operation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Operation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Operation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperation(); while (reader.pos < end) { @@ -420,13 +420,13 @@ export const Operation = { return message; }, fromJSON(object: any): Operation { - return { - name: isSet(object.name) ? String(object.name) : "", - metadata: isSet(object.metadata) ? Any.fromJSON(object.metadata) : undefined, - done: isSet(object.done) ? Boolean(object.done) : false, - error: isSet(object.error) ? Status.fromJSON(object.error) : undefined, - response: isSet(object.response) ? Any.fromJSON(object.response) : undefined - }; + const obj = createBaseOperation(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.metadata)) obj.metadata = Any.fromJSON(object.metadata); + if (isSet(object.done)) obj.done = Boolean(object.done); + if (isSet(object.error)) obj.error = Status.fromJSON(object.error); + if (isSet(object.response)) obj.response = Any.fromJSON(object.response); + return obj; }, toJSON(message: Operation): unknown { const obj: any = {}; @@ -440,10 +440,16 @@ export const Operation = { fromPartial(object: DeepPartial): Operation { const message = createBaseOperation(); message.name = object.name ?? ""; - message.metadata = object.metadata !== undefined && object.metadata !== null ? Any.fromPartial(object.metadata) : undefined; + if (object.metadata !== undefined && object.metadata !== null) { + message.metadata = Any.fromPartial(object.metadata); + } message.done = object.done ?? false; - message.error = object.error !== undefined && object.error !== null ? Status.fromPartial(object.error) : undefined; - message.response = object.response !== undefined && object.response !== null ? Any.fromPartial(object.response) : undefined; + if (object.error !== undefined && object.error !== null) { + message.error = Status.fromPartial(object.error); + } + if (object.response !== undefined && object.response !== null) { + message.response = Any.fromPartial(object.response); + } return message; }, fromSDK(object: OperationSDKType): Operation { @@ -505,14 +511,14 @@ function createBaseGetOperationRequest(): GetOperationRequest { } export const GetOperationRequest = { typeUrl: "/google.longrunning.GetOperationRequest", - encode(message: GetOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GetOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GetOperationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GetOperationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGetOperationRequest(); while (reader.pos < end) { @@ -529,9 +535,9 @@ export const GetOperationRequest = { return message; }, fromJSON(object: any): GetOperationRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseGetOperationRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: GetOperationRequest): unknown { const obj: any = {}; @@ -589,7 +595,7 @@ function createBaseListOperationsRequest(): ListOperationsRequest { } export const ListOperationsRequest = { typeUrl: "/google.longrunning.ListOperationsRequest", - encode(message: ListOperationsRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListOperationsRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(34).string(message.name); } @@ -604,8 +610,8 @@ export const ListOperationsRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListOperationsRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListOperationsRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListOperationsRequest(); while (reader.pos < end) { @@ -631,12 +637,12 @@ export const ListOperationsRequest = { return message; }, fromJSON(object: any): ListOperationsRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - filter: isSet(object.filter) ? String(object.filter) : "", - pageSize: isSet(object.pageSize) ? Number(object.pageSize) : 0, - pageToken: isSet(object.pageToken) ? String(object.pageToken) : "" - }; + const obj = createBaseListOperationsRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.filter)) obj.filter = String(object.filter); + if (isSet(object.pageSize)) obj.pageSize = Number(object.pageSize); + if (isSet(object.pageToken)) obj.pageToken = String(object.pageToken); + return obj; }, toJSON(message: ListOperationsRequest): unknown { const obj: any = {}; @@ -710,7 +716,7 @@ function createBaseListOperationsResponse(): ListOperationsResponse { } export const ListOperationsResponse = { typeUrl: "/google.longrunning.ListOperationsResponse", - encode(message: ListOperationsResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListOperationsResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.operations) { Operation.encode(v!, writer.uint32(10).fork()).ldelim(); } @@ -719,8 +725,8 @@ export const ListOperationsResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListOperationsResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListOperationsResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListOperationsResponse(); while (reader.pos < end) { @@ -740,10 +746,10 @@ export const ListOperationsResponse = { return message; }, fromJSON(object: any): ListOperationsResponse { - return { - operations: Array.isArray(object?.operations) ? object.operations.map((e: any) => Operation.fromJSON(e)) : [], - nextPageToken: isSet(object.nextPageToken) ? String(object.nextPageToken) : "" - }; + const obj = createBaseListOperationsResponse(); + if (Array.isArray(object?.operations)) object.operations.map((e: any) => Operation.fromJSON(e)); + if (isSet(object.nextPageToken)) obj.nextPageToken = String(object.nextPageToken); + return obj; }, toJSON(message: ListOperationsResponse): unknown { const obj: any = {}; @@ -816,14 +822,14 @@ function createBaseCancelOperationRequest(): CancelOperationRequest { } export const CancelOperationRequest = { typeUrl: "/google.longrunning.CancelOperationRequest", - encode(message: CancelOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CancelOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CancelOperationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CancelOperationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCancelOperationRequest(); while (reader.pos < end) { @@ -840,9 +846,9 @@ export const CancelOperationRequest = { return message; }, fromJSON(object: any): CancelOperationRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseCancelOperationRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: CancelOperationRequest): unknown { const obj: any = {}; @@ -897,14 +903,14 @@ function createBaseDeleteOperationRequest(): DeleteOperationRequest { } export const DeleteOperationRequest = { typeUrl: "/google.longrunning.DeleteOperationRequest", - encode(message: DeleteOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DeleteOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DeleteOperationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DeleteOperationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDeleteOperationRequest(); while (reader.pos < end) { @@ -921,9 +927,9 @@ export const DeleteOperationRequest = { return message; }, fromJSON(object: any): DeleteOperationRequest { - return { - name: isSet(object.name) ? String(object.name) : "" - }; + const obj = createBaseDeleteOperationRequest(); + if (isSet(object.name)) obj.name = String(object.name); + return obj; }, toJSON(message: DeleteOperationRequest): unknown { const obj: any = {}; @@ -979,7 +985,7 @@ function createBaseWaitOperationRequest(): WaitOperationRequest { } export const WaitOperationRequest = { typeUrl: "/google.longrunning.WaitOperationRequest", - encode(message: WaitOperationRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: WaitOperationRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -988,8 +994,8 @@ export const WaitOperationRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): WaitOperationRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): WaitOperationRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseWaitOperationRequest(); while (reader.pos < end) { @@ -1009,10 +1015,10 @@ export const WaitOperationRequest = { return message; }, fromJSON(object: any): WaitOperationRequest { - return { - name: isSet(object.name) ? String(object.name) : "", - timeout: isSet(object.timeout) ? Duration.fromJSON(object.timeout) : undefined - }; + const obj = createBaseWaitOperationRequest(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.timeout)) obj.timeout = Duration.fromJSON(object.timeout); + return obj; }, toJSON(message: WaitOperationRequest): unknown { const obj: any = {}; @@ -1023,7 +1029,9 @@ export const WaitOperationRequest = { fromPartial(object: DeepPartial): WaitOperationRequest { const message = createBaseWaitOperationRequest(); message.name = object.name ?? ""; - message.timeout = object.timeout !== undefined && object.timeout !== null ? Duration.fromPartial(object.timeout) : undefined; + if (object.timeout !== undefined && object.timeout !== null) { + message.timeout = Duration.fromPartial(object.timeout); + } return message; }, fromSDK(object: WaitOperationRequestSDKType): WaitOperationRequest { @@ -1074,7 +1082,7 @@ function createBaseOperationInfo(): OperationInfo { } export const OperationInfo = { typeUrl: "/google.longrunning.OperationInfo", - encode(message: OperationInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OperationInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.responseType !== "") { writer.uint32(10).string(message.responseType); } @@ -1083,8 +1091,8 @@ export const OperationInfo = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OperationInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OperationInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOperationInfo(); while (reader.pos < end) { @@ -1104,10 +1112,10 @@ export const OperationInfo = { return message; }, fromJSON(object: any): OperationInfo { - return { - responseType: isSet(object.responseType) ? String(object.responseType) : "", - metadataType: isSet(object.metadataType) ? String(object.metadataType) : "" - }; + const obj = createBaseOperationInfo(); + if (isSet(object.responseType)) obj.responseType = String(object.responseType); + if (isSet(object.metadataType)) obj.metadataType = String(object.metadataType); + return obj; }, toJSON(message: OperationInfo): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/any.ts b/__fixtures__/v-next/outputv2/google/protobuf/any.ts index 8b4a7bae39..be2b531bba 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/any.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/any.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, bytesFromBase64, base64FromBytes, DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** @@ -83,6 +83,7 @@ export const protobufPackage = "google.protobuf"; * } */ export interface Any { + $typeUrl?: string; /** * A URL/resource name that uniquely identifies the type of the serialized * protocol buffer message. This string must contain at least @@ -321,18 +322,20 @@ export interface AnyAminoMsg { * } */ export interface AnySDKType { + $typeUrl?: string; type_url: string; value: Uint8Array; } function createBaseAny(): Any { return { + $typeUrl: "/google.protobuf.Any", typeUrl: "", value: new Uint8Array() }; } export const Any = { typeUrl: "/google.protobuf.Any", - encode(message: Any, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Any, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.typeUrl !== "") { writer.uint32(10).string(message.typeUrl); } @@ -341,8 +344,8 @@ export const Any = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Any { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Any { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseAny(); while (reader.pos < end) { @@ -362,10 +365,10 @@ export const Any = { return message; }, fromJSON(object: any): Any { - return { - typeUrl: isSet(object.typeUrl) ? String(object.typeUrl) : "", - value: isSet(object.value) ? bytesFromBase64(object.value) : new Uint8Array() - }; + const obj = createBaseAny(); + if (isSet(object.typeUrl)) obj.typeUrl = String(object.typeUrl); + if (isSet(object.value)) obj.value = bytesFromBase64(object.value); + return obj; }, toJSON(message: Any): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/api.ts b/__fixtures__/v-next/outputv2/google/protobuf/api.ts index 234e6c70bd..7cfe16694c 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/api.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/api.ts @@ -1,6 +1,6 @@ import { Option, OptionAmino, OptionSDKType, Syntax, syntaxFromJSON, syntaxToJSON } from "./type"; import { SourceContext, SourceContextAmino, SourceContextSDKType } from "./source_context"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** @@ -472,7 +472,7 @@ function createBaseApi(): Api { } export const Api = { typeUrl: "/google.protobuf.Api", - encode(message: Api, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Api, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -496,8 +496,8 @@ export const Api = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Api { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Api { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseApi(); while (reader.pos < end) { @@ -532,15 +532,15 @@ export const Api = { return message; }, fromJSON(object: any): Api { - return { - name: isSet(object.name) ? String(object.name) : "", - methods: Array.isArray(object?.methods) ? object.methods.map((e: any) => Method.fromJSON(e)) : [], - options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromJSON(e)) : [], - version: isSet(object.version) ? String(object.version) : "", - sourceContext: isSet(object.sourceContext) ? SourceContext.fromJSON(object.sourceContext) : undefined, - mixins: Array.isArray(object?.mixins) ? object.mixins.map((e: any) => Mixin.fromJSON(e)) : [], - syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 - }; + const obj = createBaseApi(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.methods)) object.methods.map((e: any) => Method.fromJSON(e)); + if (Array.isArray(object?.options)) object.options.map((e: any) => Option.fromJSON(e)); + if (isSet(object.version)) obj.version = String(object.version); + if (isSet(object.sourceContext)) obj.sourceContext = SourceContext.fromJSON(object.sourceContext); + if (Array.isArray(object?.mixins)) object.mixins.map((e: any) => Mixin.fromJSON(e)); + if (isSet(object.syntax)) obj.syntax = syntaxFromJSON(object.syntax); + return obj; }, toJSON(message: Api): unknown { const obj: any = {}; @@ -571,7 +571,9 @@ export const Api = { message.methods = object.methods?.map(e => Method.fromPartial(e)) || []; message.options = object.options?.map(e => Option.fromPartial(e)) || []; message.version = object.version ?? ""; - message.sourceContext = object.sourceContext !== undefined && object.sourceContext !== null ? SourceContext.fromPartial(object.sourceContext) : undefined; + if (object.sourceContext !== undefined && object.sourceContext !== null) { + message.sourceContext = SourceContext.fromPartial(object.sourceContext); + } message.mixins = object.mixins?.map(e => Mixin.fromPartial(e)) || []; message.syntax = object.syntax ?? 0; return message; @@ -673,7 +675,7 @@ function createBaseMethod(): Method { } export const Method = { typeUrl: "/google.protobuf.Method", - encode(message: Method, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Method, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -697,8 +699,8 @@ export const Method = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Method { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Method { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMethod(); while (reader.pos < end) { @@ -733,15 +735,15 @@ export const Method = { return message; }, fromJSON(object: any): Method { - return { - name: isSet(object.name) ? String(object.name) : "", - requestTypeUrl: isSet(object.requestTypeUrl) ? String(object.requestTypeUrl) : "", - requestStreaming: isSet(object.requestStreaming) ? Boolean(object.requestStreaming) : false, - responseTypeUrl: isSet(object.responseTypeUrl) ? String(object.responseTypeUrl) : "", - responseStreaming: isSet(object.responseStreaming) ? Boolean(object.responseStreaming) : false, - options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromJSON(e)) : [], - syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 - }; + const obj = createBaseMethod(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.requestTypeUrl)) obj.requestTypeUrl = String(object.requestTypeUrl); + if (isSet(object.requestStreaming)) obj.requestStreaming = Boolean(object.requestStreaming); + if (isSet(object.responseTypeUrl)) obj.responseTypeUrl = String(object.responseTypeUrl); + if (isSet(object.responseStreaming)) obj.responseStreaming = Boolean(object.responseStreaming); + if (Array.isArray(object?.options)) object.options.map((e: any) => Option.fromJSON(e)); + if (isSet(object.syntax)) obj.syntax = syntaxFromJSON(object.syntax); + return obj; }, toJSON(message: Method): unknown { const obj: any = {}; @@ -845,7 +847,7 @@ function createBaseMixin(): Mixin { } export const Mixin = { typeUrl: "/google.protobuf.Mixin", - encode(message: Mixin, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Mixin, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -854,8 +856,8 @@ export const Mixin = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Mixin { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Mixin { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMixin(); while (reader.pos < end) { @@ -875,10 +877,10 @@ export const Mixin = { return message; }, fromJSON(object: any): Mixin { - return { - name: isSet(object.name) ? String(object.name) : "", - root: isSet(object.root) ? String(object.root) : "" - }; + const obj = createBaseMixin(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.root)) obj.root = String(object.root); + return obj; }, toJSON(message: Mixin): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts b/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts index 90863bfc7e..d0077e45d4 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/compiler/plugin.ts @@ -1,5 +1,5 @@ import { FileDescriptorProto, FileDescriptorProtoAmino, FileDescriptorProtoSDKType } from "../descriptor"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../../binary"; import { isSet, DeepPartial } from "../../../helpers"; export const protobufPackage = "google.protobuf.compiler"; /** The version number of protocol compiler. */ @@ -299,7 +299,7 @@ function createBaseVersion(): Version { } export const Version = { typeUrl: "/google.protobuf.compiler.Version", - encode(message: Version, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Version, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.major !== 0) { writer.uint32(8).int32(message.major); } @@ -314,8 +314,8 @@ export const Version = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Version { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Version { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseVersion(); while (reader.pos < end) { @@ -341,12 +341,12 @@ export const Version = { return message; }, fromJSON(object: any): Version { - return { - major: isSet(object.major) ? Number(object.major) : 0, - minor: isSet(object.minor) ? Number(object.minor) : 0, - patch: isSet(object.patch) ? Number(object.patch) : 0, - suffix: isSet(object.suffix) ? String(object.suffix) : "" - }; + const obj = createBaseVersion(); + if (isSet(object.major)) obj.major = Number(object.major); + if (isSet(object.minor)) obj.minor = Number(object.minor); + if (isSet(object.patch)) obj.patch = Number(object.patch); + if (isSet(object.suffix)) obj.suffix = String(object.suffix); + return obj; }, toJSON(message: Version): unknown { const obj: any = {}; @@ -422,7 +422,7 @@ function createBaseCodeGeneratorRequest(): CodeGeneratorRequest { } export const CodeGeneratorRequest = { typeUrl: "/google.protobuf.compiler.CodeGeneratorRequest", - encode(message: CodeGeneratorRequest, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CodeGeneratorRequest, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.fileToGenerate) { writer.uint32(10).string(v!); } @@ -437,8 +437,8 @@ export const CodeGeneratorRequest = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CodeGeneratorRequest { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CodeGeneratorRequest { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCodeGeneratorRequest(); while (reader.pos < end) { @@ -464,12 +464,12 @@ export const CodeGeneratorRequest = { return message; }, fromJSON(object: any): CodeGeneratorRequest { - return { - fileToGenerate: Array.isArray(object?.fileToGenerate) ? object.fileToGenerate.map((e: any) => String(e)) : [], - parameter: isSet(object.parameter) ? String(object.parameter) : "", - protoFile: Array.isArray(object?.protoFile) ? object.protoFile.map((e: any) => FileDescriptorProto.fromJSON(e)) : [], - compilerVersion: isSet(object.compilerVersion) ? Version.fromJSON(object.compilerVersion) : undefined - }; + const obj = createBaseCodeGeneratorRequest(); + if (Array.isArray(object?.fileToGenerate)) object.fileToGenerate.map((e: any) => String(e)); + if (isSet(object.parameter)) obj.parameter = String(object.parameter); + if (Array.isArray(object?.protoFile)) object.protoFile.map((e: any) => FileDescriptorProto.fromJSON(e)); + if (isSet(object.compilerVersion)) obj.compilerVersion = Version.fromJSON(object.compilerVersion); + return obj; }, toJSON(message: CodeGeneratorRequest): unknown { const obj: any = {}; @@ -492,7 +492,9 @@ export const CodeGeneratorRequest = { message.fileToGenerate = object.fileToGenerate?.map(e => e) || []; message.parameter = object.parameter ?? ""; message.protoFile = object.protoFile?.map(e => FileDescriptorProto.fromPartial(e)) || []; - message.compilerVersion = object.compilerVersion !== undefined && object.compilerVersion !== null ? Version.fromPartial(object.compilerVersion) : undefined; + if (object.compilerVersion !== undefined && object.compilerVersion !== null) { + message.compilerVersion = Version.fromPartial(object.compilerVersion); + } return message; }, fromSDK(object: CodeGeneratorRequestSDKType): CodeGeneratorRequest { @@ -567,7 +569,7 @@ function createBaseCodeGeneratorResponse(): CodeGeneratorResponse { } export const CodeGeneratorResponse = { typeUrl: "/google.protobuf.compiler.CodeGeneratorResponse", - encode(message: CodeGeneratorResponse, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CodeGeneratorResponse, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.error !== "") { writer.uint32(10).string(message.error); } @@ -576,8 +578,8 @@ export const CodeGeneratorResponse = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CodeGeneratorResponse { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CodeGeneratorResponse { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCodeGeneratorResponse(); while (reader.pos < end) { @@ -597,10 +599,10 @@ export const CodeGeneratorResponse = { return message; }, fromJSON(object: any): CodeGeneratorResponse { - return { - error: isSet(object.error) ? String(object.error) : "", - file: Array.isArray(object?.file) ? object.file.map((e: any) => CodeGeneratorResponse_File.fromJSON(e)) : [] - }; + const obj = createBaseCodeGeneratorResponse(); + if (isSet(object.error)) obj.error = String(object.error); + if (Array.isArray(object?.file)) object.file.map((e: any) => CodeGeneratorResponse_File.fromJSON(e)); + return obj; }, toJSON(message: CodeGeneratorResponse): unknown { const obj: any = {}; @@ -675,7 +677,7 @@ function createBaseCodeGeneratorResponse_File(): CodeGeneratorResponse_File { } export const CodeGeneratorResponse_File = { typeUrl: "/google.protobuf.compiler.File", - encode(message: CodeGeneratorResponse_File, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: CodeGeneratorResponse_File, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -687,8 +689,8 @@ export const CodeGeneratorResponse_File = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): CodeGeneratorResponse_File { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): CodeGeneratorResponse_File { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseCodeGeneratorResponse_File(); while (reader.pos < end) { @@ -711,11 +713,11 @@ export const CodeGeneratorResponse_File = { return message; }, fromJSON(object: any): CodeGeneratorResponse_File { - return { - name: isSet(object.name) ? String(object.name) : "", - insertionPoint: isSet(object.insertionPoint) ? String(object.insertionPoint) : "", - content: isSet(object.content) ? String(object.content) : "" - }; + const obj = createBaseCodeGeneratorResponse_File(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.insertionPoint)) obj.insertionPoint = String(object.insertionPoint); + if (isSet(object.content)) obj.content = String(object.content); + return obj; }, toJSON(message: CodeGeneratorResponse_File): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts b/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts index ad2f6fae8c..4ce84ad149 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/descriptor.ts @@ -1,5 +1,5 @@ -import { Long, DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; +import { DeepPartial, isSet, bytesFromBase64, base64FromBytes } from "../../helpers"; export const protobufPackage = "google.protobuf"; export enum FieldDescriptorProto_Type { /** @@ -1700,8 +1700,8 @@ export interface UninterpretedOption { * identified it as during parsing. Exactly one of these should be set. */ identifierValue: string; - positiveIntValue: Long; - negativeIntValue: Long; + positiveIntValue: bigint; + negativeIntValue: bigint; doubleValue: number; stringValue: Uint8Array; aggregateValue: string; @@ -1746,8 +1746,8 @@ export interface UninterpretedOptionAminoMsg { export interface UninterpretedOptionSDKType { name: UninterpretedOption_NamePartSDKType[]; identifier_value: string; - positive_int_value: Long; - negative_int_value: Long; + positive_int_value: bigint; + negative_int_value: bigint; double_value: number; string_value: Uint8Array; aggregate_value: string; @@ -2204,14 +2204,14 @@ function createBaseFileDescriptorSet(): FileDescriptorSet { } export const FileDescriptorSet = { typeUrl: "/google.protobuf.FileDescriptorSet", - encode(message: FileDescriptorSet, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FileDescriptorSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.file) { FileDescriptorProto.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FileDescriptorSet { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FileDescriptorSet { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFileDescriptorSet(); while (reader.pos < end) { @@ -2228,9 +2228,9 @@ export const FileDescriptorSet = { return message; }, fromJSON(object: any): FileDescriptorSet { - return { - file: Array.isArray(object?.file) ? object.file.map((e: any) => FileDescriptorProto.fromJSON(e)) : [] - }; + const obj = createBaseFileDescriptorSet(); + if (Array.isArray(object?.file)) object.file.map((e: any) => FileDescriptorProto.fromJSON(e)); + return obj; }, toJSON(message: FileDescriptorSet): unknown { const obj: any = {}; @@ -2308,7 +2308,7 @@ function createBaseFileDescriptorProto(): FileDescriptorProto { } export const FileDescriptorProto = { typeUrl: "/google.protobuf.FileDescriptorProto", - encode(message: FileDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FileDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2351,8 +2351,8 @@ export const FileDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FileDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FileDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFileDescriptorProto(); while (reader.pos < end) { @@ -2416,20 +2416,20 @@ export const FileDescriptorProto = { return message; }, fromJSON(object: any): FileDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - package: isSet(object.package) ? String(object.package) : "", - dependency: Array.isArray(object?.dependency) ? object.dependency.map((e: any) => String(e)) : [], - publicDependency: Array.isArray(object?.publicDependency) ? object.publicDependency.map((e: any) => Number(e)) : [], - weakDependency: Array.isArray(object?.weakDependency) ? object.weakDependency.map((e: any) => Number(e)) : [], - messageType: Array.isArray(object?.messageType) ? object.messageType.map((e: any) => DescriptorProto.fromJSON(e)) : [], - enumType: Array.isArray(object?.enumType) ? object.enumType.map((e: any) => EnumDescriptorProto.fromJSON(e)) : [], - service: Array.isArray(object?.service) ? object.service.map((e: any) => ServiceDescriptorProto.fromJSON(e)) : [], - extension: Array.isArray(object?.extension) ? object.extension.map((e: any) => FieldDescriptorProto.fromJSON(e)) : [], - options: isSet(object.options) ? FileOptions.fromJSON(object.options) : undefined, - sourceCodeInfo: isSet(object.sourceCodeInfo) ? SourceCodeInfo.fromJSON(object.sourceCodeInfo) : undefined, - syntax: isSet(object.syntax) ? String(object.syntax) : "" - }; + const obj = createBaseFileDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.package)) obj.package = String(object.package); + if (Array.isArray(object?.dependency)) object.dependency.map((e: any) => String(e)); + if (Array.isArray(object?.publicDependency)) object.publicDependency.map((e: any) => Number(e)); + if (Array.isArray(object?.weakDependency)) object.weakDependency.map((e: any) => Number(e)); + if (Array.isArray(object?.messageType)) object.messageType.map((e: any) => DescriptorProto.fromJSON(e)); + if (Array.isArray(object?.enumType)) object.enumType.map((e: any) => EnumDescriptorProto.fromJSON(e)); + if (Array.isArray(object?.service)) object.service.map((e: any) => ServiceDescriptorProto.fromJSON(e)); + if (Array.isArray(object?.extension)) object.extension.map((e: any) => FieldDescriptorProto.fromJSON(e)); + if (isSet(object.options)) obj.options = FileOptions.fromJSON(object.options); + if (isSet(object.sourceCodeInfo)) obj.sourceCodeInfo = SourceCodeInfo.fromJSON(object.sourceCodeInfo); + if (isSet(object.syntax)) obj.syntax = String(object.syntax); + return obj; }, toJSON(message: FileDescriptorProto): unknown { const obj: any = {}; @@ -2486,8 +2486,12 @@ export const FileDescriptorProto = { message.enumType = object.enumType?.map(e => EnumDescriptorProto.fromPartial(e)) || []; message.service = object.service?.map(e => ServiceDescriptorProto.fromPartial(e)) || []; message.extension = object.extension?.map(e => FieldDescriptorProto.fromPartial(e)) || []; - message.options = object.options !== undefined && object.options !== null ? FileOptions.fromPartial(object.options) : undefined; - message.sourceCodeInfo = object.sourceCodeInfo !== undefined && object.sourceCodeInfo !== null ? SourceCodeInfo.fromPartial(object.sourceCodeInfo) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = FileOptions.fromPartial(object.options); + } + if (object.sourceCodeInfo !== undefined && object.sourceCodeInfo !== null) { + message.sourceCodeInfo = SourceCodeInfo.fromPartial(object.sourceCodeInfo); + } message.syntax = object.syntax ?? ""; return message; }, @@ -2643,7 +2647,7 @@ function createBaseDescriptorProto(): DescriptorProto { } export const DescriptorProto = { typeUrl: "/google.protobuf.DescriptorProto", - encode(message: DescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -2676,8 +2680,8 @@ export const DescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDescriptorProto(); while (reader.pos < end) { @@ -2721,18 +2725,18 @@ export const DescriptorProto = { return message; }, fromJSON(object: any): DescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - field: Array.isArray(object?.field) ? object.field.map((e: any) => FieldDescriptorProto.fromJSON(e)) : [], - extension: Array.isArray(object?.extension) ? object.extension.map((e: any) => FieldDescriptorProto.fromJSON(e)) : [], - nestedType: Array.isArray(object?.nestedType) ? object.nestedType.map((e: any) => DescriptorProto.fromJSON(e)) : [], - enumType: Array.isArray(object?.enumType) ? object.enumType.map((e: any) => EnumDescriptorProto.fromJSON(e)) : [], - extensionRange: Array.isArray(object?.extensionRange) ? object.extensionRange.map((e: any) => DescriptorProto_ExtensionRange.fromJSON(e)) : [], - oneofDecl: Array.isArray(object?.oneofDecl) ? object.oneofDecl.map((e: any) => OneofDescriptorProto.fromJSON(e)) : [], - options: isSet(object.options) ? MessageOptions.fromJSON(object.options) : undefined, - reservedRange: Array.isArray(object?.reservedRange) ? object.reservedRange.map((e: any) => DescriptorProto_ReservedRange.fromJSON(e)) : [], - reservedName: Array.isArray(object?.reservedName) ? object.reservedName.map((e: any) => String(e)) : [] - }; + const obj = createBaseDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.field)) object.field.map((e: any) => FieldDescriptorProto.fromJSON(e)); + if (Array.isArray(object?.extension)) object.extension.map((e: any) => FieldDescriptorProto.fromJSON(e)); + if (Array.isArray(object?.nestedType)) object.nestedType.map((e: any) => DescriptorProto.fromJSON(e)); + if (Array.isArray(object?.enumType)) object.enumType.map((e: any) => EnumDescriptorProto.fromJSON(e)); + if (Array.isArray(object?.extensionRange)) object.extensionRange.map((e: any) => DescriptorProto_ExtensionRange.fromJSON(e)); + if (Array.isArray(object?.oneofDecl)) object.oneofDecl.map((e: any) => OneofDescriptorProto.fromJSON(e)); + if (isSet(object.options)) obj.options = MessageOptions.fromJSON(object.options); + if (Array.isArray(object?.reservedRange)) object.reservedRange.map((e: any) => DescriptorProto_ReservedRange.fromJSON(e)); + if (Array.isArray(object?.reservedName)) object.reservedName.map((e: any) => String(e)); + return obj; }, toJSON(message: DescriptorProto): unknown { const obj: any = {}; @@ -2789,7 +2793,9 @@ export const DescriptorProto = { message.enumType = object.enumType?.map(e => EnumDescriptorProto.fromPartial(e)) || []; message.extensionRange = object.extensionRange?.map(e => DescriptorProto_ExtensionRange.fromPartial(e)) || []; message.oneofDecl = object.oneofDecl?.map(e => OneofDescriptorProto.fromPartial(e)) || []; - message.options = object.options !== undefined && object.options !== null ? MessageOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = MessageOptions.fromPartial(object.options); + } message.reservedRange = object.reservedRange?.map(e => DescriptorProto_ReservedRange.fromPartial(e)) || []; message.reservedName = object.reservedName?.map(e => e) || []; return message; @@ -2939,7 +2945,7 @@ function createBaseDescriptorProto_ExtensionRange(): DescriptorProto_ExtensionRa } export const DescriptorProto_ExtensionRange = { typeUrl: "/google.protobuf.ExtensionRange", - encode(message: DescriptorProto_ExtensionRange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DescriptorProto_ExtensionRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.start !== 0) { writer.uint32(8).int32(message.start); } @@ -2951,8 +2957,8 @@ export const DescriptorProto_ExtensionRange = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DescriptorProto_ExtensionRange { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DescriptorProto_ExtensionRange { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDescriptorProto_ExtensionRange(); while (reader.pos < end) { @@ -2975,11 +2981,11 @@ export const DescriptorProto_ExtensionRange = { return message; }, fromJSON(object: any): DescriptorProto_ExtensionRange { - return { - start: isSet(object.start) ? Number(object.start) : 0, - end: isSet(object.end) ? Number(object.end) : 0, - options: isSet(object.options) ? ExtensionRangeOptions.fromJSON(object.options) : undefined - }; + const obj = createBaseDescriptorProto_ExtensionRange(); + if (isSet(object.start)) obj.start = Number(object.start); + if (isSet(object.end)) obj.end = Number(object.end); + if (isSet(object.options)) obj.options = ExtensionRangeOptions.fromJSON(object.options); + return obj; }, toJSON(message: DescriptorProto_ExtensionRange): unknown { const obj: any = {}; @@ -2992,7 +2998,9 @@ export const DescriptorProto_ExtensionRange = { const message = createBaseDescriptorProto_ExtensionRange(); message.start = object.start ?? 0; message.end = object.end ?? 0; - message.options = object.options !== undefined && object.options !== null ? ExtensionRangeOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = ExtensionRangeOptions.fromPartial(object.options); + } return message; }, fromSDK(object: DescriptorProto_ExtensionRangeSDKType): DescriptorProto_ExtensionRange { @@ -3047,7 +3055,7 @@ function createBaseDescriptorProto_ReservedRange(): DescriptorProto_ReservedRang } export const DescriptorProto_ReservedRange = { typeUrl: "/google.protobuf.ReservedRange", - encode(message: DescriptorProto_ReservedRange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: DescriptorProto_ReservedRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.start !== 0) { writer.uint32(8).int32(message.start); } @@ -3056,8 +3064,8 @@ export const DescriptorProto_ReservedRange = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): DescriptorProto_ReservedRange { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): DescriptorProto_ReservedRange { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDescriptorProto_ReservedRange(); while (reader.pos < end) { @@ -3077,10 +3085,10 @@ export const DescriptorProto_ReservedRange = { return message; }, fromJSON(object: any): DescriptorProto_ReservedRange { - return { - start: isSet(object.start) ? Number(object.start) : 0, - end: isSet(object.end) ? Number(object.end) : 0 - }; + const obj = createBaseDescriptorProto_ReservedRange(); + if (isSet(object.start)) obj.start = Number(object.start); + if (isSet(object.end)) obj.end = Number(object.end); + return obj; }, toJSON(message: DescriptorProto_ReservedRange): unknown { const obj: any = {}; @@ -3141,14 +3149,14 @@ function createBaseExtensionRangeOptions(): ExtensionRangeOptions { } export const ExtensionRangeOptions = { typeUrl: "/google.protobuf.ExtensionRangeOptions", - encode(message: ExtensionRangeOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ExtensionRangeOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.uninterpretedOption) { UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ExtensionRangeOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ExtensionRangeOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseExtensionRangeOptions(); while (reader.pos < end) { @@ -3165,9 +3173,9 @@ export const ExtensionRangeOptions = { return message; }, fromJSON(object: any): ExtensionRangeOptions { - return { - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseExtensionRangeOptions(); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: ExtensionRangeOptions): unknown { const obj: any = {}; @@ -3243,7 +3251,7 @@ function createBaseFieldDescriptorProto(): FieldDescriptorProto { } export const FieldDescriptorProto = { typeUrl: "/google.protobuf.FieldDescriptorProto", - encode(message: FieldDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FieldDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3276,8 +3284,8 @@ export const FieldDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FieldDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FieldDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFieldDescriptorProto(); while (reader.pos < end) { @@ -3321,18 +3329,18 @@ export const FieldDescriptorProto = { return message; }, fromJSON(object: any): FieldDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - number: isSet(object.number) ? Number(object.number) : 0, - label: isSet(object.label) ? fieldDescriptorProto_LabelFromJSON(object.label) : -1, - type: isSet(object.type) ? fieldDescriptorProto_TypeFromJSON(object.type) : -1, - typeName: isSet(object.typeName) ? String(object.typeName) : "", - extendee: isSet(object.extendee) ? String(object.extendee) : "", - defaultValue: isSet(object.defaultValue) ? String(object.defaultValue) : "", - oneofIndex: isSet(object.oneofIndex) ? Number(object.oneofIndex) : 0, - jsonName: isSet(object.jsonName) ? String(object.jsonName) : "", - options: isSet(object.options) ? FieldOptions.fromJSON(object.options) : undefined - }; + const obj = createBaseFieldDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.number)) obj.number = Number(object.number); + if (isSet(object.label)) obj.label = fieldDescriptorProto_LabelFromJSON(object.label); + if (isSet(object.type)) obj.type = fieldDescriptorProto_TypeFromJSON(object.type); + if (isSet(object.typeName)) obj.typeName = String(object.typeName); + if (isSet(object.extendee)) obj.extendee = String(object.extendee); + if (isSet(object.defaultValue)) obj.defaultValue = String(object.defaultValue); + if (isSet(object.oneofIndex)) obj.oneofIndex = Number(object.oneofIndex); + if (isSet(object.jsonName)) obj.jsonName = String(object.jsonName); + if (isSet(object.options)) obj.options = FieldOptions.fromJSON(object.options); + return obj; }, toJSON(message: FieldDescriptorProto): unknown { const obj: any = {}; @@ -3359,7 +3367,9 @@ export const FieldDescriptorProto = { message.defaultValue = object.defaultValue ?? ""; message.oneofIndex = object.oneofIndex ?? 0; message.jsonName = object.jsonName ?? ""; - message.options = object.options !== undefined && object.options !== null ? FieldOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = FieldOptions.fromPartial(object.options); + } return message; }, fromSDK(object: FieldDescriptorProtoSDKType): FieldDescriptorProto { @@ -3442,7 +3452,7 @@ function createBaseOneofDescriptorProto(): OneofDescriptorProto { } export const OneofDescriptorProto = { typeUrl: "/google.protobuf.OneofDescriptorProto", - encode(message: OneofDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OneofDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3451,8 +3461,8 @@ export const OneofDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OneofDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OneofDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOneofDescriptorProto(); while (reader.pos < end) { @@ -3472,10 +3482,10 @@ export const OneofDescriptorProto = { return message; }, fromJSON(object: any): OneofDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - options: isSet(object.options) ? OneofOptions.fromJSON(object.options) : undefined - }; + const obj = createBaseOneofDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.options)) obj.options = OneofOptions.fromJSON(object.options); + return obj; }, toJSON(message: OneofDescriptorProto): unknown { const obj: any = {}; @@ -3486,7 +3496,9 @@ export const OneofDescriptorProto = { fromPartial(object: DeepPartial): OneofDescriptorProto { const message = createBaseOneofDescriptorProto(); message.name = object.name ?? ""; - message.options = object.options !== undefined && object.options !== null ? OneofOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = OneofOptions.fromPartial(object.options); + } return message; }, fromSDK(object: OneofDescriptorProtoSDKType): OneofDescriptorProto { @@ -3540,7 +3552,7 @@ function createBaseEnumDescriptorProto(): EnumDescriptorProto { } export const EnumDescriptorProto = { typeUrl: "/google.protobuf.EnumDescriptorProto", - encode(message: EnumDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3558,8 +3570,8 @@ export const EnumDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumDescriptorProto(); while (reader.pos < end) { @@ -3588,13 +3600,13 @@ export const EnumDescriptorProto = { return message; }, fromJSON(object: any): EnumDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - value: Array.isArray(object?.value) ? object.value.map((e: any) => EnumValueDescriptorProto.fromJSON(e)) : [], - options: isSet(object.options) ? EnumOptions.fromJSON(object.options) : undefined, - reservedRange: Array.isArray(object?.reservedRange) ? object.reservedRange.map((e: any) => EnumDescriptorProto_EnumReservedRange.fromJSON(e)) : [], - reservedName: Array.isArray(object?.reservedName) ? object.reservedName.map((e: any) => String(e)) : [] - }; + const obj = createBaseEnumDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.value)) object.value.map((e: any) => EnumValueDescriptorProto.fromJSON(e)); + if (isSet(object.options)) obj.options = EnumOptions.fromJSON(object.options); + if (Array.isArray(object?.reservedRange)) object.reservedRange.map((e: any) => EnumDescriptorProto_EnumReservedRange.fromJSON(e)); + if (Array.isArray(object?.reservedName)) object.reservedName.map((e: any) => String(e)); + return obj; }, toJSON(message: EnumDescriptorProto): unknown { const obj: any = {}; @@ -3621,7 +3633,9 @@ export const EnumDescriptorProto = { const message = createBaseEnumDescriptorProto(); message.name = object.name ?? ""; message.value = object.value?.map(e => EnumValueDescriptorProto.fromPartial(e)) || []; - message.options = object.options !== undefined && object.options !== null ? EnumOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = EnumOptions.fromPartial(object.options); + } message.reservedRange = object.reservedRange?.map(e => EnumDescriptorProto_EnumReservedRange.fromPartial(e)) || []; message.reservedName = object.reservedName?.map(e => e) || []; return message; @@ -3710,7 +3724,7 @@ function createBaseEnumDescriptorProto_EnumReservedRange(): EnumDescriptorProto_ } export const EnumDescriptorProto_EnumReservedRange = { typeUrl: "/google.protobuf.EnumReservedRange", - encode(message: EnumDescriptorProto_EnumReservedRange, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumDescriptorProto_EnumReservedRange, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.start !== 0) { writer.uint32(8).int32(message.start); } @@ -3719,8 +3733,8 @@ export const EnumDescriptorProto_EnumReservedRange = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumDescriptorProto_EnumReservedRange { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumDescriptorProto_EnumReservedRange { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumDescriptorProto_EnumReservedRange(); while (reader.pos < end) { @@ -3740,10 +3754,10 @@ export const EnumDescriptorProto_EnumReservedRange = { return message; }, fromJSON(object: any): EnumDescriptorProto_EnumReservedRange { - return { - start: isSet(object.start) ? Number(object.start) : 0, - end: isSet(object.end) ? Number(object.end) : 0 - }; + const obj = createBaseEnumDescriptorProto_EnumReservedRange(); + if (isSet(object.start)) obj.start = Number(object.start); + if (isSet(object.end)) obj.end = Number(object.end); + return obj; }, toJSON(message: EnumDescriptorProto_EnumReservedRange): unknown { const obj: any = {}; @@ -3806,7 +3820,7 @@ function createBaseEnumValueDescriptorProto(): EnumValueDescriptorProto { } export const EnumValueDescriptorProto = { typeUrl: "/google.protobuf.EnumValueDescriptorProto", - encode(message: EnumValueDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumValueDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3818,8 +3832,8 @@ export const EnumValueDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumValueDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumValueDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumValueDescriptorProto(); while (reader.pos < end) { @@ -3842,11 +3856,11 @@ export const EnumValueDescriptorProto = { return message; }, fromJSON(object: any): EnumValueDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - number: isSet(object.number) ? Number(object.number) : 0, - options: isSet(object.options) ? EnumValueOptions.fromJSON(object.options) : undefined - }; + const obj = createBaseEnumValueDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.number)) obj.number = Number(object.number); + if (isSet(object.options)) obj.options = EnumValueOptions.fromJSON(object.options); + return obj; }, toJSON(message: EnumValueDescriptorProto): unknown { const obj: any = {}; @@ -3859,7 +3873,9 @@ export const EnumValueDescriptorProto = { const message = createBaseEnumValueDescriptorProto(); message.name = object.name ?? ""; message.number = object.number ?? 0; - message.options = object.options !== undefined && object.options !== null ? EnumValueOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = EnumValueOptions.fromPartial(object.options); + } return message; }, fromSDK(object: EnumValueDescriptorProtoSDKType): EnumValueDescriptorProto { @@ -3915,7 +3931,7 @@ function createBaseServiceDescriptorProto(): ServiceDescriptorProto { } export const ServiceDescriptorProto = { typeUrl: "/google.protobuf.ServiceDescriptorProto", - encode(message: ServiceDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ServiceDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -3927,8 +3943,8 @@ export const ServiceDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ServiceDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ServiceDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseServiceDescriptorProto(); while (reader.pos < end) { @@ -3951,11 +3967,11 @@ export const ServiceDescriptorProto = { return message; }, fromJSON(object: any): ServiceDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - method: Array.isArray(object?.method) ? object.method.map((e: any) => MethodDescriptorProto.fromJSON(e)) : [], - options: isSet(object.options) ? ServiceOptions.fromJSON(object.options) : undefined - }; + const obj = createBaseServiceDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.method)) object.method.map((e: any) => MethodDescriptorProto.fromJSON(e)); + if (isSet(object.options)) obj.options = ServiceOptions.fromJSON(object.options); + return obj; }, toJSON(message: ServiceDescriptorProto): unknown { const obj: any = {}; @@ -3972,7 +3988,9 @@ export const ServiceDescriptorProto = { const message = createBaseServiceDescriptorProto(); message.name = object.name ?? ""; message.method = object.method?.map(e => MethodDescriptorProto.fromPartial(e)) || []; - message.options = object.options !== undefined && object.options !== null ? ServiceOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = ServiceOptions.fromPartial(object.options); + } return message; }, fromSDK(object: ServiceDescriptorProtoSDKType): ServiceDescriptorProto { @@ -4039,7 +4057,7 @@ function createBaseMethodDescriptorProto(): MethodDescriptorProto { } export const MethodDescriptorProto = { typeUrl: "/google.protobuf.MethodDescriptorProto", - encode(message: MethodDescriptorProto, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MethodDescriptorProto, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -4060,8 +4078,8 @@ export const MethodDescriptorProto = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MethodDescriptorProto { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MethodDescriptorProto { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMethodDescriptorProto(); while (reader.pos < end) { @@ -4093,14 +4111,14 @@ export const MethodDescriptorProto = { return message; }, fromJSON(object: any): MethodDescriptorProto { - return { - name: isSet(object.name) ? String(object.name) : "", - inputType: isSet(object.inputType) ? String(object.inputType) : "", - outputType: isSet(object.outputType) ? String(object.outputType) : "", - options: isSet(object.options) ? MethodOptions.fromJSON(object.options) : undefined, - clientStreaming: isSet(object.clientStreaming) ? Boolean(object.clientStreaming) : false, - serverStreaming: isSet(object.serverStreaming) ? Boolean(object.serverStreaming) : false - }; + const obj = createBaseMethodDescriptorProto(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.inputType)) obj.inputType = String(object.inputType); + if (isSet(object.outputType)) obj.outputType = String(object.outputType); + if (isSet(object.options)) obj.options = MethodOptions.fromJSON(object.options); + if (isSet(object.clientStreaming)) obj.clientStreaming = Boolean(object.clientStreaming); + if (isSet(object.serverStreaming)) obj.serverStreaming = Boolean(object.serverStreaming); + return obj; }, toJSON(message: MethodDescriptorProto): unknown { const obj: any = {}; @@ -4117,7 +4135,9 @@ export const MethodDescriptorProto = { message.name = object.name ?? ""; message.inputType = object.inputType ?? ""; message.outputType = object.outputType ?? ""; - message.options = object.options !== undefined && object.options !== null ? MethodOptions.fromPartial(object.options) : undefined; + if (object.options !== undefined && object.options !== null) { + message.options = MethodOptions.fromPartial(object.options); + } message.clientStreaming = object.clientStreaming ?? false; message.serverStreaming = object.serverStreaming ?? false; return message; @@ -4205,7 +4225,7 @@ function createBaseFileOptions(): FileOptions { } export const FileOptions = { typeUrl: "/google.protobuf.FileOptions", - encode(message: FileOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FileOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.javaPackage !== "") { writer.uint32(10).string(message.javaPackage); } @@ -4271,8 +4291,8 @@ export const FileOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FileOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FileOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFileOptions(); while (reader.pos < end) { @@ -4349,29 +4369,29 @@ export const FileOptions = { return message; }, fromJSON(object: any): FileOptions { - return { - javaPackage: isSet(object.javaPackage) ? String(object.javaPackage) : "", - javaOuterClassname: isSet(object.javaOuterClassname) ? String(object.javaOuterClassname) : "", - javaMultipleFiles: isSet(object.javaMultipleFiles) ? Boolean(object.javaMultipleFiles) : false, - javaGenerateEqualsAndHash: isSet(object.javaGenerateEqualsAndHash) ? Boolean(object.javaGenerateEqualsAndHash) : false, - javaStringCheckUtf8: isSet(object.javaStringCheckUtf8) ? Boolean(object.javaStringCheckUtf8) : false, - optimizeFor: isSet(object.optimizeFor) ? fileOptions_OptimizeModeFromJSON(object.optimizeFor) : -1, - goPackage: isSet(object.goPackage) ? String(object.goPackage) : "", - ccGenericServices: isSet(object.ccGenericServices) ? Boolean(object.ccGenericServices) : false, - javaGenericServices: isSet(object.javaGenericServices) ? Boolean(object.javaGenericServices) : false, - pyGenericServices: isSet(object.pyGenericServices) ? Boolean(object.pyGenericServices) : false, - phpGenericServices: isSet(object.phpGenericServices) ? Boolean(object.phpGenericServices) : false, - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - ccEnableArenas: isSet(object.ccEnableArenas) ? Boolean(object.ccEnableArenas) : false, - objcClassPrefix: isSet(object.objcClassPrefix) ? String(object.objcClassPrefix) : "", - csharpNamespace: isSet(object.csharpNamespace) ? String(object.csharpNamespace) : "", - swiftPrefix: isSet(object.swiftPrefix) ? String(object.swiftPrefix) : "", - phpClassPrefix: isSet(object.phpClassPrefix) ? String(object.phpClassPrefix) : "", - phpNamespace: isSet(object.phpNamespace) ? String(object.phpNamespace) : "", - phpMetadataNamespace: isSet(object.phpMetadataNamespace) ? String(object.phpMetadataNamespace) : "", - rubyPackage: isSet(object.rubyPackage) ? String(object.rubyPackage) : "", - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseFileOptions(); + if (isSet(object.javaPackage)) obj.javaPackage = String(object.javaPackage); + if (isSet(object.javaOuterClassname)) obj.javaOuterClassname = String(object.javaOuterClassname); + if (isSet(object.javaMultipleFiles)) obj.javaMultipleFiles = Boolean(object.javaMultipleFiles); + if (isSet(object.javaGenerateEqualsAndHash)) obj.javaGenerateEqualsAndHash = Boolean(object.javaGenerateEqualsAndHash); + if (isSet(object.javaStringCheckUtf8)) obj.javaStringCheckUtf8 = Boolean(object.javaStringCheckUtf8); + if (isSet(object.optimizeFor)) obj.optimizeFor = fileOptions_OptimizeModeFromJSON(object.optimizeFor); + if (isSet(object.goPackage)) obj.goPackage = String(object.goPackage); + if (isSet(object.ccGenericServices)) obj.ccGenericServices = Boolean(object.ccGenericServices); + if (isSet(object.javaGenericServices)) obj.javaGenericServices = Boolean(object.javaGenericServices); + if (isSet(object.pyGenericServices)) obj.pyGenericServices = Boolean(object.pyGenericServices); + if (isSet(object.phpGenericServices)) obj.phpGenericServices = Boolean(object.phpGenericServices); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (isSet(object.ccEnableArenas)) obj.ccEnableArenas = Boolean(object.ccEnableArenas); + if (isSet(object.objcClassPrefix)) obj.objcClassPrefix = String(object.objcClassPrefix); + if (isSet(object.csharpNamespace)) obj.csharpNamespace = String(object.csharpNamespace); + if (isSet(object.swiftPrefix)) obj.swiftPrefix = String(object.swiftPrefix); + if (isSet(object.phpClassPrefix)) obj.phpClassPrefix = String(object.phpClassPrefix); + if (isSet(object.phpNamespace)) obj.phpNamespace = String(object.phpNamespace); + if (isSet(object.phpMetadataNamespace)) obj.phpMetadataNamespace = String(object.phpMetadataNamespace); + if (isSet(object.rubyPackage)) obj.rubyPackage = String(object.rubyPackage); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: FileOptions): unknown { const obj: any = {}; @@ -4562,7 +4582,7 @@ function createBaseMessageOptions(): MessageOptions { } export const MessageOptions = { typeUrl: "/google.protobuf.MessageOptions", - encode(message: MessageOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MessageOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.messageSetWireFormat === true) { writer.uint32(8).bool(message.messageSetWireFormat); } @@ -4580,8 +4600,8 @@ export const MessageOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MessageOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MessageOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMessageOptions(); while (reader.pos < end) { @@ -4610,13 +4630,13 @@ export const MessageOptions = { return message; }, fromJSON(object: any): MessageOptions { - return { - messageSetWireFormat: isSet(object.messageSetWireFormat) ? Boolean(object.messageSetWireFormat) : false, - noStandardDescriptorAccessor: isSet(object.noStandardDescriptorAccessor) ? Boolean(object.noStandardDescriptorAccessor) : false, - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - mapEntry: isSet(object.mapEntry) ? Boolean(object.mapEntry) : false, - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseMessageOptions(); + if (isSet(object.messageSetWireFormat)) obj.messageSetWireFormat = Boolean(object.messageSetWireFormat); + if (isSet(object.noStandardDescriptorAccessor)) obj.noStandardDescriptorAccessor = Boolean(object.noStandardDescriptorAccessor); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (isSet(object.mapEntry)) obj.mapEntry = Boolean(object.mapEntry); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: MessageOptions): unknown { const obj: any = {}; @@ -4713,7 +4733,7 @@ function createBaseFieldOptions(): FieldOptions { } export const FieldOptions = { typeUrl: "/google.protobuf.FieldOptions", - encode(message: FieldOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FieldOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.ctype !== 1) { writer.uint32(8).int32(message.ctype); } @@ -4737,8 +4757,8 @@ export const FieldOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FieldOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FieldOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFieldOptions(); while (reader.pos < end) { @@ -4773,15 +4793,15 @@ export const FieldOptions = { return message; }, fromJSON(object: any): FieldOptions { - return { - ctype: isSet(object.ctype) ? fieldOptions_CTypeFromJSON(object.ctype) : -1, - packed: isSet(object.packed) ? Boolean(object.packed) : false, - jstype: isSet(object.jstype) ? fieldOptions_JSTypeFromJSON(object.jstype) : -1, - lazy: isSet(object.lazy) ? Boolean(object.lazy) : false, - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - weak: isSet(object.weak) ? Boolean(object.weak) : false, - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseFieldOptions(); + if (isSet(object.ctype)) obj.ctype = fieldOptions_CTypeFromJSON(object.ctype); + if (isSet(object.packed)) obj.packed = Boolean(object.packed); + if (isSet(object.jstype)) obj.jstype = fieldOptions_JSTypeFromJSON(object.jstype); + if (isSet(object.lazy)) obj.lazy = Boolean(object.lazy); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (isSet(object.weak)) obj.weak = Boolean(object.weak); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: FieldOptions): unknown { const obj: any = {}; @@ -4884,14 +4904,14 @@ function createBaseOneofOptions(): OneofOptions { } export const OneofOptions = { typeUrl: "/google.protobuf.OneofOptions", - encode(message: OneofOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: OneofOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.uninterpretedOption) { UninterpretedOption.encode(v!, writer.uint32(7994).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): OneofOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): OneofOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOneofOptions(); while (reader.pos < end) { @@ -4908,9 +4928,9 @@ export const OneofOptions = { return message; }, fromJSON(object: any): OneofOptions { - return { - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseOneofOptions(); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: OneofOptions): unknown { const obj: any = {}; @@ -4979,7 +4999,7 @@ function createBaseEnumOptions(): EnumOptions { } export const EnumOptions = { typeUrl: "/google.protobuf.EnumOptions", - encode(message: EnumOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.allowAlias === true) { writer.uint32(16).bool(message.allowAlias); } @@ -4991,8 +5011,8 @@ export const EnumOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumOptions(); while (reader.pos < end) { @@ -5015,11 +5035,11 @@ export const EnumOptions = { return message; }, fromJSON(object: any): EnumOptions { - return { - allowAlias: isSet(object.allowAlias) ? Boolean(object.allowAlias) : false, - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseEnumOptions(); + if (isSet(object.allowAlias)) obj.allowAlias = Boolean(object.allowAlias); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: EnumOptions): unknown { const obj: any = {}; @@ -5099,7 +5119,7 @@ function createBaseEnumValueOptions(): EnumValueOptions { } export const EnumValueOptions = { typeUrl: "/google.protobuf.EnumValueOptions", - encode(message: EnumValueOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumValueOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deprecated === true) { writer.uint32(8).bool(message.deprecated); } @@ -5108,8 +5128,8 @@ export const EnumValueOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumValueOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumValueOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumValueOptions(); while (reader.pos < end) { @@ -5129,10 +5149,10 @@ export const EnumValueOptions = { return message; }, fromJSON(object: any): EnumValueOptions { - return { - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseEnumValueOptions(); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: EnumValueOptions): unknown { const obj: any = {}; @@ -5206,7 +5226,7 @@ function createBaseServiceOptions(): ServiceOptions { } export const ServiceOptions = { typeUrl: "/google.protobuf.ServiceOptions", - encode(message: ServiceOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ServiceOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deprecated === true) { writer.uint32(264).bool(message.deprecated); } @@ -5215,8 +5235,8 @@ export const ServiceOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ServiceOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ServiceOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseServiceOptions(); while (reader.pos < end) { @@ -5236,10 +5256,10 @@ export const ServiceOptions = { return message; }, fromJSON(object: any): ServiceOptions { - return { - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseServiceOptions(); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: ServiceOptions): unknown { const obj: any = {}; @@ -5314,7 +5334,7 @@ function createBaseMethodOptions(): MethodOptions { } export const MethodOptions = { typeUrl: "/google.protobuf.MethodOptions", - encode(message: MethodOptions, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: MethodOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.deprecated === true) { writer.uint32(264).bool(message.deprecated); } @@ -5326,8 +5346,8 @@ export const MethodOptions = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): MethodOptions { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): MethodOptions { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseMethodOptions(); while (reader.pos < end) { @@ -5350,11 +5370,11 @@ export const MethodOptions = { return message; }, fromJSON(object: any): MethodOptions { - return { - deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - idempotencyLevel: isSet(object.idempotencyLevel) ? methodOptions_IdempotencyLevelFromJSON(object.idempotencyLevel) : -1, - uninterpretedOption: Array.isArray(object?.uninterpretedOption) ? object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)) : [] - }; + const obj = createBaseMethodOptions(); + if (isSet(object.deprecated)) obj.deprecated = Boolean(object.deprecated); + if (isSet(object.idempotencyLevel)) obj.idempotencyLevel = methodOptions_IdempotencyLevelFromJSON(object.idempotencyLevel); + if (Array.isArray(object?.uninterpretedOption)) object.uninterpretedOption.map((e: any) => UninterpretedOption.fromJSON(e)); + return obj; }, toJSON(message: MethodOptions): unknown { const obj: any = {}; @@ -5430,8 +5450,8 @@ function createBaseUninterpretedOption(): UninterpretedOption { return { name: [], identifierValue: "", - positiveIntValue: Long.UZERO, - negativeIntValue: Long.ZERO, + positiveIntValue: BigInt(0), + negativeIntValue: BigInt(0), doubleValue: 0, stringValue: new Uint8Array(), aggregateValue: "" @@ -5439,17 +5459,17 @@ function createBaseUninterpretedOption(): UninterpretedOption { } export const UninterpretedOption = { typeUrl: "/google.protobuf.UninterpretedOption", - encode(message: UninterpretedOption, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UninterpretedOption, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.name) { UninterpretedOption_NamePart.encode(v!, writer.uint32(18).fork()).ldelim(); } if (message.identifierValue !== "") { writer.uint32(26).string(message.identifierValue); } - if (!message.positiveIntValue.isZero()) { + if (message.positiveIntValue !== BigInt(0)) { writer.uint32(32).uint64(message.positiveIntValue); } - if (!message.negativeIntValue.isZero()) { + if (message.negativeIntValue !== BigInt(0)) { writer.uint32(40).int64(message.negativeIntValue); } if (message.doubleValue !== 0) { @@ -5463,8 +5483,8 @@ export const UninterpretedOption = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UninterpretedOption { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UninterpretedOption { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUninterpretedOption(); while (reader.pos < end) { @@ -5477,10 +5497,10 @@ export const UninterpretedOption = { message.identifierValue = reader.string(); break; case 4: - message.positiveIntValue = (reader.uint64() as Long); + message.positiveIntValue = reader.uint64(); break; case 5: - message.negativeIntValue = (reader.int64() as Long); + message.negativeIntValue = reader.int64(); break; case 6: message.doubleValue = reader.double(); @@ -5499,15 +5519,15 @@ export const UninterpretedOption = { return message; }, fromJSON(object: any): UninterpretedOption { - return { - name: Array.isArray(object?.name) ? object.name.map((e: any) => UninterpretedOption_NamePart.fromJSON(e)) : [], - identifierValue: isSet(object.identifierValue) ? String(object.identifierValue) : "", - positiveIntValue: isSet(object.positiveIntValue) ? Long.fromValue(object.positiveIntValue) : Long.UZERO, - negativeIntValue: isSet(object.negativeIntValue) ? Long.fromValue(object.negativeIntValue) : Long.ZERO, - doubleValue: isSet(object.doubleValue) ? Number(object.doubleValue) : 0, - stringValue: isSet(object.stringValue) ? bytesFromBase64(object.stringValue) : new Uint8Array(), - aggregateValue: isSet(object.aggregateValue) ? String(object.aggregateValue) : "" - }; + const obj = createBaseUninterpretedOption(); + if (Array.isArray(object?.name)) object.name.map((e: any) => UninterpretedOption_NamePart.fromJSON(e)); + if (isSet(object.identifierValue)) obj.identifierValue = String(object.identifierValue); + if (isSet(object.positiveIntValue)) obj.positiveIntValue = BigInt(object.positiveIntValue.toString()); + if (isSet(object.negativeIntValue)) obj.negativeIntValue = BigInt(object.negativeIntValue.toString()); + if (isSet(object.doubleValue)) obj.doubleValue = Number(object.doubleValue); + if (isSet(object.stringValue)) obj.stringValue = bytesFromBase64(object.stringValue); + if (isSet(object.aggregateValue)) obj.aggregateValue = String(object.aggregateValue); + return obj; }, toJSON(message: UninterpretedOption): unknown { const obj: any = {}; @@ -5517,8 +5537,8 @@ export const UninterpretedOption = { obj.name = []; } message.identifierValue !== undefined && (obj.identifierValue = message.identifierValue); - message.positiveIntValue !== undefined && (obj.positiveIntValue = (message.positiveIntValue || Long.UZERO).toString()); - message.negativeIntValue !== undefined && (obj.negativeIntValue = (message.negativeIntValue || Long.ZERO).toString()); + message.positiveIntValue !== undefined && (obj.positiveIntValue = (message.positiveIntValue || BigInt(0)).toString()); + message.negativeIntValue !== undefined && (obj.negativeIntValue = (message.negativeIntValue || BigInt(0)).toString()); message.doubleValue !== undefined && (obj.doubleValue = message.doubleValue); message.stringValue !== undefined && (obj.stringValue = base64FromBytes(message.stringValue !== undefined ? message.stringValue : new Uint8Array())); message.aggregateValue !== undefined && (obj.aggregateValue = message.aggregateValue); @@ -5528,8 +5548,12 @@ export const UninterpretedOption = { const message = createBaseUninterpretedOption(); message.name = object.name?.map(e => UninterpretedOption_NamePart.fromPartial(e)) || []; message.identifierValue = object.identifierValue ?? ""; - message.positiveIntValue = object.positiveIntValue !== undefined && object.positiveIntValue !== null ? Long.fromValue(object.positiveIntValue) : Long.UZERO; - message.negativeIntValue = object.negativeIntValue !== undefined && object.negativeIntValue !== null ? Long.fromValue(object.negativeIntValue) : Long.ZERO; + if (object.positiveIntValue !== undefined && object.positiveIntValue !== null) { + message.positiveIntValue = BigInt(object.positiveIntValue.toString()); + } + if (object.negativeIntValue !== undefined && object.negativeIntValue !== null) { + message.negativeIntValue = BigInt(object.negativeIntValue.toString()); + } message.doubleValue = object.doubleValue ?? 0; message.stringValue = object.stringValue ?? new Uint8Array(); message.aggregateValue = object.aggregateValue ?? ""; @@ -5565,8 +5589,8 @@ export const UninterpretedOption = { return { name: Array.isArray(object?.name) ? object.name.map((e: any) => UninterpretedOption_NamePart.fromAmino(e)) : [], identifierValue: object.identifier_value, - positiveIntValue: Long.fromString(object.positive_int_value), - negativeIntValue: Long.fromString(object.negative_int_value), + positiveIntValue: BigInt(object.positive_int_value), + negativeIntValue: BigInt(object.negative_int_value), doubleValue: object.double_value, stringValue: object.string_value, aggregateValue: object.aggregate_value @@ -5611,7 +5635,7 @@ function createBaseUninterpretedOption_NamePart(): UninterpretedOption_NamePart } export const UninterpretedOption_NamePart = { typeUrl: "/google.protobuf.NamePart", - encode(message: UninterpretedOption_NamePart, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: UninterpretedOption_NamePart, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.namePart !== "") { writer.uint32(10).string(message.namePart); } @@ -5620,8 +5644,8 @@ export const UninterpretedOption_NamePart = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): UninterpretedOption_NamePart { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): UninterpretedOption_NamePart { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseUninterpretedOption_NamePart(); while (reader.pos < end) { @@ -5641,10 +5665,10 @@ export const UninterpretedOption_NamePart = { return message; }, fromJSON(object: any): UninterpretedOption_NamePart { - return { - namePart: isSet(object.namePart) ? String(object.namePart) : "", - isExtension: isSet(object.isExtension) ? Boolean(object.isExtension) : false - }; + const obj = createBaseUninterpretedOption_NamePart(); + if (isSet(object.namePart)) obj.namePart = String(object.namePart); + if (isSet(object.isExtension)) obj.isExtension = Boolean(object.isExtension); + return obj; }, toJSON(message: UninterpretedOption_NamePart): unknown { const obj: any = {}; @@ -5705,14 +5729,14 @@ function createBaseSourceCodeInfo(): SourceCodeInfo { } export const SourceCodeInfo = { typeUrl: "/google.protobuf.SourceCodeInfo", - encode(message: SourceCodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceCodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.location) { SourceCodeInfo_Location.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceCodeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceCodeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceCodeInfo(); while (reader.pos < end) { @@ -5729,9 +5753,9 @@ export const SourceCodeInfo = { return message; }, fromJSON(object: any): SourceCodeInfo { - return { - location: Array.isArray(object?.location) ? object.location.map((e: any) => SourceCodeInfo_Location.fromJSON(e)) : [] - }; + const obj = createBaseSourceCodeInfo(); + if (Array.isArray(object?.location)) object.location.map((e: any) => SourceCodeInfo_Location.fromJSON(e)); + return obj; }, toJSON(message: SourceCodeInfo): unknown { const obj: any = {}; @@ -5802,7 +5826,7 @@ function createBaseSourceCodeInfo_Location(): SourceCodeInfo_Location { } export const SourceCodeInfo_Location = { typeUrl: "/google.protobuf.Location", - encode(message: SourceCodeInfo_Location, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceCodeInfo_Location, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.path) { writer.int32(v); @@ -5824,8 +5848,8 @@ export const SourceCodeInfo_Location = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceCodeInfo_Location { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceCodeInfo_Location { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceCodeInfo_Location(); while (reader.pos < end) { @@ -5868,13 +5892,13 @@ export const SourceCodeInfo_Location = { return message; }, fromJSON(object: any): SourceCodeInfo_Location { - return { - path: Array.isArray(object?.path) ? object.path.map((e: any) => Number(e)) : [], - span: Array.isArray(object?.span) ? object.span.map((e: any) => Number(e)) : [], - leadingComments: isSet(object.leadingComments) ? String(object.leadingComments) : "", - trailingComments: isSet(object.trailingComments) ? String(object.trailingComments) : "", - leadingDetachedComments: Array.isArray(object?.leadingDetachedComments) ? object.leadingDetachedComments.map((e: any) => String(e)) : [] - }; + const obj = createBaseSourceCodeInfo_Location(); + if (Array.isArray(object?.path)) object.path.map((e: any) => Number(e)); + if (Array.isArray(object?.span)) object.span.map((e: any) => Number(e)); + if (isSet(object.leadingComments)) obj.leadingComments = String(object.leadingComments); + if (isSet(object.trailingComments)) obj.trailingComments = String(object.trailingComments); + if (Array.isArray(object?.leadingDetachedComments)) object.leadingDetachedComments.map((e: any) => String(e)); + return obj; }, toJSON(message: SourceCodeInfo_Location): unknown { const obj: any = {}; @@ -5989,14 +6013,14 @@ function createBaseGeneratedCodeInfo(): GeneratedCodeInfo { } export const GeneratedCodeInfo = { typeUrl: "/google.protobuf.GeneratedCodeInfo", - encode(message: GeneratedCodeInfo, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GeneratedCodeInfo, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.annotation) { GeneratedCodeInfo_Annotation.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GeneratedCodeInfo { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GeneratedCodeInfo { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGeneratedCodeInfo(); while (reader.pos < end) { @@ -6013,9 +6037,9 @@ export const GeneratedCodeInfo = { return message; }, fromJSON(object: any): GeneratedCodeInfo { - return { - annotation: Array.isArray(object?.annotation) ? object.annotation.map((e: any) => GeneratedCodeInfo_Annotation.fromJSON(e)) : [] - }; + const obj = createBaseGeneratedCodeInfo(); + if (Array.isArray(object?.annotation)) object.annotation.map((e: any) => GeneratedCodeInfo_Annotation.fromJSON(e)); + return obj; }, toJSON(message: GeneratedCodeInfo): unknown { const obj: any = {}; @@ -6085,7 +6109,7 @@ function createBaseGeneratedCodeInfo_Annotation(): GeneratedCodeInfo_Annotation } export const GeneratedCodeInfo_Annotation = { typeUrl: "/google.protobuf.Annotation", - encode(message: GeneratedCodeInfo_Annotation, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: GeneratedCodeInfo_Annotation, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { writer.uint32(10).fork(); for (const v of message.path) { writer.int32(v); @@ -6102,8 +6126,8 @@ export const GeneratedCodeInfo_Annotation = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): GeneratedCodeInfo_Annotation { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): GeneratedCodeInfo_Annotation { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseGeneratedCodeInfo_Annotation(); while (reader.pos < end) { @@ -6136,12 +6160,12 @@ export const GeneratedCodeInfo_Annotation = { return message; }, fromJSON(object: any): GeneratedCodeInfo_Annotation { - return { - path: Array.isArray(object?.path) ? object.path.map((e: any) => Number(e)) : [], - sourceFile: isSet(object.sourceFile) ? String(object.sourceFile) : "", - begin: isSet(object.begin) ? Number(object.begin) : 0, - end: isSet(object.end) ? Number(object.end) : 0 - }; + const obj = createBaseGeneratedCodeInfo_Annotation(); + if (Array.isArray(object?.path)) object.path.map((e: any) => Number(e)); + if (isSet(object.sourceFile)) obj.sourceFile = String(object.sourceFile); + if (isSet(object.begin)) obj.begin = Number(object.begin); + if (isSet(object.end)) obj.end = Number(object.end); + return obj; }, toJSON(message: GeneratedCodeInfo_Annotation): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/duration.ts b/__fixtures__/v-next/outputv2/google/protobuf/duration.ts index 377461eb13..38fd177755 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/duration.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/duration.ts @@ -1,5 +1,5 @@ -import { Long, isSet, DeepPartial } from "../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; +import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** * A Duration represents a signed, fixed-length span of time represented @@ -67,7 +67,7 @@ export interface Duration { * to +315,576,000,000 inclusive. Note: these bounds are computed from: * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years */ - seconds: Long; + seconds: bigint; /** * Signed fractions of a second at nanosecond resolution of the span * of time. Durations less than one second are represented with a 0 @@ -208,19 +208,19 @@ export interface DurationAminoMsg { * microsecond should be expressed in JSON format as "3.000001s". */ export interface DurationSDKType { - seconds: Long; + seconds: bigint; nanos: number; } function createBaseDuration(): Duration { return { - seconds: Long.ZERO, + seconds: BigInt(0), nanos: 0 }; } export const Duration = { typeUrl: "/google.protobuf.Duration", - encode(message: Duration, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.seconds.isZero()) { + encode(message: Duration, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.seconds !== BigInt(0)) { writer.uint32(8).int64(message.seconds); } if (message.nanos !== 0) { @@ -228,15 +228,15 @@ export const Duration = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Duration { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Duration { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseDuration(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.seconds = (reader.int64() as Long); + message.seconds = reader.int64(); break; case 2: message.nanos = reader.int32(); @@ -249,20 +249,22 @@ export const Duration = { return message; }, fromJSON(object: any): Duration { - return { - seconds: isSet(object.seconds) ? Long.fromValue(object.seconds) : Long.ZERO, - nanos: isSet(object.nanos) ? Number(object.nanos) : 0 - }; + const obj = createBaseDuration(); + if (isSet(object.seconds)) obj.seconds = BigInt(object.seconds.toString()); + if (isSet(object.nanos)) obj.nanos = Number(object.nanos); + return obj; }, toJSON(message: Duration): unknown { const obj: any = {}; - message.seconds !== undefined && (obj.seconds = (message.seconds || Long.ZERO).toString()); + message.seconds !== undefined && (obj.seconds = (message.seconds || BigInt(0)).toString()); message.nanos !== undefined && (obj.nanos = Math.round(message.nanos)); return obj; }, fromPartial(object: DeepPartial): Duration { const message = createBaseDuration(); - message.seconds = object.seconds !== undefined && object.seconds !== null ? Long.fromValue(object.seconds) : Long.ZERO; + if (object.seconds !== undefined && object.seconds !== null) { + message.seconds = BigInt(object.seconds.toString()); + } message.nanos = object.nanos ?? 0; return message; }, @@ -279,14 +281,14 @@ export const Duration = { return obj; }, fromAmino(object: DurationAmino): Duration { - const value = parseInt(object); + const value = BigInt(object); return { - seconds: Long.fromNumber(Math.floor(value / 1_000_000_000)), - nanos: value % 1_000_000_000 + seconds: value / BigInt("1000000000"), + nanos: Number(value % BigInt("1000000000")) }; }, toAmino(message: Duration): DurationAmino { - return (message.seconds.toInt() * 1_000_000_000 + message.nanos).toString(); + return (message.seconds * BigInt("1000000000") + BigInt(message.nanos)).toString(); }, fromAminoMsg(object: DurationAminoMsg): Duration { return Duration.fromAmino(object.value); diff --git a/__fixtures__/v-next/outputv2/google/protobuf/empty.ts b/__fixtures__/v-next/outputv2/google/protobuf/empty.ts index b7c91b0fb6..8e8de0bffb 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/empty.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/empty.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** @@ -50,11 +50,11 @@ function createBaseEmpty(): Empty { } export const Empty = { typeUrl: "/google.protobuf.Empty", - encode(_: Empty, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(_: Empty, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Empty { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Empty { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEmpty(); while (reader.pos < end) { @@ -68,7 +68,8 @@ export const Empty = { return message; }, fromJSON(_: any): Empty { - return {}; + const obj = createBaseEmpty(); + return obj; }, toJSON(_: Empty): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts b/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts index fff977e6d1..f22fd9509f 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/field_mask.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** @@ -630,14 +630,14 @@ function createBaseFieldMask(): FieldMask { } export const FieldMask = { typeUrl: "/google.protobuf.FieldMask", - encode(message: FieldMask, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: FieldMask, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.paths) { writer.uint32(10).string(v!); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): FieldMask { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): FieldMask { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseFieldMask(); while (reader.pos < end) { @@ -654,9 +654,9 @@ export const FieldMask = { return message; }, fromJSON(object: any): FieldMask { - return { - paths: Array.isArray(object?.paths) ? object.paths.map((e: any) => String(e)) : [] - }; + const obj = createBaseFieldMask(); + if (Array.isArray(object?.paths)) object.paths.map((e: any) => String(e)); + return obj; }, toJSON(message: FieldMask): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts b/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts index 8a145e0fa1..72517caaf8 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/source_context.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** @@ -45,14 +45,14 @@ function createBaseSourceContext(): SourceContext { } export const SourceContext = { typeUrl: "/google.protobuf.SourceContext", - encode(message: SourceContext, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: SourceContext, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.fileName !== "") { writer.uint32(10).string(message.fileName); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): SourceContext { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): SourceContext { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseSourceContext(); while (reader.pos < end) { @@ -69,9 +69,9 @@ export const SourceContext = { return message; }, fromJSON(object: any): SourceContext { - return { - fileName: isSet(object.fileName) ? String(object.fileName) : "" - }; + const obj = createBaseSourceContext(); + if (isSet(object.fileName)) obj.fileName = String(object.fileName); + return obj; }, toJSON(message: SourceContext): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/struct.ts b/__fixtures__/v-next/outputv2/google/protobuf/struct.ts index fd63f943b2..4cdf0f697b 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/struct.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/struct.ts @@ -1,4 +1,4 @@ -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial, isObject } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** @@ -218,7 +218,7 @@ function createBaseStruct_FieldsEntry(): Struct_FieldsEntry { }; } export const Struct_FieldsEntry = { - encode(message: Struct_FieldsEntry, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Struct_FieldsEntry, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.key !== "") { writer.uint32(10).string(message.key); } @@ -227,8 +227,8 @@ export const Struct_FieldsEntry = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Struct_FieldsEntry { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Struct_FieldsEntry { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStruct_FieldsEntry(); while (reader.pos < end) { @@ -248,10 +248,10 @@ export const Struct_FieldsEntry = { return message; }, fromJSON(object: any): Struct_FieldsEntry { - return { - key: isSet(object.key) ? String(object.key) : "", - value: isSet(object.value) ? Value.fromJSON(object.value) : undefined - }; + const obj = createBaseStruct_FieldsEntry(); + if (isSet(object.key)) obj.key = String(object.key); + if (isSet(object.value)) obj.value = Value.fromJSON(object.value); + return obj; }, toJSON(message: Struct_FieldsEntry): unknown { const obj: any = {}; @@ -262,7 +262,9 @@ export const Struct_FieldsEntry = { fromPartial(object: DeepPartial): Struct_FieldsEntry { const message = createBaseStruct_FieldsEntry(); message.key = object.key ?? ""; - message.value = object.value !== undefined && object.value !== null ? Value.fromPartial(object.value) : undefined; + if (object.value !== undefined && object.value !== null) { + message.value = Value.fromPartial(object.value); + } return message; }, fromSDK(object: Struct_FieldsEntrySDKType): Struct_FieldsEntry { @@ -306,7 +308,7 @@ function createBaseStruct(): Struct { } export const Struct = { typeUrl: "/google.protobuf.Struct", - encode(message: Struct, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Struct, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { Object.entries(message.fields).forEach(([key, value]) => { Struct_FieldsEntry.encode({ key: (key as any), @@ -315,8 +317,8 @@ export const Struct = { }); return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Struct { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Struct { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseStruct(); while (reader.pos < end) { @@ -336,14 +338,14 @@ export const Struct = { return message; }, fromJSON(object: any): Struct { - return { - fields: isObject(object.fields) ? Object.entries(object.fields).reduce<{ - [key: string]: Value; - }>((acc, [key, value]) => { - acc[key] = Value.fromJSON(value); - return acc; - }, {}) : {} - }; + const obj = createBaseStruct(); + if (isObject(object.fields)) obj.fields = Object.entries(object.fields).reduce<{ + [key: string]: Value; + }>((acc, [key, value]) => { + acc[key] = Value.fromJSON(value); + return acc; + }, {}); + return obj; }, toJSON(message: Struct): unknown { const obj: any = {}; @@ -435,7 +437,7 @@ function createBaseValue(): Value { } export const Value = { typeUrl: "/google.protobuf.Value", - encode(message: Value, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Value, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.nullValue !== undefined) { writer.uint32(8).int32(message.nullValue); } @@ -456,8 +458,8 @@ export const Value = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Value { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Value { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseValue(); while (reader.pos < end) { @@ -489,14 +491,14 @@ export const Value = { return message; }, fromJSON(object: any): Value { - return { - nullValue: isSet(object.nullValue) ? nullValueFromJSON(object.nullValue) : undefined, - numberValue: isSet(object.numberValue) ? Number(object.numberValue) : undefined, - stringValue: isSet(object.stringValue) ? String(object.stringValue) : undefined, - boolValue: isSet(object.boolValue) ? Boolean(object.boolValue) : undefined, - structValue: isSet(object.structValue) ? Struct.fromJSON(object.structValue) : undefined, - listValue: isSet(object.listValue) ? ListValue.fromJSON(object.listValue) : undefined - }; + const obj = createBaseValue(); + if (isSet(object.nullValue)) obj.nullValue = nullValueFromJSON(object.nullValue); + if (isSet(object.numberValue)) obj.numberValue = Number(object.numberValue); + if (isSet(object.stringValue)) obj.stringValue = String(object.stringValue); + if (isSet(object.boolValue)) obj.boolValue = Boolean(object.boolValue); + if (isSet(object.structValue)) obj.structValue = Struct.fromJSON(object.structValue); + if (isSet(object.listValue)) obj.listValue = ListValue.fromJSON(object.listValue); + return obj; }, toJSON(message: Value): unknown { const obj: any = {}; @@ -514,8 +516,12 @@ export const Value = { message.numberValue = object.numberValue ?? undefined; message.stringValue = object.stringValue ?? undefined; message.boolValue = object.boolValue ?? undefined; - message.structValue = object.structValue !== undefined && object.structValue !== null ? Struct.fromPartial(object.structValue) : undefined; - message.listValue = object.listValue !== undefined && object.listValue !== null ? ListValue.fromPartial(object.listValue) : undefined; + if (object.structValue !== undefined && object.structValue !== null) { + message.structValue = Struct.fromPartial(object.structValue); + } + if (object.listValue !== undefined && object.listValue !== null) { + message.listValue = ListValue.fromPartial(object.listValue); + } return message; }, fromSDK(object: ValueSDKType): Value { @@ -581,14 +587,14 @@ function createBaseListValue(): ListValue { } export const ListValue = { typeUrl: "/google.protobuf.ListValue", - encode(message: ListValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: ListValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { for (const v of message.values) { Value.encode(v!, writer.uint32(10).fork()).ldelim(); } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): ListValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): ListValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseListValue(); while (reader.pos < end) { @@ -605,9 +611,9 @@ export const ListValue = { return message; }, fromJSON(object: any): ListValue { - return { - values: Array.isArray(object?.values) ? object.values.map((e: any) => Value.fromJSON(e)) : [] - }; + const obj = createBaseListValue(); + if (Array.isArray(object?.values)) object.values.map((e: any) => Value.fromJSON(e)); + return obj; }, toJSON(message: ListValue): unknown { const obj: any = {}; diff --git a/__fixtures__/v-next/outputv2/google/protobuf/timestamp.ts b/__fixtures__/v-next/outputv2/google/protobuf/timestamp.ts index b4a69e888a..895f2983d9 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/timestamp.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/timestamp.ts @@ -1,5 +1,5 @@ -import { Long, isSet, DeepPartial, fromJsonTimestamp, fromTimestamp } from "../../helpers"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; +import { isSet, DeepPartial, fromJsonTimestamp, fromTimestamp } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** * A Timestamp represents a point in time independent of any time zone or local @@ -91,7 +91,7 @@ export interface Timestamp { * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to * 9999-12-31T23:59:59Z inclusive. */ - seconds: Long; + seconds: bigint; /** * Non-negative fractions of a second at nanosecond resolution. Negative * second values with fractions must still have non-negative nanos values @@ -278,19 +278,19 @@ export interface TimestampAminoMsg { * ) to obtain a formatter capable of generating timestamps in this format. */ export interface TimestampSDKType { - seconds: Long; + seconds: bigint; nanos: number; } function createBaseTimestamp(): Timestamp { return { - seconds: Long.ZERO, + seconds: BigInt(0), nanos: 0 }; } export const Timestamp = { typeUrl: "/google.protobuf.Timestamp", - encode(message: Timestamp, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { - if (!message.seconds.isZero()) { + encode(message: Timestamp, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { + if (message.seconds !== BigInt(0)) { writer.uint32(8).int64(message.seconds); } if (message.nanos !== 0) { @@ -298,15 +298,15 @@ export const Timestamp = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Timestamp { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Timestamp { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseTimestamp(); while (reader.pos < end) { const tag = reader.uint32(); switch (tag >>> 3) { case 1: - message.seconds = (reader.int64() as Long); + message.seconds = reader.int64(); break; case 2: message.nanos = reader.int32(); @@ -319,20 +319,22 @@ export const Timestamp = { return message; }, fromJSON(object: any): Timestamp { - return { - seconds: isSet(object.seconds) ? Long.fromValue(object.seconds) : Long.ZERO, - nanos: isSet(object.nanos) ? Number(object.nanos) : 0 - }; + const obj = createBaseTimestamp(); + if (isSet(object.seconds)) obj.seconds = BigInt(object.seconds.toString()); + if (isSet(object.nanos)) obj.nanos = Number(object.nanos); + return obj; }, toJSON(message: Timestamp): unknown { const obj: any = {}; - message.seconds !== undefined && (obj.seconds = (message.seconds || Long.ZERO).toString()); + message.seconds !== undefined && (obj.seconds = (message.seconds || BigInt(0)).toString()); message.nanos !== undefined && (obj.nanos = Math.round(message.nanos)); return obj; }, fromPartial(object: DeepPartial): Timestamp { const message = createBaseTimestamp(); - message.seconds = object.seconds !== undefined && object.seconds !== null ? Long.fromValue(object.seconds) : Long.ZERO; + if (object.seconds !== undefined && object.seconds !== null) { + message.seconds = BigInt(object.seconds.toString()); + } message.nanos = object.nanos ?? 0; return message; }, diff --git a/__fixtures__/v-next/outputv2/google/protobuf/type.ts b/__fixtures__/v-next/outputv2/google/protobuf/type.ts index e4af245774..32e0faf0b2 100644 --- a/__fixtures__/v-next/outputv2/google/protobuf/type.ts +++ b/__fixtures__/v-next/outputv2/google/protobuf/type.ts @@ -1,6 +1,6 @@ import { SourceContext, SourceContextAmino, SourceContextSDKType } from "./source_context"; import { Any, AnyAmino, AnySDKType } from "./any"; -import * as _m0 from "protobufjs/minimal"; +import { BinaryReader, BinaryWriter } from "../../binary"; import { isSet, DeepPartial } from "../../helpers"; export const protobufPackage = "google.protobuf"; /** Basic field types. */ @@ -509,7 +509,7 @@ function createBaseType(): Type { } export const Type = { typeUrl: "/google.protobuf.Type", - encode(message: Type, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Type, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -530,8 +530,8 @@ export const Type = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Type { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Type { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseType(); while (reader.pos < end) { @@ -563,14 +563,14 @@ export const Type = { return message; }, fromJSON(object: any): Type { - return { - name: isSet(object.name) ? String(object.name) : "", - fields: Array.isArray(object?.fields) ? object.fields.map((e: any) => Field.fromJSON(e)) : [], - oneofs: Array.isArray(object?.oneofs) ? object.oneofs.map((e: any) => String(e)) : [], - options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromJSON(e)) : [], - sourceContext: isSet(object.sourceContext) ? SourceContext.fromJSON(object.sourceContext) : undefined, - syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 - }; + const obj = createBaseType(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.fields)) object.fields.map((e: any) => Field.fromJSON(e)); + if (Array.isArray(object?.oneofs)) object.oneofs.map((e: any) => String(e)); + if (Array.isArray(object?.options)) object.options.map((e: any) => Option.fromJSON(e)); + if (isSet(object.sourceContext)) obj.sourceContext = SourceContext.fromJSON(object.sourceContext); + if (isSet(object.syntax)) obj.syntax = syntaxFromJSON(object.syntax); + return obj; }, toJSON(message: Type): unknown { const obj: any = {}; @@ -600,7 +600,9 @@ export const Type = { message.fields = object.fields?.map(e => Field.fromPartial(e)) || []; message.oneofs = object.oneofs?.map(e => e) || []; message.options = object.options?.map(e => Option.fromPartial(e)) || []; - message.sourceContext = object.sourceContext !== undefined && object.sourceContext !== null ? SourceContext.fromPartial(object.sourceContext) : undefined; + if (object.sourceContext !== undefined && object.sourceContext !== null) { + message.sourceContext = SourceContext.fromPartial(object.sourceContext); + } message.syntax = object.syntax ?? 0; return message; }, @@ -700,7 +702,7 @@ function createBaseField(): Field { } export const Field = { typeUrl: "/google.protobuf.Field", - encode(message: Field, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Field, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.kind !== 0) { writer.uint32(8).int32(message.kind); } @@ -733,8 +735,8 @@ export const Field = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Field { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Field { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseField(); while (reader.pos < end) { @@ -778,18 +780,18 @@ export const Field = { return message; }, fromJSON(object: any): Field { - return { - kind: isSet(object.kind) ? field_KindFromJSON(object.kind) : -1, - cardinality: isSet(object.cardinality) ? field_CardinalityFromJSON(object.cardinality) : -1, - number: isSet(object.number) ? Number(object.number) : 0, - name: isSet(object.name) ? String(object.name) : "", - typeUrl: isSet(object.typeUrl) ? String(object.typeUrl) : "", - oneofIndex: isSet(object.oneofIndex) ? Number(object.oneofIndex) : 0, - packed: isSet(object.packed) ? Boolean(object.packed) : false, - options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromJSON(e)) : [], - jsonName: isSet(object.jsonName) ? String(object.jsonName) : "", - defaultValue: isSet(object.defaultValue) ? String(object.defaultValue) : "" - }; + const obj = createBaseField(); + if (isSet(object.kind)) obj.kind = field_KindFromJSON(object.kind); + if (isSet(object.cardinality)) obj.cardinality = field_CardinalityFromJSON(object.cardinality); + if (isSet(object.number)) obj.number = Number(object.number); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.typeUrl)) obj.typeUrl = String(object.typeUrl); + if (isSet(object.oneofIndex)) obj.oneofIndex = Number(object.oneofIndex); + if (isSet(object.packed)) obj.packed = Boolean(object.packed); + if (Array.isArray(object?.options)) object.options.map((e: any) => Option.fromJSON(e)); + if (isSet(object.jsonName)) obj.jsonName = String(object.jsonName); + if (isSet(object.defaultValue)) obj.defaultValue = String(object.defaultValue); + return obj; }, toJSON(message: Field): unknown { const obj: any = {}; @@ -914,7 +916,7 @@ function createBaseEnum(): Enum { } export const Enum = { typeUrl: "/google.protobuf.Enum", - encode(message: Enum, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Enum, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -932,8 +934,8 @@ export const Enum = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Enum { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Enum { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnum(); while (reader.pos < end) { @@ -962,13 +964,13 @@ export const Enum = { return message; }, fromJSON(object: any): Enum { - return { - name: isSet(object.name) ? String(object.name) : "", - enumvalue: Array.isArray(object?.enumvalue) ? object.enumvalue.map((e: any) => EnumValue.fromJSON(e)) : [], - options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromJSON(e)) : [], - sourceContext: isSet(object.sourceContext) ? SourceContext.fromJSON(object.sourceContext) : undefined, - syntax: isSet(object.syntax) ? syntaxFromJSON(object.syntax) : -1 - }; + const obj = createBaseEnum(); + if (isSet(object.name)) obj.name = String(object.name); + if (Array.isArray(object?.enumvalue)) object.enumvalue.map((e: any) => EnumValue.fromJSON(e)); + if (Array.isArray(object?.options)) object.options.map((e: any) => Option.fromJSON(e)); + if (isSet(object.sourceContext)) obj.sourceContext = SourceContext.fromJSON(object.sourceContext); + if (isSet(object.syntax)) obj.syntax = syntaxFromJSON(object.syntax); + return obj; }, toJSON(message: Enum): unknown { const obj: any = {}; @@ -992,7 +994,9 @@ export const Enum = { message.name = object.name ?? ""; message.enumvalue = object.enumvalue?.map(e => EnumValue.fromPartial(e)) || []; message.options = object.options?.map(e => Option.fromPartial(e)) || []; - message.sourceContext = object.sourceContext !== undefined && object.sourceContext !== null ? SourceContext.fromPartial(object.sourceContext) : undefined; + if (object.sourceContext !== undefined && object.sourceContext !== null) { + message.sourceContext = SourceContext.fromPartial(object.sourceContext); + } message.syntax = object.syntax ?? 0; return message; }, @@ -1073,7 +1077,7 @@ function createBaseEnumValue(): EnumValue { } export const EnumValue = { typeUrl: "/google.protobuf.EnumValue", - encode(message: EnumValue, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: EnumValue, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1085,8 +1089,8 @@ export const EnumValue = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): EnumValue { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): EnumValue { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseEnumValue(); while (reader.pos < end) { @@ -1109,11 +1113,11 @@ export const EnumValue = { return message; }, fromJSON(object: any): EnumValue { - return { - name: isSet(object.name) ? String(object.name) : "", - number: isSet(object.number) ? Number(object.number) : 0, - options: Array.isArray(object?.options) ? object.options.map((e: any) => Option.fromJSON(e)) : [] - }; + const obj = createBaseEnumValue(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.number)) obj.number = Number(object.number); + if (Array.isArray(object?.options)) object.options.map((e: any) => Option.fromJSON(e)); + return obj; }, toJSON(message: EnumValue): unknown { const obj: any = {}; @@ -1193,7 +1197,7 @@ function createBaseOption(): Option { } export const Option = { typeUrl: "/google.protobuf.Option", - encode(message: Option, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer { + encode(message: Option, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { if (message.name !== "") { writer.uint32(10).string(message.name); } @@ -1202,8 +1206,8 @@ export const Option = { } return writer; }, - decode(input: _m0.Reader | Uint8Array, length?: number): Option { - const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input); + decode(input: BinaryReader | Uint8Array, length?: number): Option { + const reader = input instanceof BinaryReader ? input : new BinaryReader(input); let end = length === undefined ? reader.len : reader.pos + length; const message = createBaseOption(); while (reader.pos < end) { @@ -1223,10 +1227,10 @@ export const Option = { return message; }, fromJSON(object: any): Option { - return { - name: isSet(object.name) ? String(object.name) : "", - value: isSet(object.value) ? Any.fromJSON(object.value) : undefined - }; + const obj = createBaseOption(); + if (isSet(object.name)) obj.name = String(object.name); + if (isSet(object.value)) obj.value = Any.fromJSON(object.value); + return obj; }, toJSON(message: Option): unknown { const obj: any = {}; @@ -1237,7 +1241,9 @@ export const Option = { fromPartial(object: DeepPartial